vis-core 0.30.0-beta.5 → 0.30.0-beta.6

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.5", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
+const version = "0.30.0-beta.6", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
   token: void 0,
   getInfo() {
     if (!this.token)
@@ -140370,38 +140370,39 @@ class Editor {
   }
   fromJSON(e, r) {
     return N0(this, null, function* () {
-      var o, w, W;
+      var w, W, E;
+      let o = null;
       try {
         r && !y(r) ? console.warn(
           "fromJSON 第二个参数已修改，{beforeSetVisOptions:(r)=>r} 替代"
-        ) : r && this.hooks.addEvents(r);
-        let E;
+        ) : r && (o = r.fj, delete r.fj, this.hooks.addEvents(r));
+        let O;
         if (typeof e == "string") {
-          const O = this.options.assetsPrefix + e;
+          const j = this.options.assetsPrefix + e;
           console.time("vis-core:time.json-fetch");
-          const { res: j, err: le } = yield jsonFetch(O);
-          if (console.timeEnd("vis-core:time.json-fetch"), le)
-            throw new Error("fromJSON error:" + le);
-          E = j;
+          const { res: le, err: fe } = yield jsonFetch(j);
+          if (console.timeEnd("vis-core:time.json-fetch"), fe)
+            throw new Error("fromJSON error:" + fe);
+          O = le;
         } else
-          E = e;
-        if (this.hooks.dispatch("beforeFromJSON"), E = fixJSON(E), E.at && (accessToken.token = E.at), !this.storage) {
+          O = e;
+        if (this.hooks.dispatch("beforeFromJSON"), o && (O = yield o(O)), O = fixJSON(O), O.at && (accessToken.token = O.at), !this.storage) {
           if (!accessToken.token)
             throw new Error("设置 token 或平台重新下载 JSON 文件");
-          const O = accessToken.getInfo();
-          if (!O || !O.isValid)
+          const j = accessToken.getInfo();
+          if (!j || !j.isValid)
             throw new Error("need accessToken");
         }
-        if (this.config.fromJSON(E.c), this.history.fromJSON(E.h), this.viewport.fromJSON(E.v), this.hooks.fromJSON(E.s), this.config.compareVersion(), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (o = E.v.bg) != null && o.texture && this.viewport.vis) {
-          const O = parseTexture(E.v.bg.texture);
-          O.colorSpace = SRGBColorSpace, this.viewport.vis.pencil.scene.background = O;
+        if (this.config.fromJSON(O.c), this.history.fromJSON(O.h), this.viewport.fromJSON(O.v), this.hooks.fromJSON(O.s), this.config.compareVersion(), yield this.history.processUndos(this.options.processUndosMaxFrameTime), (w = O.v.bg) != null && w.texture && this.viewport.vis) {
+          const j = parseTexture(O.v.bg.texture);
+          j.colorSpace = SRGBColorSpace, this.viewport.vis.pencil.scene.background = j;
         }
-        return this.hooks.dispatch("beforeShow"), (w = this.viewport.vis) == null || w.show(), this.hooks.dispatch("afterShow"), (W = this.pencil.controls) == null || W.saveState(), this.select(null), window.requestIdleCallback(() => {
-          var O;
-          (O = this.viewport.vis) == null || O.worker.dispose();
-        }), this.hooks.dispatch("afterFromJSON"), E;
-      } catch (E) {
-        throw this.hooks.dispatch("errorFromJSON"), new Error("fromJSON error:" + E);
+        return this.hooks.dispatch("beforeShow"), (W = this.viewport.vis) == null || W.show(), this.hooks.dispatch("afterShow"), (E = this.pencil.controls) == null || E.saveState(), this.select(null), window.requestIdleCallback(() => {
+          var j;
+          (j = this.viewport.vis) == null || j.worker.dispose();
+        }), this.hooks.dispatch("afterFromJSON"), O;
+      } catch (O) {
+        throw this.hooks.dispatch("errorFromJSON"), new Error("fromJSON error:" + O);
       }
     });
   }

package/dist/version.d.ts

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

package/package.json

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