!2805 优化:自动设置孔面功能,增加支持指定名称板件不改变大孔面

src/Add-on/AutoHoleFaceSetting.ts

@@ -36,13 +36,13 @@ export class AutoHoleFaceSetting implements Command
             if (brRes.Status === PromptStatus.OK)
             {
                 let brs = brRes.SelectSet.SelectEntityList as Board[];
+                const filterBoardsSet = new Set(autoHoleFaceSettingStore.option.filterBoards.split(',').filter(item => item.trim() !== ''));
+                const filterDrillArraySet = new Set(autoHoleFaceSettingStore.option.filterDrill.split(',').filter(item => item.trim() !== ''));
                 for (let br of brs)
                 {
                     let p = br.Position;
-                    const filterDrillArray = autoHoleFaceSettingStore.option.filterDrill.split(',').filter(item => item.trim() !== '');
-                    if (p.z > autoHoleFaceSettingStore.option.hight &&
-                        !filterDrillArray.some(item => item === br.BoardProcessOption[EBoardKeyList.DrillType])
-                    )
+                    if (filterBoardsSet.has(br.Name) || filterDrillArraySet.has(br.BoardProcessOption[EBoardKeyList.DrillType])) continue;
+                    if (p.z > autoHoleFaceSettingStore.option.hight)
                         br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Front;
                     else
                         br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Back;
@@ -73,18 +73,20 @@ export class AutoHoleFaceSettingStore extends Singleton implements IConfigStore
     @observable configName = "默认";
     @observable configsNames = ['默认'];
     @observable option: IAutoHoleFaceOption = {
-        version: 1,
+        version: 2,
         hight: 1500,
-        filterDrill: ''
+        filterDrill: '',
+        filterBoards: '',
     };
     @observable uiOption: IUiOption<IAutoHoleFaceOption>;
 
     InitOption()
     {
         Object.assign(this.option, {
-            version: 1,
+            version: 2,
             hight: 1500,
-            filterDrill: ''
+            filterDrill: '',
+            filterBoards: '',
         });
     }
     get UiOption()
@@ -108,7 +110,13 @@ export class AutoHoleFaceSettingStore extends Singleton implements IConfigStore
             conf.option.version = 1;
             conf.option.filterDrill = '';
         }
+        if (conf.option.version < 2)
+        {
+            conf.option.version = 2;
+            conf.option.filterBoards = '';
+        }
         this.option.filterDrill = conf.option.filterDrill;
+        this.option.filterBoards = conf.option.filterBoards;
         if (this.uiOption)
             Object.assign(this.uiOption, DataAdapter.ConvertUIData(conf.option));
     }

src/UI/Components/FilterDrillModal.tsx

@@ -92,6 +92,17 @@ export const FilterDrillModal = (observer((props: { store?: AutoHoleFaceSettingS
         store.option.filterDrill = newValueString;
     };
 
+    const filterBoardsChange = (e) =>
+    {
+        const newValue = e.target.value;
+        let newValueString = '';
+        if (newValue.trim() !== '')
+        {
+            newValueString = newValue.trim();
+        }
+        store.option.filterBoards = newValueString;
+    };
+
     const handleApplySelected = () =>
     {
         const inputDrillArray = inputDrillStr.split(',').filter(item => item.trim() !== '');
@@ -184,8 +195,19 @@ export const FilterDrillModal = (observer((props: { store?: AutoHoleFaceSettingS
                         style={{ height: '2.5rem' }}
                         value={store.option.filterDrill}
                         onChange={(e) => handleInputChange(e)}
+                        onKeyUp={(e) => { e.currentTarget.value = e.currentTarget.value.replaceAll(/，/g, ','); }}
                     />
                 </div>
+                <h5>输入不受分界高度影响的板件名称</h5>
+                <Tooltip content="用逗号分割板件名称">
+                    <input
+                        className={`${Classes.INPUT} filterDrill-input`}
+                        style={{ height: '2.5rem', width: 260 }}
+                        value={store.option.filterBoards}
+                        onChange={(e) => filterBoardsChange(e)}
+                        onKeyUp={(e) => { e.currentTarget.value = e.currentTarget.value.replaceAll(/，/g, ','); }}
+                    />
+                </Tooltip>
             </div>
         </CommonModal>);
 }));

src/UI/Store/OptionInterface/IOptionInterface.ts

@@ -351,6 +351,7 @@ export interface IAutoHoleFaceOption extends IBaseOption
 {
     hight: number;
     filterDrill: string; //被过滤的排钻
+    filterBoards: string;//被过滤的板件
 }
 
 export interface OneClickInspectionOption extends IBaseOption