vis-core 0.28.37 → 0.28.38

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.28.37", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
+const version = "0.28.38", publicKeyPEM = "LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUEyTG1aVVQzVG9LZEVRRUdrdUU1QQo3dnlYTzRMM1Z6NDA5RFF2a2xzRHZ2SytNM2M2OGl4ZEVhZDZFcnZGS2FKQ1QrNTZNdU1XSXhUTnlDZDVQSkFGCjVYdzI4cW1iVkVCR3FGdXVIZTltSm5GUmRXN1NpK1Z1cTZvRWxwQkRkeEFIQ0dsWVVpU1R3WmhBbjJaVXJLSUYKd1J2c1k1bi9uWWNhZnl5QW9tRjhmNVRsTkpwS1JtbDU3WlRSWjBMdzdQRDFSeHFIbmJ0YWFETkpiSDV5eFd6cQpaVTBwQWhxMFNkNHdlOW1DUTJWWXc5czhtUERLbW4rU083eGovSUsrR1ZEaEJNOUpaZ3VIcGFZUGt3bWd5UkdwCkx6V0tHMkZULzJRalZUT1dRT09mRFVtVitDSVlsN1hVVlh1Q0toYWFNQ0ZVa1JQOHg4aEZucmNFeklHQ1JpM3IKK3dJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t", accessToken = {
   token: void 0,
   getInfo() {
     if (!this.token)
@@ -59743,7 +59743,7 @@ class SetMaterialVector extends Command {
 class SetMaterialMapVector extends Command {
   constructor(e, n, r, C, _, I = "repeat") {
     var O, Se, ve, Ce;
-    super(e), this.type = "SetMaterialMapVector", this.attributeName2 = I, this.name = `Set Material.${r}.${I}`, this.updatable = !0, this.object = n, this.materialSlot = _, this.material = this.editor.getObjectMaterial(n, _), this.material instanceof _e$1 && r === "map" && I === "repeat" ? this.oldValue = this.material.repeat.toArray() : ((Se = (O = this.material) == null ? void 0 : O[r]) == null ? void 0 : Se[I]) instanceof Vector2 ? this.oldValue = this.material[r][I].toArray() : typeof ((Ce = (ve = this.material) == null ? void 0 : ve[r]) == null ? void 0 : Ce[I]) != "undefined" && (this.oldValue = this.material[r][I]), this.newValue = C, this.attributeName = r;
+    super(e), this.type = "SetMaterialMapVector", this.attributeName2 = I, this.name = `Set Material.${r}.${I}`, this.updatable = !0, this.object = n, this.materialSlot = _, n != null && n.isScene ? this.material = n[_] : this.material = this.editor.getObjectMaterial(n, _), this.material instanceof _e$1 && r === "map" && I === "repeat" ? this.oldValue = this.material.repeat.toArray() : ((Se = (O = this.material) == null ? void 0 : O[r]) == null ? void 0 : Se[I]) instanceof Vector2 ? this.oldValue = this.material[r][I].toArray() : typeof ((Ce = (ve = this.material) == null ? void 0 : ve[r]) == null ? void 0 : Ce[I]) != "undefined" && (this.oldValue = this.material[r][I]), this.newValue = C, this.attributeName = r;
   }
   execute() {
     var e, n, r, C, _;
@@ -59769,7 +59769,8 @@ class SetMaterialMapVector extends Command {
     return e.objectUuid = this.editor.uuidByMaterialObject(this.object), e.materialSlot = this.materialSlot, e.attributeName = this.attributeName, e.attributeName2 = this.attributeName2, e.oldValue = this.oldValue, e.newValue = this.newValue, e;
   }
   fromJSON(e) {
-    super.fromJSON(e), this.object = this.editor.materialObjectByUuid(e.objectUuid), this.materialSlot = e.materialSlot, this.material = this.editor.getObjectMaterial(
+    var n;
+    super.fromJSON(e), this.object = this.editor.materialObjectByUuid(e.objectUuid), this.materialSlot = e.materialSlot, (n = this.object) != null && n.isScene ? this.material = this.object[e.materialSlot] : this.material = this.editor.getObjectMaterial(
       this.object,
       this.materialSlot
     ), this.attributeName = e.attributeName, e.attributeName2 && (this.attributeName2 = e.attributeName2), this.oldValue = e.oldValue, this.newValue = e.newValue, this.attributeName === "repeat" && (this.attributeName = "map");
@@ -143729,7 +143730,10 @@ const getLabelElement = (v) => {
       return ke.object3d.name = ((ct = findAdcodeInfo(O)) == null ? void 0 : ct.name) || `${O}`, this.options.style === "map2CityOnMap" && !this.options.showCityOnMapInnerLine && (Re.lineMat.colorWrite = !1, ke.lineArr.forEach((Ue) => {
         Ue.userData.selectHide = !0;
       })), ke.extrudelineArr && ke.extrudelineArr.forEach((Ue) => {
-        Ue.object3d.name = "板块边线", this.lead.updateBaseObjectKey(Ue, "extrudeLine"), this.initBaseObjectUserData(Ue), I && (Ue.object3d.userData.bloom = !0);
+        Ue.object3d.name = "板块边线", this.lead.updateBaseObjectKey(
+          Ue,
+          this.mapHistory.length ? "extrudeLine#$p:" : "extrudeLine"
+        ), this.initBaseObjectUserData(Ue), I && (Ue.object3d.userData.bloom = !0);
       }), ke.lineArr && ke.lineArr.forEach((Ue) => {
         this.initBaseObjectUserData(Ue);
       }), ke;

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.28.37";
+declare const _default: "0.28.38";
 export default _default;

package/package.json

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