!3052 优化:圆弧板默认圆弧槽配置值区间提示

src/Add-on/ArcBoard/ArcBoardGeooveConfig/ArcBoardGroove.tsx

@@ -7,6 +7,7 @@ import { BoardModalType } from "../../../UI/Components/Board/BoardModalType";
 import { Config_ModalType } from "../../../UI/Components/Board/UserConfigComponent";
 import { CommonModal } from "../../../UI/Components/Modal/ModalContainer";
 import { ModalState } from "../../../UI/Components/Modal/ModalInterface";
+import { IArcBoardGrooveOption } from "../../../UI/Store/OptionInterface/IOptionInterface";
 import { ArcBoardGrooveStore } from "./ArcBoardGrooveStore";
 
 @observer
@@ -31,6 +32,13 @@ export class ArcBoardGroove extends React.Component<{ store: ArcBoardGrooveStore
         ["grooveAddDepth2", "槽加深"],
     ];
 
+    curOption: IArcBoardGrooveOption;
+
+    componentDidMount(): void
+    {
+        this.curOption = { ...this.props.store.m_Option };
+    }
+
     render()
     {
         const { store, type } = this.props;
@@ -39,7 +47,7 @@ export class ArcBoardGroove extends React.Component<{ store: ArcBoardGrooveStore
                 title={store.title}
                 icon="bold"
                 modalId="arcBoardGeoove"
-                close={async () => store.OnOk(ModalState.Cancel)}
+                close={() => store.OnOk(ModalState.Cancel)}
                 configType={Config_ModalType.ConfigListModal}
                 store={store}
                 type={type}
@@ -50,7 +58,7 @@ export class ArcBoardGroove extends React.Component<{ store: ArcBoardGrooveStore
                             text="确定"
                             onClick={() =>
                             {
-                                store.OnOk(ModalState.Ok, true, { isOk: true });
+                                store.OnOk(ModalState.Ok);
                             }} />
                         <Button
                             className={Classes.INTENT_DANGER}
@@ -101,6 +109,7 @@ export class ArcBoardGroove extends React.Component<{ store: ArcBoardGrooveStore
                                                 type={CheckObjectType.BR}
                                                 titleStyle={{ width: "7rem" }}
                                                 option={store.m_Option}
+                                                uiOption={store.UIOption}
                                                 optKey={optKey}
                                                 title={title}
                                             />);
@@ -126,6 +135,7 @@ export class ArcBoardGroove extends React.Component<{ store: ArcBoardGrooveStore
                                                 type={CheckObjectType.BR}
                                                 titleStyle={{ width: "7rem" }}
                                                 option={store.m_Option}
+                                                uiOption={store.UIOption}
                                                 optKey={optKey}
                                                 title={title}
                                             />);

src/Add-on/ArcBoard/ArcBoardGeooveConfig/ArcBoardGrooveStore.ts

@@ -1,4 +1,5 @@
 import { observable, toJS } from "mobx";
+import { DataAdapter } from "../../../Common/DataAdapter";
 import { DefaultArcBoardGrooveOption } from "../../../Editor/DefaultConfig";
 import { IConfigOption } from "../../../UI/Components/Board/UserConfigComponent";
 import { BoardStore } from "../../../UI/Store/BoardStore";
@@ -29,6 +30,8 @@ export class ArcBoardGrooveStore extends BoardStore<IArcBoardGrooveOption>
             cof.option.grooveAddDepth2 = "0";
         }
         Object.assign(this.m_Option, cof.option);
+        if (this.m_UiOption)
+            Object.assign(this.m_UiOption, DataAdapter.ConvertUIData(this.m_Option));
     }
 
     SaveConfig()

src/Common/CheckoutVaildValue.ts

@@ -209,6 +209,7 @@ export namespace CheckoutValid
             case "startDist":
             case "endDist":
             case "arcExtension":
+            case "arcExtension2":
                 {
                     let val = safeEval(v);
                     if (typeof v === "string" && v.includes(','))//v类型不是字符串时,这个代码出错了
@@ -231,11 +232,15 @@ export namespace CheckoutValid
             case "thickness":
             case "footThickness":
             case "knifeRadius":
+            case "knifeRadius2":
             case "fzThickness":
             case "fzWidth":
             case "grooveSpacing":
             case "grooveWidth":
             case "retainedThickness":
+            case "grooveSpacing2":
+            case "grooveWidth2":
+            case "retainedThickness2":
                 {
                     let val = safeEval(v);
                     if (isNaN(val))
@@ -276,6 +281,9 @@ export namespace CheckoutValid
             case "grooveAddLength":
             case "grooveAddDepth":
             case "grooveAddWidth":
+            case "grooveAddLength2":
+            case "grooveAddDepth2":
+            case "grooveAddWidth2":
             case "back":
                 {
                     let val = safeEval(v);