vis-core 0.22.11 → 0.22.12

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.11";
+}, version = "0.22.12";
 /**
  * @license
  * Copyright 2010-2024 Three.js Authors
@@ -49327,27 +49327,27 @@ class History {
       }
     return e;
   }
-  fromJSON(e, s) {
-    var de;
+  fromJSON(e) {
+    var T;
     if (e === void 0) return;
-    let r = -1;
-    const T = e.i;
-    for (let Xe = 0; Xe < e.u.length; Xe++) {
-      const Ke = e.u[Xe];
-      if (T != null && T.length && ((de = Ke.newMap) != null && de.images) && Ke.newMap.images.forEach((Qe) => {
-        if (Qe.url.startsWith("$rp-")) {
-          const _e = parseInt(Qe.url.replace("$rp-", ""));
-          Qe.url = T[_e];
+    let s = -1;
+    const r = e.i;
+    for (let de = 0; de < e.u.length; de++) {
+      const Xe = e.u[de];
+      if (r != null && r.length && ((T = Xe.newMap) != null && T.images) && Xe.newMap.images.forEach((Je) => {
+        if (Je.url.startsWith("$rp-")) {
+          const Qe = parseInt(Je.url.replace("$rp-", ""));
+          Je.url = r[Qe];
         }
-      }), Ke.id <= r) {
+      }), Xe.id <= s) {
         console.error("历史记录id错误");
         continue;
       }
-      if (Ke.id === 1 && Ke.visOptions && s && (Ke.visOptions = s(Ke.visOptions)), Ke.type === "SetOption" || !Ke.type)
+      if (Xe.type === "SetOption" || !Xe.type)
         continue;
-      Ke.type.endsWith("Command") && (Ke.type = Ke.type.replace("Command", ""));
-      const Je = new Commands[Ke.type](this.editor);
-      Je.json = Ke, Je.id = Ke.id, Je.name = Ke.name, this.undos.push(Je), this.idCounter = Ke.id > this.idCounter ? Ke.id : this.idCounter, r = Ke.id;
+      Xe.type.endsWith("Command") && (Xe.type = Xe.type.replace("Command", ""));
+      const Ke = new Commands[Xe.type](this.editor);
+      Ke.json = Xe, Ke.id = Xe.id, Ke.name = Xe.name, this.undos.push(Ke), this.idCounter = Xe.id > this.idCounter ? Xe.id : this.idCounter, s = Xe.id;
     }
     this.editor.emit("historyChanged", this.undos[this.undos.length - 1]);
   }
@@ -49356,14 +49356,15 @@ 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();
-          yield this.executeUndo(Qe), yield this.editor.injectionModification(Qe, T), Xe += 1;
+          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;
         }
         this.editor.emit("progress", {
           type: "还原场景",
@@ -49421,25 +49422,26 @@ class Viewport {
   }
   setVis(r) {
     return ei(this, arguments, function* (e, s = {}) {
-      var de;
+      var Xe, Ke;
       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}}`);
-      this.vis.setOptions(ai(ai({}, s), this.extendsOptions)), this.delLoadObj && (this.vis.delLoadArr = this.delLoadObj), this.vis.playing = this.editor.playing, this.vis.on("loaderProgress", (Xe, Ke) => {
+      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) => {
         this.editor.emit("progress", {
           type: "下载资源",
-          value: Xe / Ke * 100 | 0
+          value: Je / Qe * 100 | 0
         });
       }), this.vis.on("settingsChanged", () => {
         this.editor.emit("settingsChanged");
       }), this.vis.on("show", () => {
         this.editor.emit("visShow");
       }), yield this.vis.init();
-      const { pencil: T } = this.vis;
-      T.userData.EditorEnv = !this.editor.playing, this.editor.pencil = T, this.editor.changeSelectOption(), this.editor.playing || (this.initEvent(), this.editor.emit("visChanged", this.vis)), (de = this.vis) == null || de.pencil.event.on("object3dListChange", () => {
+      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", () => {
         this.editor.changeSelectOption();
       });
     });
@@ -49649,6 +49651,7 @@ 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(
@@ -49790,7 +49793,9 @@ class Editor {
     return ei(this, null, function* () {
       var r, T, de, Xe;
       try {
-        window.postMessage({ type: "vis-core.fromJSON.start" }), console.time("vis-core:time.fromJSON");
+        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");
         let Ke;
         if (typeof e == "string") {
           const Je = this.options.assetsPrefix + e, { res: Qe } = yield jsonFetch(Je);
@@ -49808,7 +49813,7 @@ class Editor {
           "vis-core 版本过低，可能会出现问题",
           "json:" + Ke.c.version,
           "sdk:" + this.sdkVersion
-        ), this.setConfig(Ke.c), this.history.fromJSON(Ke.h, s), 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), 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;
         }
@@ -49830,8 +49835,6 @@ class Editor {
   }
   setViewportVis(...e) {
   }
-  injectionModification(...e) {
-  }
   setConfig(e) {
     const s = {
       name: this.name,

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.22.11";
+declare const _default: "0.22.12";
 export default _default;

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

@@ -73,7 +73,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, extendVisOptions?: (json: any) => any) => Promise<Record<string, any>>;
+    get fromJSON(): (jsonOrUrl: Record<string, any> | string, hooks?: import("../../editor").Hooks) => Promise<Record<string, any>>;
     get baseObjectByUuid(): {
         (uuid: `arc${string}`, flag?: boolean): import("../all/objects/Arc").default;
         (uuid: `sprite${string}`, flag?: boolean): import("../all/objects/Sprite").default;

package/package.json

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