From 4c3c7727ceb078f48767be378b33f82cf2783368 Mon Sep 17 00:00:00 2001
From: ZoeLeeFZ <lizhou1021@qq.com>
Date: Tue, 2 Jun 2020 14:47:28 +0800
Subject: [PATCH] =?UTF-8?q?!1077=20=E4=BF=AE=E5=A4=8D:=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/DrawWineRack/EditorWineRack.ts |  2 +-
 src/UI/Components/Board/UserConfig.tsx    |  2 +-
 src/UI/Components/Board/WineRack.tsx      | 12 ++++++------
 src/UI/Store/BoardStore.ts                |  1 +
 src/UI/Store/WineRackStore.ts             |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Add-on/DrawWineRack/EditorWineRack.ts b/src/Add-on/DrawWineRack/EditorWineRack.ts
index 2cc8e69f3..fa66bcc8f 100644
--- a/src/Add-on/DrawWineRack/EditorWineRack.ts
+++ b/src/Add-on/DrawWineRack/EditorWineRack.ts
@@ -26,7 +26,7 @@ export class EditorWineRack implements Command
 
         let editorTemp = brs[0].Template.Object as TemplateWineRackRecord;
         const store = WineRackStore.GetInstance() as WineRackStore;
-        store.editorTemplate = editorTemp;
+        store.EditorTemplate = editorTemp;
         store.UpdateOption({ option: editorTemp.Option });
         app.Editor.ModalManage.RenderModal(WineRackModal, { store });
     }
diff --git a/src/UI/Components/Board/UserConfig.tsx b/src/UI/Components/Board/UserConfig.tsx
index 798178186..7791521c7 100644
--- a/src/UI/Components/Board/UserConfig.tsx
+++ b/src/UI/Components/Board/UserConfig.tsx
@@ -108,7 +108,7 @@ export class UserConfig extends React.Component<IConfigProps, UserConfigState>{
                 curName = confNames[0];
             this.props.store.configName = curName;
 
-            if (type !== BoardModalType.TempDes && (!userConfig.keepConfig || !this._userConfigStore.readConfigs.has(type)))
+            if (type !== BoardModalType.TempDes && !this.props.store.EditorTemplate && (!userConfig.keepConfig || !this._userConfigStore.readConfigs.has(type)))
                 this.updateBoardOption(curName);
         }
         if (type === BoardModalType.TempDes)
diff --git a/src/UI/Components/Board/WineRack.tsx b/src/UI/Components/Board/WineRack.tsx
index e619f2087..225112beb 100644
--- a/src/UI/Components/Board/WineRack.tsx
+++ b/src/UI/Components/Board/WineRack.tsx
@@ -42,15 +42,15 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore; }, {
             }
 
             app.Editor.ModalManage.Destory();
-            if (this.props.store.editorTemplate)
+            if (this.props.store.EditorTemplate)
             {
                 await CommandWrap(async () =>
                 {
-                    let temp = this.props.store.editorTemplate;
+                    let temp = this.props.store.EditorTemplate;
                     temp.Option = opt;
                     await temp.UpdateTemplateTree();
                     app.Editor.UpdateScreen();
-                    this.props.store.editorTemplate = undefined;
+                    this.props.store.EditorTemplate = undefined;
                 }, "编辑酒格");
             }
             else
@@ -131,7 +131,7 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore; }, {
                 icon={IconNames.REGRESSION_CHART}
                 close={() =>
                 {
-                    this.props.store.editorTemplate = undefined;
+                    this.props.store.EditorTemplate = undefined;
                     app.Editor.ModalManage.Destory();
                 }}
                 bodyClass="door"
@@ -140,7 +140,7 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore; }, {
                 footerChildren={
                     <>
                         <Button
-                            text={this.props.store.editorTemplate === undefined ? "绘制" : "更新"}
+                            text={this.props.store.EditorTemplate === undefined ? "绘制" : "更新"}
                             intent={Intent.SUCCESS}
                             onClick={this.handleExec}
                         />
@@ -149,7 +149,7 @@ export class WineRackModal extends React.Component<{ store?: WineRackStore; }, {
                             intent={Intent.DANGER}
                             onClick={() =>
                             {
-                                this.props.store.editorTemplate = undefined;
+                                this.props.store.EditorTemplate = undefined;
                                 app.Editor.ModalManage.Destory();
                             }}
                         />
diff --git a/src/UI/Store/BoardStore.ts b/src/UI/Store/BoardStore.ts
index 4501a0bae..520414b7f 100644
--- a/src/UI/Store/BoardStore.ts
+++ b/src/UI/Store/BoardStore.ts
@@ -27,6 +27,7 @@ export interface IConfigStore
     SaveConfig: () => IConfigOption;
     UpdateOption: Function;
     HasInvailValue?: () => boolean;
+    EditorTemplate?: TemplateRecord;
 }
 
 export class BoardStore extends Singleton implements IConfigStore
diff --git a/src/UI/Store/WineRackStore.ts b/src/UI/Store/WineRackStore.ts
index 629554317..c51cd7aae 100644
--- a/src/UI/Store/WineRackStore.ts
+++ b/src/UI/Store/WineRackStore.ts
@@ -9,7 +9,7 @@ import { IWineRackOption } from "./WineRackInterface";
 
 export class WineRackStore extends BoardStore
 {
-    editorTemplate: TemplateWineRackRecord;
+    EditorTemplate: TemplateWineRackRecord;
     @observable m_Option: IWineRackOption = Object.assign({}, DefaultWineRackConfig);
     HasInvailValue()
     {