@shjjs/visual-ui 1.0.28 → 1.0.30

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

@@ -29,23 +29,23 @@ const y = class y {
    */
   static parse({ sources: t, callback: a, tId: e, isStore: s = !1, noUseMapping: i = !1, isInterval: n = !0 }) {
     return a ?? (a = () => {
-    }), t && k(t) && t.length > 0 ? new Promise((p, o) => {
+    }), t && k(t) && t.length > 0 && t[0] ? new Promise((p, o) => {
       P.cleanupPreviousWebSockets(this.wsInstances, t.map((r) => r.id), e);
-      const f = /* @__PURE__ */ new Set(), h = this.wsInstances.get(e) || /* @__PURE__ */ new Set();
+      const f = /* @__PURE__ */ new Set(), m = this.wsInstances.get(e) || /* @__PURE__ */ new Set();
       t.forEach((r) => {
         var w;
         if (n) {
-          const { source: c } = r, d = `${e}-${r.id}`, D = this.datasourceTimer.findIndex((m) => m.id === d);
+          const { source: c } = r, u = `${e}-${r.id}`, D = this.datasourceTimer.findIndex((h) => h.id === u);
           if (D !== -1 && (clearInterval(this.datasourceTimer[D].timer), this.datasourceTimer.splice(D, 1)), c.isAutoUpdate) {
-            const m = setInterval(() => {
+            const h = setInterval(() => {
               var l;
-              (l = this.task(r, s, i, e, (u) => {
-                a(u);
-              })) == null || l.then((u) => {
-                p(u);
+              (l = this.task(r, s, i, e, (d) => {
+                a(d);
+              })) == null || l.then((d) => {
+                p(d);
               });
             }, c.autoUpdateTime * 1e3);
-            this.datasourceTimer.push({ id: d, timer: m });
+            this.datasourceTimer.push({ id: u, timer: h });
           }
         }
         if (r.source.type !== "ws") {
@@ -53,12 +53,12 @@ const y = class y {
           return;
         }
         if (P.hasValidWebSocket(this.wsInstances, e, r.id))
-          h.forEach((c) => {
+          m.forEach((c) => {
             c.getId() === r.id && f.add(c);
           });
         else {
-          const c = $(r, r.id, i, e, (d) => {
-            p(d), a({ data: [{ data: d.finalUserData.data }] }), this.taskStorage(t, d.rawData.data);
+          const c = $(r, r.id, i, e, (u) => {
+            p(u), a({ data: [{ data: u.finalUserData.data }] }), this.taskStorage(t, u.rawData.data);
           });
           f.add(c);
         }
@@ -78,8 +78,8 @@ const y = class y {
   }) {
     return t ? new Promise((n, p) => {
       let o = null;
-      const { source: f } = t, h = this.getParser(f.type);
-      h && (o = h(t, t.id, e)), o.then((r) => {
+      const { source: f } = t, m = this.getParser(f.type);
+      m && (o = m(t, t.id, e)), o.then((r) => {
         i(e ? r.noMappingData : r.finalKeyData), this.taskStorage(t, r.rawData.data), n(r);
       });
     }) : (i([]), Promise.resolve([]));
@@ -126,38 +126,38 @@ const y = class y {
     return new Promise(function(p) {
       const o = I({ id: s, data: a });
       y.filterData(t, a).then((f) => {
-        const h = I({ id: s, data: f });
+        const m = I({ id: s, data: f });
         if (n)
           p({
             id: s,
             finalKeyData: [],
             finalUserData: { id: s, data: f },
-            filteredData: h,
+            filteredData: m,
             rawData: o,
             noMappingData: f
           });
         else {
           let r = [];
-          k(f) && (r = f.map((d, D) => {
-            const m = {};
+          k(f) && (r = f.map((u, D) => {
+            const h = {};
             if (i && i && D === 0) {
               const l = [];
-              for (const u in d) {
-                const T = e.find((b) => b.name === u);
-                T ? l.push({ alias: T.alias, name: u, type: "any", label: u, mapping: T.mapping, status: !0 }) : l.push({ alias: u, name: u, type: "any", label: u, mapping: u, status: !0 });
+              for (const d in u) {
+                const T = e.find((b) => b.name === d);
+                T ? l.push({ alias: T.alias, name: d, type: "any", label: d, mapping: T.mapping, status: !0 }) : l.push({ alias: d, name: d, type: "any", label: d, mapping: d, status: !0 });
               }
               e.splice(0, e.length), e.push(...l);
             }
             return e.forEach((l) => {
-              l.alias ? m[l.alias] = d[l.mapping] : m[l.name] = d[l.mapping];
-            }), m;
+              l.alias ? h[l.alias] = u[l.mapping] : h[l.name] = u[l.mapping];
+            }), h.userdata = u, h;
           }));
           const w = I({ id: s, data: r }), c = I({ id: s, data: y.parseMappedData(r, e, s) });
           p({
             id: s,
             finalKeyData: r.length === 0 ? { id: s, data: f } : c,
             finalUserData: r.length === 0 ? { id: s, data: f } : w,
-            filteredData: h,
+            filteredData: m,
             rawData: o,
             noMappingData: []
           });

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

@@ -90,7 +90,7 @@ export declare class DataSourceUtils {
     static getNestedValue(obj: any, path: string): any;
     /**
      * 从路径字符串中提取变量名
-     * @param path 路径字符串，例如 "test[0].aa" 或 "test.aa[1]"
+     * @param path 路径字符串，例如 "测试.test" 或 "333[0].aa"
      * @returns 提取出的变量名
      */
     static extractVariableName(path: string): string;

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

@@ -174,11 +174,11 @@ class o {
   }
   /**
    * 从路径字符串中提取变量名
-   * @param path 路径字符串，例如 "test[0].aa" 或 "test.aa[1]"
+   * @param path 路径字符串，例如 "测试.test" 或 "333[0].aa"
    * @returns 提取出的变量名
    */
   static extractVariableName(e) {
-    const n = e.match(/^([a-zA-Z_][a-zA-Z0-9_]*)/);
+    const n = e.match(/^([\u4e00-\u9fa5a-zA-Z0-9_][\u4e00-\u9fa5a-zA-Z0-9_]*)/);
     return n ? n[1] : "";
   }
 }

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

@@ -1,22 +1,23 @@
-var m = Object.defineProperty;
-var f = (a, e, t) => e in a ? m(a, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : a[e] = t;
-var d = (a, e, t) => f(a, typeof e != "symbol" ? e + "" : e, t);
-import { cloneDeep as l } from "lodash";
-import { executeLinkAction as y } from "./actions/linkAction.mjs";
-import { executeMoveAction as A } from "./actions/moveAction.mjs";
+var d = Object.defineProperty;
+var f = (s, e, t) => e in s ? d(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t;
+var m = (s, e, t) => f(s, typeof e != "symbol" ? e + "" : e, t);
+import { cloneDeep as y } from "lodash";
+import { executeLinkAction as A } from "./actions/linkAction.mjs";
+import { executeMoveAction as g } from "./actions/moveAction.mjs";
 import { executeSendApiAction as h } from "./actions/sendApiAction.mjs";
 import { executeScaleAction as x } from "./actions/scaleAction.mjs";
-import { executeRotateAction as g } from "./actions/rotateAction.mjs";
-import { executeUpdatePageAction as E } from "./actions/updatePageAction.mjs";
-import { executeInvokeAction as S } from "./actions/invokeAction.mjs";
-import { executeFullScreenAction as b } from "./actions/fullScreenAction.mjs";
+import { executeRotateAction as S } from "./actions/rotateAction.mjs";
+import { executeUpdatePageAction as b } from "./actions/updatePageAction.mjs";
+import { executeInvokeAction as E } from "./actions/invokeAction.mjs";
+import { executeFullScreenAction as V } from "./actions/fullScreenAction.mjs";
 import { executeUpdateVariableAction as w } from "./actions/updateVariableAction.mjs";
 import { executeUpdateWidgetAction as M } from "./actions/updateWidgetAction.mjs";
 import { executeUeCommonsWebscoketAction as U } from "./actions/ueCommonsWebscoketAction.mjs";
 import { executeUeShjExecMethodAction as k } from "./actions/ueShjExecMethodAction.mjs";
 import { executeUnityWebglExecMethodAction as C } from "./actions/unityWebglExecMethodAction.mjs";
-import { executeUnityIframeExecMethodAction as N } from "./actions/unityIframeExecMethodAction.mjs";
-import { executeVrSceneMethodAction as V } from "./actions/vrSceneMethodAction.mjs";
+import { executeUnityIframeExecMethodAction as D } from "./actions/unityIframeExecMethodAction.mjs";
+import { executeVrSceneMethodAction as N } from "./actions/vrSceneMethodAction.mjs";
+import { DataSourceUtils as l } from "../datasource/utils/utils.mjs";
 class W {
   /**
    * 添加事件解析器
@@ -24,8 +25,8 @@ class W {
    * @param parser 事件解析器
    */
   static addAction(e, t) {
-    const o = Array.from(this.actions).find((r) => r.type === e);
-    o && this.actions.delete(o), this.actions.add({ type: e, parser: t });
+    const i = Array.from(this.actions).find((r) => r.type === e);
+    i && this.actions.delete(i), this.actions.add({ type: e, parser: t });
   }
   /**
    * 获取事件解析器
@@ -33,7 +34,7 @@ class W {
    * @returns 事件解析器
    */
   static getAction(e) {
-    const t = Array.from(this.actions).find((o) => o.type === e);
+    const t = Array.from(this.actions).find((i) => i.type === e);
     return t == null ? void 0 : t.parser;
   }
   /**
@@ -42,22 +43,22 @@ class W {
    * @param type 事件类型
    * @param params 参数
    */
-  static parseEvents(e, t, o) {
-    e != null && e.length && e.forEach((r, p) => {
+  static parseEvents(e, t, i) {
+    e != null && e.length && e.forEach((r, c) => {
       r.eventType === t && setTimeout(() => {
         const u = new CustomEvent("event-params-log", {
           detail: {
             eventId: r.id,
-            params: o
+            params: i
           }
         });
         window.dispatchEvent(u);
-        const s = this.filterEvent(r, o);
-        if (!this.conditionLogic(r, s) || !r.actions)
+        const p = this.filterEvent(r, i);
+        if (!this.conditionLogic(r, p) || !r.actions)
           return;
         const n = this.getAction(r.actions);
-        n && n(r, s);
-      }, r.delay + p * 10);
+        n && n(r, p);
+      }, r.delay + c * 10);
     });
   }
   /**
@@ -67,19 +68,20 @@ class W {
    * @returns 过滤后的参数
    */
   static filterEvent(e, t) {
-    let o = l(t);
+    let i = y(t);
     if (e.filterCode)
       try {
-        const r = `
+        const r = l.getVariableData();
+        let c = `
                  ${e.filterCode}
      
                  // 在这里调用 filter 函数，并传递 data 参数
                  return filter(data);
              `;
-        o = new Function("data", r)(t);
+        c = c.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ""), c = l.replaceStringVariables(c, r), i = new Function("data", c)(t);
       } catch {
       }
-    return o;
+    return i;
   }
   /**
    * 条件逻辑判断
@@ -88,68 +90,69 @@ class W {
    * @returns 是否通过
    */
   static conditionLogic(e, t) {
-    var u, s;
-    if (!((s = (u = e.condition) == null ? void 0 : u.list) != null && s.length))
+    var u, p;
+    if (!((p = (u = e.condition) == null ? void 0 : u.list) != null && p.length))
       return !0;
-    const o = (n) => {
+    const i = (n) => {
       if (n.type === "field") {
         if (!n.conditionName) return !1;
-        const i = t[n.conditionName];
-        if (i === void 0) return !1;
-        const c = n.conditionValue;
+        const a = t[n.conditionName];
+        if (a === void 0) return !1;
+        const o = n.conditionValue;
         switch (n.conditionExpression) {
           case "eq":
-            return i.toString() === (c || "").toString();
+            return a.toString() === (o || "").toString();
           case "neq":
-            return i !== c;
+            return a !== o;
           case "lt":
-            return i < Number(c);
+            return a < Number(o);
           case "gt":
-            return i > Number(c);
+            return a > Number(o);
           case "lte":
-            return i <= Number(c);
+            return a <= Number(o);
           case "gte":
-            return i >= Number(c);
+            return a >= Number(o);
           case "includes":
-            return i.includes(c);
+            return a.includes(o);
           case "noincludes":
-            return !i.includes(c);
+            return !a.includes(o);
           default:
             return !1;
         }
       }
       if (n.type === "custom")
         try {
-          const i = `
+          const a = l.getVariableData();
+          let o = `
                         ${n.customValue}
                         return condition(data);
                     `;
-          return new Function("data", i)(t);
+          return o = o.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ""), o = l.replaceStringVariables(o, a), new Function("data", o)(t);
         } catch {
           return !1;
         }
       return !1;
-    }, r = e.condition.list.map(o);
+    }, r = e.condition.list.map(i);
     return e.condition.type === "and" ? r.every(Boolean) : r.some(Boolean);
   }
 }
 /** 事件动作 */
-d(W, "actions", /* @__PURE__ */ new Set([
-  { type: "link", parser: y },
+m(W, "actions", /* @__PURE__ */ new Set([
+  { type: "link", parser: A },
   { type: "sendApi", parser: h },
-  { type: "move", parser: A },
+  { type: "move", parser: g },
   { type: "scale", parser: x },
-  { type: "rotate", parser: g },
-  { type: "updatePage", parser: E },
-  { type: "invoke", parser: S },
-  { type: "fullscreen", parser: b },
+  { type: "rotate", parser: S },
+  { type: "updatePage", parser: b },
+  { type: "invoke", parser: E },
+  { type: "fullscreen", parser: V },
   { type: "updateVariable", parser: w },
   { type: "updateWidget", parser: M },
   { type: "ueCommonsWebscoket", parser: U },
   { type: "ueShjExecMethod", parser: k },
   { type: "unityWebglExecMethod", parser: C },
-  { type: "unityIframeExecMethod", parser: N },
-  { type: "vrSceneMethod", parser: V }
+  { type: "unityIframeExecMethod", parser: D },
+  { type: "vrSceneMethod", parser: N }
 ]));
 export {
   W as SHJParseEvent

package/es/components/scene-amap2d/index.vue.mjs

@@ -1,7 +1,7 @@
 import o from "./index.vue2.mjs";
 /* empty css            */
 import t from "../../_virtual/_plugin-vue_export-helper.mjs";
-const p = /* @__PURE__ */ t(o, [["__scopeId", "data-v-1495d842"]]);
+const p = /* @__PURE__ */ t(o, [["__scopeId", "data-v-1a9e6290"]]);
 export {
   p as default
 };