!2637 优化:顶底板大孔面在模块参数更新时,若板重新生产,没有使用原始UI数据

src/DatabaseServices/Template/ProgramTempate/TemplateTopBottomBoard.ts

@@ -138,6 +138,7 @@ export class TemplateTopBottomBoard extends TemplateRecord
                     oldBrs[j].Width = newBrs[j].Width;
                     oldBrs[j].Height = newBrs[j].Height;
                     oldBrs[j].Thickness = newBrs[j].Thickness;
+                    this.SetBoardProcess(oldBrs[j], minSealed);
                 }
                 else
                 {
@@ -164,14 +165,14 @@ export class TemplateTopBottomBoard extends TemplateRecord
     {
         if (br.Name === "底板")
         {
-            if (this.BoardProcessOption?.bigHoleDir === FaceDirection.Inside)
+            if (this._bottomOption.bigHoleDir === FaceDirection.Inside)
                 br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Front;
             else
                 br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Back;
         }
         else if (br.Name === "顶板")
         {
-            if (this.BoardProcessOption?.bigHoleDir === FaceDirection.Front)
+            if (this._bottomOption.bigHoleDir === FaceDirection.Front)
                 br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Front;
             else
                 br.BoardProcessOption[EBoardKeyList.BigHole] = FaceDirection.Back;
@@ -228,11 +229,12 @@ export class TemplateTopBottomBoard extends TemplateRecord
         this._bottomOption.isDrawStrengthenStrip = file.Read();
         this._bottomOption.footerOffset = file.Read();
         this._bottomOption.divCount = file.Read();
-
+        if (ver > 2)
+            this._bottomOption.bigHoleDir = file.Read();
     }
     WriteFile(file: CADFiler)
     {
-        file.Write(2);
+        file.Write(3);
         super.WriteFile(file);
         file.Write(this.DrawCounts[0]);
         file.Write(this.DrawCounts[1]);
@@ -268,6 +270,7 @@ export class TemplateTopBottomBoard extends TemplateRecord
         file.Write(this._bottomOption.isDrawStrengthenStrip);
         file.Write(this._bottomOption.footerOffset);
         file.Write(this._bottomOption.divCount);
+        file.Write(this._bottomOption.bigHoleDir);
     }
 }
 

src/Editor/DefaultConfig.ts

@@ -155,6 +155,7 @@ export const DefaultBottomBoardOption: TBBoardOption = {
     isDrawStrengthenStrip: false,
     footerOffset: 0,
     divCount: 1,
+    bigHoleDir: FaceDirection.Front,
 };
 Object.freeze(DefaultBottomBoardOption);
 

src/UI/Components/Board/BoardModal.tsx

@@ -175,7 +175,7 @@ export class BoardModal extends React.Component<BoardModalProps, {}>
                                         }}
                                     />
                                 }
-                                <BoardProcessModal type={this.props.type} opt={store.m_BoardProcessOption} drillOption={store.rectDrillOption} uiOpt={store.UIBoardProcessOption} />
+                                <BoardProcessModal type={this.props.type} opt={store.m_BoardProcessOption} topBottomOption={(store as TopBottomBoardStore).bottomBoardOption} drillOption={store.rectDrillOption} uiOpt={store.UIBoardProcessOption} />
                             </div>
                             <div className={Classes.CARD}>
                                 <Notes remarks={this.props.store.remarks} />

src/UI/Components/Board/BoardProcessModal.tsx

@@ -21,7 +21,7 @@ import { TempEditor } from '../../../Editor/TempEditor';
 import { IGoodInfo } from '../../MaterialEditor/GoodsList';
 import { GoodsListDiv } from '../../MaterialEditor/GoodsListDiv';
 import { BoardProcessOption } from "../../Store/OptionInterface/BoardProcessOption";
-import { IHightDrillOption, IUiOption } from "../../Store/OptionInterface/IOptionInterface";
+import { IHightDrillOption, IUiOption, TBBoardOption } from "../../Store/OptionInterface/IOptionInterface";
 import { RightPanelStore } from '../../Store/RightPanelStore/RightPanelStore';
 import "../Modal/ModalStyle/BoardProcessModal.less";
 import { RightTabId } from '../RightPanel/RightPanel';
@@ -38,6 +38,7 @@ interface BoardProcessProps
     isSpecial?: IObservableValue<boolean>;
     br?: Board;
     drillOption?: IHightDrillOption;
+    topBottomOption?: TBBoardOption;
     otherBoardData?: { [key: string]: any; };
     isEdgeRemarks?: boolean;
 }
@@ -391,13 +392,16 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
                     <label className="bp3-label bp3-inline .modifier">
                         <span>大孔面:</span>
                         <HTMLSelect
-                            value={this.props.opt.bigHoleDir.toString()}
+                            value={this.props.topBottomOption?.bigHoleDir ? this.props.topBottomOption.bigHoleDir.toString() : this.props.opt.bigHoleDir.toString()}
                             options={
                                 this.getOptions(this.props.type)
                             }
                             onChange={e =>
                             {
-                                this.props.opt.bigHoleDir = safeEval(e.target.value);
+                                if (this.props.topBottomOption)
+                                    this.props.topBottomOption.bigHoleDir = safeEval(e.target.value);
+                                else
+                                    this.props.opt.bigHoleDir = safeEval(e.target.value);
                             }}
                         />
                     </label>

src/UI/Components/Board/TopBottomBoardModal.tsx

@@ -1,7 +1,9 @@
-import { Checkbox } from '@blueprintjs/core';
+import { Checkbox, HTMLSelect } from '@blueprintjs/core';
 import { observer } from 'mobx-react';
 import * as React from 'react';
+import { FaceDirection } from '../../../Add-on/DrawDrilling/DrillType';
 import { CheckObjectType } from '../../../Common/CheckoutVaildValue';
+import { safeEval } from '../../../Common/eval';
 import { TopBottomBoardStore } from '../../Store/BoardStore';
 import { SetBoardDataItem, TBBoardDataBlock } from './BoardCommon';
 
@@ -106,6 +108,36 @@ export const TopBottomBoardModal =
                         }}
                     />
                 </div>
+                <div>
+                    {store.EditorTemplate &&
+                        <label className="bp3-label bp3-inline .modifier">
+                            <span>大孔面:</span>
+                            <HTMLSelect
+                                value={store.bottomBoardOption?.bigHoleDir ? store.bottomBoardOption.bigHoleDir.toString() : store.bottomBoardOption.bigHoleDir.toString()}
+                                options={
+                                    [
+                                        {
+                                            label: "正(朝向柜外)",
+                                            value: FaceDirection.Front.toString()
+                                        },
+                                        {
+                                            label: "反(两面朝下)",
+                                            value: FaceDirection.Back.toString()
+                                        }, {
+                                            label: "朝向柜内",
+                                            value: FaceDirection.Inside.toString()
+                                        }]
+                                }
+                                onChange={e =>
+                                {
+                                    if (store.bottomBoardOption)
+                                        store.bottomBoardOption.bigHoleDir = safeEval(e.target.value);
+                                    else
+                                        store.bottomBoardOption.bigHoleDir = safeEval(e.target.value);
+                                }}
+                            />
+                        </label>}
+                </div>
             </ div>
         );
     }));

src/UI/Store/BoardStore.ts

@@ -381,6 +381,11 @@ export class TopBottomBoardStore extends BoardStore
             cof.bottomBoardData.version = 2;
             FixErrorDataConfig(cof.bottomBoardData, DefaultBottomBoardOption);
         }
+        if (cof.bottomBoardData.version < 3)
+        {
+            cof.bottomBoardData.version = 3;
+            cof.bottomBoardData.bigHoleDir = cof.processData?.bigHoleDir ?? FaceDirection.Front;
+        }
 
     }
     HasInvailValue()

src/UI/Store/OptionInterface/IOptionInterface.ts

@@ -1,3 +1,4 @@
+import { FaceDirection } from "../../../Add-on/DrawDrilling/DrillType";
 import { BoardOpenDir, BoardType, BrRelativePos } from "../../../DatabaseServices/Entity/BoardInterface";
 import { EOrderType } from "../../../Editor/OrderType";
 import { RenderType } from "../../../GraphicsSystem/RenderType";
@@ -168,6 +169,7 @@ export interface TBBoardOption extends BoardConfigOption
     footerOffset?: number;
     isDrawStrengthenStrip?: boolean;
     divCount?: number;
+    bigHoleDir?: FaceDirection;
 }