From f65dab522e8bffa0f6e7ed980ddf31a4dd934a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=B3=BD?= <3365712788@qq.com>
Date: Wed, 17 Apr 2024 05:58:00 +0000
Subject: [PATCH] =?UTF-8?q?!2677=20=E4=BC=98=E5=8C=96:=20=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=80=A7(=E9=9D=9E=E8=AD=A6=E5=91=8A=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB)=E5=BC=B9=E7=AA=97=E6=94=B9=E8=BF=9B(=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=98=BE=E7=A4=BA=E6=9D=A1=E6=95=B0=E6=88=96=E7=BC=A9?=
 =?UTF-8?q?=E7=9F=AD=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangeColorByMaterial.tsx                  |  3 ++-
 src/Add-on/ChangeColorByBoard/ResetColor.tsx   | 18 +++++++++++++-----
 .../ChangeColorByRoomOrCabinet.tsx             |  3 ++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx b/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx
index a8df6d0a0..a7ea51951 100644
--- a/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx
+++ b/src/Add-on/ChangeColorByBoard/ChangeColorByMaterial.tsx
@@ -125,7 +125,8 @@ interface BoardColorMaterialMapDialogProps
 
 //用显示板材和板件的对应关系,命令根据板件材质改颜色的功能
 @observer
-export class BoardColorMaterialMapDialog extends React.Component<BoardColorMaterialMapDialogProps, {}> {
+export class BoardColorMaterialMapDialog extends React.Component<BoardColorMaterialMapDialogProps, {}>
+{
 
     //当前选择的板材列表
     @observable selectIndexs: number[] = [];
diff --git a/src/Add-on/ChangeColorByBoard/ResetColor.tsx b/src/Add-on/ChangeColorByBoard/ResetColor.tsx
index 8d3f50003..8d16be7c9 100644
--- a/src/Add-on/ChangeColorByBoard/ResetColor.tsx
+++ b/src/Add-on/ChangeColorByBoard/ResetColor.tsx
@@ -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;
diff --git a/src/Add-on/ChangeColorByRoomOrCabinet/ChangeColorByRoomOrCabinet.tsx b/src/Add-on/ChangeColorByRoomOrCabinet/ChangeColorByRoomOrCabinet.tsx
index 19d7f3140..2a5f04f68 100644
--- a/src/Add-on/ChangeColorByRoomOrCabinet/ChangeColorByRoomOrCabinet.tsx
+++ b/src/Add-on/ChangeColorByRoomOrCabinet/ChangeColorByRoomOrCabinet.tsx
@@ -114,7 +114,8 @@ export class BoardColorByRoomOrCabinetDialog extends React.Component<{
         color: number;
     }[];
     oldColorMap: Map<Board, number>;
-}, {}> {
+}, {}>
+{
 
     //当前选择的板材列表
     @observable _SelectIndexs: number[] = [];