@shjjs/visual-ui 3.0.2 → 3.0.4

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/commons/plugins/datasource/sources/api.d.ts

@@ -1,3 +1,3 @@
 import { httpRequest } from "../utils/request";
-export declare const parseAPIPort: (source: any, noUseMapping: boolean, callback: (data: any) => void) => void;
 export { httpRequest };
+export declare const parseAPIPort: (source: any, noUseMapping: boolean, callback: (data: any) => void) => Promise<void>;

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

@@ -1,2 +1,8 @@
 import { IMapping } from "../types";
 export declare const mappingData: (data: any[], mapping: IMapping[], dynamicMapping: boolean, isUserdata: boolean) => any;
+export declare const dynamicMappingData: (item: any, mapping: IMapping[]) => {
+    alias: string;
+    name: string;
+    label: string;
+    mapping: string;
+}[];

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

@@ -3,119 +3,29 @@ import { IVariable } from "../types";
  * 数据源工具类
  */
 export declare class DataSourceUtils {
-    static replaceURLVariables(url: string): string;
+    static executeAllVariable(variableData: IVariable[]): void;
     static replaceObjectVariables(obj: any): any;
     static replaceStringVariables(str: string): string;
-    static getURLVariableNames(url: string): string[];
     static getObjectVariableNames(obj: any): string[];
     static getStringVariableNames(str: string): string[];
-    /**
-     * 获取环境变量
-     * @returns 环境变量
-     */
+    static parseVariablePath(path: any): {
+        varName: any;
+        propPath: any;
+    };
     static getEnvironments(): {
         envName: string;
         envBaseUrl: string;
     };
-    /**
-     * 设置环境变量
-     * @param environments 环境变量
-     */
     static setEnvironments(environments: any[]): void;
-    /**
-     * 获取变量数据
-     * @returns 变量数据
-     */
     static getVariables(): any[];
-    /**
-     * 设置变量数据
-     * @param variable 变量数据
-     */
     static setVariables(variable: any[]): void;
-    /**
-     *
-     * @param id
-     * @returns
-     */
+    static setVariableById(variable: any, value: any, updateWidget?: boolean): void;
     static getVariableById(id: string): any;
-    /**
-     *
-     * @param name
-     * @returns
-     */
     static getVariableByName(name: string): any;
-    /**
-     *
-     * @param name
-     * @returns
-     */
     static getVariableValueByName(name: string): any;
-    /**
-     *
-     * @param name
-     * @returns
-     */
-    static getVariableInitialStateByName(name: string): any;
-    /**
-     * 设置变量数据
-     * @param id 变量 ID
-     * @param variable 变量数据
-     */
-    static setVariableById(variable: any, value: any, updateWidget?: boolean): void;
-    /**
-     * 新增变量
-     * @param data
-     */
     static addVariable: (variable: any) => void;
-    /**
-     * 更新变量
-     * @param data
-     */
     static updateVariable: (variable: any) => void;
-    /**
-     * 更新变量
-     * @param data
-     */
     static deleteVariableById: (id: any) => void;
-    /**
-     * 检查 WebSocket 是否已存在且有效
-     * @param wsInstances WebSocket 实例
-     * @param tId WebSocket 实例的 ID
-     * @param sourceId WebSocket 实例的源 ID
-     * @returns 是否有效
-     */
-    static hasValidWebSocket(wsInstances: any, tId: string, sourceId: string): boolean;
-    /**
-     * 只在必要时清理 WebSocket 连接
-     * @param wsInstances WebSocket 实例
-     * @param sourceIds 源 ID
-     * @param tId WebSocket 实例的 ID
-     */
-    static cleanupPreviousWebSockets(wsInstances: any, sourceIds: string[], tId: string): void;
-    /**
-     * 使用 Function 构造函数获取对象中的嵌套值（更简洁但安全性较低）
-     * @param obj 源对象
-     * @param path 路径字符串，例如 ".a[0].value"
-     * @returns 获取到的值，如果路径不存在则返回 undefined
-     */
-    static getNestedValue(obj: any, path: string): any;
-    /**
-     * 从路径字符串中提取变量名
-     * @param path 路径字符串，例如 "测试.test" 或 "333[0].aa"
-     * @returns 提取出的变量名
-     */
-    static extractVariableName(path: string): string;
-    /**
-     * 初始化所有变量
-     * @param variableData
-     * @returns
-     */
-    static executeAllVariable(variableData: IVariable[]): void;
-    /**
-     * 返回空数据
-     * @param id 数据源 ID
-     * @returns 空数据
-     */
     static noneData(id: string): {
         id: string;
         finalKeyData: {

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;