@shjjs/visual-ui 3.0.8 → 3.0.9

package/es/commons/plugins/datasource/index.mjs

@@ -1,21 +1,21 @@
-var w = Object.defineProperty;
-var x = (p, t, e) => t in p ? w(p, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[t] = e;
-var f = (p, t, e) => x(p, typeof t != "symbol" ? t + "" : t, e);
-import { cloneDeep as k, isString as C } from "lodash";
-import { parseStaticData as M } from "./sources/static.mjs";
-import { parseUrlData as v } from "./sources/url.mjs";
-import { parseVariableData as A } from "./sources/variable.mjs";
-import { parseAPIPort as E } from "./sources/api.mjs";
-import { DataSourceUtils as U } from "./utils/utils.mjs";
-import { parseStorage as B } from "./sources/storage.mjs";
-import { parseMqttData as T } from "./sources/mqtt.mjs";
-import { parseWebSocketData as W } from "./sources/websocket.mjs";
-import { MqttConnectionPoolManager as d } from "./utils/mqttConnectionPool.mjs";
-import { WebSocketConnectionPoolManager as S } from "./utils/websocketConnectionPool.mjs";
-import { mappingData as q } from "./utils/mappingData.mjs";
-import { groupData as K } from "./utils/groupData.mjs";
-import { storageData as m } from "./utils/storageData.mjs";
-const l = class l {
+var x = Object.defineProperty;
+var k = (l, t, e) => t in l ? x(l, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[t] = e;
+var h = (l, t, e) => k(l, typeof t != "symbol" ? t + "" : t, e);
+import { cloneDeep as C, isString as M } from "lodash";
+import { parseStaticData as v } from "./sources/static.mjs";
+import { parseUrlData as A } from "./sources/url.mjs";
+import { parseVariableData as E } from "./sources/variable.mjs";
+import { parseAPIPort as U } from "./sources/api.mjs";
+import { DataSourceUtils as B } from "./utils/utils.mjs";
+import { parseStorage as T } from "./sources/storage.mjs";
+import { parseMqttData as W } from "./sources/mqtt.mjs";
+import { parseWebSocketData as q } from "./sources/websocket.mjs";
+import { MqttConnectionPoolManager as S } from "./utils/mqttConnectionPool.mjs";
+import { WebSocketConnectionPoolManager as D } from "./utils/websocketConnectionPool.mjs";
+import { mappingData as K } from "./utils/mappingData.mjs";
+import { groupData as b } from "./utils/groupData.mjs";
+import { storageData as g } from "./utils/storageData.mjs";
+const c = class c {
   /**
    * 添加数据源解析器
    * @param type - 数据源类型
@@ -224,7 +224,7 @@ const l = class l {
         r(s);
         return;
       }
-      e ? (m(o.source.storage, s.noMappingData), r(s.noMappingData)) : (m(o.source.storage, s.finalKeyData), r(s.finalKeyData));
+      e ? (g(o.source.storage, s.noMappingData), r(s.noMappingData)) : (g(o.source.storage, s.finalKeyData), r(s.finalKeyData));
     });
   }
   /**
@@ -236,31 +236,32 @@ const l = class l {
    * @returns
    */
   static processData(t, e, a, r) {
-    const { filter: o, mapping: i, dynamicMapping: n, isUserdata: s } = k(t);
-    return new Promise(function(P) {
-      const D = e;
-      l.filterData(o, e).then(
-        (u) => {
-          const h = {
+    const { filter: o, mapping: i, dynamicMapping: n, isUserdata: s } = C(t);
+    return new Promise(function(y) {
+      const w = e;
+      c.filterData(o, e).then(
+        (p) => {
+          var d;
+          const u = {
             id: a,
             finalKeyData: { id: a, data: null },
             finalUserData: { id: a, data: null },
-            filteredData: { id: a, data: u },
-            rawData: { id: a, data: D },
+            filteredData: { id: a, data: p },
+            rawData: { id: a, data: w },
             noMappingData: null
           };
           if (r)
-            h.finalUserData.data = u, h.noMappingData = u;
+            u.finalUserData.data = u.noMappingData = p;
           else {
-            const { mappedData: c, finalMapping: y } = q(
-              u,
+            const f = K(
+              p,
               i,
               n,
               s
-            );
-            h.finalKeyData.data = c != null && c.length ? K(c, y) : u, h.finalUserData.data = c != null && c.length ? c : u;
+            ), m = !!((d = f.mappedData) != null && d.length);
+            u.finalKeyData.data = m ? b(f.mappedData, f.finalMapping) : p, u.finalUserData.data = m ? f.mappedData : p;
           }
-          P(h);
+          y(u);
         }
       );
     });
@@ -272,11 +273,11 @@ const l = class l {
    * @returns
    */
   static async filterData(t, e) {
-    if (!C(t))
+    if (!M(t))
       return e;
     try {
       let a = t.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, "");
-      a = U.replaceStringVariables(a);
+      a = B.replaceStringVariables(a);
       const r = `
         ${a}
         if (typeof filter !== 'function') {
@@ -295,38 +296,38 @@ const l = class l {
   static destroy() {
     this.timerPool.forEach((t) => {
       clearInterval(t);
-    }), this.timerPool.clear(), this.dataSourceStatePool.clear(), this.dataSourceStatePool = /* @__PURE__ */ new Map(), this.waitingPool.clear(), this.waitingPool = /* @__PURE__ */ new Map(), d.closeAllConnections(), S.closeAllConnections();
+    }), this.timerPool.clear(), this.dataSourceStatePool.clear(), this.dataSourceStatePool = /* @__PURE__ */ new Map(), this.waitingPool.clear(), this.waitingPool = /* @__PURE__ */ new Map(), S.closeAllConnections(), D.closeAllConnections();
   }
   static clearMqttConnectionById(t) {
-    d.removeConnectionByUUID(t);
+    S.removeConnectionByUUID(t);
   }
   static clearWebSocketConnectionById(t) {
-    S.removeConnectionByUUID(t);
+    D.removeConnectionByUUID(t);
   }
 };
 /**
  * 定时器池
  */
-f(l, "timerPool", /* @__PURE__ */ new Map()), /**
+h(c, "timerPool", /* @__PURE__ */ new Map()), /**
  * 数据源状态池 - 跟踪所有数据源的执行状态
  */
-f(l, "dataSourceStatePool", /* @__PURE__ */ new Map()), /**
+h(c, "dataSourceStatePool", /* @__PURE__ */ new Map()), /**
  * 等待执行的数据源池 - 存储因依赖关系而等待的数据源
  */
-f(l, "waitingPool", /* @__PURE__ */ new Map()), /**
+h(c, "waitingPool", /* @__PURE__ */ new Map()), /**
  * 数据源解析器
  */
-f(l, "parsers", /* @__PURE__ */ new Set([
-  { type: "url", parser: v },
-  { type: "static", parser: M },
-  { type: "variable", parser: A },
-  { type: "api", parser: E },
-  { type: "storage", parser: B },
-  { type: "mqtt", parser: T },
-  { type: "ws", parser: W }
+h(c, "parsers", /* @__PURE__ */ new Set([
+  { type: "url", parser: A },
+  { type: "static", parser: v },
+  { type: "variable", parser: E },
+  { type: "api", parser: U },
+  { type: "storage", parser: T },
+  { type: "mqtt", parser: W },
+  { type: "ws", parser: q }
 ]));
-let g = l;
+let P = c;
 export {
-  U as DataSourceUtils,
-  g as SHJDatasourceV2
+  B as DataSourceUtils,
+  P as SHJDatasourceV2
 };

package/es/commons/plugins/datasource/utils/utils.mjs

@@ -5,7 +5,7 @@ import { cloneDeep as g } from "lodash";
 import { SHJDatasourceV2 as u } from "../index.mjs";
 import { storageData as V } from "./storageData.mjs";
 import "../../event/actions/fullScreenAction.mjs";
-import { EventUtils as m } from "../../event/utils/utils.mjs";
+import { EventUtils as h } from "../../event/utils/utils.mjs";
 const i = class i {
   static executeAllVariable(a) {
     a.forEach((e) => {
@@ -87,7 +87,7 @@ const i = class i {
       }
       r._callbacks ?? (r._callbacks = /* @__PURE__ */ new Map()), r._callbacks.forEach(
         (n) => n(a._value)
-      ), t && m.updateWidgetVariableData(r);
+      ), t && h.updateWidgetVariableData(r);
     }
   }
   static getVariableById(a) {
@@ -96,8 +96,8 @@ const i = class i {
   static getVariableByName(a) {
     return window._variables.find((e) => e.name === a);
   }
-  static getVariableValueByName(a) {
-    const e = window._variables.find((t) => t.name === a);
+  static getVariableValueById(a) {
+    const e = window._variables.find((t) => t.id === a);
     return e ? e._value : null;
   }
   static noneData(a) {
@@ -124,7 +124,7 @@ d(i, "addVariable", (a) => {
     sources: [a.sources],
     noUseMapping: !0,
     callback: (e) => {
-      i.setVariableById(a, e, !1);
+      i.setVariableById(a, e, !0);
     }
   });
 }), d(i, "deleteVariableById", (a) => {

package/es/components/Scene/components/Map3d/utils/map.mjs

@@ -1,7 +1,7 @@
 var W = Object.defineProperty;
-var U = (A, B, e) => B in A ? W(A, B, { enumerable: !0, configurable: !0, writable: !0, value: e }) : A[B] = e;
-var l = (A, B, e) => U(A, typeof B != "symbol" ? B + "" : B, e);
-import { BufferGeometry as E, Mesh as S, Sprite as X, Color as M, AxesHelper as Y, Raycaster as q, Vector2 as H, Group as L, PlaneGeometry as z, TextureLoader as R, sRGBEncoding as _, MeshBasicMaterial as v, DoubleSide as C, RepeatWrapping as k, AdditiveBlending as T, Vector3 as F, MeshStandardMaterial as O, BoxGeometry as V, NearestFilter as J, Shape as Z, ShapeGeometry as K, LineBasicMaterial as ee, Box3Helper as te } from "three";
+var U = (A, w, e) => w in A ? W(A, w, { enumerable: !0, configurable: !0, writable: !0, value: e }) : A[w] = e;
+var l = (A, w, e) => U(A, typeof w != "symbol" ? w + "" : w, e);
+import { BufferGeometry as Q, Mesh as S, Sprite as X, Color as M, AxesHelper as Y, Raycaster as q, Vector2 as H, Group as L, PlaneGeometry as z, TextureLoader as R, sRGBEncoding as _, MeshBasicMaterial as v, DoubleSide as C, RepeatWrapping as k, AdditiveBlending as T, Vector3 as F, MeshStandardMaterial as O, BoxGeometry as V, NearestFilter as J, Shape as Z, ShapeGeometry as K, LineBasicMaterial as ee, Box3Helper as te } from "three";
 import { computeBoundsTree as ae, disposeBoundsTree as ie, acceleratedRaycast as $ } from "three-mesh-bvh";
 import { pinyin as se } from "pinyin-pro";
 import { Mini3d as re } from "./mini3d/core/index.mjs";
@@ -17,18 +17,18 @@ import { PathLine as he } from "./mini3d/components/PathLine.mjs";
 import { Assets as pe } from "./map/assets.mjs";
 import { ExtrudeMap as ue } from "./map/extrudeMap.mjs";
 import m from "gsap";
-import { isEmpty as Q, isArray as j, isNumber as de, cloneDeep as me } from "lodash";
+import { isEmpty as E, isArray as j, isNumber as de, cloneDeep as me } from "lodash";
 import { createFloorGaoGuang as fe } from "./module/FloorGaoGuang.mjs";
 import { createFloorRotateBorder as be } from "./module/FloorRotateBorder.mjs";
 import { createFloorGridRipple as ye } from "./module/FloorGridRipple.mjs";
 import { createMirror as ge } from "./module/MapMirror.mjs";
 import { createTimeLine as Me } from "./module/Timeline.mjs";
 import { createParticles as Le } from "./module/Particles.mjs";
-import { getMapDataByAdcode as Ge, getMapDataByUrl as xe, getTextureResource as I, getMapDataByAdcode2 as we, setScaleArea as Be, calcUv2 as ve } from "./map/utils.mjs";
+import { getMapDataByAdcode as Ge, getMapDataByUrl as xe, getTextureResource as I, getMapDataByAdcode2 as Be, setScaleArea as we, calcUv2 as ve } from "./map/utils.mjs";
 import { createEnvironment as Se } from "./module/Environment.mjs";
 import { Utils as D } from "../../../../../commons/utils/utils.mjs";
-E.prototype.computeBoundsTree = ae;
-E.prototype.disposeBoundsTree = ie;
+Q.prototype.computeBoundsTree = ae;
+Q.prototype.disposeBoundsTree = ie;
 S.prototype.raycast = $;
 X.prototype.raycast = $;
 class et extends re {
@@ -196,7 +196,7 @@ class et extends re {
         lineMaterial: this.provinceLineMaterial,
         renderOrder: 9
       });
-      this.option.scene.defaultMapAdcode !== 1e5 && Be(this, s), this.areaData = s.coordinates, this.time.on("tick", () => {
+      this.option.scene.defaultMapAdcode !== 1e5 && we(this, s), this.areaData = s.coordinates, this.time.on("tick", () => {
         i.map && (i.map.offset.y += 2e-3);
       });
       const o = N(s.mapGroup);
@@ -236,11 +236,11 @@ class et extends re {
           e.texture,
           "texture"
         );
-        if (Q(s))
+        if (E(s))
           a(!0);
         else {
           let o = s.texture;
-          o.wrapS = o.wrapT = k, o.repeat.set(1, 1), this.pathLineTexture = o, we(
+          o.wrapS = o.wrapT = k, o.repeat.set(1, 1), this.pathLineTexture = o, Be(
             this.option.scene.defaultMapAdcode,
             (h) => {
               try {
@@ -404,7 +404,7 @@ class et extends re {
       transparent: !0,
       opacity: e.opacity
     }), s = I(this, "sideMap", t.map, "map");
-    Q(s) || (s.map.repeat.set(1, 0.2), s.map.offset.y += 0.01);
+    E(s) || (s.map.repeat.set(1, 0.2), s.map.offset.y += 0.01);
     let o = new O({
       ...s,
       color: new M(t.color || "#061e47"),
@@ -487,23 +487,23 @@ class et extends re {
               d.translate(0, 0, p / 2);
               const g = new S(d, u);
               g.renderOrder = 22, g.geometry.computeBoundsTree();
-              let b = g, [x, w] = this.geoProjection(n.coords);
-              b.position.set(x, -w, (this.depth + 0.46) / this.scale), r ? b.scale.set(1 / this.scale, 1 / this.scale, 0) : b.scale.set(
+              let b = g, [x, B] = this.geoProjection(n.coords);
+              b.position.set(x, -B, (this.depth + 0.46) / this.scale), r ? b.scale.set(1 / this.scale, 1 / this.scale, 0) : b.scale.set(
                 1 / this.scale,
                 1 / this.scale,
                 1 / this.scale
               ), b.userData.name = n.name, b.userData.adcode = n.adcode, b.userData.value = n.value, b.userData.position = [
                 x,
-                -w,
+                -B,
                 (this.depth + 0.46) / this.scale
               ];
               let G = this.createBarGuangQuan(
                 e.bottom,
                 r
               );
-              if (G.position.set(x, -w, (this.depth + 0.46) / this.scale), G.userData.name = n.name, G.userData.adcode = n.adcode, G.userData.position = [
+              if (G.position.set(x, -B, (this.depth + 0.46) / this.scale), G.userData.name = n.name, G.userData.adcode = n.adcode, G.userData.position = [
                 x,
-                -w,
+                -B,
                 (this.depth + 0.46) / this.scale
               ], G.name = "bar-" + e.id, this.barGuangQuanGroup.add(G), e.huiguang.show && p > 0) {
                 let f = this.createBarHUIGUANG(p, e.huiguang);
@@ -513,7 +513,7 @@ class et extends re {
               let y = i(
                 n,
                 c,
-                new F(x, -w, (this.depth + 0.9 + p) / this.scale)
+                new F(x, -B, (this.depth + 0.9 + p) / this.scale)
               );
               this.allBar.push(b), this.allBarMaterial.push(u), this.allBarGuangquan.push(G), this.allBarLabel.push(y);
             }
@@ -746,7 +746,9 @@ class et extends re {
                 <img src="${e.map}" style="width:${e.width}px; height:${e.height}px;" >
               </div>`,
               h
-            ), this.label3d.setLabelStyle(c, 0.08 / this.scale, "x"), e.rotation && (c.rotation.x = e.rotation[0] * (Math.PI / 180), c.rotation.y = e.rotation[1] * (Math.PI / 180), c.rotation.z = e.rotation[2] * (Math.PI / 180)), c.name = "scatter-" + e.id, c.setParent(this.scatterLabelGroup), c.userData.adcode = s.adcode, c.userData.scale = s, c.userData.name = s.name, c.userData.labelShow = e.label.show, c.userData.value = s.value, c.userData.position = [h.x, h.y, h.z], c;
+            ), this.label3d.setLabelStyle(c, 0.08 / this.scale, "x", "auto"), e.rotation && (c.rotation.x = e.rotation[0] * (Math.PI / 180), c.rotation.y = e.rotation[1] * (Math.PI / 180), c.rotation.z = e.rotation[2] * (Math.PI / 180)), c.name = "scatter-" + e.id, c.setParent(this.scatterLabelGroup), c.userData.adcode = s.adcode, c.userData.scale = s, c.userData.name = s.name, c.userData.labelShow = e.label.show, c.userData.value = s.value, c.userData.position = [h.x, h.y, h.z], c.element.style.cursor = "pointer", c.element.addEventListener("click", () => {
+              this.onCallBack.onClickScatter(c.userData);
+            }), c;
           };
           t.map((s, o) => {
             let [h, n] = this.geoProjection([s.lng, s.lat]), c = i(
@@ -930,12 +932,12 @@ class et extends re {
               const [f, P] = this.geoProjection(g[y]);
               y === 0 && x.moveTo(f, -P), x.lineTo(f, -P);
             }
-            const w = t.find((y) => y.name === h);
+            const B = t.find((y) => y.name === h);
             let G = e.defaultColor;
-            if (w)
+            if (B)
               for (let y = 0; y < e.rules.length; y++) {
                 const f = e.rules[y];
-                w.value >= f.min && w.value <= f.max && (G = f.color || e.defaultColor);
+                B.value >= f.min && B.value <= f.max && (G = f.color || e.defaultColor);
               }
             try {
               const y = new K(me(x)), f = new S(

package/es/packages/commons/plugins/datasource/utils/utils.d.ts

@@ -22,7 +22,7 @@ export declare class DataSourceUtils {
     static setVariableById(variable: any, value: any, updateWidget?: boolean): void;
     static getVariableById(id: string): any;
     static getVariableByName(name: string): any;
-    static getVariableValueByName(name: string): any;
+    static getVariableValueById(id: string): any;
     static addVariable: (variable: any) => void;
     static updateVariable: (variable: any) => void;
     static deleteVariableById: (id: any) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shjjs/visual-ui",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "description": "国产自研零代码可视化源码工具",
   "keywords": [
     "three",