Public
/
WebCAD
mirror of https://gitee.com/cf-fz/WebCAD.git
7
1
Fork 0
Code Issues Projects Releases Wiki Activity

!2493 优化:阵列,板类,矩形变板件界面

Browse Source
pull/2304/MERGE
黄诗津 9 months ago committed by ChenX
parent c6a2aad473
commit 8b2c97fb22
8 changed files with 52 additions and 39 deletions
Show Stats Download Patch File Download Diff File

9
src/Add-on/twoD2threeD/Modals/Rec2Br.less
Unescape View File

@ -58,16 +58,17 @@
.roomName{ .roomName{
display: flex; display: flex;
justify-content: space-between;
.roomNameBody{ .roomNameBody{
width: 196px; width: 196px;
} }
.inputGroup{ .inputGroup{
width: 110px; width: 107px;
input{ input{
width : 100px; width : 110px;
margin-right : 10px; margin-right : 10px;
} }
} }
@ -142,7 +143,7 @@
padding: 20px; padding: 20px;
height: 100%; height: 100%;
} }
> :not(.board-name) { > :not(.board-name) {
&:nth-child(1) { &:nth-child(1) {
padding-top: 20px; padding-top: 20px;

22
src/Add-on/twoD2threeD/ParseBoardNamePanel.tsx
Unescape View File

@ -68,7 +68,7 @@ export class ParseBoardName extends Component<IParseBoardProps>
<div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isfarLeftVerticalBrName} checked={store.m_Option.isfarLeftVerticalBrName}
label={"最左侧立板"} label={"最左侧立板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isfarLeftVerticalBrName = !store.m_Option.isfarLeftVerticalBrName; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isfarRightVerticalBrName} checked={store.m_Option.isfarRightVerticalBrName}
label={"最右侧立板"} label={"最右侧立板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isfarRightVerticalBrName = !store.m_Option.isfarRightVerticalBrName; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isModifyMiddleVerticalBrName} checked={store.m_Option.isModifyMiddleVerticalBrName}
label={"内侧立板"} label={"内侧立板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isModifyMiddleVerticalBrName = !store.m_Option.isModifyMiddleVerticalBrName; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.istopMostLayerBrName} checked={store.m_Option.istopMostLayerBrName}
label={"最顶层板"} label={"最顶层板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.istopMostLayerBrName = !store.m_Option.istopMostLayerBrName; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isbottomMostLayerBrName} checked={store.m_Option.isbottomMostLayerBrName}
label={"最底层板"} label={"最底层板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isbottomMostLayerBrName = !store.m_Option.isbottomMostLayerBrName; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isModifyMiddleLayerBrName} checked={store.m_Option.isModifyMiddleLayerBrName}
label={"内部层板"} label={"内部层板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isModifyMiddleLayerBrName = !store.m_Option.isModifyMiddleLayerBrName; 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" }}> !isR2B && <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isBack} checked={store.m_Option.isBack}
label={"最后背板"} label={"最后背板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isBack = !store.m_Option.isBack; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isbottomMostBackBrName} checked={store.m_Option.isbottomMostBackBrName}
label={"最底背板"} label={"最底背板:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isbottomMostBackBrName = !store.m_Option.isbottomMostBackBrName; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isstripeBrName} checked={store.m_Option.isstripeBrName}
label={"收口条"} label={"收口条:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isstripeBrName = !store.m_Option.isstripeBrName; 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" }}> <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.iscabinetName} checked={store.m_Option.iscabinetName}
label={"柜名"} label={"柜名:"}
onChange={() => onChange={() =>
{ {
store.m_Option.iscabinetName = !store.m_Option.iscabinetName; 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" }}> isR2B && <div style={{ display: "flex", flexDirection: "row", justifyContent: "space-between" }}>
<Checkbox <Checkbox
checked={store.m_Option.isModifyRoomName} checked={store.m_Option.isModifyRoomName}
label={"房间名"} label={"房间名:"}
onChange={() => onChange={() =>
{ {
store.m_Option.isModifyRoomName = !store.m_Option.isModifyRoomName; store.m_Option.isModifyRoomName = !store.m_Option.isModifyRoomName;

4
src/Add-on/twoD2threeD/R2BProcessComponent.tsx
Unescape View File

@ -41,7 +41,7 @@ export class R2BProcessComponent extends React.Component<IR2BProcessComponentPro
isInline={true} isInline={true}
/> />
<button <button
style={{ width: "2rem" }} style={{ width: "2rem", height: 80 }}
className="bp3-button bp3-intent-success" className="bp3-button bp3-intent-success"
onClick={() => this.showShops.set(true)} onClick={() => this.showShops.set(true)}
>选择</button> >选择</button>
@ -53,7 +53,7 @@ export class R2BProcessComponent extends React.Component<IR2BProcessComponentPro
} }
</div> </div>
<label className="bp3-label bp3-inline .modifier"> <label className="bp3-label bp3-inline .modifier">
<span>排钻</span> <span style={{ width: 37 }}>排钻:</span>
<HTMLSelect <HTMLSelect
className="select-drillType" className="select-drillType"
value={store.m_Option.drillType} value={store.m_Option.drillType}

8
src/UI/Components/Board/BoardCommon.tsx
Unescape View File

@ -396,9 +396,10 @@ export class Notes extends React.Component<{ remarks: [string, string][]; }>{
export const ItemName = observer( export const ItemName = observer(
({ title, opt, className }: { title: string, opt: { name: string; openDir?: BoardOpenDir; }, className?: string; }) => ({ title, opt, className }: { title: string, opt: { name: string; openDir?: BoardOpenDir; }, className?: string; }) =>
<label className="bp3-label bp3-inline"> <label className="bp3-label bp3-inline">
<span>{title}</span> <span>{title}:</span>
<input <input
tabIndex={1} tabIndex={1}
style={{ margin: 0 }}
className={`bp3-input ${className}`} className={`bp3-input ${className}`}
value={opt.name} value={opt.name}
onChange={e => onChange={e =>
@ -439,9 +440,10 @@ export const ItemName = observer(
</label> </label>
); );
export const BoardTypeComponent = observer((data: { opt?: BoardConfigOption, className?: string; }) => export const BoardTypeComponent = observer((data: { opt?: BoardConfigOption, className?: string; }) =>
<label className={"bp3-label bp3-inline .modifier " + data.className} > <label className={"bp3-label bp3-inline board-type-select .modifier " + data.className} >
<span>板类型</span> <span>板类型:</span>
<HTMLSelect <HTMLSelect
style={{ margin: 0 }}
value={data.opt.type} value={data.opt.type}
options={ options={
[ [

12
src/UI/Components/Board/BoardProcessModal.tsx
Unescape View File

@ -261,7 +261,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
</div> </div>
<div> <div>
<label className="bp3-label bp3-inline .modifier"> <label className="bp3-label bp3-inline .modifier">
<span>纹路</span> <span>纹路:</span>
<HTMLSelect <HTMLSelect
value={this.props.opt.lines.toString()} value={this.props.opt.lines.toString()}
options={LineTypeSelectOption} options={LineTypeSelectOption}
@ -272,7 +272,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
/> />
</label> </label>
<label className="bp3-label bp3-inline .modifier" style={{ display: "flex" }}> <label className="bp3-label bp3-inline .modifier" style={{ display: "flex" }}>
<span>加工组</span> <span>加工组:</span>
<div className="flex" style={{ display: "inline-flex", width: "65%" }}> <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} /> <input className="bp3-input br-process-input" title="双击查看详细内容" value={this.tags.length > 0 ? this.tags.join(", ") : ""} readOnly style={{ flex: 1 }} onDoubleClick={this.onProcessInputDbClick} />
<Button <Button
@ -319,7 +319,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
</Alert> </Alert>
</label> </label>
<label className="bp3-label bp3-inline .modifier"> <label className="bp3-label bp3-inline .modifier">
<span>大孔面</span> <span>大孔面:</span>
<HTMLSelect <HTMLSelect
value={this.props.opt.bigHoleDir.toString()} value={this.props.opt.bigHoleDir.toString()}
options={ options={
@ -341,7 +341,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
/> />
</label> </label>
<label className="bp3-label bp3-inline .modifier" style={{ width: 175 }}> <label className="bp3-label bp3-inline .modifier" style={{ width: 175 }}>
<span>排钻</span> <span>排钻:</span>
<DrillTypeSelectCom <DrillTypeSelectCom
opt={this.props.opt} opt={this.props.opt}
br={this.props.br} br={this.props.br}
@ -350,7 +350,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
/> />
</label> </label>
<label className="bp3-label bp3-inline .modifier"> <label className="bp3-label bp3-inline .modifier">
<span>排版面</span> <span>排版面:</span>
<HTMLSelect <HTMLSelect
value={this.props.opt.composingFace.toString()} value={this.props.opt.composingFace.toString()}
options={ComposingFaceSelectOption} options={ComposingFaceSelectOption}
@ -361,7 +361,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>{
/> />
</label> </label>
<label className="bp3-label bp3-inline .modifier"> <label className="bp3-label bp3-inline .modifier">
<span>排孔面</span> <span>排孔面:</span>
<div className="inline"> <div className="inline">
<Checkbox <Checkbox
label="正面" label="正面"

12
src/UI/Components/Modal/ArrayModal.tsx
Unescape View File

@ -5,8 +5,8 @@ import * as xaop from 'xaop';
import { ArrayStore, ArrayType, CirArrMethod, Pick } from '../../../Add-on/Array'; import { ArrayStore, ArrayType, CirArrMethod, Pick } from '../../../Add-on/Array';
import { app } from '../../../ApplicationServices/Application'; import { app } from '../../../ApplicationServices/Application';
import { CheckObjectType } from "../../../Common/CheckoutVaildValue"; import { CheckObjectType } from "../../../Common/CheckoutVaildValue";
import { safeEval } from "../../../Common/eval";
import { KeyBoard } from "../../../Common/KeyEnum"; import { KeyBoard } from "../../../Common/KeyEnum";
import { safeEval } from "../../../Common/eval";
import { GetCompoentObjectIdString } from "../ComponentObjectId"; import { GetCompoentObjectIdString } from "../ComponentObjectId";
import { AppToaster, ToasterInput } from "../Toaster"; import { AppToaster, ToasterInput } from "../Toaster";
@ -331,11 +331,11 @@ class CirArray extends React.Component<{ store: ArrayStore; }, {}>
let uiOption = this.props.store.UIOption; let uiOption = this.props.store.UIOption;
return ( return (
<div> <div>
<div className="flex array-type" style={{ justifyContent: "space-between" }}> <div className="flex array-type">
<span >中心点</span> <span >中心点</span>
<div className="flexWrap" style={{ flexWrap: "initial", width: "100%", justifyContent: "center" }}> <div className="flexWrap">
<div> <div style={{ marginRight: 5 }}>
<span style={{ fontSize: 11 }}>X</span> <span style={{ fontSize: 16, width: 15 }}>X:</span>
<ToasterInput <ToasterInput
type={CheckObjectType.AR} type={CheckObjectType.AR}
optKey="x" optKey="x"
@ -345,7 +345,7 @@ class CirArray extends React.Component<{ store: ArrayStore; }, {}>
/> />
</div> </div>
<div> <div>
<span style={{ fontSize: 11 }}>Y</span> <span style={{ fontSize: 16, width: 15 }}>Y:</span>
<ToasterInput <ToasterInput
type={CheckObjectType.AR} type={CheckObjectType.AR}
optKey="y" optKey="y"

12
src/UI/Components/Modal/ModalStyle/ArrayModal.less
Unescape View File

@ -31,10 +31,14 @@
padding: 0px 8px; padding: 0px 8px;
} }
#modal .ar-set>span:first-child { #modal .ar-set{
display : inline-block; margin-right: 5px;
width : 2rem;
white-space: nowrap; &>span:first-child {
display : inline-block;
width : 2rem;
white-space: nowrap;
}
} }
#arrayModal .bp3-dialog>.bp3-dialog-body { #arrayModal .bp3-dialog>.bp3-dialog-body {

12
src/UI/Components/Modal/ModalStyle/BoardModal.less
Unescape View File

@ -49,7 +49,7 @@
} }
#commonModal .notes { #commonModal .notes {
.bp3-input { .bp3-html-select {
height: @noteInputHeight; height: @noteInputHeight;
} }
@ -58,6 +58,12 @@
} }
} }
#commonModal .board-type-select {
.bp3-html-select {
margin: 0;
}
}
//背板延伸数据 //背板延伸数据
#commonModal .process-data .br-set input { #commonModal .process-data .br-set input {
display: block; display: block;
@ -327,7 +333,7 @@
#commonModal .invalidDrill { #commonModal .invalidDrill {
.bp3-dialog-body{ .bp3-dialog-body{
padding : 25px; padding : 25px;
max-height: 250px; max-height: 250px;
overflow : auto; overflow : auto;
} }
@ -347,4 +353,4 @@
.bp3-dialog-footer{ .bp3-dialog-footer{
padding: 2px 20px; padding: 2px 20px;
} }
} }

Write Preview
Loading…
Cancel
Save