@maqiuyao/dxf-viewer 0.2.14 → 0.2.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -31166,6 +31166,10 @@ const ps = class ps {
31166
31166
  g(this, "gltfLoader");
31167
31167
  g(this, "font");
31168
31168
  g(this, "manager");
31169
+ /**
31170
+ * 最近一次进行中的 DXF 加载器,用于中断未完成的加载(快速切换图纸场景)
31171
+ */
31172
+ g(this, "currentDxfLoader");
31169
31173
  this.manager = t;
31170
31174
  }
31171
31175
  setLoadManager(t) {
@@ -31297,10 +31301,18 @@ const ps = class ps {
31297
31301
  async loadDxfData(t, e, i, s, n) {
31298
31302
  this.font || console.warn("[LoadingHelper] Should set font first!");
31299
31303
  const r = new X(this.manager, n);
31300
- return r.setFont(this.font), await this.font?.getFontFromIndexeddb(), r.manager.onLoad = () => {
31304
+ return this.currentDxfLoader = r, r.setFont(this.font), await this.font?.getFontFromIndexeddb(), r.manager.onLoad = () => {
31301
31305
  s && s();
31302
31306
  }, r.loadEx(t, e, i);
31303
31307
  }
31308
+ /**
31309
+ * 中断当前进行中的 DXF 加载(若有)。
31310
+ * 每次加载使用独立的 DxfLoader 实例,因此只影响最近一次未完成的加载,
31311
+ * 已完成的模型与后续新加载不受影响。
31312
+ */
31313
+ abortDxfLoading() {
31314
+ this.currentDxfLoader?.abort(), this.currentDxfLoader = void 0;
31315
+ }
31304
31316
  /**
31305
31317
  * Sets font.
31306
31318
  * Font is required for Viewer2d to view Chinese, etc.
@@ -32903,6 +32915,9 @@ class bu {
32903
32915
  addModel(t) {
32904
32916
  this.modelGroup.add(t.getModelObject());
32905
32917
  }
32918
+ removeModel(t) {
32919
+ this.modelGroup.remove(t.getModelObject());
32920
+ }
32906
32921
  enableShadow(t) {
32907
32922
  this.renderer.shadowMap.enabled = t, this.directionalLight.castShadow = t, t && (this.tryAdjustDirectionalLight(), this.updateDirectionalLightShadow()), this.modelGroup.traverse((e) => {
32908
32923
  e.isMesh && (e.castShadow = t, e.receiveShadow = t);
@@ -33431,10 +33446,18 @@ class Pr extends hi {
33431
33446
  };
33432
33447
  }
33433
33448
  /**
33434
- *
33449
+ * 从场景中移除指定模型(不销毁 viewer,用于切换图纸等场景)。
33450
+ * @param modelId 加载时指定的 modelId
33451
+ * @returns 被移除的模型,未找到时返回 undefined
33435
33452
  */
33453
+ removeModel(e) {
33454
+ const i = this.loadedModels.findIndex((n) => n.modelId === e);
33455
+ if (i === -1) return;
33456
+ const s = this.loadedModels.splice(i, 1)[0];
33457
+ return this.sceneManager.removeModel(s), this.enableRender(), s;
33458
+ }
33436
33459
  destroy() {
33437
- this.requestAnimationFrameHandle && cancelAnimationFrame(this.requestAnimationFrameHandle), this.css2dRenderer.domElement.remove(), this.container.destroy(), this.sceneManager.destroy(), this.cameraManager.destroy(), this.overlayRender.destroy(), this.spinner.destroy(), this.progressBar?.destroy(), this.undoManager.destroy();
33460
+ this.requestAnimationFrameHandle && cancelAnimationFrame(this.requestAnimationFrameHandle), this.loaderHelper.abortDxfLoading(), this.css2dRenderer.domElement.remove(), this.container.destroy(), this.sceneManager.destroy(), this.cameraManager.destroy(), this.overlayRender.destroy(), this.spinner.destroy(), this.progressBar?.destroy(), this.undoManager.destroy();
33438
33461
  }
33439
33462
  /**
33440
33463
  * Installs a Plugin.
@@ -33692,6 +33715,7 @@ class $o extends Pr {
33692
33715
  * ```
33693
33716
  */
33694
33717
  async loadModel(e, i, s) {
33718
+ this.loaderHelper.abortDxfLoading();
33695
33719
  const n = this.getUniqueModelId(e.modelId || e.src);
33696
33720
  this.spinner.increaseJobCount(), this.loaderHelper.setFont(this.fontManager), this.masterModelId || (this.masterModelId = n);
33697
33721
  const r = n, a = Je.t("ProgressBar.Loading"), o = (d) => {
@@ -33739,6 +33763,16 @@ class $o extends Pr {
33739
33763
  this.spinner.decreaseJobCount();
33740
33764
  }
33741
33765
  }
33766
+ /**
33767
+ * 从场景中移除指定模型(不销毁 viewer,用于切换图纸等场景)。
33768
+ * 场景被清空后重置主模型与布局状态,保证后续加载的模型按全新流程初始化。
33769
+ * @param modelId 加载时指定的 modelId
33770
+ * @returns 被移除的模型,未找到时返回 undefined
33771
+ */
33772
+ removeModel(e) {
33773
+ const i = super.removeModel(e);
33774
+ return i && this.loadedModels.length === 0 && (this.masterModelId = "", this.activeLayoutName = "", this.layoutInfos = {}, this.units = void 0), i;
33775
+ }
33742
33776
  addModel(e) {
33743
33777
  super.addModel(e);
33744
33778
  const i = e.modelId;
@@ -36,10 +36,20 @@ export declare class LoadingHelper {
36
36
  * It is kind of tricky to load image into scene, but we'll do this by creating a sprite.
37
37
  */
38
38
  loadImage(url: string, onProgress?: (event: ProgressEvent) => void): Promise<THREE.Object3D>;
39
+ /**
40
+ * 最近一次进行中的 DXF 加载器,用于中断未完成的加载(快速切换图纸场景)
41
+ */
42
+ private currentDxfLoader?;
39
43
  /**
40
44
  * Loads dxf data, including entities, tables(layers, blocks), etc.
41
45
  */
42
46
  loadDxfData(url: string, dxfDataId?: string, onProgress?: (event: ProgressEvent) => void, onLoad?: () => void, cfg?: DxfLoaderConfig): Promise<DxfData>;
47
+ /**
48
+ * 中断当前进行中的 DXF 加载(若有)。
49
+ * 每次加载使用独立的 DxfLoader 实例,因此只影响最近一次未完成的加载,
50
+ * 已完成的模型与后续新加载不受影响。
51
+ */
52
+ abortDxfLoading(): void;
43
53
  /**
44
54
  * Sets font.
45
55
  * Font is required for Viewer2d to view Chinese, etc.
@@ -17,6 +17,7 @@ export declare class SceneManager {
17
17
  private initPMREMGenerator;
18
18
  get maxFragmentUniforms(): number;
19
19
  addModel(model: Model): void;
20
+ removeModel(model: Model): void;
20
21
  enableShadow(enable: boolean): void;
21
22
  enableClipping(enable: boolean): void;
22
23
  setClipPlanes(planes: THREE.Plane[]): void;
@@ -224,8 +224,11 @@ export declare abstract class BaseViewer extends Event<ViewerEvents> {
224
224
  materials: number;
225
225
  };
226
226
  /**
227
- *
227
+ * 从场景中移除指定模型(不销毁 viewer,用于切换图纸等场景)。
228
+ * @param modelId 加载时指定的 modelId
229
+ * @returns 被移除的模型,未找到时返回 undefined
228
230
  */
231
+ removeModel(modelId: string): Model | undefined;
229
232
  destroy(): void;
230
233
  /**
231
234
  * Installs a Plugin.
@@ -303,6 +303,13 @@ export declare class Viewer2d extends BaseViewer {
303
303
  threejsObject: THREE.Object3D;
304
304
  llbMesh?: LlbMeshItem[];
305
305
  }) => void): Promise<void>;
306
+ /**
307
+ * 从场景中移除指定模型(不销毁 viewer,用于切换图纸等场景)。
308
+ * 场景被清空后重置主模型与布局状态,保证后续加载的模型按全新流程初始化。
309
+ * @param modelId 加载时指定的 modelId
310
+ * @returns 被移除的模型,未找到时返回 undefined
311
+ */
312
+ removeModel(modelId: string): Model2d | undefined;
306
313
  addModel(model: Model2d): void;
307
314
  private getDxfUnits;
308
315
  private handleOverlayDxf;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@maqiuyao/dxf-viewer",
3
- "version": "0.2.14",
3
+ "version": "0.2.15",
4
4
  "description": "基于 three.js 的 DXF 图纸 2D/3D 查看与对比库(Viewer2d / DxfCompareHelper)",
5
5
  "type": "module",
6
6
  "main": "./dist/dxf-viewer.cjs",