@shjjs/visual-ui 3.0.2 → 3.0.3

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

@@ -1,14 +1,14 @@
 var y = Object.defineProperty;
-var w = (p, t, e) => t in p ? y(p, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[t] = e;
-var h = (p, t, e) => w(p, typeof t != "symbol" ? t + "" : t, e);
+var w = (u, t, e) => t in u ? y(u, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : u[t] = e;
+var h = (u, t, e) => w(u, typeof t != "symbol" ? t + "" : t, e);
 import { cloneDeep as x, isString as k } from "lodash";
 import { parseStaticData as C } from "./sources/static.mjs";
 import { parseUrlData as M } from "./sources/url.mjs";
 import { parseVariableData as v } from "./sources/variable.mjs";
 import { parseAPIPort as A } from "./sources/api.mjs";
-import { DataSourceUtils as U } from "./utils/utils.mjs";
-import { parseStorage as B } from "./sources/storage.mjs";
-import { parseMqttData as E } from "./sources/mqtt.mjs";
+import { DataSourceUtils as E } from "./utils/utils.mjs";
+import { parseStorage as U } from "./sources/storage.mjs";
+import { parseMqttData as B } from "./sources/mqtt.mjs";
 import { parseWebSocketData as T } from "./sources/websocket.mjs";
 import { MqttConnectionPoolManager as m } from "./utils/mqttConnectionPool.mjs";
 import { WebSocketConnectionPoolManager as S } from "./utils/websocketConnectionPool.mjs";
@@ -195,7 +195,7 @@ const c = class c {
       });
       return;
     }
-    this.setupInterval(t, r, a, i, e), this.executeTask(t, a, i, (o) => {
+    this.markDataSourceExecuting(t.id), this.setupInterval(t, r, a, i, e), this.executeTask(t, a, i, (o) => {
       e(o), this.markDataSourceCompleted(t.id);
     });
   }
@@ -242,7 +242,7 @@ const c = class c {
       const P = e;
       c.filterData(i, e).then(
         (l) => {
-          const u = {
+          const p = {
             id: a,
             finalKeyData: { id: a, data: null },
             finalUserData: { id: a, data: null },
@@ -257,10 +257,10 @@ const c = class c {
               n,
               s
             );
-            u.finalKeyData.data = d.length ? q(d, o) : l, u.finalUserData.data = d.length ? d : l;
+            p.finalKeyData.data = d.length ? q(d, o) : l, p.finalUserData.data = d.length ? d : l;
           } else
-            u.finalUserData.data = l, u.noMappingData = l;
-          f(u);
+            p.finalUserData.data = l, p.noMappingData = l;
+          f(p);
         }
       );
     });
@@ -276,7 +276,7 @@ const c = class c {
       return e;
     try {
       let a = t.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, "");
-      a = U.replaceStringVariables(a);
+      a = E.replaceStringVariables(a);
       const r = `
         ${a}
         if (typeof filter !== 'function') {
@@ -321,12 +321,12 @@ h(c, "parsers", /* @__PURE__ */ new Set([
   { type: "static", parser: C },
   { type: "variable", parser: v },
   { type: "api", parser: A },
-  { type: "storage", parser: B },
-  { type: "mqtt", parser: E },
+  { type: "storage", parser: U },
+  { type: "mqtt", parser: B },
   { type: "ws", parser: T }
 ]));
 let D = c;
 export {
-  U as DataSourceUtils,
+  E as DataSourceUtils,
   D as SHJDatasourceV2
 };

package/es/commons/plugins/datasource/sources/api.mjs

@@ -1,51 +1,51 @@
-import { SHJDatasourceV2 as P } from "../index.mjs";
+import { SHJDatasourceV2 as l } from "../index.mjs";
 import { httpRequest as f } from "../utils/request.mjs";
 import { DataSourceUtils as t } from "../utils/utils.mjs";
-const S = (e, h, i) => {
-  const { api: n } = e.source;
+const v = (e, h, n) => {
+  const { api: i } = e.source;
   try {
-    if (n) {
-      let { isHeaders: y, isBody: c, headers: r, contentType: d, url: a, postParam: o } = n;
-      const l = t.getEnvironments(), p = (E) => {
-        E.then((m) => {
+    if (i) {
+      let { isHeaders: y, isBody: c, headers: r, contentType: d, url: a, postParam: s } = i;
+      const E = t.getEnvironments(), o = (U) => {
+        U.then((m) => {
           if (m.status === 200) {
-            P.processData(
+            l.processData(
               e.source,
               m.data,
               e.id,
               h
             ).then((D) => {
-              D && i(D);
-            }).catch(() => i(t.noneData(e.id)));
+              D && n(D);
+            }).catch(() => n(t.noneData(e.id)));
             return;
           }
-          i(t.noneData(e.id));
+          n(t.noneData(e.id));
         }).catch(() => {
-          i(t.noneData(e.id));
+          n(t.noneData(e.id));
         });
-      }, s = l.envBaseUrl || "";
-      a = t.replaceURLVariables(a), a = t.replaceStringVariables(a), c && (o = t.replaceObjectVariables(o)), y && (r = t.replaceObjectVariables(r)), n.type === "GET" && p(f.get(s + a, { headers: r })), n.type === "POST" && p(
+      }, p = i.isUseEnv ? E.envBaseUrl : "";
+      a = t.replaceURLVariables(a), a = t.replaceStringVariables(a), c && (s = t.replaceObjectVariables(s)), y && (r = t.replaceObjectVariables(r)), i.type === "GET" && o(f.get(p + a, { headers: r })), i.type === "POST" && o(
         f.post(
-          s + a,
-          o,
+          p + a,
+          s,
           { headers: r },
           d
         )
-      ), n.type === "PUT" && p(
+      ), i.type === "PUT" && o(
         f.put(
-          s + a,
-          o,
+          p + a,
+          s,
           { headers: r },
           d
         )
-      ), n.type === "DELETE" && p(f.delete(s + a, { headers: r }));
+      ), i.type === "DELETE" && o(f.delete(p + a, { headers: r }));
     } else
-      i(t.noneData(e.id));
+      n(t.noneData(e.id));
   } catch {
-    i(t.noneData(e.id));
+    n(t.noneData(e.id));
   }
 };
 export {
   f as httpRequest,
-  S as parseAPIPort
+  v as parseAPIPort
 };

package/es/components/Scene/components/Map3d/index.vue.mjs

@@ -2,7 +2,7 @@ import o from "./index.vue2.mjs";
 /* empty css            */
 /* empty css            */
 import t from "../../../../_virtual/_plugin-vue_export-helper.mjs";
-const _ = /* @__PURE__ */ t(o, [["__scopeId", "data-v-03cb3209"]]);
+const a = /* @__PURE__ */ t(o, [["__scopeId", "data-v-673277b1"]]);
 export {
-  _ as default
+  a as default
 };

package/es/components/Scene/components/Map3d/index.vue2.mjs

@@ -1,15 +1,15 @@
-import { defineComponent as P, computed as F, ref as f, onMounted as Q, onBeforeUnmount as X, watch as S, createElementBlock as u, openBlock as d, createElementVNode as B, normalizeClass as A, createCommentVNode as L, normalizeStyle as h, Fragment as O, renderList as z, toDisplayString as j, unref as Y } from "vue";
-import { cloneDeep as v, isEqual as E } from "lodash";
+import { defineComponent as P, computed as O, ref as f, onMounted as X, nextTick as Y, onBeforeUnmount as Z, watch as E, createElementBlock as u, openBlock as d, createElementVNode as B, normalizeClass as W, createCommentVNode as L, normalizeStyle as h, Fragment as z, renderList as T, toDisplayString as x, unref as _ } from "vue";
+import { cloneDeep as v, isEqual as w } from "lodash";
 import $ from "gsap";
-import { useFps as Z } from "@vueuse/core";
-import { World as _ } from "./utils/map.mjs";
-import { initWatch as ee } from "./watch.mjs";
+import { useFps as ee } from "@vueuse/core";
+import { World as te } from "./utils/map.mjs";
+import { initWatch as oe } from "./watch.mjs";
 import "three";
 import "d3-geo";
 import "three/examples/jsm/controls/OrbitControls";
 import "three/examples/jsm/loaders/GLTFLoader";
 import "three/examples/jsm/loaders/DRACOLoader.js";
-import { createHistory as te } from "./utils/mini3d/utils/CreateHistory.mjs";
+import { createHistory as re } from "./utils/mini3d/utils/CreateHistory.mjs";
 import "three/examples/jsm/libs/lil-gui.module.min";
 import "three/examples/jsm/utils/BufferGeometryUtils";
 import "three/examples/jsm/renderers/CSS3DRenderer";
@@ -168,15 +168,15 @@ import "../UnityIframe/index.mjs";
 import "../UnityWebgl/index.mjs";
 import "../Vr/index.mjs";
 import "../Earth/index.mjs";
-import { SHJDatasourceV2 as oe } from "../../../../commons/plugins/datasource/index.mjs";
+import { SHJDatasourceV2 as ae } from "../../../../commons/plugins/datasource/index.mjs";
 import { SHJParseEvent as s } from "../../../../commons/plugins/event/index.mjs";
-import { upgradeMap3d as re } from "./version.mjs";
-import { Utils as b } from "../../../../commons/utils/utils.mjs";
-const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }, ie = ["onClick"], ne = {
+import { upgradeMap3d as le } from "./version.mjs";
+import { Utils as k } from "../../../../commons/utils/utils.mjs";
+const ie = { style: { width: "100%", height: "100%" } }, ne = { class: "value" }, ce = ["onClick"], pe = {
   key: 3,
   class: "fps"
-}, ce = P({ name: "ShjMap3d" }), Er = /* @__PURE__ */ P({
-  ...ce,
+}, se = P({ name: "ShjMap3d" }), Cr = /* @__PURE__ */ P({
+  ...se,
   props: {
     option: {},
     sources: {},
@@ -195,10 +195,10 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
     "on-return",
     "on-data-change"
   ],
-  setup(l, { expose: T, emit: V }) {
-    const a = F(() => re(l.option)), p = V, r = f(), x = f(!1), H = f(!1), w = "zerov-map3d-scene", C = f(), i = new te(), g = f(!1), k = (e = !0) => {
+  setup(l, { expose: V, emit: N }) {
+    const a = O(() => le(l.option)), p = N, r = f(), H = f(!1), j = f(!1), C = "zerov-map3d-scene", y = f(), i = new re(), g = f(!1), b = (e = !0) => {
       r.value.cleanAllBar(), r.value.cleanAllScatter(), r.value.cleanAllFlyLine(), r.value.createAllRegionalLevel(), l.sources && l.sources.length > 0 && a.value.widgets.forEach((o, t) => {
-        oe.parse({
+        ae.parse({
           sources: [l.sources[t]],
           callback: (n) => {
             try {
@@ -224,15 +224,15 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
           }
         });
       });
-    }, N = () => {
+    }, U = () => {
       try {
-        C.value && document.getElementById(w) && C.value.removeChild(document.getElementById(w));
+        y.value && document.getElementById(C) && y.value.removeChild(document.getElementById(C));
         const e = document.createElement("canvas");
-        e.id = w, e.className = "zerov-map-3d", e.style.width = "100%", e.style.height = "100%", C.value.appendChild(e);
+        e.id = C, e.className = "zerov-map-3d", e.style.width = "100%", e.style.height = "100%", y.value.appendChild(e);
       } catch {
       }
-    }, y = (e) => (x.value = !1, H.value = !1, r.value && (r.value.destroy(), r.value = null), N(), new _(
-      document.getElementById(w),
+    }, S = (e) => (H.value = !1, j.value = !1, r.value && (r.value.destroy(), r.value = null), U(), new te(
+      document.getElementById(C),
       { geoProjectionCenter: [108.55, 36.32] },
       e,
       {
@@ -246,14 +246,14 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
           if (p("on-area-click", t), s.parseEvents(l.useEvents, "on-area-click", t), t.adcode !== i.present && e.scene.isDrilling && e.scene.defaultMapAdcode !== 1) {
             p("on-drill-down", t), s.parseEvents(l.useEvents, "on-drill-down", t);
             const n = v(e);
-            n.scene.defaultMapAdcode = t.adcode, r.value = y(n), i.push(t.adcode), i.past.length <= 0 ? g.value = !1 : g.value = !0;
+            n.scene.defaultMapAdcode = t.adcode, r.value = S(n), i.push(t.adcode), i.past.length <= 0 ? g.value = !1 : g.value = !0;
           }
         },
         onMapSuccess: () => {
-          x.value = !0, p("on-loaded"), s.parseEvents(l.useEvents, "on-loaded", null);
+          H.value = !0, p("on-loaded"), s.parseEvents(l.useEvents, "on-loaded", null);
         },
         onMapAnimationSuccess: () => {
-          k(), H.value = !0, p("on-animated"), s.parseEvents(l.useEvents, "on-animated", null);
+          b(), j.value = !0, p("on-animated"), s.parseEvents(l.useEvents, "on-animated", null);
         },
         onClickBar: (t) => {
           p("on-bar-click", t), s.parseEvents(l.useEvents, "on-bar-click", t);
@@ -265,18 +265,24 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
           p("on-flyline-click", t), s.parseEvents(l.useEvents, "on-flyline-click", t);
         }
       }
-    ));
-    Q(() => {
-      r.value = y(a.value), i.push(a.value.scene.defaultMapAdcode), ee(
+    )), A = () => {
+      if (!y.value) return;
+      const { clientWidth: e, clientHeight: o } = y.value;
+      !e || !o || (r.value = S(a.value), i.push(a.value.scene.defaultMapAdcode), oe(
         { option: a.value, sources: l.sources, useEvents: l.useEvents },
         r,
-        y,
-        k,
-        U
-      ), window.addEventListener("resize", () => {
-        r.value = y(a.value);
+        S,
+        b,
+        D
+      ));
+    };
+    X(() => {
+      Y(() => {
+        A();
+      }), window.addEventListener("resize", () => {
+        A();
       });
-    }), X(() => {
+    }), Z(() => {
       r.value && r.value.destroy();
     });
     const I = () => {
@@ -288,10 +294,10 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
         adcode: i.present
       }), i.undo();
       const e = v(a.value);
-      e.scene.defaultMapAdcode = i.present, r.value = y(e), i.past.length <= 0 ? g.value = !1 : g.value = !0;
-    }, U = () => {
-      i.empty(), i.push(a.value.scene.defaultMapAdcode), r.value = y(a.value), i.past.length <= 0 ? g.value = !1 : g.value = !0;
-    }, D = (e, o, t) => {
+      e.scene.defaultMapAdcode = i.present, r.value = S(e), i.past.length <= 0 ? g.value = !1 : g.value = !0;
+    }, D = () => {
+      i.empty(), i.push(a.value.scene.defaultMapAdcode), r.value = S(a.value), i.past.length <= 0 ? g.value = !1 : g.value = !0;
+    }, J = (e, o, t) => {
       $.timeline().add(
         $.to(r.value.camera.instance.position, {
           duration: 2,
@@ -303,29 +309,29 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
         })
       );
     };
-    T({
-      refresh: () => k(),
-      refreshView: () => k(),
-      refreshData: () => k(),
+    V({
+      refresh: () => b(),
+      refreshView: () => b(),
+      refreshData: () => b(),
       // 返回上一级
       goBack: () => I(),
       // 更新相机位置
-      setCameraPosition: (e, o, t) => D(e, o, t)
+      setCameraPosition: (e, o, t) => J(e, o, t)
     });
-    const J = Z(), M = f(), q = (e) => {
+    const q = ee(), M = f(), G = (e) => {
       if (M.value && e) {
         const o = `url(${e.backgroundImage})`;
         return {
-          ...b.json2cssObject(e.background),
-          ...b.json2cssObject(e.border),
-          ...b.json2cssObject(e.text),
+          ...k.json2cssObject(e.background),
+          ...k.json2cssObject(e.border),
+          ...k.json2cssObject(e.text),
           left: a.value.backButton.left + "%",
           bottom: a.value.backButton.bottom + "%",
           "background-image": o
         };
       }
       return {};
-    }, m = f(v(a.value.widgets)), c = F(() => {
+    }, m = f(v(a.value.widgets)), c = O(() => {
       try {
         const e = m.value.filter(
           (o) => o.type === "regionalLevel"
@@ -335,22 +341,22 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
         return null;
       }
     });
-    S(
+    E(
       () => v(a.value.widgets),
       (e, o) => {
         try {
-          !E(e, o) && r.value && (m.value = v(a.value.widgets));
+          !w(e, o) && r.value && (m.value = v(a.value.widgets));
         } catch {
         }
       },
       {
         deep: !0
       }
-    ), S(
+    ), E(
       () => v(m.value.filter((e) => e.type === "bar")),
       (e, o) => {
         try {
-          !E(e, o) && r.value && e.length === o.length && e.forEach((t) => {
+          !w(e, o) && r.value && e.length === o.length && e.forEach((t) => {
             r.value.createBar(t, void 0, !1);
           });
         } catch {
@@ -359,11 +365,11 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
       {
         deep: !0
       }
-    ), S(
+    ), E(
       () => v(m.value.filter((e) => e.type === "scatter")),
       (e, o) => {
         try {
-          !E(e, o) && r.value && e.length === o.length && e.forEach((t) => {
+          !w(e, o) && r.value && e.length === o.length && e.forEach((t) => {
             r.value.createScatter(t, void 0, !1);
           });
         } catch {
@@ -372,11 +378,11 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
       {
         deep: !0
       }
-    ), S(
+    ), E(
       () => v(m.value.filter((e) => e.type === "flyline")),
       (e, o) => {
         try {
-          !E(e, o) && r.value && e.length === o.length && e.forEach((t) => {
+          !w(e, o) && r.value && e.length === o.length && e.forEach((t) => {
             r.value.createFlyLine(t, void 0, !1);
           });
         } catch {
@@ -385,11 +391,11 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
       {
         deep: !0
       }
-    ), S(
+    ), E(
       () => v(m.value.filter((e) => e.type === "regionalLevel")),
       (e, o) => {
         try {
-          !E(e, o) && r.value && e.length === o.length && e.forEach((t) => {
+          !w(e, o) && r.value && e.length === o.length && e.forEach((t) => {
             r.value.createRegionalLevel(t, void 0, !1);
           });
         } catch {
@@ -399,40 +405,40 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
         deep: !0
       }
     );
-    const G = (e) => {
+    const K = (e) => {
       try {
         e.isHide === void 0 ? e.isHide = !0 : e.isHide = !e.isHide;
       } catch {
       }
-    }, K = () => {
+    }, Q = () => {
       try {
         const e = m.value.every((o) => !o.isHide);
         m.value.forEach((o) => o.isHide = e);
       } catch {
       }
-    }, W = (e) => {
-      const o = `url(${e.backgroundImage})`, t = `url(${R(e.hover.backgroundImage)})`, n = `url(${R(e.active.backgroundImage)})`;
+    }, R = (e) => {
+      const o = `url(${e.backgroundImage})`, t = `url(${F(e.hover.backgroundImage)})`, n = `url(${F(e.active.backgroundImage)})`;
       return {
-        ...b.json2cssObject(e),
-        ...b.json2cssObject(e.hover, "hover"),
-        ...b.json2cssObject(e.active, "active"),
+        ...k.json2cssObject(e),
+        ...k.json2cssObject(e.hover, "hover"),
+        ...k.json2cssObject(e.active, "active"),
         "background-image": o,
         "--hover-background-image": t,
         "--active-background-image": n
       };
-    }, R = (e) => !e.startsWith("http") && !e.startsWith("//") ? "../" + e : e;
-    return (e, o) => (d(), u("div", ae, [
+    }, F = (e) => !e.startsWith("http") && !e.startsWith("//") ? "../" + e : e;
+    return (e, o) => (d(), u("div", ie, [
       B("div", {
         ref_key: "map3dWrapRef",
-        ref: C,
-        class: A(["map-3d-wrap", { show: x.value }])
+        ref: y,
+        class: W(["map-3d-wrap", { show: H.value }])
       }, [
-        H.value && g.value && a.value.backButton.show ? (d(), u("div", {
+        j.value && g.value && a.value.backButton.show ? (d(), u("div", {
           key: 0,
           ref_key: "buttonRef",
           ref: M,
           class: "return-btn",
-          style: h(q(a.value.backButton)),
+          style: h(G(a.value.backButton)),
           onClick: I
         }, " 返回上一级 ", 4)) : L("", !0),
         c.value ? (d(), u("div", {
@@ -452,7 +458,7 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
             "--color-borderRadius": c.value.labelStyle.colorStyle.borderRadius + "px"
           })
         }, [
-          (d(!0), u(O, null, z(c.value.rules, (t, n) => (d(), u("div", {
+          (d(!0), u(z, null, T(c.value.rules, (t, n) => (d(), u("div", {
             key: n,
             class: "item"
           }, [
@@ -460,7 +466,7 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
               class: "color",
               style: h({ backgroundColor: t.color })
             }, null, 4),
-            B("span", le, j(t.label), 1)
+            B("span", ne, x(t.label), 1)
           ]))), 128))
         ], 4)) : L("", !0),
         a.value.widgets.length > 0 && a.value.widgetControlStyle && a.value.widgetControlStyle.show ? (d(), u("div", {
@@ -476,26 +482,26 @@ const ae = { style: { width: "100%", height: "100%" } }, le = { class: "value" }
           })
         }, [
           B("div", {
-            class: A(["control-button", {
+            class: W(["control-button", {
               active: m.value.every((t) => !t.isHide)
             }]),
-            style: h(W(a.value.widgetControlStyle)),
-            onClick: K
-          }, j(m.value.every((t) => !t.isHide) ? "隐藏" : "显示") + "/全部 ", 7),
-          (d(!0), u(O, null, z(m.value, (t) => (d(), u("div", {
+            style: h(R(a.value.widgetControlStyle)),
+            onClick: Q
+          }, x(m.value.every((t) => !t.isHide) ? "隐藏" : "显示") + "/全部 ", 7),
+          (d(!0), u(z, null, T(m.value, (t) => (d(), u("div", {
             key: t.id,
-            class: A(["control-button", {
+            class: W(["control-button", {
               active: !t.isHide
             }]),
-            style: h(W(a.value.widgetControlStyle)),
-            onClick: (n) => G(t)
-          }, j(t.name || "-"), 15, ie))), 128))
+            style: h(R(a.value.widgetControlStyle)),
+            onClick: (n) => K(t)
+          }, x(t.name || "-"), 15, ce))), 128))
         ], 4)) : L("", !0),
-        a.value.debugger ? (d(), u("div", ne, "fps:" + j(Y(J)), 1)) : L("", !0)
+        a.value.debugger ? (d(), u("div", pe, "fps:" + x(_(q)), 1)) : L("", !0)
       ], 2)
     ]));
   }
 });
 export {
-  Er as default
+  Cr as default
 };

package/es/packages/components/Scene/components/Map3d/index.vue.d.ts

@@ -26,6 +26,7 @@ declare const _sfc_main: import("vue").DefineComponent<import("vue").ExtractProp
     initData: (isAnimation?: boolean) => void;
     initDom: () => void;
     createWorld: (option: any) => World;
+    safeCreateWorld: () => void;
     goBack: () => void;
     cleanAndCreateWorld: () => void;
     setCameraPosition: (x: number, y: number, z: number) => void;