!778 优化提取造型交互,优化userConfigStore

src/UI/Components/Board/BoardConfigModal.tsx

@@ -237,7 +237,6 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
                 cu.ColorIndex = color;
                 moveCus.push(cu);
             }
-
         }
 
         let isOk = await selectOutlinePosition(moveCus);
@@ -246,9 +245,12 @@ export class BoardConfigModal extends React.Component<BoardConfigProps, {}>{
         if (isOk)
         {
             //显示右侧状态栏
+            store.modelingStore.isUpdate = false;
+            store.modelingStore.configName = "";
             store.m_IsShow = true;
             store.m_TabId = RightTabId.Model;
             app.Editor.MaskManage.OnFocusEvent();
+            store.modelingStore.isUpdate = true;
         }
 
         commandMachine.CommandEnd();

src/UI/Components/Board/UserConfig.tsx

@@ -107,7 +107,7 @@ export class UserConfig extends React.Component<IConfigProps, UserConfigState>{
                 curName = confNames[0];
             this.props.store.configName = curName;
 
-            if (type !== BoardModalType.TempDes && type !== BoardModalType.Zx && !this._userConfigStore.readConfigs.has(type))
+            if (type !== BoardModalType.TempDes && !this._userConfigStore.readConfigs.has(type))
                 this.updateBoardOption(curName);
         }
         if (type === BoardModalType.TempDes)

src/UI/Components/Modal/ProcessingGroupModal.tsx

@@ -78,7 +78,7 @@ export class ProcessingGroupModalStore extends Singleton implements IConfigStore
         this.expandedNodesId = [];
     };
     //
-    configName: string;
+    configName: string = "default";
     configsNames: string[];
     UpdateOption: Function;
 }
@@ -126,6 +126,7 @@ export class ProcessingGroupModal extends React.Component<{ store: ProcessingGro
         for (let f of this.removeFuncs)
             f();
         this.removeFuncs.length = 0;
+        userConfigStore.SaveConfig(BoardModalType.ProcessGroupCategory, ProcessingGroupModalStore.GetInstance(), false);
     }
     //检查加工类别中有无重复实体
     CheckSelect = () =>
@@ -439,7 +440,6 @@ export class ProcessingGroupModal extends React.Component<{ store: ProcessingGro
             this.props.store.processGroupCategory.push(groupname);
             this.canCreateGroup.set(false);
             this.setState({ nodes: this.parseNodes() });
-            userConfigStore.SaveConfig(BoardModalType.ProcessGroupCategory, ProcessingGroupModalStore.GetInstance(), true);
         }
         else
         {
@@ -474,7 +474,6 @@ export class ProcessingGroupModal extends React.Component<{ store: ProcessingGro
             }
             this.props.store.processGroupCategory = this.props.store.processGroupCategory.filter((g) => !this.props.store.selectedLeftNodeSet.has(g));
             this.setState({ nodes: this.parseNodes() });
-            userConfigStore.SaveConfig(BoardModalType.ProcessGroupCategory, ProcessingGroupModalStore.GetInstance(), true);
             this.props.store.selectedLeftNodeSet.clear();
         }
 

src/UI/Components/RightPanel/ModelingComponent.tsx

@@ -104,7 +104,7 @@ export class ModelingComponent extends React.Component<{ store?: RightPanelStore
                         })
                     }
                 </ul>
-                <UserConfig type={BoardModalType.Zx} store={this.props.store.modelingStore} />
+                <UserConfig type={BoardModalType.Zx} store={this.props.store.modelingStore} isUpdate={this.props.store.modelingStore.isUpdate} />
             </>
         );
     }

src/UI/Store/RightPanelStore/ModelingStore.ts

@@ -18,9 +18,9 @@ export class ModelingStore implements IConfigStore
 {
     @observable configName = "默认";
     @observable configsNames: string[] = [];
-    readConfigs: Set<string> = new Set(); //已经读取过的配置
     @observable modelingItems: IModelingItem[] = [];
     @observable UIModelingItems: IUIModeiling[] = [];
+    isUpdate = true;
     constructor()
     {
         this.InitModelingItems();

src/UI/Store/UserConfigStore.ts

@@ -192,22 +192,6 @@ export class UserConfigStore extends Singleton
     async SaveConfig(type: BoardModalType, store: IConfigStore, isInit: boolean = false, isCheckName = false)
     {
         let name = store.configName;
-        if (type === BoardModalType.ProcessGroupCategory)
-        {
-            let newConfig: IConfigOption = store.SaveConfig();
-            let dbStore = await IndexedDbStore.CADStore();
-            let data = await PostJson(ConfigUrls.Edit, { key: type, value: JSON.stringify(newConfig.processGroupCategory) });//
-            if (data.err_code === RequestStatus.Ok)
-            {
-                await dbStore.Put(StoreName.ConfigData, GetIndexDBID(type), newConfig.processGroupCategory);//
-                await dbStore.Put(StoreName.ConfigVersion, GetIndexDBID(type), data.version);
-                appCache.set(type, newConfig.processGroupCategory);//
-                userConfig.userConfigName[type] = type;
-                this.UpdateUserConfig(type, newConfig);//
-                await userConfig.UploadUserConfigNames();
-            }
-            return;
-        }
         if (name === "")
         {
             AppToaster.show({
@@ -225,22 +209,32 @@ export class UserConfigStore extends Singleton
             });
             return;
         }
-        let configs = (await this.GetAllConfigs(type)) || {};
-
-        let isContinue = true;
-        if (configs.hasOwnProperty(name) && !isInit && isCheckName)
-            isContinue = confirm("配置名称已存在，是否覆盖");
-
-        if (!isContinue) return;
 
         //新的配置
         let newConfig: IConfigOption = store.SaveConfig();
-        // 配置添加到数据库
-        configs[name] = newConfig;
-        observable(store.configsNames).replace(Object.keys(configs));
 
-        if (type === BoardModalType.Dr)
-            this.ChangeDrillRuleMap(configs);
+        let configs = {};
+
+        if (type === BoardModalType.ProcessGroupCategory)
+        {
+            configs = newConfig.processGroupCategory;
+        }
+        else
+        {
+            configs = (await this.GetAllConfigs(type)) || {};
+            let isContinue = true;
+            if (configs.hasOwnProperty(name) && !isInit && isCheckName)
+                isContinue = confirm("配置名称已存在，是否覆盖");
+
+            if (!isContinue) return;
+
+            // 配置添加到数据库
+            configs[name] = newConfig;
+            observable(store.configsNames).replace(Object.keys(configs));
+
+            if (type === BoardModalType.Dr)
+                this.ChangeDrillRuleMap(configs);
+        }
 
         let dbStore = await IndexedDbStore.CADStore();
 
@@ -251,10 +245,11 @@ export class UserConfigStore extends Singleton
             await dbStore.Put(StoreName.ConfigData, GetIndexDBID(type), configs);
             await dbStore.Put(StoreName.ConfigVersion, GetIndexDBID(type), data.version);
             appCache.set(type, configs);
-            AppToaster.show({
-                message: isInit ? "初始化配置成功" : "配置保存成功",
-                timeout: 1000
-            });
+            if (type !== BoardModalType.ProcessGroupCategory)
+                AppToaster.show({
+                    message: isInit ? "初始化配置成功" : "配置保存成功",
+                    timeout: 1000
+                });
             userConfig.userConfigName[type] = name;
             this.UpdateUserConfig(type, newConfig);
             await userConfig.UploadUserConfigNames();