酷家乐:在modelTypeId = 1时,对五金实体增加备注

pull/2281/MERGE
ChenX 1 year ago
parent 98137dd2e6
commit 3207daa30d

@ -2,13 +2,13 @@ import { Box3, Euler, Matrix4, Vector3 } from "three";
import { app } from "../../../ApplicationServices/Application";
import { arrayLast, arrayRemoveIf } from "../../../Common/ArrayExt";
import { EBoardKeyList } from "../../../Common/BoardKeyList";
import { safeEval } from "../../../Common/eval";
import { FS } from "../../../Common/FileSystem";
import { BuyZengZhiBao } from "../../../Common/HostUrl";
import { JigMoveEntity } from "../../../Common/JigMove";
import { MakeMirrorMtx, NormalMatrix, RoundMatrix } from "../../../Common/Matrix4Utils";
import { DuplicateRecordCloning } from "../../../Common/Status";
import { Intent, ToasterShowEntityMsg } from "../../../Common/Toaster";
import { safeEval } from "../../../Common/eval";
import { Board } from "../../../DatabaseServices/Entity/Board";
import { Entity } from "../../../DatabaseServices/Entity/Entity";
import { ExtrudeSolid } from "../../../DatabaseServices/Entity/Extrude";
@ -20,7 +20,7 @@ import { GetOnlineTemplate } from "../../../DatabaseServices/Template/TempateUti
import { TemplateRecord } from "../../../DatabaseServices/Template/TemplateRecord";
import { Command, CommandWrap } from "../../../Editor/CommandMachine";
import { userConfig } from "../../../Editor/UserConfig";
import { equaln, ZAxis } from "../../../Geometry/GeUtils";
import { ZAxis, equaln } from "../../../Geometry/GeUtils";
import { ConverEachSeal2HightSealData, SetBoardTopDownLeftRightSealData } from "../../../GraphicsSystem/CalcEdgeSealing";
import { BoardModalType } from "../../../UI/Components/Board/BoardModalType";
import { AppConfirm } from "../../../UI/Components/Common/Confirm";
@ -32,7 +32,7 @@ import { CuttingBoardByBoard } from "../../BoardCutting/CuttingUtils2";
import { KJLUseName } from "../KJLImportConfig/KJLConfig";
import { DefaultKJImportOption, KJLImportConfigOption } from "../KJLImportConfig/KJLImportConfigOption";
import { KJLEdgeAndDrillParse } from "./KJLEdgeAndDrillParse";
import { KJL_DrillData, KJL_JsonFile, KJL_ModelType, KJL_Parameter, KJL_ParamModel, KJL_ParamModel_Board, KJL_ParamModel_Hardware } from "./KJLInterface";
import { KJL_DrillData, KJL_JsonFile, KJL_ModelType, KJL_ParamModel, KJL_ParamModel_Board, KJL_ParamModel_Hardware, KJL_Parameter } from "./KJLInterface";
import { KJLMaterialLoader } from "./KJLMaterialLoader";
import { ParseBCBZ, ParseBT, ParseCabNameMap, ParseKMFX, ParsePathOutlineAndHole, ParseRoomNameMap, ParseTopline } from "./KJLParse";
import { ApplyMaterial, CreateHardware, ParseHardwareParam } from "./KJLUtils";
@ -236,6 +236,7 @@ async function ParseModel(model: KJL_ParamModel,
en.HardwareOption[EBoardKeyList.RoomName] = roomName;
en.HardwareOption[EBoardKeyList.CabinetName] = gName;
let hmodel = model as KJL_ParamModel_Hardware;
en.HardwareOption.comments = hmodel.modelProductNumber ?? "";
ParseHardwareParam(en, hmodel);
}
en.ApplyMatrix(new Matrix4().premultiply(mtx));

Loading…
Cancel
Save