vis-core 0.22.14 → 0.23.0

package/dist/index.module.js

@@ -90,7 +90,7 @@ const publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRz
     ).toString(CryptoJS.enc.Utf8), qe = JSON.parse($e), st = Date.now();
     return !qe.s || qe.s > st ? (this.token = void 0, "") : qe.e && qe.e < st ? (this.token = void 0, "") : (qe.isValid = Qe, qe);
   }
-}, version = "0.22.14";
+}, version = "0.23.0";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -38160,21 +38160,23 @@ class Arc extends A$1 {
   }
   update() {
     var s;
-    (s = this.helperMesh) != null && s.length && this.helperMesh.some((r, T) => {
-      if (r.position.distanceTo(this.helperMeshPosition[T]) > 0.01) {
-        this.helperMeshPosition[T].copy(r.position);
-        const Xe = new CubicBezierCurve3(
-          this.helperMeshPosition[0],
-          this.helperMeshPosition[1],
-          this.helperMeshPosition[2],
-          this.helperMeshPosition[3]
-        ).getPoints(1500);
-        return this.line.setGeometry(
-          Xe,
-          this.line.object3d.geometry.widthCallback
-        ), !0;
-      }
-    });
+    if ((s = this.helperMesh) != null && s.length && this.helperMesh.find(
+      (T, de) => T.position.distanceTo(this.helperMeshPosition[de]) > 0.01
+    )) {
+      this.helperMesh.forEach((Xe, Ke) => {
+        this.helperMeshPosition[Ke].copy(Xe.position);
+      });
+      const de = new CubicBezierCurve3(
+        this.helperMeshPosition[0],
+        this.helperMeshPosition[1],
+        this.helperMeshPosition[2],
+        this.helperMeshPosition[3]
+      ).getPoints(1500);
+      this.line.setGeometry(
+        de,
+        this.line.object3d.geometry.widthCallback
+      );
+    }
   }
   setMList() {
     var r;
@@ -49359,15 +49361,14 @@ class History {
       const T = [...this.undos], de = T.length;
       let Xe = 0;
       const Ke = () => ei(this, null, function* () {
-        var Qe, _e, $e;
         const Je = performance.now();
         for (; T.length > 0 && performance.now() - Je < e; ) {
           if (this.editor._dispose) {
             r("dispose");
             return;
           }
-          const qe = T.shift(), st = (Qe = this.editor.hooks) != null && Qe.beforeExecuteUndo ? yield this.editor.hooks.beforeExecuteUndo(qe) : qe;
-          st && (yield this.executeUndo(st)), yield ($e = (_e = this.editor.hooks) == null ? void 0 : _e.afterExecuteUndo) == null ? void 0 : $e.call(_e, qe), Xe += 1;
+          const Qe = T.shift(), _e = this.editor.scripts.events.beforeExecuteUndo.length ? this.editor.scripts.dispatch("beforeExecuteUndo", Qe) : Qe;
+          _e && (yield this.executeUndo(_e)), this.editor.scripts.events.afterExecuteUndo.length && this.editor.scripts.dispatch("afterExecuteUndo", Qe), Xe += 1;
         }
         this.editor.emit("progress", {
           type: "还原场景",
@@ -49425,18 +49426,18 @@ class Viewport {
   }
   setVis(r) {
     return ei(this, arguments, function* (e, s = {}) {
-      var Xe, Ke;
+      var Xe;
       if (!this.options.visFactories && (this.editor.setViewportVis(e), !this.options.visFactories)) {
         console.error("visFactories is not defined");
         return;
       }
       if (this.vis = this.options.visFactories, this.vis.visName !== e)
         throw new Error(`visName is not match, import {${e}}`);
-      const T = (Xe = this.editor.hooks) != null && Xe.beforeSetVisOptions ? this.editor.hooks.beforeSetVisOptions(s) : s;
-      this.vis.setOptions(ai(ai({}, T), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis.on("loaderProgress", (Je, Qe) => {
+      const T = this.editor.scripts.events.beforeSetVisOptions.length ? this.editor.scripts.dispatch("beforeSetVisOptions", s) : s;
+      this.vis.setOptions(ai(ai({}, T), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis.on("loaderProgress", (Ke, Je) => {
         this.editor.emit("progress", {
           type: "下载资源",
-          value: Je / Qe * 100 | 0
+          value: Ke / Je * 100 | 0
         });
       }), this.vis.on("settingsChanged", () => {
         this.editor.emit("settingsChanged");
@@ -49444,7 +49445,7 @@ class Viewport {
         this.editor.emit("visShow");
       }), yield this.vis.init();
       const { pencil: de } = this.vis;
-      de.userData.EditorEnv = !this.editor.playing, this.editor.pencil = de, this.editor.changeSelectOption(), this.editor.playing || (this.initEvent(), this.editor.emit("visChanged", this.vis)), (Ke = this.vis) == null || Ke.pencil.event.on("object3dListChange", () => {
+      de.userData.EditorEnv = !this.editor.playing, this.editor.pencil = de, this.editor.changeSelectOption(), this.editor.playing || (this.initEvent(), this.editor.emit("visChanged", this.vis)), (Xe = this.vis) == null || Xe.pencil.event.on("object3dListChange", () => {
         this.editor.changeSelectOption();
       });
     });
@@ -49621,7 +49622,54 @@ const compareVersion = (c, e) => {
       de.attributeName = de.attributeName.replace(Xe, `caId.${Xe}`);
     }
   }), compareVersion(c.c.version, "0.21.24") === -1 && c.h.u[0] && c.h.u[0].visType === "map" && (T = (r = c.v) == null ? void 0 : r.eo) != null && T.parentBgCurvatureResolution && (delete c.v.eo.parentBgCurvatureResolution, c.v.eo.parentBgTopSegments = 400), c;
-}, jsonFetch = (c, e, s = !1) => {
+};
+class Scripts {
+  constructor(e) {
+    H0(this, "editor");
+    H0(this, "events", {
+      beforeSetVisOptions: [],
+      beforeExecuteUndo: [],
+      afterExecuteUndo: [],
+      beforeShow: [],
+      afterShow: []
+    });
+    H0(this, "source", "");
+    this.editor = e;
+  }
+  add(e) {
+    for (const s in e) {
+      const r = s;
+      this.events[r] && this.events[r].push(e[r].bind(e));
+    }
+  }
+  fromJSON(e) {
+    try {
+      e = `
+        return ${e}(vis);
+      `;
+      const s = new Function(e)();
+      this.add(s), this.source = e;
+    } catch (s) {
+      console.error(s);
+    }
+  }
+  toJSON() {
+    return this.source;
+  }
+  clear() {
+    Object.keys(this.events).forEach((e) => {
+      this.events[e] = [];
+    });
+  }
+  dispatch(e, ...s) {
+    let r;
+    for (const T of this.events[e])
+      if (e === "beforeSetVisOptions" ? r = T(r != null ? r : s[0]) : r = T(this.editor.viewport.vis, ...s), r === !1)
+        break;
+    return r;
+  }
+}
+const jsonFetch = (c, e, s = !1) => {
   const r = makePromiseCreator(!0), T = c.endsWith("gzip") || s;
   return window.fetch(c).then((de) => {
     let Xe = de;
@@ -49645,6 +49693,7 @@ class Editor {
     H0(this, "events", new EventEmitter());
     H0(this, "history");
     H0(this, "viewport");
+    H0(this, "scripts");
     H0(this, "pencil");
     H0(this, "on", this.events.on.bind(this.events));
     H0(this, "emit", this.events.emit.bind(this.events));
@@ -49654,7 +49703,6 @@ class Editor {
     H0(this, "name");
     H0(this, "open", !1);
     H0(this, "options");
-    H0(this, "hooks");
     H0(this, "selectOption", []);
     H0(this, "selectOption2", []);
     H0(this, "checkSelectOption", throttle(
@@ -49673,7 +49721,7 @@ class Editor {
       processUndosMaxFrameTime: Number.MAX_VALUE
     }, e), this.events.setMaxListeners(9999999), this.viewport = new Viewport(this, {
       visFactories: e.visFactories
-    }), this.history = new History(this);
+    }), this.history = new History(this), this.scripts = new Scripts(this);
   }
   getObjectMaterial(e, s) {
     if (!e)
@@ -49796,9 +49844,9 @@ class Editor {
     return ei(this, null, function* () {
       var r, T, de, Xe;
       try {
-        s && !n$1(s) && console.warn(
+        s && !n$1(s) ? console.warn(
           "fromJSON 第二个参数已修改，{beforeSetVisOptions:(r)=>r} 替代"
-        ), this.hooks = s, window.postMessage({ type: "vis-core.fromJSON.start" }), console.time("vis-core:time.fromJSON");
+        ) : s && this.scripts.add(s), window.postMessage({ type: "vis-core.fromJSON.start" }), console.time("vis-core:time.fromJSON");
         let Ke;
         if (typeof e == "string") {
           const Je = this.options.assetsPrefix + e, { res: Qe } = yield jsonFetch(Je);
@@ -49816,11 +49864,11 @@ class Editor {
           "vis-core 版本过低，可能会出现问题",
           "json:" + Ke.c.version,
           "sdk:" + this.sdkVersion
-        ), this.setConfig(Ke.c), this.history.fromJSON(Ke.h), this.viewport.fromJSON(Ke.v), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (r = Ke.v.bg) != null && r.texture && this.viewport.vis) {
+        ), this.setConfig(Ke.c), this.history.fromJSON(Ke.h), this.viewport.fromJSON(Ke.v), Ke.s && this.scripts.fromJSON(Ke.s), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (r = Ke.v.bg) != null && r.texture && this.viewport.vis) {
           const Je = parseTexture(Ke.v.bg.texture);
           Je.colorSpace = SRGBColorSpace, this.viewport.vis.pencil.scene.background = Je;
         }
-        return (T = this.viewport.vis) == null || T.show(), (de = this.pencil.controls) == null || de.saveState(), this.select(null), console.timeEnd("vis-core:time.fromJSON"), window.postMessage({ type: "vis-core.fromJSON.end" }), (Xe = this.viewport.vis) != null && Xe.workerOnce && this.playing && window.requestIdleCallback(() => {
+        return this.scripts.dispatch("beforeShow"), (T = this.viewport.vis) == null || T.show(), this.scripts.dispatch("afterShow"), (de = this.pencil.controls) == null || de.saveState(), this.select(null), console.timeEnd("vis-core:time.fromJSON"), window.postMessage({ type: "vis-core.fromJSON.end" }), (Xe = this.viewport.vis) != null && Xe.workerOnce && this.playing && window.requestIdleCallback(() => {
           var Je;
           (Je = this.viewport.vis) == null || Je.worker.dispose();
         }), Ke;
@@ -49860,7 +49908,7 @@ class Editor {
     return this.pencil ? (this.pencil.render(), this.pencil.renderer.domElement.toDataURL()) : "";
   }
   dispose() {
-    this.events.removeAllListeners(), this.viewport.dispose(), this.history.clear(), this._dispose = !0;
+    this.events.removeAllListeners(), this.viewport.dispose(), this.history.clear(), this.scripts.clear(), this._dispose = !0;
   }
 }
 const BLOCKLISTED_GPUS = [
@@ -129774,14 +129822,11 @@ const objs$4 = Ki(ai({}, objs$5), {
   }, c.initMaterial = function() {
     return ei(this, null, function* () {
       const e = this.loader, s = (() => {
-        const r = new MeshStandardMaterial({
+        const T = new MeshStandardMaterial({
           name: "顶面",
           map: e.getAsset("/image/map/hp.webp"),
           normalMap: e.getAsset("/image/map/shuchu2.webp")
-        }), T = this.options.drillDownTopMatTwo ? new MeshBasicMaterial({
-          name: "二级顶面",
-          color: new Color$1("#0d2425")
-        }) : null, de = new MeshBasicMaterial({
+        }), de = new MeshBasicMaterial({
           name: "侧面",
           map: e.getAsset("/image/map/jianbian.webp")
         }), Xe = new it$1({
@@ -129799,14 +129844,41 @@ const objs$4 = Ki(ai({}, objs$5), {
           depthWrite: !1
         });
         return {
-          topMat: r,
-          topMatTwo: T,
+          topMat: T,
           sideMat: de,
           lineMat: Xe,
           extrudeLineMat: Ke
         };
-      })();
-      this.mList.setMaterialObj("plane", s), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
+      })(), r = this.options.drillDownTopMatTwo ? (() => {
+        const T = new MeshBasicMaterial({
+          name: "二级顶面",
+          color: new Color$1("#0d2425")
+        }), de = new MeshBasicMaterial({
+          name: "二级侧面",
+          color: new Color$1("#0d2425")
+        }), Xe = new it$1({
+          name: "二级线",
+          color: new Color$1("#73FEDD"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.lineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        }), Ke = new it$1({
+          name: "二级边线",
+          color: new Color$1("#00FFED"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.extrudeLineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        });
+        return {
+          topMat: T,
+          sideMat: de,
+          lineMat: Xe,
+          extrudeLineMat: Ke
+        };
+      })() : null;
+      this.mList.setMaterialObj("plane", s), r && this.mList.setMaterialObj("secondPlane", r), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
         name: "板块"
       }), this.mList.setShowMaterialList("line", "plane#lineMat", {
         name: "板块线"
@@ -129821,13 +129893,10 @@ const objs$4 = Ki(ai({}, objs$5), {
   }, c.initMaterial = function() {
     return ei(this, null, function* () {
       const e = this.loader, s = (() => {
-        const r = new MeshBasicMaterial({
+        const T = new MeshBasicMaterial({
           name: "顶面",
           color: new Color$1("#0d2425")
-        }), T = this.options.drillDownTopMatTwo ? new MeshBasicMaterial({
-          name: "二级顶面",
-          color: new Color$1("#0d2425")
-        }) : null, de = new MeshBasicMaterial({
+        }), de = new MeshBasicMaterial({
           name: "侧面",
           map: e.getAsset("/image/map/jianbian.webp")
         }), Xe = new it$1({
@@ -129844,14 +129913,41 @@ const objs$4 = Ki(ai({}, objs$5), {
           depthWrite: !1
         });
         return {
-          topMatTwo: T,
-          topMat: r,
+          topMat: T,
           sideMat: de,
           lineMat: Xe,
           extrudeLineMat: Ke
         };
-      })();
-      this.mList.setMaterialObj("plane", s), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
+      })(), r = this.options.drillDownTopMatTwo ? (() => {
+        const T = new MeshBasicMaterial({
+          name: "二级顶面",
+          color: new Color$1("#0d2425")
+        }), de = new MeshBasicMaterial({
+          name: "二级侧面",
+          color: new Color$1("#0d2425")
+        }), Xe = new it$1({
+          name: "二级线",
+          color: new Color$1("#73FEDD"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.lineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        }), Ke = new it$1({
+          name: "二级边线",
+          color: new Color$1("#00FFED"),
+          sizeAttenuation: 0,
+          lineWidth: this.options.extrudeLineWidth,
+          //@ts-ignore
+          depthWrite: !1
+        });
+        return {
+          topMat: T,
+          sideMat: de,
+          lineMat: Xe,
+          extrudeLineMat: Ke
+        };
+      })() : null;
+      this.mList.setMaterialObj("plane", s), r && this.mList.setMaterialObj("secondPlane", r), this.mList.setShowMaterialList("area", ["plane#topMat", "plane#sideMat"], {
         name: "板块"
       }), this.mList.setShowMaterialList("line", "plane#lineMat", {
         name: "板块线"
@@ -130671,9 +130767,7 @@ const objs$4 = Ki(ai({}, objs$5), {
       depth: de,
       adcode: Xe
     }) {
-      const Je = this.mapHistory.length === 0, Qe = this.mList.getMaterialObj("plane"), _e = ai({}, Qe);
-      !Je && _e.topMatTwo && (_e.topMat = _e.topMatTwo);
-      const $e = yield this.drawController.draw(
+      const Je = this.mapHistory.length !== 0 && this.options.drillDownTopMatTwo, Qe = Je ? "secondPlane" : "plane", _e = this.mList.getMaterialObj(Qe), $e = ai({}, _e), qe = yield this.drawController.draw(
         "PlaneMap",
         {
           geojson: s,
@@ -130685,7 +130779,7 @@ const objs$4 = Ki(ai({}, objs$5), {
             rotate: this.options.worldPacificCentre ? [-160, 0] : void 0,
             projectionType: this.options.projectionType
           },
-          materialOptions: _e,
+          materialOptions: $e,
           bbox: T,
           topSegments: this.options.topSegments,
           lineOffset: this.options.lineOffset,
@@ -130693,19 +130787,19 @@ const objs$4 = Ki(ai({}, objs$5), {
         },
         this.group
       );
-      return $e.extrudelineArr && $e.extrudelineArr.forEach((qe) => {
-        qe.object3d.name = "板块边线", this.mList.setObject3d(qe.object3d, "extrudeLine", {
-          baseObject: qe,
+      return Je || (qe.extrudelineArr && qe.extrudelineArr.forEach((st) => {
+        st.object3d.name = "板块边线", this.mList.setObject3d(st.object3d, "extrudeLine", {
+          baseObject: st,
           replace: !0
-        }), this.initBaseObjectUserData(qe);
+        }), this.initBaseObjectUserData(st);
       }), this.mList.setObject3d(
-        $e.object3d,
+        qe.object3d,
         Xe === 1e5 ? "chinaGroup" : "planeMapGroup",
         {
-          baseObject: $e,
+          baseObject: qe,
           replace: !0
         }
-      ), $e;
+      )), qe;
     });
   }
   handleBack() {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.22.14";
+declare const _default: "0.23.0";
 export default _default;

package/dist/vis/base/index.d.ts

@@ -74,7 +74,7 @@ export default class Base extends Event {
     tier0: boolean;
     constructor(options: BaseOptions);
     setOptions(options: Record<string, any>): void;
-    get fromJSON(): (jsonOrUrl: Record<string, any> | string, hooks?: import("../../editor").Hooks) => Promise<Record<string, any>>;
+    get fromJSON(): (jsonOrUrl: Record<string, any> | string, scripts?: Record<string, any>) => Promise<Record<string, any>>;
     get baseObjectByUuid(): {
         (uuid: `arc${string}`, flag?: boolean): Arc;
         (uuid: `sprite${string}`, flag?: boolean): import("../all/objects/Sprite").default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.22.14",
+  "version": "0.23.0",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && bundler",