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

!2753 功能:抽屉添加修改复合实体材料颜色属性选项

Browse Source
pull/2756/head
黄诗津 5 months ago
parent 8bf067cc4a
commit 1da3e5926e
4 changed files with 114 additions and 75 deletions
Show Stats Download Patch File Download Diff File

12
src/Add-on/DrawBoard/DrawDrawer.ts
Unescape View File

@ -119,13 +119,18 @@ export class DrawDrawrer implements Command
{
en.HardwareOption[EBoardKeyList.RoomName] = surroundOption[EBoardKeyList.RoomName];
en.HardwareOption[EBoardKeyList.CabinetName] = surroundOption[EBoardKeyList.CabinetName];
if (store.m_Option.isModifyHardwareMaterial)
{
en.HardwareOption[EBoardKeyList.Mat] = surroundOption[EBoardKeyList.Mat];
en.HardwareOption[EBoardKeyList.Color] = surroundOption[EBoardKeyList.Color];
}
}
}
}
}
else
{
const { roomName, cabinetName, boardMatName, material, color } = store.m_Option;
const { roomName, cabinetName, boardMatName, material, color, isModifyHardwareMaterial } = store.m_Option;
for (let en of ens)
{
if (en instanceof Board)
@ -140,6 +145,11 @@ export class DrawDrawrer implements Command
{
en.HardwareOption[EBoardKeyList.RoomName] = roomName;
en.HardwareOption[EBoardKeyList.CabinetName] = cabinetName;
if (isModifyHardwareMaterial)
{
en.HardwareOption[EBoardKeyList.Mat] = material;
en.HardwareOption[EBoardKeyList.Color] = color;
}
}
}
}

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

@ -33,7 +33,8 @@ export interface IBoardProps
}
@observer
export class BoardFindItem extends React.Component<IBoardProps, {}> {
export class BoardFindItem extends React.Component<IBoardProps, {}>
{
public render()
{
const { k, useKey, option, uiOption,
@ -103,7 +104,8 @@ export interface IFindSelectItem
checkChange?();
}
@observer
export class BoardFindSelectItem extends React.Component<IFindSelectItem, {}> {
export class BoardFindSelectItem extends React.Component<IFindSelectItem, {}>
{
public render()
{
const { k, useKey, option,
@ -167,31 +169,41 @@ export class MatColorCom extends React.Component<IMatColorComProps>
<div>
<span>板材</span>
{
hasCompare &&
<HTMLSelect
value={(option as IBoardFindOption).compareType[EBoardKeyList.BrMat]}
options={SimpleOption}
onChange={(e) =>
{
(option as IBoardFindOption).compareType[EBoardKeyList.BrMat] = e.target.value as ECompareType;
}}
/>
}
<div>
<Tooltip
content={option[EBoardKeyList.BrMat]}
>
hasCompare ?
<>
<HTMLSelect
value={(option as IBoardFindOption).compareType[EBoardKeyList.BrMat]}
options={SimpleOption}
onChange={(e) =>
{
(option as IBoardFindOption).compareType[EBoardKeyList.BrMat] = e.target.value as ECompareType;
}}
/>
<div>
<Tooltip
content={option[EBoardKeyList.BrMat]}
>
<input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1}
className={Classes.INPUT}
value={option[EBoardKeyList.BrMat]}
onChange={e => option[EBoardKeyList.BrMat] = e.target.value}
/>
</Tooltip>
</div>
</>
:
<input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1}
className={Classes.INPUT}
value={option[EBoardKeyList.BrMat]}
onChange={e => option[EBoardKeyList.BrMat] = e.target.value} />
</Tooltip>
</div>
onChange={e => option[EBoardKeyList.BrMat] = e.target.value}
/>
}
</div>
<div>
<Checkbox
@ -206,60 +218,80 @@ export class MatColorCom extends React.Component<IMatColorComProps>
}}
/>
{
hasCompare &&
<HTMLSelect
value={(option as IBoardFindOption).compareType[EBoardKeyList.Mat]}
options={SimpleOption}
onChange={(e) =>
{
(option as IBoardFindOption).compareType[EBoardKeyList.Mat] = e.target.value as ECompareType;
}}
/>
}
<div>
<Tooltip
content={option[EBoardKeyList.Mat]}
>
hasCompare ?
<>
<HTMLSelect
value={(option as IBoardFindOption).compareType[EBoardKeyList.Mat]}
options={SimpleOption}
onChange={(e) =>
{
(option as IBoardFindOption).compareType[EBoardKeyList.Mat] = e.target.value as ECompareType;
}}
/>
<div>
<Tooltip
content={option[EBoardKeyList.Mat]}
>
<input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1}
className={Classes.INPUT}
value={option[EBoardKeyList.Mat]}
onChange={e => option[EBoardKeyList.Mat] = e.target.value}
/>
</Tooltip>
</div>
</>
:
<input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1}
className={Classes.INPUT}
value={option[EBoardKeyList.Mat]}
onChange={e => option[EBoardKeyList.Mat] = e.target.value} />
</Tooltip>
</div>
onChange={e => option[EBoardKeyList.Mat] = e.target.value}
/>
}
</div>
<div>
<span>颜色</span>
{
hasCompare &&
<HTMLSelect
value={(option as IBoardFindOption).compareType[EBoardKeyList.Color]}
options={SimpleOption}
onChange={(e) =>
{
(option as IBoardFindOption).compareType[EBoardKeyList.Color] = e.target.value as ECompareType;
}}
/>
}
<div>
<Tooltip
content={option[EBoardKeyList.Color]}
>
hasCompare ?
<>
<HTMLSelect
value={(option as IBoardFindOption).compareType[EBoardKeyList.Color]}
options={SimpleOption}
onChange={(e) =>
{
(option as IBoardFindOption).compareType[EBoardKeyList.Color] = e.target.value as ECompareType;
}}
/>
<div>
<Tooltip
content={option[EBoardKeyList.Color]}
>
<input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1}
className={Classes.INPUT}
value={option[EBoardKeyList.Color]}
onChange={e => option[EBoardKeyList.Color] = e.target.value}
/>
</Tooltip>
</div>
</>
:
<input
style={{
margin: "0 5px",
width: "75px",
}}
tabIndex={1}
className={Classes.INPUT}
value={option[EBoardKeyList.Color]}
onChange={e => option[EBoardKeyList.Color] = e.target.value} />
</Tooltip>
</div>
onChange={e => option[EBoardKeyList.Color] = e.target.value}
/>
}
</div>
</div>
<div className="flex">

14
src/UI/Components/Board/Door/DoorModal.tsx
Unescape View File

@ -102,14 +102,12 @@ export class DoorModal extends React.Component<{ store: DoorDrawerStore, type: B
onChange={() => { store.OnHandleUseBoardProcessOptionChange(); }}
/>
</Tooltip>
{
isDoor && <Checkbox
checked={store.m_Option.isModifyHardwareMaterial}
label="修改复合实体材料颜色属性"
style={{ marginLeft: 10 }}
onChange={() => { store.OnHandleIsModifyHardwareMaterialChange(); }}
/>
}
<Checkbox
checked={store.m_Option.isModifyHardwareMaterial}
label="修改复合实体材料颜色属性"
style={{ marginLeft: 10 }}
onChange={() => { store.OnHandleIsModifyHardwareMaterialChange(); }}
/>
</div>
<RoomAndBoardMaterialInfo data={store.m_Option} />
</div>

1
src/UI/Store/DoorDrawerStore/DrawerStore.ts
Unescape View File

@ -99,7 +99,6 @@ export class DrawerStore extends DoorDrawerStore
if (opt.version < 7)
{
opt.version = 7;
//抽屉现在不引用这个功能了
opt.isModifyHardwareMaterial = DefaultDrawerOption.isModifyHardwareMaterial;
}
if (opt.version < 8)

Write Preview
Loading…
Cancel
Save