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

!2484 功能: 查找修改中板名、实体名、房名和柜名添加鼠标悬停显示文本

Browse Source
pull/2463/MERGE
张子涵 5 months ago committed by ChenX
parent 4edbada2e6
commit 01d7457f72
2 changed files with 93 additions and 43 deletions
Show Stats Download Patch File Download Diff File

34
src/UI/Components/Board/BoardFindCommon.tsx
Unescape View File

@ -60,6 +60,9 @@ export class BoardFindItem extends React.Component<IBoardProps, {}> {
option.compareType[k] = e.target.value; option.compareType[k] = e.target.value;
}} }}
/> />
<Tooltip
content={option[k]}
>
<ToasterInput <ToasterInput
inputClassName='toasterInput' inputClassName='toasterInput'
type={CheckObjectType.BF} type={CheckObjectType.BF}
@ -68,6 +71,7 @@ export class BoardFindItem extends React.Component<IBoardProps, {}> {
optKey={k} optKey={k}
onChange={e => option[k] = e.target.value} onChange={e => option[k] = e.target.value}
/> />
</Tooltip>
{ {
hasTolerance && hasTolerance &&
<input <input
@ -173,11 +177,21 @@ export class MatColorCom extends React.Component<IMatColorComProps>
}} }}
/> />
} }
<div>
<Tooltip
content={option[EBoardKeyList.BrMat]}
>
<input <input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1} tabIndex={1}
className={Classes.INPUT} className={Classes.INPUT}
value={option[EBoardKeyList.BrMat]} value={option[EBoardKeyList.BrMat]}
onChange={e => option[EBoardKeyList.BrMat] = e.target.value} /> onChange={e => option[EBoardKeyList.BrMat] = e.target.value} />
</Tooltip>
</div>
</div> </div>
<div> <div>
<Checkbox <Checkbox
@ -202,11 +216,21 @@ export class MatColorCom extends React.Component<IMatColorComProps>
}} }}
/> />
} }
<div>
<Tooltip
content={option[EBoardKeyList.Mat]}
>
<input <input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1} tabIndex={1}
className={Classes.INPUT} className={Classes.INPUT}
value={option[EBoardKeyList.Mat]} value={option[EBoardKeyList.Mat]}
onChange={e => option[EBoardKeyList.Mat] = e.target.value} /> onChange={e => option[EBoardKeyList.Mat] = e.target.value} />
</Tooltip>
</div>
</div> </div>
<div> <div>
<span>颜色</span> <span>颜色</span>
@ -221,11 +245,21 @@ export class MatColorCom extends React.Component<IMatColorComProps>
}} }}
/> />
} }
<div>
<Tooltip
content={option[EBoardKeyList.Color]}
>
<input <input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1} tabIndex={1}
className={Classes.INPUT} className={Classes.INPUT}
value={option[EBoardKeyList.Color]} value={option[EBoardKeyList.Color]}
onChange={e => option[EBoardKeyList.Color] = e.target.value} /> onChange={e => option[EBoardKeyList.Color] = e.target.value} />
</Tooltip>
</div>
</div> </div>
</div> </div>
<div className="flex"> <div className="flex">

16
src/UI/Components/Board/BoardFindModify.tsx
Unescape View File

@ -434,7 +434,14 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
option.compareType.brName = e.target.value as ECompareType; option.compareType.brName = e.target.value as ECompareType;
}} }}
/> />
<Tooltip
content={option.brName}
>
<input <input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1} tabIndex={1}
className={Classes.INPUT} className={Classes.INPUT}
value={option.brName} value={option.brName}
@ -444,6 +451,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
this.setState({ userInputName: e.target.value }); this.setState({ userInputName: e.target.value });
}} }}
/> />
</Tooltip>
<div className="select-name"> <div className="select-name">
<Button text="拾取" onClick={() => this.getBoardOption("brName", "选择板件获取板名")} /> <Button text="拾取" onClick={() => this.getBoardOption("brName", "选择板件获取板名")} />
<Popover <Popover
@ -522,7 +530,14 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
option.compareType.hardwareName = e.target.value as ECompareType; option.compareType.hardwareName = e.target.value as ECompareType;
}} }}
/> />
<Tooltip
content={option.hardwareName}
>
<input <input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1} tabIndex={1}
className={Classes.INPUT} className={Classes.INPUT}
value={option.hardwareName} value={option.hardwareName}
@ -532,6 +547,7 @@ export default class BoardFindModifyModal extends React.Component<{ store?: Boar
this.setState({ hardwareInput: e.target.value }); this.setState({ hardwareInput: e.target.value });
}} }}
/> />
</Tooltip>
<div className="select-name"> <div className="select-name">
<Button text="拾取" onClick={() => this.getHardWareOption("hardwareName", "选择五金获取实体名")} /> <Button text="拾取" onClick={() => this.getHardWareOption("hardwareName", "选择五金获取实体名")} />
<Popover <Popover

Write Preview
Loading…
Cancel
Save