!2677 优化: 提示性(非警告级别)弹窗改进(限制显示条数或缩短显示时间)

pull/2689/head
彭泽 6 months ago committed by ChenX
parent 7ce8056d97
commit f65dab522e

@ -125,7 +125,8 @@ interface BoardColorMaterialMapDialogProps
//用显示板材和板件的对应关系,命令根据板件材质改颜色的功能
@observer
export class BoardColorMaterialMapDialog extends React.Component<BoardColorMaterialMapDialogProps, {}> {
export class BoardColorMaterialMapDialog extends React.Component<BoardColorMaterialMapDialogProps, {}>
{
//当前选择的板材列表
@observable selectIndexs: number[] = [];

@ -1,3 +1,4 @@
import { Toaster } from "@blueprintjs/core";
import React from "react";
import { Intent } from "../../Common/Toaster";
import { Board } from "../../DatabaseServices/Entity/Board";
@ -6,10 +7,16 @@ import { CommandWrap } from "../../Editor/CommandMachine";
import { CommandState } from "../../Editor/CommandState";
import { AppToaster } from "../../UI/Components/Toaster";
export const ResetColorToast = Toaster.create({
canEscapeKeyClear: true
});
/** 弹窗-是否要还原颜色 */
export function ResetColor(colorMap: Map<Board, number>)
export async function ResetColor(colorMap: Map<Board, number>)
{
const key = AppToaster.show({
if (ResetColorToast)
ResetColorToast.clear();
ResetColorToast.show({
message: <>
<span style={{ marginRight: "5px" }}></span>
<button onClick={() =>
@ -21,7 +28,7 @@ export function ResetColor(colorMap: Map<Board, number>)
{
br.ColorIndex = color;
}
AppToaster.dismiss(key);
ResetColorToast.clear();
}, "还原上次颜色");
else
AppToaster.show({
@ -39,7 +46,7 @@ export function ResetColor(colorMap: Map<Board, number>)
{
ResetDefaultColor(br);
}
AppToaster.dismiss(key);
ResetColorToast.clear();
}, "还原初始颜色");
else
AppToaster.show({
@ -49,10 +56,11 @@ export function ResetColor(colorMap: Map<Board, number>)
});
}}></button>
</>,
timeout: 60000,
timeout: 5000,
});
}
function ResetDefaultColor(br: Board)
{
let boardType = br.BoardType;

@ -114,7 +114,8 @@ export class BoardColorByRoomOrCabinetDialog extends React.Component<{
color: number;
}[];
oldColorMap: Map<Board, number>;
}, {}> {
}, {}>
{
//当前选择的板材列表
@observable _SelectIndexs: number[] = [];

Loading…
Cancel
Save