vis-core 0.30.0-beta.30 → 0.30.0-beta.32

package/dist/index.module.js

@@ -63,7 +63,7 @@ import { continentsCountriesIso2 } from "geojson-cn";
 Array.prototype.at || (Array.prototype.at = function(v) {
   return v < 0 && (v = this.length + v), this[v];
 });
-const version = "0.30.0-beta.30", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
+const version = "0.30.0-beta.32", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
   token: void 0,
   getInfo() {
     if (!this.token)
@@ -140399,39 +140399,39 @@ class Editor {
   }
   fromJSON(e, r) {
     return B0(this, null, function* () {
-      var V, le, fe;
+      var V, le;
       let o = null;
       try {
         r && !y(r) ? console.warn(
           "fromJSON 第二个参数已修改，{beforeSetVisOptions:(r)=>r} 替代"
         ) : r && (o = r.fj, delete r.fj, this.hooks.addEvents(r));
-        let Le;
+        let fe;
         if (typeof e == "string") {
-          const Ce = this.options.assetsPrefix + e;
+          const Le = this.options.assetsPrefix + e;
           console.time("vis-core:time.json-fetch");
-          const { res: Re, err: Pe } = yield jsonFetch(Ce);
-          if (console.timeEnd("vis-core:time.json-fetch"), Pe)
-            throw new Error("fromJSON error:" + Pe);
-          Le = Re;
+          const { res: Ce, err: Re } = yield jsonFetch(Le);
+          if (console.timeEnd("vis-core:time.json-fetch"), Re)
+            throw new Error("fromJSON error:" + Re);
+          fe = Ce;
         } else
-          Le = e;
-        if (this.hooks.dispatch("beforeFromJSON"), o && (Le = yield o(Le)), Le = fixJSON(Le), Le.at && (accessToken.token = Le.at), !this.storage) {
+          fe = e;
+        if (this.hooks.dispatch("beforeFromJSON"), o && (fe = yield o(fe)), fe = fixJSON(fe), fe.at && (accessToken.token = fe.at), !this.storage) {
           if (!accessToken.token)
             throw new Error("设置 token 或平台重新下载 JSON 文件");
-          const Ce = accessToken.getInfo();
-          if (!Ce || !Ce.isValid)
+          const Le = accessToken.getInfo();
+          if (!Le || !Le.isValid)
             throw new Error("need accessToken");
         }
-        if (this.config.fromJSON(Le.c), this.history.fromJSON(Le.h), this.viewport.fromJSON(Le.v), this.hooks.fromJSON(Le.s), this.config.compareVersion(), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (V = Le.v.bg) != null && V.texture && this.viewport.vis) {
-          const Ce = parseTexture(Le.v.bg.texture);
-          Ce.colorSpace = SRGBColorSpace, this.viewport.vis.pencil.scene.background = Ce;
+        if (this.config.fromJSON(fe.c), this.history.fromJSON(fe.h), this.viewport.fromJSON(fe.v), this.hooks.fromJSON(fe.s), this.config.compareVersion(), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (V = fe.v.bg) != null && V.texture && this.viewport.vis) {
+          const Le = parseTexture(fe.v.bg.texture);
+          Le.colorSpace = SRGBColorSpace, this.viewport.vis.pencil.scene.background = Le;
         }
-        return this.hooks.dispatch("beforeShow"), (le = this.viewport.vis) == null || le.show(), this.hooks.dispatch("afterShow"), (fe = this.pencil.controls) == null || fe.saveState(), this.select(null), window.requestIdleCallback(() => {
-          var Ce;
-          (Ce = this.viewport.vis) == null || Ce.worker.dispose();
-        }), this.hooks.dispatch("afterFromJSON"), Le;
-      } catch (Le) {
-        throw this.hooks.dispatch("errorFromJSON"), new Error("fromJSON error:" + Le);
+        return this.hooks.dispatch("beforeShow"), this.viewport.vis && (this.playing && this.viewport.vis.lead.prefabGroup.hide(), this.viewport.vis.show()), this.hooks.dispatch("afterShow"), (le = this.pencil.controls) == null || le.saveState(), this.select(null), window.requestIdleCallback(() => {
+          var Le;
+          (Le = this.viewport.vis) == null || Le.worker.dispose();
+        }), this.hooks.dispatch("afterFromJSON"), fe;
+      } catch (fe) {
+        throw this.hooks.dispatch("errorFromJSON"), new Error("fromJSON error:" + fe);
       }
     });
   }
@@ -144282,7 +144282,8 @@ const getLabelElement = (v) => {
   initCityVis(r, o = !1) {
     return B0(this, null, function* () {
       var Le;
-      (Le = this.options.fixCity) != null && Le[r] && (r = this.options.fixCity[r]);
+      if ((Le = this.options.fixCity) != null && Le[r] && (r = this.options.fixCity[r]), r === 71e4)
+        return null;
       const V = new City({
         container: this.container,
         editor: !1
@@ -144311,9 +144312,10 @@ const getLabelElement = (v) => {
   initCityOnMap(r) {
     return B0(this, null, function* () {
       const o = this.getAdcodeShowLevel(r);
-      if (o === "province")
-        yield (yield this.initCityVis(r)).drawCityPlane(r, this.lead.group);
-      else if (o === "city") {
+      if (o === "province") {
+        const V = yield this.initCityVis(r);
+        yield V == null ? void 0 : V.drawCityPlane(r, this.lead.group);
+      } else if (o === "city") {
         const V = findAdcodeInfo(r).c;
         let le = null;
         if (V.length > 0)
@@ -144322,10 +144324,13 @@ const getLabelElement = (v) => {
         else
           le = yield this.initCityVis(r);
         yield le == null ? void 0 : le.drawCityPlane(r, this.lead.group), this.pencil.camera.near = 1e-3, this.pencil.camera.far = 7, this.pencil.camera.updateProjectionMatrix();
-      } else if (o === "district" && (yield (yield this.initCityVis(r)).drawCityPlane(r, this.lead.group), this.pencil.camera.near = 1e-3, this.pencil.camera.far = 7, this.pencil.camera.updateProjectionMatrix(), this.options.nearbyCities)) {
-        const le = findAdcodeInfo(r).parent, fe = findAdcodeInfo(le).c;
-        for (const Le of fe)
-          (this.options.nearbyCities === "full" || Le !== r) && (yield this.initCityVis(Le, !0));
+      } else if (o === "district") {
+        const V = yield this.initCityVis(r);
+        if (yield V == null ? void 0 : V.drawCityPlane(r, this.lead.group), this.pencil.camera.near = 1e-3, this.pencil.camera.far = 7, this.pencil.camera.updateProjectionMatrix(), this.options.nearbyCities) {
+          const le = findAdcodeInfo(r).parent, fe = findAdcodeInfo(le).c;
+          for (const Le of fe)
+            (this.options.nearbyCities === "full" || Le !== r) && (yield this.initCityVis(Le, !0));
+        }
       }
       this.cityVis.forEach((V) => {
         if (!V.options.grey) {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.30.0-beta.30";
+declare const _default: "0.30.0-beta.32";
 export default _default;

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

@@ -190,7 +190,7 @@ export default class extends Base {
     initSettingsObj: Record<string, any>;
     handleSetting(key: string, value: any): Promise<any>;
     init(): Promise<void>;
-    initCityVis(adcode: number, grey?: boolean): Promise<City>;
+    initCityVis(adcode: number, grey?: boolean): Promise<City | null>;
     initCityOnMap(adcode: number): Promise<void>;
     initVisBg(): Promise<void>;
     initVis(adcode: number): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.30.0-beta.30",
+  "version": "0.30.0-beta.32",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version && PUBLIC_EXCLUDE=true  bundler",