From 8b2c97fb220776e78fba333856638d0f15ad50e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=AF=97=E6=B4=A5?= <2723065175@qq.com>
Date: Wed, 10 Jan 2024 03:31:26 +0000
Subject: [PATCH] =?UTF-8?q?!2493=20=E4=BC=98=E5=8C=96:=E9=98=B5=E5=88=97,?=
 =?UTF-8?q?=E6=9D=BF=E7=B1=BB,=E7=9F=A9=E5=BD=A2=E5=8F=98=E6=9D=BF?=
 =?UTF-8?q?=E4=BB=B6=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Add-on/twoD2threeD/Modals/Rec2Br.less     |  9 ++++----
 .../twoD2threeD/ParseBoardNamePanel.tsx       | 22 +++++++++----------
 .../twoD2threeD/R2BProcessComponent.tsx       |  4 ++--
 src/UI/Components/Board/BoardCommon.tsx       |  8 ++++---
 src/UI/Components/Board/BoardProcessModal.tsx | 12 +++++-----
 src/UI/Components/Modal/ArrayModal.tsx        | 12 +++++-----
 .../Modal/ModalStyle/ArrayModal.less          | 12 ++++++----
 .../Modal/ModalStyle/BoardModal.less          | 12 +++++++---
 8 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/src/Add-on/twoD2threeD/Modals/Rec2Br.less b/src/Add-on/twoD2threeD/Modals/Rec2Br.less
index 205d539cd..bc84384cb 100644
--- a/src/Add-on/twoD2threeD/Modals/Rec2Br.less
+++ b/src/Add-on/twoD2threeD/Modals/Rec2Br.less
@@ -58,16 +58,17 @@
 
     .roomName{
         display: flex;
+        justify-content: space-between;
 
         .roomNameBody{
             width: 196px;
         }
 
         .inputGroup{
-            width: 110px;
-    
+            width: 107px;
+
             input{
-                width        : 100px;
+                width        : 110px;
                 margin-right : 10px;
             }
         }
@@ -142,7 +143,7 @@
                 padding: 20px;
                 height: 100%;
             }
-            
+
             > :not(.board-name) {
                 &:nth-child(1) {
                     padding-top: 20px;
diff --git a/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx b/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx
index 175a0edf0..4a5a273ec 100644
--- a/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx
+++ b/src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx
@@ -68,7 +68,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.isfarLeftVerticalBrName}
-                                label={"最左侧立板"}
+                                label={"最左侧立板:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.isfarLeftVerticalBrName = !store.m_Option.isfarLeftVerticalBrName;
@@ -86,7 +86,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.isfarRightVerticalBrName}
-                                label={"最右侧立板"}
+                                label={"最右侧立板:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.isfarRightVerticalBrName = !store.m_Option.isfarRightVerticalBrName;
@@ -104,7 +104,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.isModifyMiddleVerticalBrName}
-                                label={"内侧立板"}
+                                label={"内侧立板:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.isModifyMiddleVerticalBrName = !store.m_Option.isModifyMiddleVerticalBrName;
@@ -122,7 +122,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.istopMostLayerBrName}
-                                label={"最顶层板"}
+                                label={"最顶层板:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.istopMostLayerBrName = !store.m_Option.istopMostLayerBrName;
@@ -140,7 +140,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.isbottomMostLayerBrName}
-                                label={"最底层板"}
+                                label={"最底层板:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.isbottomMostLayerBrName = !store.m_Option.isbottomMostLayerBrName;
@@ -158,7 +158,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.isModifyMiddleLayerBrName}
-                                label={"内部层板"}
+                                label={"内部层板:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.isModifyMiddleLayerBrName = !store.m_Option.isModifyMiddleLayerBrName;
@@ -177,7 +177,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                             !isR2B && <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                                 <Checkbox
                                     checked={store.m_Option.isBack}
-                                    label={"最后背板"}
+                                    label={"最后背板:"}
                                     onChange={() =>
                                     {
                                         store.m_Option.isBack = !store.m_Option.isBack;
@@ -194,7 +194,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.isbottomMostBackBrName}
-                                label={"最底背板"}
+                                label={"最底背板:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.isbottomMostBackBrName = !store.m_Option.isbottomMostBackBrName;
@@ -212,7 +212,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                         <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                             <Checkbox
                                 checked={store.m_Option.isstripeBrName}
-                                label={"收口条"}
+                                label={"收口条:"}
                                 onChange={() =>
                                 {
                                     store.m_Option.isstripeBrName = !store.m_Option.isstripeBrName;
@@ -249,7 +249,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                                 <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                                     <Checkbox
                                         checked={store.m_Option.iscabinetName}
-                                        label={"柜名"}
+                                        label={"柜名:"}
                                         onChange={() =>
                                         {
                                             store.m_Option.iscabinetName = !store.m_Option.iscabinetName;
@@ -270,7 +270,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
                                     isR2B && <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
                                         <Checkbox
                                             checked={store.m_Option.isModifyRoomName}
-                                            label={"房间名"}
+                                            label={"房间名:"}
                                             onChange={() =>
                                             {
                                                 store.m_Option.isModifyRoomName = !store.m_Option.isModifyRoomName;
diff --git a/src/Add-on/twoD2threeD/R2BProcessComponent.tsx b/src/Add-on/twoD2threeD/R2BProcessComponent.tsx
index a6931af25..154230ba5 100644
--- a/src/Add-on/twoD2threeD/R2BProcessComponent.tsx
+++ b/src/Add-on/twoD2threeD/R2BProcessComponent.tsx
@@ -41,7 +41,7 @@ export class R2BProcessComponent extends React.Component<IR2BProcessComponentPro
                             isInline={true}
                         />
                         <button
-                            style={{ width: "2rem" }}
+                            style={{ width: "2rem", height: 80 }}
                             className="bp3-button bp3-intent-success"
                             onClick={() => this.showShops.set(true)}
                         >选择</button>
@@ -53,7 +53,7 @@ export class R2BProcessComponent extends React.Component<IR2BProcessComponentPro
                         }
                     </div>
                     <label className="bp3-label bp3-inline .modifier">
-                        <span>排钻</span>
+                        <span style={{ width: 37 }}>排钻:</span>
                         <HTMLSelect
                             className="select-drillType"
                             value={store.m_Option.drillType}
diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx
index 0c1bd6cd5..d99356302 100644
--- a/src/UI/Components/Board/BoardCommon.tsx
+++ b/src/UI/Components/Board/BoardCommon.tsx
@@ -396,9 +396,10 @@ export class Notes extends React.Component<{ remarks: [string, string][]; }>{
 export const ItemName = observer(
     ({ title, opt, className }: { title: string, opt: { name: string; openDir?: BoardOpenDir; }, className?: string; }) =>
         <label className="bp3-label bp3-inline">
-            <span>{title}</span>
+            <span>{title}:</span>
             <input
                 tabIndex={1}
+                style={{ margin: 0 }}
                 className={`bp3-input ${className}`}
                 value={opt.name}
                 onChange={e =>
@@ -439,9 +440,10 @@ export const ItemName = observer(
         </label>
 );
 export const BoardTypeComponent = observer((data: { opt?: BoardConfigOption, className?: string; }) =>
-    <label className={"bp3-label bp3-inline .modifier " + data.className} >
-        <span>板类型</span>
+    <label className={"bp3-label bp3-inline board-type-select .modifier " + data.className} >
+        <span>板类型:</span>
         <HTMLSelect
+            style={{ margin: 0 }}
             value={data.opt.type}
             options={
                 [
diff --git a/src/UI/Components/Board/BoardProcessModal.tsx b/src/UI/Components/Board/BoardProcessModal.tsx
index 85aa8449d..45d01c9cd 100644
--- a/src/UI/Components/Board/BoardProcessModal.tsx
+++ b/src/UI/Components/Board/BoardProcessModal.tsx
@@ -261,7 +261,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
                 </div>
                 <div>
                     <label className="bp3-label bp3-inline .modifier">
-                        <span>纹路</span>
+                        <span>纹路:</span>
                         <HTMLSelect
                             value={this.props.opt.lines.toString()}
                             options={LineTypeSelectOption}
@@ -272,7 +272,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
                         />
                     </label>
                     <label className="bp3-label bp3-inline .modifier" style={{ display: "flex" }}>
-                        <span>加工组</span>
+                        <span>加工组:</span>
                         <div className="flex" style={{ display: "inline-flex", width: "65%" }}>
                             <input className="bp3-input br-process-input" title="双击查看详细内容" value={this.tags.length > 0 ? this.tags.join(", ") : ""} readOnly style={{ flex: 1 }} onDoubleClick={this.onProcessInputDbClick} />
                             <Button
@@ -319,7 +319,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
                         </Alert>
                     </label>
                     <label className="bp3-label bp3-inline .modifier">
-                        <span>大孔面</span>
+                        <span>大孔面:</span>
                         <HTMLSelect
                             value={this.props.opt.bigHoleDir.toString()}
                             options={
@@ -341,7 +341,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
                         />
                     </label>
                     <label className="bp3-label bp3-inline .modifier" style={{ width: 175 }}>
-                        <span>排钻</span>
+                        <span>排钻:</span>
                         <DrillTypeSelectCom
                             opt={this.props.opt}
                             br={this.props.br}
@@ -350,7 +350,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
                         />
                     </label>
                     <label className="bp3-label  bp3-inline .modifier">
-                        <span>排版面</span>
+                        <span>排版面:</span>
                         <HTMLSelect
                             value={this.props.opt.composingFace.toString()}
                             options={ComposingFaceSelectOption}
@@ -361,7 +361,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
                         />
                     </label>
                     <label className="bp3-label bp3-inline .modifier">
-                        <span>排孔面</span>
+                        <span>排孔面:</span>
                         <div className="inline">
                             <Checkbox
                                 label="正面"
diff --git a/src/UI/Components/Modal/ArrayModal.tsx b/src/UI/Components/Modal/ArrayModal.tsx
index e2cea05ea..b2646b563 100644
--- a/src/UI/Components/Modal/ArrayModal.tsx
+++ b/src/UI/Components/Modal/ArrayModal.tsx
@@ -5,8 +5,8 @@ import * as xaop from 'xaop';
 import { ArrayStore, ArrayType, CirArrMethod, Pick } from '../../../Add-on/Array';
 import { app } from '../../../ApplicationServices/Application';
 import { CheckObjectType } from "../../../Common/CheckoutVaildValue";
-import { safeEval } from "../../../Common/eval";
 import { KeyBoard } from "../../../Common/KeyEnum";
+import { safeEval } from "../../../Common/eval";
 import { GetCompoentObjectIdString } from "../ComponentObjectId";
 import { AppToaster, ToasterInput } from "../Toaster";
 
@@ -331,11 +331,11 @@ class CirArray extends React.Component<{ store: ArrayStore; }, {}>
         let uiOption = this.props.store.UIOption;
         return (
             <div>
-                <div className="flex array-type" style={{ justifyContent: "space-between" }}>
+                <div className="flex array-type">
                     <span >中心点</span>
-                    <div className="flexWrap" style={{ flexWrap: "initial", width: "100%", justifyContent: "center" }}>
-                        <div>
-                            <span style={{ fontSize: 11 }}>X</span>
+                    <div className="flexWrap">
+                        <div style={{ marginRight: 5 }}>
+                            <span style={{ fontSize: 16, width: 15 }}>X:</span>
                             <ToasterInput
                                 type={CheckObjectType.AR}
                                 optKey="x"
@@ -345,7 +345,7 @@ class CirArray extends React.Component<{ store: ArrayStore; }, {}>
                             />
                         </div>
                         <div>
-                            <span style={{ fontSize: 11 }}>Y</span>
+                            <span style={{ fontSize: 16, width: 15 }}>Y:</span>
                             <ToasterInput
                                 type={CheckObjectType.AR}
                                 optKey="y"
diff --git a/src/UI/Components/Modal/ModalStyle/ArrayModal.less b/src/UI/Components/Modal/ModalStyle/ArrayModal.less
index 5716ac782..4dd1baad8 100644
--- a/src/UI/Components/Modal/ModalStyle/ArrayModal.less
+++ b/src/UI/Components/Modal/ModalStyle/ArrayModal.less
@@ -31,10 +31,14 @@
     padding: 0px 8px;
 }
 
-#modal .ar-set>span:first-child {
-    display    : inline-block;
-    width      : 2rem;
-    white-space: nowrap;
+#modal .ar-set{
+    margin-right: 5px;
+
+    &>span:first-child {
+        display    : inline-block;
+        width      : 2rem;
+        white-space: nowrap;
+    }
 }
 
 #arrayModal .bp3-dialog>.bp3-dialog-body {
diff --git a/src/UI/Components/Modal/ModalStyle/BoardModal.less b/src/UI/Components/Modal/ModalStyle/BoardModal.less
index 0ab74221a..21bff41d8 100644
--- a/src/UI/Components/Modal/ModalStyle/BoardModal.less
+++ b/src/UI/Components/Modal/ModalStyle/BoardModal.less
@@ -49,7 +49,7 @@
 }
 
 #commonModal .notes {
-    .bp3-input {
+    .bp3-html-select {
         height: @noteInputHeight;
     }
 
@@ -58,6 +58,12 @@
     }
 }
 
+#commonModal .board-type-select {
+    .bp3-html-select {
+        margin: 0;
+    }
+}
+
 //背板延伸数据
 #commonModal .process-data .br-set input {
     display: block;
@@ -327,7 +333,7 @@
 #commonModal .invalidDrill {
     .bp3-dialog-body{
         padding   : 25px;
-        max-height: 250px; 
+        max-height: 250px;
         overflow  : auto;
     }
 
@@ -347,4 +353,4 @@
     .bp3-dialog-footer{
         padding: 2px 20px;
     }
-}
\ No newline at end of file
+}