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

!2696 优化:右边栏(板件属性、五金)显示改进

Browse Source
pull/2738/head
彭泽 5 months ago committed by ChenX
parent 4cb8ea2d51
commit 204dd41ad4
6 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File

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

@ -845,7 +845,7 @@ export class DrillTypeSelectCom extends React.Component<IDrillTypeSelect, { isDa
minHeight: 18, minHeight: 18,
height: 18, height: 18,
padding: 0, padding: 0,
fontSize: 12 fontSize: 12,
}} }}
onClick={() => this.editorDrilling(this.props.br)} onClick={() => this.editorDrilling(this.props.br)}
/> />

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

@ -347,7 +347,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: "83%" }}>
<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
text="更多" text="更多"

11
src/UI/Components/Modal/ModalStyle/LookOverBoardInfos.less
Unescape View File

@ -8,6 +8,7 @@
.bp3-popover-target { .bp3-popover-target {
width: 100%; width: 100%;
} }
.bp3-input { .bp3-input {
width: 100%; width: 100%;
} }
@ -33,7 +34,7 @@
margin-right: 20px; margin-right: 20px;
} }
.bp3-button > span > a { .bp3-button>span>a {
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -59,7 +60,7 @@
padding-bottom: 0px; padding-bottom: 0px;
.react-draggable { .react-draggable {
> span > div { >span>div {
margin-top: 5px; margin-top: 5px;
} }
} }
@ -84,7 +85,7 @@
// display: table-row; // display: table-row;
padding-left: 5px; padding-left: 5px;
> span { >span {
width: 25px; width: 25px;
text-align: center; text-align: center;
} }
@ -152,10 +153,10 @@
width: 320px; width: 320px;
height: 100%; height: 100%;
& > div { &>div {
flex: 1; flex: 1;
& > ul { &>ul {
outline: 1px solid #ccc; outline: 1px solid #ccc;
padding-left: 5px; padding-left: 5px;
overflow: auto; overflow: auto;

6
src/UI/Components/RightPanel/BoardProps.less
Unescape View File

@ -1,5 +1,5 @@
#boardPropsCom .br-name { #boardPropsCom .br-name {
width: 12rem; width: 18rem;
} }
#boardPropsCom .bp3-input { #boardPropsCom .bp3-input {
@ -76,7 +76,7 @@
#boardPropsCom .board-info select, #boardPropsCom .board-info select,
#boardPropsCom .board-info .br-set input { #boardPropsCom .board-info .br-set input {
width: 9rem; width: 15rem;
} }
#boardPropsCom { #boardPropsCom {
@ -158,7 +158,7 @@
} }
.notes>div>label { .notes>div>label {
height : 2.5rem; height: 2.5rem;
line-height: 2.5rem; line-height: 2.5rem;
} }

9
src/UI/Components/RightPanel/CommonMetalPanel.tsx
Unescape View File

@ -26,7 +26,8 @@ export interface ICommonMetalPanelProps
} }
@observer @observer
export class CommonMetalPanel extends React.Component<ICommonMetalPanelProps> { export class CommonMetalPanel extends React.Component<ICommonMetalPanelProps>
{
private size = new Vector3(); private size = new Vector3();
private length: string; private length: string;
@ -155,7 +156,7 @@ export class CommonMetalPanel extends React.Component<ICommonMetalPanelProps> {
return ( return (
<> <>
<label className="bp3-label bp3-inline .modifier" style={{ display: "flex" }}> <label className="bp3-label bp3-inline .modifier" style={{ display: "flex" }}>
<span style={{ width: 65 }}>加工组:</span> <span style={{ width: 47 }}>加工组:</span>
<div style={{ display: "inline-flex", flex: 1, minWidth: 120 }}> <div style={{ display: "inline-flex", flex: 1, minWidth: 120 }}>
<input className="bp3-input" title="双击查看详细内容" value={this.tags.length > 0 ? this.tags.join(", ") : ""} readOnly style={{ minWidth: 100, flex: 1 }} onDoubleClick={this.onProcessInputDbClick} /> <input className="bp3-input" title="双击查看详细内容" value={this.tags.length > 0 ? this.tags.join(", ") : ""} readOnly style={{ minWidth: 100, flex: 1 }} onDoubleClick={this.onProcessInputDbClick} />
<Button <Button
@ -227,7 +228,7 @@ export class CommonMetalPanel extends React.Component<ICommonMetalPanelProps> {
{ {
return ( return (
<Label className={`metal-label ${Classes.INLINE}`} key={k}> <Label className={`metal-label ${Classes.INLINE}`} key={k}>
<span>{t}</span> <span >{t}</span>
<input tabIndex={1} type="text" className={Classes.INPUT} value={option[k]} onChange={e => option[k] = e.target.value} /> <input tabIndex={1} type="text" className={Classes.INPUT} value={option[k]} onChange={e => option[k] = e.target.value} />
</Label> </Label>
); );
@ -288,7 +289,7 @@ export class CommonMetalPanel extends React.Component<ICommonMetalPanelProps> {
{ {
metalTypeFields.map(([t, k]) => ( metalTypeFields.map(([t, k]) => (
<Label className={`metal-label ${Classes.INLINE}`} key={k}> <Label className={`metal-label ${Classes.INLINE}`} key={k}>
<span>{t}</span> <span >{t}</span>
<input <input
tabIndex={1} tabIndex={1}
type="text" type="text"

25
src/UI/Components/RightPanel/RightPanel.less
Unescape View File

@ -389,8 +389,7 @@
.common-matal_1, .common-matal_1,
.common-matal_2, .common-matal_2,
.common-matal_3 .common-matal_3 {
{
&>label { &>label {
display: flex; display: flex;
align-items: center; align-items: center;
@ -445,22 +444,22 @@
} }
} }
.room-cabinet-name{ .room-cabinet-name {
display: flex; display: flex;
&>:first-child { &>:first-child {
width: 45%; width: 45%;
.bp3-label{ .bp3-label {
display: flex; display: flex;
span { span {
flex:1 flex: 1
} }
input { input {
margin: 0; margin: 0;
width: 70%; width: 72%;
} }
} }
} }
@ -473,8 +472,7 @@
} }
.metal-param, .metal-param,
.metal-param_name .metal-param_name {
{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
@ -485,12 +483,13 @@
display: flex; display: flex;
span { span {
flex:1 flex: 1
} }
input { input {
margin: 0; margin: 0;
width: 70%; width: 72%;
} }
} }
} }
@ -498,7 +497,7 @@
.common-matal_2 { .common-matal_2 {
.room-cabinet-name { .room-cabinet-name {
&>:first-child { &>:first-child {
width: 70%; width: 90%;
} }
button { button {
@ -511,7 +510,7 @@
flex-direction: column; flex-direction: column;
.metal-label { .metal-label {
width: 70%; width: 88%;
} }
} }
@ -531,7 +530,7 @@
} }
} }
.common-matal_3{ .common-matal_3 {
.metal-label_count { .metal-label_count {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

Write Preview
Loading…
Cancel
Save