From 20164f4f61a96d72157fb630fab88a4f1044510b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=AF=97=E6=B4=A5?= <2723065175@qq.com>
Date: Wed, 14 Jun 2023 02:19:23 +0000
Subject: [PATCH] =?UTF-8?q?!2245=20=E4=BF=AE=E5=A4=8D:=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=9D=E5=AD=98=E5=90=8E,=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E7=BD=91=E9=A1=B5=E8=BF=9B=E6=9D=A5,=E6=B2=A1?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=9A=E4=BD=8D=E5=88=B0=E5=88=9A=E6=89=8D?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Room/Entity/Wall/Hole/Window/WindowTempSelect.tsx      | 2 +-
 src/UI/Components/BBS/LookOverBoardInfos.tsx               | 2 +-
 src/UI/Components/Common/Datalist.tsx                      | 2 +-
 src/UI/Components/SourceManage/CommonPanel.tsx             | 4 ++--
 src/UI/Store/UserConfigStore.tsx                           | 7 ++++---
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempSelect.tsx b/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempSelect.tsx
index 7fe67fd15..9099b0818 100644
--- a/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempSelect.tsx
+++ b/src/DatabaseServices/Room/Entity/Wall/Hole/Window/WindowTempSelect.tsx
@@ -142,7 +142,7 @@ export class WindowTempSelect extends React.Component<IWindowTempSelectProps, {}
 
     private handleClose = (modalState: ModalState) =>
     {
-        userConfigStore.SaveConfig(BoardModalType.DatalistStore, datalistStore, { toaster: false }); //保存配置
+        userConfigStore.SaveConfig(BoardModalType.DatalistStore, datalistStore, { toaster: false, isUploadUserConfigNames: false }); //保存配置
 
         if (this.props.selectDiv)
         {
diff --git a/src/UI/Components/BBS/LookOverBoardInfos.tsx b/src/UI/Components/BBS/LookOverBoardInfos.tsx
index 99b0d39ed..29590da59 100644
--- a/src/UI/Components/BBS/LookOverBoardInfos.tsx
+++ b/src/UI/Components/BBS/LookOverBoardInfos.tsx
@@ -317,7 +317,7 @@ export class LookOverBoardInfosModal extends React.Component<LookOverBoardInfosM
     }
     componentWillUnmount()
     {
-        userConfigStore.SaveConfig(BoardModalType.UserConfig, userConfig, { toaster: false });
+        userConfigStore.SaveConfig(BoardModalType.UserConfig, userConfig, { toaster: false, isUploadUserConfigNames: false });
         for (let f of this.removeFuncs)
             f();
         this.removeFuncs.length = 0;
diff --git a/src/UI/Components/Common/Datalist.tsx b/src/UI/Components/Common/Datalist.tsx
index b22924927..66eb96fb2 100644
--- a/src/UI/Components/Common/Datalist.tsx
+++ b/src/UI/Components/Common/Datalist.tsx
@@ -146,7 +146,7 @@ export class DataList extends React.Component<IDataListProps> {
 
     private SaveConfig = () =>
     {
-        userConfigStore.SaveConfig(BoardModalType.DatalistStore, datalistStore, { toaster: false }); //保存配置
+        userConfigStore.SaveConfig(BoardModalType.DatalistStore, datalistStore, { toaster: false, isUploadUserConfigNames: false }); //保存配置
     };
     renderBigData = () =>
     {
diff --git a/src/UI/Components/SourceManage/CommonPanel.tsx b/src/UI/Components/SourceManage/CommonPanel.tsx
index 624771b02..f3e856981 100644
--- a/src/UI/Components/SourceManage/CommonPanel.tsx
+++ b/src/UI/Components/SourceManage/CommonPanel.tsx
@@ -348,7 +348,7 @@ export class CommonPanel extends React.Component<ICommonPanelProps, ICommonPanel
                                     onChange={(e) =>
                                     {
                                         commonPanelStore.m_Option.orderType = e.target.value as EOrderType;
-                                        userConfigStore.SaveConfig(BoardModalType.CommonPanelStore, commonPanelStore, { toaster: false }); //保存配置
+                                        userConfigStore.SaveConfig(BoardModalType.CommonPanelStore, commonPanelStore, { toaster: false, isUploadUserConfigNames: false, }); //保存配置
                                         this.handleGetData();
                                     }}
                                 />
@@ -457,7 +457,7 @@ export class CommonPanel extends React.Component<ICommonPanelProps, ICommonPanel
                                         onChange={(e) =>
                                         {
                                             commonPanelStore.m_Option.orderType = e.target.value as EOrderType;
-                                            userConfigStore.SaveConfig(BoardModalType.CommonPanelStore, commonPanelStore, { toaster: false }); //保存配置
+                                            userConfigStore.SaveConfig(BoardModalType.CommonPanelStore, commonPanelStore, { toaster: false, isUploadUserConfigNames: false, }); //保存配置
                                             this.handleGetData();
                                         }}
                                     />
diff --git a/src/UI/Store/UserConfigStore.tsx b/src/UI/Store/UserConfigStore.tsx
index 54086bde6..1badc9071 100644
--- a/src/UI/Store/UserConfigStore.tsx
+++ b/src/UI/Store/UserConfigStore.tsx
@@ -50,6 +50,7 @@ interface ISaveOption
     isInit?: boolean;
     isCheckName?: boolean;
     toaster?: boolean;
+    isUploadUserConfigNames?: boolean;
 }
 export enum EZengZhiBaoId
 {
@@ -319,7 +320,7 @@ export class UserConfigStore extends Singleton
     }
     async SaveConfig(type: BoardModalType, store: IConfigStore, option: ISaveOption = {}, tagName?: string)
     {
-        const { isInit = false, isCheckName = false, toaster = true } = option;
+        const { isInit = false, isCheckName = false, toaster = true, isUploadUserConfigNames = true } = option;
         const configName = store.configName;
         if (configName === "")
         {
@@ -390,9 +391,9 @@ export class UserConfigStore extends Singleton
                     intent: Intent.SUCCESS,
                 });
             this.UpdateUserConfig(type, newConfig);
-            if (userConfig.userConfigName[type] != configName)
+            userConfig.userConfigName[type] = configName;
+            if (isUploadUserConfigNames)
             {
-                userConfig.userConfigName[type] = configName;
                 await this.UploadUserConfigNames(dbStore);
             }
         }