diff --git a/src/Editor/UCSServices.ts b/src/Editor/UCSServices.ts index e4666a051..2779a923b 100644 --- a/src/Editor/UCSServices.ts +++ b/src/Editor/UCSServices.ts @@ -67,9 +67,9 @@ export function MatrixToPreViewMat(mat: Matrix4, view: Viewer, obj: Object3D, di else obj.position.set(-view.Width / 2 + 180, -view.Height / 2 + 130, 0); - obj.updateMatrix(); let tempMat = mat.clone(); tempMat.multiplyMatrices(view.Camera.matrixWorldInverse, tempMat); tempMat.multiplyMatrices(view.PreViewer.Camera.matrixWorld, tempMat); obj.quaternion.setFromRotationMatrix(tempMat); + obj.updateMatrix(); } diff --git a/src/UI/Components/Board/GangDrillModal.tsx b/src/UI/Components/Board/GangDrillModal.tsx index 8c0780fc1..d71492fd1 100644 --- a/src/UI/Components/Board/GangDrillModal.tsx +++ b/src/UI/Components/Board/GangDrillModal.tsx @@ -48,7 +48,7 @@ export class DrillModal extends React.Component<{ store?: DrillStore }, {}> { } private saveAndDrilling = () => { - userConfigStore.SaveConfig(BoardModalType.Dr, this.props.store); + userConfigStore.SaveConfig(BoardModalType.Dr, this.props.store, false, false); app.Editor.ModalManage.Clear(); commandMachine.ExecCommand('PZ'); } diff --git a/src/UI/Store/DrillStore.ts b/src/UI/Store/DrillStore.ts index 9ca2f15fa..fc82836c1 100644 --- a/src/UI/Store/DrillStore.ts +++ b/src/UI/Store/DrillStore.ts @@ -4,6 +4,7 @@ import { DataAdapter } from "../../Common/DataAdapter"; import { IConfigOption } from "../Components/Board/UserConfig"; import { BoardStore } from "./BoardStore"; import { DrillingOption, SpacingType } from "./drillInterface"; +import { userConfig } from "../../Editor/UserConfig"; export class DrillStore extends BoardStore { @@ -144,6 +145,8 @@ export class DrillStore extends BoardStore { Object.assign(this.rules[this.m_CurrentRuleIndex], this.m_Option); } + //写入时修改用户当前配置 + userConfig.DrillConfigs.set(this.type, toJS(this.rules)); } SaveConfig() { diff --git a/src/UI/Store/UserConfigStore.ts b/src/UI/Store/UserConfigStore.ts index b6abf525e..b86109393 100644 --- a/src/UI/Store/UserConfigStore.ts +++ b/src/UI/Store/UserConfigStore.ts @@ -129,7 +129,7 @@ export class UserConfigStore extends Singleton } return null; } - async SaveConfig(type: BoardModalType, store: IConfigStore, isInit: boolean = false) + async SaveConfig(type: BoardModalType, store: IConfigStore, isInit: boolean = false, isCheckName = false) { let name = this.configName; if (name === "") @@ -144,7 +144,7 @@ export class UserConfigStore extends Singleton let configs = (await this.GetAllConfigs(type)) || {}; let isContinue = true; - if (configs.hasOwnProperty(name) && !isInit) + if (configs.hasOwnProperty(name) && !isInit && isCheckName) isContinue = confirm("配置名称已存在,是否覆盖"); if (!isContinue) return;