!2569 新增:活动层板添加不排钻选项

src/Add-on/ActivityLayerBoard.ts

@@ -12,6 +12,7 @@ import { ModalState } from "../UI/Components/Modal/ModalInterface";
 import { AppToaster } from "../UI/Components/Toaster";
 import { ActivityLayerBoardStore } from "../UI/Store/ActivityLayerBoardStore";
 import { activityLayerBoardTool } from "./DrawBoard/ActivityLayerBoardTool";
+import { DrillType } from "./DrawDrilling/DrillType";
 
 export class ActicityLayerBoard implements Command
 {
@@ -64,6 +65,11 @@ export class ActicityLayerBoard implements Command
                 }
                 else
                     noTempBrs.push(br);
+                if (shinkOption.isDrill)
+                {
+                    br.BoardProcessOption.drillType = DrillType.None;
+                    br.BoardProcessOption.highDrill.fill('不排');
+                }
             }
 
             let needRemoveTempBrs: Board[] = [];

src/UI/Components/Modal/ActivityLayerBoard.tsx

@@ -120,13 +120,24 @@ export class ActivityLayerBoard extends React.Component<IActivityLayerBoardProps
                                 </div>
                                 <h6 className={Classes.HEADING}>层板钉</h6>
                                 <div>
-                                    <Checkbox
-                                        checked={nailOpt.isDraw}
-                                        label="是否绘制层板钉"
-                                        onChange={() =>
-                                        {
-                                            nailOpt.isDraw = !nailOpt.isDraw;
-                                        }} />
+                                    <div className='flex'>
+                                        <Checkbox
+                                            checked={nailOpt.isDraw}
+                                            label="是否绘制层板钉"
+                                            style={{ marginRight: '40px' }}
+                                            onChange={() =>
+                                            {
+                                                nailOpt.isDraw = !nailOpt.isDraw;
+                                            }} />
+                                        <Checkbox
+                                            checked={shrinkOption.isDrill}
+                                            label="层板改为不排钻"
+                                            onChange={() =>
+                                            {
+                                                shrinkOption.isDrill = !shrinkOption.isDrill;
+                                            }} />
+                                    </div>
+
                                     <div className="flexWrap">
                                         {
                                             nailPars1.map(([k, v]) =>

src/UI/Store/ActivityLayerBoardStore.ts

@@ -10,7 +10,7 @@ import { INailRule, IShinkOption, IUiOption, LayerNailOption } from "./OptionInt
 export class ActivityLayerBoardStore extends BoardStore<IShinkOption>
 {
     @observable m_Option: IShinkOption = {
-        version: 1,
+        version: 2,
         name: "",
         front: 1,
         back: 1,
@@ -18,6 +18,7 @@ export class ActivityLayerBoardStore extends BoardStore<IShinkOption>
         right: 1,
         isLREqual: true,
         isFBEqual: true,
+        isDrill: false,
     };
     @observable nailOption: LayerNailOption = { ...DefaultNailOption };
     @observable private uiNailOption: IUiOption<LayerNailOption>;
@@ -67,7 +68,7 @@ export class ActivityLayerBoardStore extends BoardStore<IShinkOption>
     InitOption()
     {
         Object.assign(this.m_Option, {
-            version: 1,
+            version: 2,
             name: "",
             front: 0,
             back: 0,
@@ -75,6 +76,7 @@ export class ActivityLayerBoardStore extends BoardStore<IShinkOption>
             right: 1,
             isLREqual: true,
             isFBEqual: true,
+            isDrill: false,
         });
         this.rules.length = 0;
         this.rules.push({
@@ -112,6 +114,11 @@ export class ActivityLayerBoardStore extends BoardStore<IShinkOption>
             cof.option.option.version = 1;
             cof.option.option.name = "";
         }
+        if (cof.option.option.version < 2)
+        {
+            cof.option.option.version = 2;
+            cof.option.option.isDrill = false;
+        }
         let { option, rules } = cof.option as { option: IShinkOption, rules: INailRule[]; };
         Object.assign(this.m_Option, option);
         observable(this.rules).replace(rules);

src/UI/Store/OptionInterface/IOptionInterface.ts

@@ -193,6 +193,7 @@ export interface IShinkOption extends IBaseOption
     back: number;
     isLREqual: boolean;
     isFBEqual: boolean;
+    isDrill:boolean;
 }
 
 export type IUiOption<T> = {