!2365 新增:一键隐藏显示增加不拆单板件选项

Merge pull request !2365 from 林三/sh_nochaidan

src/Editor/DefaultConfig.ts

@@ -868,7 +868,7 @@ export const DefaultR2b2Option: IRect2Br2Option = {
 Object.freeze(DefaultR2b2Option);
 
 export const DefaultHSOption: IHSOption = {
-    version: 3,
+    version: 4,
     isAll: true,
     isHide: true,
     isDelete: false,
@@ -882,6 +882,7 @@ export const DefaultHSOption: IHSOption = {
     door: false,
     drawer: false,
     closingStrip: false,
+    noChaiDan: false,
     winerack: false,
     wood: false,
     nails: false,

src/UI/Components/Modal/HideSelectModal.less

@@ -1,6 +1,6 @@
 .selectHide {
     .bp3-checkbox {
-        width: 80px;
+        width: 86px;
         margin-right: 10px;
     }
 

src/UI/Components/Modal/HideSelectModal.tsx

@@ -61,6 +61,7 @@ export const KEY2LABEL: AllString<IHSOption> = {
     hinge: "铰链",
     hwComposity: "复合实体",
     dim: "标注",
+    noChaiDan: "不拆单的板",
     curve: "曲线",
     line: "直线",
     polyline: "多段线",
@@ -72,7 +73,7 @@ export const KEY2LABEL: AllString<IHSOption> = {
 const BOARD_KEYS = [
     "layer", "behind", "vertial", "footer", "tbBoard",
     "closingStrip", "specialShape", "door", "drawer", "winerack",
-    "lattice", "custom",
+    "lattice", "noChaiDan", "custom",
 ];
 const HOLE_KEYS = [
     "hole", "wood", "nails"
@@ -379,9 +380,9 @@ export class HideSelectModal extends React.Component<{ store: HideSelectStore; h
 
             if (option[key])
                 ens.forEach(e => e && resEntSet.add(e));
-            else if (option.custom)//自定义板名搜索
+            else if (option.custom || option.noChaiDan)
             {
-                //避免使用板名搜索时,这些实体被禁用
+                //避免被模块归类时（门、抽屉、酒格、格子抽）, 其他条件失效
             }
             else if (option.hwComposity)//避免使用五金搜索时,这些实体被禁用
                 for (let en of ens)
@@ -420,6 +421,16 @@ export class HideSelectModal extends React.Component<{ store: HideSelectStore; h
                 }
             }
 
+            //不拆单板件
+            if (option.noChaiDan)
+            {
+                if (!b.IsChaiDan)
+                {
+                    resEntSet.add(b);
+                    continue;
+                }
+            }
+
             if (option.specialShape)
             {
                 if (b.IsSpecialShape)

src/UI/Store/HSInterface.ts

@@ -31,6 +31,7 @@ export interface IHSOption extends IBaseOption
     circle: boolean;
     arc: boolean;
     custom: boolean;//自定义板名搜索
+    noChaiDan: boolean; //不拆单板件
     matchType?: ECompareType;
     customBoardName?: string;
 }

src/UI/Store/HideSelectStore.ts

@@ -50,6 +50,12 @@ export class HideSelectStore implements IConfigStore
             cof.option.matchType = ECompareType.Equal;
         }
 
+        if (cof.option.version < 4)
+        {
+            cof.option.version = 4;
+            cof.option.noChaiDan = false;
+        }
+
         Object.assign(this.m_Option, cof.option);
         this.CheckIsAll();
         this.isRev = false;