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

!2694 优化:基础板件绘制时要能直接显示板边备注功能

Browse Source
pull/2786/head
钱若寒 4 months ago committed by ChenX
parent 411392c026
commit 622a07a3d4
9 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File

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

@ -32,7 +32,9 @@ export class DrawLeftRightOpenDoor extends DrawDoorTool
const {
lbSealedUp, lbSealedDown, lbSealedRight, lbSealedLeft,
topBrSeal, bottomBrSeal, leftBrSeal, rightBrSeal,
verticalBoardName, layerBoardName,
verticalBoardName, layerBoardName, layerEdgeRemarkUp, layerEdgeRemarkDown,
layerEdgeRemarkLeft, layerEdgeRemarkRight, verticalEdgeRemarkUp,
verticalEdgeRemarkDown, verticalEdgeRemarkLeft, verticalEdgeRemarkRight,
offset, thickness, isAuto, useBoardProcessOption,
lbHightDrillOption: { down: lbDrillDown, up: lbDrillUp, left: lbDrillLeft, right: lbDrillRight },
cbHightDrillOption: { down: cbDrillDown, up: cbDrillUp, left: cbDrillLeft, right: cbDrillRight },
@ -68,6 +70,10 @@ export class DrawLeftRightOpenDoor extends DrawDoorTool
en.BoardProcessOption[EBoardKeyList.DownSealed] = bottomBrSeal.toString();
en.BoardProcessOption[EBoardKeyList.LeftSealed] = leftBrSeal.toString();
en.BoardProcessOption[EBoardKeyList.RightSealed] = rightBrSeal.toString();
en.BoardProcessOption.edgeRemarkUp = layerEdgeRemarkUp.toString();
en.BoardProcessOption.edgeRemarkDown = layerEdgeRemarkDown.toString();
en.BoardProcessOption.edgeRemarkLeft = layerEdgeRemarkLeft.toString();
en.BoardProcessOption.edgeRemarkRight = layerEdgeRemarkRight.toString();
en.BoardProcessOption.highDrill = [cbDrillDown, cbDrillRight, cbDrillUp, cbDrillLeft];
let drillSet = new Set(en.BoardProcessOption.highDrill);
if (drillSet.size > 1)
@ -113,6 +119,10 @@ export class DrawLeftRightOpenDoor extends DrawDoorTool
en.BoardProcessOption[EBoardKeyList.DownSealed] = lbSealedDown.toString();
en.BoardProcessOption[EBoardKeyList.LeftSealed] = lbSealedLeft.toString();
en.BoardProcessOption[EBoardKeyList.RightSealed] = lbSealedRight.toString();
en.BoardProcessOption.edgeRemarkUp = verticalEdgeRemarkUp.toString();
en.BoardProcessOption.edgeRemarkDown = verticalEdgeRemarkDown.toString();
en.BoardProcessOption.edgeRemarkLeft = verticalEdgeRemarkLeft.toString();
en.BoardProcessOption.edgeRemarkRight = verticalEdgeRemarkRight.toString();
en.BoardProcessOption.highDrill = [lbDrillDown, lbDrillRight, lbDrillUp, lbDrillLeft];
let drillSet = new Set(en.BoardProcessOption.highDrill);
if (drillSet.size > 1)

10
src/Add-on/DrawBoard/DrawDoorDrawer/DrawUpDownOpenDoor.ts
Unescape View File

@ -31,6 +31,8 @@ export class DrawUpDownOpenDoor extends DrawDoorTool
const {
lbSealedUp, lbSealedDown, lbSealedRight, lbSealedLeft,
topBrSeal, bottomBrSeal, leftBrSeal, rightBrSeal,
layerEdgeRemarkUp, layerEdgeRemarkDown, layerEdgeRemarkLeft, layerEdgeRemarkRight, verticalEdgeRemarkUp,
verticalEdgeRemarkDown, verticalEdgeRemarkLeft, verticalEdgeRemarkRight,
verticalBoardName, layerBoardName,
thickness, isAuto, useBoardProcessOption,
lbHightDrillOption: { down: lbDrillDown, up: lbDrillUp, left: lbDrillLeft, right: lbDrillRight },
@ -69,6 +71,10 @@ export class DrawUpDownOpenDoor extends DrawDoorTool
en.BoardProcessOption[EBoardKeyList.LeftSealed] = lbSealedLeft.toString();
en.BoardProcessOption[EBoardKeyList.RightSealed] = lbSealedRight.toString();
en.BoardProcessOption.highDrill = [lbDrillDown, lbDrillRight, lbDrillUp, lbDrillLeft];
en.BoardProcessOption.edgeRemarkUp = verticalEdgeRemarkUp.toString();
en.BoardProcessOption.edgeRemarkDown = verticalEdgeRemarkDown.toString();
en.BoardProcessOption.edgeRemarkLeft = verticalEdgeRemarkLeft.toString();
en.BoardProcessOption.edgeRemarkRight = verticalEdgeRemarkRight.toString();
let drillSet = new Set(en.BoardProcessOption.highDrill);
if (drillSet.size > 1)
en.BoardProcessOption.drillType = DrillType.More;
@ -115,6 +121,10 @@ export class DrawUpDownOpenDoor extends DrawDoorTool
en.BoardProcessOption[EBoardKeyList.LeftSealed] = leftBrSeal.toString();
en.BoardProcessOption[EBoardKeyList.RightSealed] = rightBrSeal.toString();
en.BoardProcessOption.highDrill = [cbDrillDown, cbDrillRight, cbDrillUp, cbDrillLeft];
en.BoardProcessOption.edgeRemarkUp = layerEdgeRemarkUp.toString();
en.BoardProcessOption.edgeRemarkDown = layerEdgeRemarkDown.toString();
en.BoardProcessOption.edgeRemarkLeft = layerEdgeRemarkLeft.toString();
en.BoardProcessOption.edgeRemarkRight = layerEdgeRemarkRight.toString();
let drillSet = new Set(en.BoardProcessOption.highDrill);
if (drillSet.size > 1)
en.BoardProcessOption.drillType = DrillType.More;

10
src/Editor/DefaultConfig.ts
Unescape View File

@ -460,7 +460,7 @@ export const DefaultLatticOption: ILatticeOption = {
Object.freeze(DefaultLatticOption);
export const DefaultDoorOption: IDoorConfigOption = {
version: 10,
version: 11,
col: 2,
row: 1,
isAllSelect: true,
@ -519,6 +519,14 @@ export const DefaultDoorOption: IDoorConfigOption = {
color: "",//颜色
roomName: "",//房名
cabinetName: "",//柜名
layerEdgeRemarkUp: '', //层板板边备注上下左右
layerEdgeRemarkDown: '',
layerEdgeRemarkLeft: '',
layerEdgeRemarkRight: '',
verticalEdgeRemarkUp: '', //立板板边备注上下左右
verticalEdgeRemarkDown: '',
verticalEdgeRemarkLeft: '',
verticalEdgeRemarkRight: '',
};
Object.freeze(DefaultDoorOption);
export const DefaultHingeOption: IHingeConfigOption = {

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

@ -490,6 +490,8 @@ interface I5InputComponent extends ISetItemOption
isRemarks?: boolean;
edgeRemarks?: string[];
otherBoardData?: { [key: string]: any; };
verticalRemark?: boolean;
layerRemark?: boolean;
}
/**
@ -535,13 +537,15 @@ export class Input5Or4Component extends React.Component<I5InputComponent, {}>
{
isRemarks &&
<Tooltip
content={`${option.edgeRemarkUp}`}
content={this.props.verticalRemark ? `${option.verticalEdgeRemarkUp}`
: this.props.layerRemark ? `${option.layerEdgeRemarkUp}` : `${option.edgeRemarkUp}`}
position={Position.TOP}
>
<ToasterInput
inputClassName='remark-input'
type={this.props.type}
optKey={"edgeRemarkUp"}
optKey={this.props.verticalRemark ? "verticalEdgeRemarkUp"
: this.props.layerRemark ? "layerEdgeRemarkUp" : "edgeRemarkUp"}
option={option}
uiOption={this.props.uiOption}
onChange={this.props.onChange}
@ -580,13 +584,15 @@ export class Input5Or4Component extends React.Component<I5InputComponent, {}>
{
isRemarks &&
<Tooltip
content={`${option.edgeRemarkLeft}`}
content={this.props.verticalRemark ? `${option.verticalEdgeRemarkLeft}`
: this.props.layerRemark ? `${option.layerEdgeRemarkLeft}` : `${option.edgeRemarkLeft}`}
position={Position.TOP}
>
<ToasterInput
inputClassName='remark-input'
type={this.props.type}
optKey={"edgeRemarkLeft"}
optKey={this.props.verticalRemark ? "verticalEdgeRemarkLeft"
: this.props.layerRemark ? "layerEdgeRemarkLeft" : "edgeRemarkLeft"}
option={option}
uiOption={this.props.uiOption}
onChange={this.props.onChange}
@ -631,13 +637,15 @@ export class Input5Or4Component extends React.Component<I5InputComponent, {}>
{
isRemarks &&
<Tooltip
content={`${option.edgeRemarkRight}`}
content={this.props.verticalRemark ? `${option.verticalEdgeRemarkRight}`
: this.props.layerRemark ? `${option.layerEdgeRemarkRight}` : `${option.edgeRemarkRight}`}
position={Position.TOP}
>
<ToasterInput
inputClassName='remark-input'
type={this.props.type}
optKey={"edgeRemarkRight"}
optKey={this.props.verticalRemark ? "verticalEdgeRemarkRight"
: this.props.layerRemark ? "layerEdgeRemarkRight" : "edgeRemarkRight"}
option={option}
uiOption={this.props.uiOption}
onChange={this.props.onChange}
@ -671,13 +679,15 @@ export class Input5Or4Component extends React.Component<I5InputComponent, {}>
{
isRemarks &&
<Tooltip
content={`${option.edgeRemarkDown}`}
content={this.props.verticalRemark ? `${option.verticalEdgeRemarkDown}`
: this.props.layerRemark ? `${option.layerEdgeRemarkDown}` : `${option.edgeRemarkDown}`}
position={Position.TOP}
>
<ToasterInput
inputClassName='remark-input'
type={this.props.type}
optKey={"edgeRemarkDown"}
optKey={this.props.verticalRemark ? "verticalEdgeRemarkDown"
: this.props.layerRemark ? "layerEdgeRemarkDown" : "edgeRemarkDown"}
option={option}
uiOption={this.props.uiOption}
onChange={this.props.onChange}

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

@ -305,7 +305,7 @@ export class BoardProcessModal extends React.Component<BoardProcessProps, {}>
}
render()
{
const { isEdgeRemarks = false } = this.props;
const { isEdgeRemarks = true } = this.props;
let isShowHighEditor = Boolean(this.props.br);
const CheckBoxStyle: React.CSSProperties = { marginBottom: 3 };

4
src/UI/Components/Board/Door/DoorConfigModal.tsx
Unescape View File

@ -240,6 +240,8 @@ export class DoorConfigModal extends React.Component<{ store?: DoorDrawerStore;
uiOption={store.UIOption}
isShowEditor={true}
highDrillOption={store.m_Option.lbHightDrillOption}
isRemarks={true}
verticalRemark={true}
/>
</div>
<div>
@ -257,6 +259,8 @@ export class DoorConfigModal extends React.Component<{ store?: DoorDrawerStore;
uiOption={this.uiOption}
isShowEditor={true}
highDrillOption={m_Option.cbHightDrillOption}
isRemarks={true}
layerRemark={true}
/>
</div>
</div>

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

@ -106,7 +106,7 @@ export class SpecialShapeBoardModal extends React.Component<{ store: SpecialShap
</div>
<div className={Classes.CARD}>
<h6 className={Classes.HEADING}>封边信息</h6>
<BoardProcessModal opt={store.m_BoardProcessOption} uiOpt={store.UIBoardProcessOption} />
<BoardProcessModal opt={store.m_BoardProcessOption} uiOpt={store.UIBoardProcessOption} isEdgeRemarks={false} />
</div>
<div className={Classes.CARD}>
<Notes remarks={store.remarks} />

14
src/UI/Store/DoorDrawerStore/DoorStore.ts
Unescape View File

@ -233,6 +233,20 @@ export class DoorStore extends DoorDrawerStore
cof.option.roomName = DefaultDoorOption.roomName;
cof.option.cabinetName = DefaultDoorOption.cabinetName;
}
if (opt.version < 11)
{
cof.option.version = 11;
cof.option.layerEdgeRemarkUp = DefaultDoorOption.layerEdgeRemarkUp;
cof.option.layerEdgeRemarkDown = DefaultDoorOption.layerEdgeRemarkDown;
cof.option.layerEdgeRemarkLeft = DefaultDoorOption.layerEdgeRemarkLeft;
cof.option.layerEdgeRemarkRight = DefaultDoorOption.layerEdgeRemarkRight;
cof.option.verticalEdgeRemarkUp = DefaultDoorOption.verticalEdgeRemarkUp;
cof.option.verticalEdgeRemarkDown = DefaultDoorOption.verticalEdgeRemarkDown;
cof.option.verticalEdgeRemarkLeft = DefaultDoorOption.verticalEdgeRemarkLeft;
cof.option.verticalEdgeRemarkRight = DefaultDoorOption.verticalEdgeRemarkRight;
}
}
get UIRule()
{

8
src/UI/Store/DoorInterface.ts
Unescape View File

@ -69,6 +69,14 @@ export interface IDoorConfigOption extends IDoorAndDrawerConfigOption
layerBoardName: string;
cbHightDrillOption: IHightDrillOption; //层板高级排钻
deviation: number; //铰链碰撞单次偏移量
verticalEdgeRemarkUp: string; //立板板边备注上下左右
verticalEdgeRemarkDown: string;
verticalEdgeRemarkLeft: string;
verticalEdgeRemarkRight: string;
layerEdgeRemarkUp: string; //层板板边备注上下左右
layerEdgeRemarkDown: string;
layerEdgeRemarkLeft: string;
layerEdgeRemarkRight: string;
}
/**

Write Preview
Loading…
Cancel
Save