vis-core 0.23.0 → 0.23.2

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.23.0";
+}, version = "0.23.2";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -49434,7 +49434,7 @@ class Viewport {
       if (this.vis = this.options.visFactories, this.vis.visName !== e)
         throw new Error(`visName is not match, import {${e}}`);
       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.vis.setOptions(ai(ai({}, T), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis._baseObjectByUuid = this.editor.baseObjectByUuid.bind(this.editor), this.vis.on("loaderProgress", (Ke, Je) => {
         this.editor.emit("progress", {
           type: "下载资源",
           value: Ke / Je * 100 | 0
@@ -49601,17 +49601,13 @@ const compareVersion = (c, e) => {
     }
     compareVersion(c.c.version, "0.13.0") === -1 && c.h.u[0].visOptions.adcode === 0 && (c.h.u[0].visType = "world");
   }
-  if (compareVersion(c.c.version, "0.13.0") === -1 && c.h.u[0] && c.h.u[0].visType === "world" && (c.h.u[0].visType = "map", c.h.u[0].visOptions = {
+  return compareVersion(c.c.version, "0.13.0") === -1 && c.h.u[0] && c.h.u[0].visType === "world" && (c.h.u[0].visType = "map", c.h.u[0].visOptions = {
     adcode: 0,
     mapDepth: 5,
     lineWidth: 2,
     worldPacificCentre: !0,
     extrudeLine: !1
-  }), c.h.u[0] && c.h.u[0].visType === "FJ" && (c.h.u[0].visType = "map2"), c.h.u[0] && c.h.u[0].visType === "map2") {
-    const { adcode: de } = c.h.u[0].visOptions;
-    de === 35e4 && (c.h.u[0].visOptions.drillDownHideParent = !0);
-  }
-  return compareVersion(c.c.version, "0.18.1") === -1 && c.h.u[0] && c.h.u[0].visType === "earth3" && (c.h.u[0].visType = "earth", c.h.u[0].visOptions.style = "countryPlate"), compareVersion(c.c.version, "0.18.14") === -1 && c.h.u[0] && c.h.u[0].visType === "map" && c.h.u.forEach((de) => {
+  }), c.h.u[0] && c.h.u[0].visType === "FJ" && (c.h.u[0].visType = "map2"), compareVersion(c.c.version, "0.18.1") === -1 && c.h.u[0] && c.h.u[0].visType === "earth3" && (c.h.u[0].visType = "earth", c.h.u[0].visOptions.style = "countryPlate"), compareVersion(c.c.version, "0.18.14") === -1 && c.h.u[0] && c.h.u[0].visType === "map" && c.h.u.forEach((de) => {
     if (de.type === "SetSetting" && de.attributeName.startsWith("测试") && typeof de.newValue == "string" && de.newValue.includes(":::")) {
       const Xe = de.newValue.split(":::")[1];
       de.attributeName += ":::" + Xe, de.newValue = de.newValue.split(":::")[0], de.oldValue && typeof de.oldValue == "string" && (de.oldValue = de.oldValue.split(":::")[0]);
@@ -49621,7 +49617,7 @@ const compareVersion = (c, e) => {
       const Xe = de.attributeName.split(":::")[1];
       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;
+  }), 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), compareVersion(c.c.version, "0.23.1") === -1 && c.h.u[0] && c.h.u[0].visType === "map2" && !c.h.u[0].visOptions.cityOnMap && (c.h.u[0].visOptions.clickHandleDrillDown = !0), c;
 };
 class Scripts {
   constructor(e) {
@@ -49636,19 +49632,21 @@ class Scripts {
     H0(this, "source", "");
     this.editor = e;
   }
-  add(e) {
+  addEvents(e) {
     for (const s in e) {
       const r = s;
       this.events[r] && this.events[r].push(e[r].bind(e));
     }
   }
+  addStaticEvents(e) {
+    this.addEvents(e());
+    const s = e.toString().replace(/^\s+/gm, "").replace(/(\r\n|\n|\r)/gm, "");
+    this.source !== s && (this.source = s, this.editor.emit("scriptsChanged"));
+  }
   fromJSON(e) {
     try {
-      e = `
-        return ${e}(vis);
-      `;
-      const s = new Function(e)();
-      this.add(s), this.source = e;
+      const s = new Function(`return ${e}()`)();
+      this.addEvents(s), this.source = e;
     } catch (s) {
       console.error(s);
     }
@@ -49846,7 +49844,7 @@ class Editor {
       try {
         s && !n$1(s) ? console.warn(
           "fromJSON 第二个参数已修改，{beforeSetVisOptions:(r)=>r} 替代"
-        ) : s && this.scripts.add(s), window.postMessage({ type: "vis-core.fromJSON.start" }), console.time("vis-core:time.fromJSON");
+        ) : s && this.scripts.addEvents(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);
@@ -50382,6 +50380,7 @@ class Base extends Event {
     H0(this, "visName");
     H0(this, "editor");
     H0(this, "tier0", !1);
+    H0(this, "_baseObjectByUuid");
     H0(this, "initSettingsObj");
     H0(this, "mouseButtonsActiveStore", null);
     if (this.container = s.container, this.options = ai({
@@ -50435,7 +50434,8 @@ class Base extends Event {
     return this.editor.fromJSON.bind(this.editor);
   }
   get baseObjectByUuid() {
-    return this.editor.baseObjectByUuid.bind(this.editor);
+    var s;
+    return ((s = this.editor) == null ? void 0 : s.baseObjectByUuid.bind(this.editor)) || this._baseObjectByUuid;
   }
   get objectByUuid() {
     return this.editor.objectByUuid.bind(this.editor);
@@ -132323,7 +132323,7 @@ class Map$1 extends Map$2 {
       polarAngle: 0.6690037180091797,
       mapDepth: [1, 0.3, 0.12],
       clickOusideBack: !0,
-      clickHandleDrillDown: !0,
+      clickHandleDrillDown: !1,
       bottomPlane: !0,
       bottomPlaneWater: !1,
       parentBg: !0,

package/dist/version.d.ts

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

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

@@ -74,6 +74,7 @@ export default class Base extends Event {
     tier0: boolean;
     constructor(options: BaseOptions);
     setOptions(options: Record<string, any>): void;
+    _baseObjectByUuid: Editor['baseObjectByUuid'];
     get fromJSON(): (jsonOrUrl: Record<string, any> | string, scripts?: Record<string, any>) => Promise<Record<string, any>>;
     get baseObjectByUuid(): {
         (uuid: `arc${string}`, flag?: boolean): Arc;

package/package.json

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