vis-core 0.16.10 → 0.16.11

package/dist/index.module.js

@@ -39665,8 +39665,14 @@ class qK extends yt {
     return be(this, null, function* () {
       const s = new Mn(0.5, 5, 2, 2);
       this.createGroup();
-      const l = new Ge(s, this.options.material), a = l.clone();
-      l.rotation.x = -Math.PI * 0.5, a.rotation.x = -Math.PI * 0.5, a.rotation.y = -Math.PI * 0.5, l.translateY(5 / 2), a.translateY(5 / 2), this.add(l, a);
+      const l = new Ge(
+        s,
+        this.options.material || new _e({
+          color: "#ffffff",
+          side: Ht
+        })
+      ), a = l.clone();
+      l.rotation.x = -Math.PI * 0.5, a.rotation.x = -Math.PI * 0.5, a.rotation.y = -Math.PI * 0.5, l.translateY(5 / 2), a.translateY(5 / 2), this.add(l, a), this.userData.material = l.material;
     });
   }
 }
@@ -39888,7 +39894,13 @@ class Zk {
   removeObject3d(e) {
     this.objectList.forEach((t, n) => {
       var s;
-      (n === e || ((s = t.meta) == null ? void 0 : s.parent) === e) && this.objectList.delete(n);
+      (n === e || ((s = t.meta) == null ? void 0 : s.parent) === e) && (t.selectHide = !0);
+    }), this.emitObject3dChange();
+  }
+  resetObject3d(e) {
+    this.objectList.forEach((t, n) => {
+      var s;
+      (n === e || ((s = t.meta) == null ? void 0 : s.parent) === e) && (t.selectHide = !1);
     }), this.emitObject3dChange();
   }
   dispose() {
@@ -43639,7 +43651,7 @@ function oa(i) {
   const e = new _e();
   return e.color.setScalar(i), e;
 }
-const Xf = "0.16.10", cp = !1;
+const Xf = "0.16.11", cp = !1;
 class qa {
   constructor(e, t = {}) {
     O(this, "container");
@@ -46894,9 +46906,10 @@ const Bz = Dt(ze({}, Ls), {
       mapDepth: () => this.options.mapDepth
     });
     O(this, "map");
+    O(this, "barArr", []);
     this.pencilConfig = Pz, this.initSettingsObj = {
       "测试板块颜色.color": "#000000",
-      测试立柱: !1
+      测试立柱: ""
     };
   }
   get mapArea() {
@@ -46904,7 +46917,7 @@ const Bz = Dt(ze({}, Ls), {
   }
   handleSetting(t, n) {
     return be(this, null, function* () {
-      return yield Kn(qo.prototype, this, "handleSetting").call(this, t, n), t === "测试板块颜色.color" ? this.setAreaEmissiveByProperty("ISO_A2", "CN", n) : t === "测试立柱" && (n ? this.addBar() : this.removeBar()), n;
+      return yield Kn(qo.prototype, this, "handleSetting").call(this, t, n), t === "测试板块颜色.color" ? this.setAreaEmissiveByProperty("ISO_A2", "CN", n) : t === "测试立柱" && (typeof n == "boolean" && (n = ""), n ? this.addBar(n) : this.removeBar()), n;
     });
   }
   loaderAdd() {
@@ -47173,16 +47186,14 @@ const Bz = Dt(ze({}, Ls), {
       c();
     });
   }
-  addBar() {
-    if (!this.mList.getMaterial("bar")) {
-      const n = new _e({
-        name: "立柱",
-        color: 16711680,
-        side: Ht
-      });
-      this.mList.setMaterial("bar", n);
-    }
-    const t = [
+  addBar(t) {
+    this.removeBar();
+    const n = this.drawController.getObject("CrossPlane", {
+      key: t.replace(/.*[#_]/, "")
+    });
+    if (!n)
+      return;
+    const s = [
       "中国",
       "泰国",
       "缅甸",
@@ -47195,16 +47206,15 @@ const Bz = Dt(ze({}, Ls), {
       "马来西亚",
       "俄罗斯"
     ];
-    this.mapArea.filter((n) => t.includes(n.userData.NAME_CN)).forEach((n) => be(this, null, function* () {
-      const [s, l] = n.userData.CENTROID, a = this.getLocationPosition([s, l], 0.1), o = yield this.drawController.draw("CrossPlane", {
-        material: this.mList.getMaterial("bar"),
-        key: "bar"
-      });
-      o.position.set(...a), o.object3d.lookAt(0, 0, 0);
+    this.mapArea.filter((l) => s.includes(l.userData.NAME_CN)).forEach((l) => be(this, null, function* () {
+      const [a, o] = l.userData.CENTROID, c = this.getLocationPosition([a, o], 0.1), d = yield n.instantiate();
+      d.position.set(...c), d.object3d.lookAt(0, 0, 0), this.barArr.push(d);
     }));
   }
   removeBar() {
-    this.drawController.erase("CrossPlane#bar");
+    this.barArr.forEach((t) => {
+      t.erase();
+    }), this.barArr.length = 0;
   }
 };
 O(qo, "VisName", "earth");
@@ -48589,7 +48599,7 @@ class I2 extends A0 {
     return e.objectUuid = this.editor.uuidByObject(this.object), e.oldPosition = (t = this.oldPosition) == null ? void 0 : t.toArray(), e.newPosition = this.newPosition.toArray(), e.cameraControls = !!this.cameraControls, e;
   }
   fromJSON(e) {
-    super.fromJSON(e), this.object = this.editor.objectByUuid(e.objectUuid), e.oldPosition && (this.oldPosition = new N().fromArray(e.oldPosition)), this.newPosition = new N().fromArray(e.newPosition), e.cameraControls && (this.cameraControls = this.editor.viewport.vis.pencil.cameraControls);
+    super.fromJSON(e), this.object = this.editor.objectByUuid(e.objectUuid), e.oldPosition && (this.oldPosition = new N().fromArray(e.oldPosition)), this.newPosition = new N().fromArray(e.newPosition), e.cameraControls && (this.cameraControls = this.editor.pencil.cameraControls);
   }
 }
 class vf extends A0 {
@@ -48774,11 +48784,12 @@ class Hf extends A0 {
   }
   execute() {
     var t;
-    this.object.erase(), (t = this.editor.viewport.vis) == null || t.mList.removeObject3d(this.object.object3d), this.editor.select(null);
+    this.object.hide(), (t = this.editor.viewport.vis) == null || t.mList.removeObject3d(this.object.object3d), this.editor.select(null);
   }
   undo() {
     return be(this, null, function* () {
-      return !1;
+      var t;
+      this.object.show(), (t = this.editor.viewport.vis) == null || t.mList.resetObject3d(this.object.object3d);
     });
   }
   toJSON() {
@@ -48851,7 +48862,7 @@ class Jf extends A0 {
     return e.objectUuid = this.editor.uuidByObject(this.object), e.oldPosition = (t = this.oldPosition) == null ? void 0 : t.toArray(), e.newPosition = this.newPosition.toArray(), e.cameraControls = !!this.cameraControls, e;
   }
   fromJSON(e) {
-    super.fromJSON(e), this.object = this.editor.objectByUuid(e.objectUuid), e.oldPosition && (this.oldPosition = new N().fromArray(e.oldPosition)), this.newPosition = new N().fromArray(e.newPosition), e.cameraControls && (this.cameraControls = this.editor.viewport.vis.pencil.cameraControls);
+    super.fromJSON(e), this.object = this.editor.objectByUuid(e.objectUuid), e.oldPosition && (this.oldPosition = new N().fromArray(e.oldPosition)), this.newPosition = new N().fromArray(e.newPosition), e.cameraControls && (this.cameraControls = this.editor.pencil.cameraControls);
   }
 }
 class ZU extends Nf {
@@ -48905,11 +48916,11 @@ class XU {
       return;
     let e;
     if (this.undos.length > 0 && (e = this.undos.pop()), e !== void 0) {
-      if (e.undo() === !1) {
-        this.undos.push(e);
+      if (!e.name) {
+        console.log("压缩配置，不支持 undo"), this.undos.push(e);
         return;
       }
-      this.redos.push(e), this.editor.emit("historyChanged", e);
+      e.undo(), this.redos.push(e), this.editor.emit("historyChanged", e);
     }
     return e;
   }
@@ -49363,8 +49374,9 @@ class eB {
   getObjectMaterial(e, t) {
     if (!e)
       return;
-    let n = e.material;
-    return Array.isArray(n) && t !== void 0 && (n = n[t]), n;
+    const n = this.pencil.getPlugin("draw").objMap.get(e);
+    let s = e.material || (n == null ? void 0 : n.userData.material);
+    return Array.isArray(s) && t !== void 0 && (s = s[t]), s;
   }
   setObjectMaterial(e, t, n) {
     var l;
@@ -49407,19 +49419,17 @@ class eB {
         name: u,
         object: h
       };
-    }), a = [...n.objectList.keys()].map(
-      (c) => {
-        const { name: d, meta: h } = n.objectList.get(c);
-        let r = !1;
-        return h != null && h.baseObject && h.remove !== !1 && (r = !0), Dt(ze({
-          uuid: d.replace(d[0], d[0].toLowerCase()),
-          object: c,
-          name: c.name
-        }, h), {
-          remove: r
-        });
-      }
-    ), o = [...l, ...a];
+    }), a = [...n.objectList.keys()].filter((c) => n.objectList.get(c).selectHide !== !0).map((c) => {
+      const { name: d, meta: h } = n.objectList.get(c);
+      let r = !1;
+      return h != null && h.baseObject && h.remove !== !1 && (r = !0), Dt(ze({
+        uuid: d.replace(d[0], d[0].toLowerCase()),
+        object: c,
+        name: c.name
+      }, h), {
+        remove: r
+      });
+    }), o = [...l, ...a];
     if (o.unshift(
       {
         name: "场景",
@@ -49446,18 +49456,22 @@ class eB {
   }
   fromJSON(e, t) {
     return be(this, null, function* () {
-      var s, l;
-      let n;
-      if (typeof e == "string") {
-        const a = this.assetsPrefix + e, { res: o } = yield hs(a);
-        n = o;
-      } else
-        n = e;
-      return n = WU(n), Fo(n.c.version, this.sdkVersion) === 1 && console.warn(
-        "vis-core 版本过低，可能会出现问题",
-        "json:" + n.c.version,
-        "sdk:" + this.sdkVersion
-      ), this.setConfig(n.c), this.history.fromJSON(n.h, t), this.viewport.fromJSON(n.v), yield this.history.executeUndos(), (s = this.viewport.vis) == null || s.show(), (l = this.pencil.cameraControls) == null || l.saveState(), this.select(null), n;
+      var n, s;
+      try {
+        let l;
+        if (typeof e == "string") {
+          const a = this.assetsPrefix + e, { res: o } = yield hs(a);
+          l = o;
+        } else
+          l = e;
+        return l = WU(l), Fo(l.c.version, this.sdkVersion) === 1 && console.warn(
+          "vis-core 版本过低，可能会出现问题",
+          "json:" + l.c.version,
+          "sdk:" + this.sdkVersion
+        ), this.setConfig(l.c), this.history.fromJSON(l.h, t), this.viewport.fromJSON(l.v), yield this.history.executeUndos(), (n = this.viewport.vis) == null || n.show(), (s = this.pencil.cameraControls) == null || s.saveState(), this.select(null), l;
+      } catch (l) {
+        return console.error(l), {};
+      }
     });
   }
   toJSON() {

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.16.10";
+declare const _default: "0.16.11";
 export default _default;

package/dist/vis/all/MaterialList.d.ts

@@ -12,6 +12,7 @@ export default class MaterialList {
     objectList: Map<THREE.Object3D<THREE.Object3DEventMap>, {
         name: string;
         meta?: any;
+        selectHide?: boolean;
     }>;
     install(pencil: Pencil): void;
     setMaterial(name: string, material: THREE.Material, options?: {
@@ -26,5 +27,6 @@ export default class MaterialList {
     delObject3d(object3d: THREE.Object3D): void;
     changeObject3dName(object3d: THREE.Object3D, name: string): void;
     removeObject3d(object3d: THREE.Object3D): void;
+    resetObject3d(object3d: THREE.Object3D): void;
     dispose(): void;
 }

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

@@ -61,7 +61,8 @@ export default class extends Base {
         line: ConstructorParameters<typeof MeshLineMaterial>[0];
     }): Promise<Countries | undefined>;
     checkBehindEarth(objArr: () => BaseObject[], cb: (behind: BaseObject[], front: BaseObject[]) => any, eventType?: 'update' | 'controlend'): void;
-    addBar(): void;
+    barArr: BaseObject[];
+    addBar(id: string): void;
     removeBar(): void;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis-core",
-  "version": "0.16.10",
+  "version": "0.16.11",
   "scripts": {
     "start": "npm run version && PORT=5173 bundler-dev",
     "build:site": "npm run version &&PUBLIC_EXCLUDE=public/city bundler",