vis-core 0.30.0-beta.21 → 0.30.0-beta.23

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.21", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
+const version = "0.30.0-beta.23", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
   token: void 0,
   getInfo() {
     if (!this.token)
@@ -140012,10 +140012,10 @@ class Viewport {
         this.editor.changeSelectOption(), this.editor.emit("visShow", !0);
       }), yield this.vis.init();
       const { pencil: O } = this.vis;
-      O.userData.EditorEnv = !this.editor.playing, this.editor.pencil = O, this.editor.changeSelectOption(), this.editor.changeMListOptions(), V.__template && this.editor.config.setConfig("__template", V.__template), this.editor.playing || (this.initEvent(), this.editor.emit("visChanged", this.vis)), this.editor.on("baseObjectListChange", () => {
+      O.userData.EditorEnv = !this.editor.playing, this.editor.pencil = O, this.editor.changeSelectOption(), console.log("setVis 111"), this.editor.changeMListOptions(), V.__template && this.editor.config.setConfig("__template", V.__template), this.editor.playing || (this.initEvent(), this.editor.emit("visChanged", this.vis)), this.editor.on("baseObjectListChange", () => {
         this.editor.changeSelectOption();
       }), this.editor.on("mListChange", () => {
-        this.editor.changeMListOptions();
+        console.log("mListChange"), this.editor.changeMListOptions();
       }), O.event.on("lead.updateKey", () => {
         this.editor.emit("baseObjectListChange");
       }), O.event.on("lead.draw", () => {
@@ -140023,13 +140023,13 @@ class Viewport {
       }), O.event.on("lead.erase", () => {
         this.editor.emit("baseObjectListChange");
       }), O.event.on("mList.add", () => {
-        this.editor.emit("mListChange");
+        console.log("mList add event"), this.editor.emit("mListChange");
       }), O.event.on("mList.remove", () => {
-        this.editor.emit("mListChange");
+        console.log("mList remove event"), this.editor.emit("mListChange");
       }), O.event.on("mList.addBaseObjectMap", () => {
-        this.editor.emit("mListChange");
+        console.log("mList addBaseObjectMap event"), this.editor.emit("mListChange");
       }), O.event.on("mList.rmBaseObjectMap", () => {
-        this.editor.emit("mListChange");
+        console.log("mList rmBaseObjectMap event"), this.editor.emit("mListChange");
       });
     });
   }
@@ -140348,23 +140348,28 @@ class Editor {
       return this._mListOptionsMaps[o].get(r);
   }
   changeMListOptions() {
-    var r;
+    var r, o, V, O;
     if (!((r = this.pencil) != null && r.mList))
-      return [];
+      return console.log({
+        _dispose: this._dispose,
+        //@ts-ignore
+        minDisabledLayer: (o = this.pencil) == null ? void 0 : o.pages.getMinDisabledLayer(),
+        pencil: (O = (V = this.viewport) == null ? void 0 : V.vis) == null ? void 0 : O.pencil
+      }), [];
     this._mListOptionsMaps.key.clear(), this._mListOptionsMaps.material = /* @__PURE__ */ new WeakMap(), this._mListOptionsMaps.object = /* @__PURE__ */ new WeakMap();
     const e = Array.from(this.pencil.mList.fixBaseObjects.entries());
     this.mListOptions = new Array(e.length);
-    for (let o = 0; o < e.length; o++) {
-      const [V, O] = e[o], j = this.pencil.mList.get(V), le = O.object3d, fe = {
-        key: V,
-        name: j.name,
-        type: j.type,
-        object: le,
-        baseObject: O,
-        material: j,
-        use: this.pencil.mList.getBaseObjectMap(j).size
+    for (let j = 0; j < e.length; j++) {
+      const [le, fe] = e[j], Se = this.pencil.mList.get(le), Ce = fe.object3d, Re = {
+        key: le,
+        name: Se.name,
+        type: Se.type,
+        object: Ce,
+        baseObject: fe,
+        material: Se,
+        use: this.pencil.mList.getBaseObjectMap(Se).size
       };
-      this.mListOptions[o] = fe, this._mListOptionsMaps.key.set(V, fe), this._mListOptionsMaps.material.set(j, fe), this._mListOptionsMaps.object.set(le, fe);
+      this.mListOptions[j] = Re, this._mListOptionsMaps.key.set(le, Re), this._mListOptionsMaps.material.set(Se, Re), this._mListOptionsMaps.object.set(Ce, Re);
     }
     this.emit("mListGraphChanged");
   }
@@ -144124,7 +144129,7 @@ const getLabelElement = (v) => {
     v0(this, "pcenter", [104, 37.5]);
     v0(this, "pscale", 5e4 / 1e3);
     v0(this, "meters");
-    v0(this, "cityVis", null);
+    v0(this, "cityVis", []);
     v0(this, "extendsOptions", {
       mapDepth: () => this.getOptionsDepth(this.options.adcode),
       equirectangular: () => this.options.projectionType === "equirectangular",
@@ -144287,7 +144292,7 @@ const getLabelElement = (v) => {
         setWaterMaterial: this.options.setWaterMaterial,
         ssao: this.options.citySSAO,
         pencil2: this.pencil
-      }), yield j.init(), this.cityVis = j, this.settings.mouseLeft = Xi.SCREEN_PAN, yield this.settings.mouseLeft, this.emit("initCityVis", r), j;
+      }), yield j.init(), this.cityVis.push(j), this.settings.mouseLeft = Xi.SCREEN_PAN, yield this.settings.mouseLeft, this.emit("initCityVis", r), j;
     });
   }
   initCityOnMap(r) {
@@ -145146,10 +145151,12 @@ const getLabelElement = (v) => {
     return findAdcodeInfo(r);
   }
   dispose() {
-    var r, o, V;
-    (r = this.cityVis) == null || r.dispose(), (o = this.map) == null || o.dispose(), this.parentBg.forEach((O) => {
-      O.dispose();
-    }), this.parentBg.length = 0, (V = this.continentsBg) == null || V.dispose(), this.continentsBg = void 0, this.mapHistory.length = 0, super.dispose();
+    var r, o;
+    this.cityVis.forEach((V) => {
+      V.dispose();
+    }), this.cityVis.length = 0, (r = this.map) == null || r.dispose(), this.parentBg.forEach((V) => {
+      V.dispose();
+    }), this.parentBg.length = 0, (o = this.continentsBg) == null || o.dispose(), this.continentsBg = void 0, this.mapHistory.length = 0, super.dispose();
   }
 };
 v0(Mn, "VisName", "map"), v0(Mn, "getAdcodeShowLevel", getAdcodeShowLevel);

package/dist/version.d.ts

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

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

@@ -165,7 +165,7 @@ export default class extends Base {
     pcenter: [number, number];
     pscale: number;
     meters: number;
-    cityVis: City | null;
+    cityVis: City[];
     extendsOptions: Record<string, any>;
     setOptions(options: MapOptions): void;
     initSettingsObj: Record<string, any>;

package/package.json

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