@shjjs/visual-ui 1.0.29 → 1.0.31

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

@@ -52,7 +52,7 @@ export declare class SHJDatasourceV2 {
      * @param noUseMapping 是否不使用映射
      * @returns
      */
-    static processData(filter: any, data: any, mappings: any[], id: string, dynamicMapping?: boolean, noUseMapping?: boolean): Promise<unknown>;
+    static processData(filter: any, data: any, mappings: any[], id: string, dynamicMapping?: boolean, noUseMapping?: boolean, isUserdata?: boolean): Promise<unknown>;
     /**
      * 解析数据为Key、Data格式
      * @param data 数据

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

@@ -1,15 +1,15 @@
-var x = Object.defineProperty;
-var A = (g, t, a) => t in g ? x(g, t, { enumerable: !0, configurable: !0, writable: !0, value: a }) : g[t] = a;
-var S = (g, t, a) => A(g, typeof t != "symbol" ? t + "" : t, a);
-import { isArray as k, isString as K, cloneDeep as I } from "lodash";
-import { parseStaticData as U } from "./sources/static.mjs";
-import { parseUrlData as j } from "./sources/url.mjs";
-import { parseVariableData as E } from "./sources/variable.mjs";
-import { parseAPIPort as W } from "./sources/api.mjs";
-import { parseWebSocket as $ } from "./sources/ws.mjs";
-import { DataSourceUtils as P } from "./utils/utils.mjs";
-import { parseStorage as v } from "./sources/storage.mjs";
-const y = class y {
+var K = Object.defineProperty;
+var b = (w, t, a) => t in w ? K(w, t, { enumerable: !0, configurable: !0, writable: !0, value: a }) : w[t] = a;
+var I = (w, t, a) => b(w, typeof t != "symbol" ? t + "" : t, a);
+import { isArray as F, isString as j, cloneDeep as P } from "lodash";
+import { parseStaticData as E } from "./sources/static.mjs";
+import { parseUrlData as U } from "./sources/url.mjs";
+import { parseVariableData as W } from "./sources/variable.mjs";
+import { parseAPIPort as $ } from "./sources/api.mjs";
+import { parseWebSocket as N } from "./sources/ws.mjs";
+import { DataSourceUtils as T } from "./utils/utils.mjs";
+import { parseStorage as O } from "./sources/storage.mjs";
+const D = class D {
   static addParser(t, a) {
     this.parsers.add({ type: t, parser: a });
   }
@@ -27,42 +27,47 @@ const y = class y {
    * @param isInterval 是否开启定时任务
    * @returns
    */
-  static parse({ sources: t, callback: a, tId: e, isStore: s = !1, noUseMapping: i = !1, isInterval: n = !0 }) {
+  static parse({ sources: t, callback: a, tId: e, isStore: r = !1, noUseMapping: i = !1, isInterval: n = !0 }) {
     return a ?? (a = () => {
-    }), 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();
-      t.forEach((r) => {
-        var w;
+    }), t && F(t) && t.length > 0 && t[0] ? new Promise((p, o) => {
+      T.cleanupPreviousWebSockets(this.wsInstances, t.map((s) => s.id), e);
+      const u = /* @__PURE__ */ new Set(), l = this.wsInstances.get(e) || /* @__PURE__ */ new Set();
+      t.forEach((s) => {
+        var d;
         if (n) {
-          const { source: c } = r, d = `${e}-${r.id}`, D = this.datasourceTimer.findIndex((m) => m.id === d);
-          if (D !== -1 && (clearInterval(this.datasourceTimer[D].timer), this.datasourceTimer.splice(D, 1)), c.isAutoUpdate) {
-            const m = setInterval(() => {
-              var l;
-              (l = this.task(r, s, i, e, (u) => {
-                a(u);
-              })) == null || l.then((u) => {
-                p(u);
+          const { source: f } = s;
+          if (!f) {
+            a([]), p([]);
+            return;
+          }
+          const h = `${e}-${s.id}`, m = this.datasourceTimer.findIndex((S) => S.id === h);
+          if (m !== -1 && (clearInterval(this.datasourceTimer[m].timer), this.datasourceTimer.splice(m, 1)), f.isAutoUpdate) {
+            const S = setInterval(() => {
+              var y;
+              (y = this.task(s, r, i, e, (c) => {
+                a(c);
+              })) == null || y.then((c) => {
+                p(c);
               });
-            }, c.autoUpdateTime * 1e3);
-            this.datasourceTimer.push({ id: d, timer: m });
+            }, f.autoUpdateTime * 1e3);
+            this.datasourceTimer.push({ id: h, timer: S });
           }
         }
-        if (r.source.type !== "ws") {
-          (w = this.task(r, s, i, e, (c) => a(c))) == null || w.then((c) => p(c));
+        if (s.source.type !== "ws") {
+          (d = this.task(s, r, i, e, (f) => a(f))) == null || d.then((f) => p(f));
           return;
         }
-        if (P.hasValidWebSocket(this.wsInstances, e, r.id))
-          h.forEach((c) => {
-            c.getId() === r.id && f.add(c);
+        if (T.hasValidWebSocket(this.wsInstances, e, s.id))
+          l.forEach((f) => {
+            f.getId() === s.id && u.add(f);
           });
         else {
-          const c = $(r, r.id, i, e, (d) => {
-            p(d), a({ data: [{ data: d.finalUserData.data }] }), this.taskStorage(t, d.rawData.data);
+          const f = N(s, s.id, i, e, (h) => {
+            p(h), a({ data: [{ data: h.finalUserData.data }] }), this.taskStorage(t, h.rawData.data);
           });
-          f.add(c);
+          u.add(f);
         }
-      }), f.size > 0 && this.wsInstances.set(e, f);
+      }), u.size > 0 && this.wsInstances.set(e, u);
     }) : (a([]), Promise.resolve([]));
   }
   /**
@@ -74,13 +79,13 @@ const y = class y {
    * @param callback 回调函数
    * @returns
    */
-  static task(t, a = !1, e = !1, s, i = () => {
+  static task(t, a = !1, e = !1, r, i = () => {
   }) {
     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) => {
-        i(e ? r.noMappingData : r.finalKeyData), this.taskStorage(t, r.rawData.data), n(r);
+      const { source: u } = t, l = this.getParser(u.type);
+      l && (o = l(t, t.id, e)), o.then((s) => {
+        this.taskStorage(t, s.rawData.data), n(s), e && i(s.noMappingData), e || i(s.finalKeyData);
       });
     }) : (i([]), Promise.resolve([]));
   }
@@ -91,17 +96,17 @@ const y = class y {
    * @returns
    */
   static filterData(t, a) {
-    return new Promise((e, s) => {
-      if (K(t)) {
+    return new Promise((e, r) => {
+      if (j(t)) {
         try {
-          const i = P.getVariableData();
+          const i = T.getVariableData();
           let n = `
                         ${t}
             
                         // 在这里调用 filter 函数，并传递 data 参数
                         return filter(data);
                     `;
-          n = n.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ""), n = P.replaceStringVariables(n, i);
+          n = n.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ""), n = T.replaceStringVariables(n, i);
           const p = new Function("data", n);
           e(p(a));
         } catch {
@@ -122,43 +127,43 @@ const y = class y {
    * @param noUseMapping 是否不使用映射
    * @returns
    */
-  static processData(t, a, e, s, i, n) {
-    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 });
+  static processData(t, a, e, r, i, n, p) {
+    return new Promise(function(o) {
+      const u = P({ id: r, data: a });
+      D.filterData(t, a).then((l) => {
+        const s = P({ id: r, data: l });
         if (n)
-          p({
-            id: s,
+          o({
+            id: r,
             finalKeyData: [],
-            finalUserData: { id: s, data: f },
-            filteredData: h,
-            rawData: o,
-            noMappingData: f
+            finalUserData: { id: r, data: l },
+            filteredData: s,
+            rawData: u,
+            noMappingData: l
           });
         else {
-          let r = [];
-          k(f) && (r = f.map((d, D) => {
-            const m = {};
-            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 });
+          let d = [];
+          F(l) && (d = l.map((m, S) => {
+            const y = {};
+            if (i && i && S === 0) {
+              const c = [];
+              for (const g in m) {
+                const k = e.find((A) => A.name === g);
+                k ? c.push({ alias: k.alias, name: g, type: "any", label: g, mapping: k.mapping, status: !0 }) : c.push({ alias: g, name: g, type: "any", label: g, mapping: g, status: !0 });
               }
-              e.splice(0, e.length), e.push(...l);
+              e.splice(0, e.length), e.push(...c);
             }
-            return e.forEach((l) => {
-              l.alias ? m[l.alias] = d[l.mapping] : m[l.name] = d[l.mapping];
-            }), m;
+            return e.forEach((c) => {
+              c.alias ? y[c.alias] = m[c.mapping] : y[c.name] = m[c.mapping];
+            }), p && (y.userdata = m), y;
           }));
-          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,
-            rawData: o,
+          const f = P({ id: r, data: d }), h = P({ id: r, data: D.parseMappedData(d, e, r) });
+          o({
+            id: r,
+            finalKeyData: d.length === 0 ? { id: r, data: l } : h,
+            finalUserData: d.length === 0 ? { id: r, data: l } : f,
+            filteredData: s,
+            rawData: u,
             noMappingData: []
           });
         }
@@ -174,11 +179,11 @@ const y = class y {
    */
   static parseMappedData(t, a, e) {
     return t.reduce(
-      (s, i) => {
+      (r, i) => {
         let n = "系列一";
         a && a.find((o) => o.name === "series") && (n = i[a.find((o) => o.name === "series").name], delete i[a.find((o) => o.name === "series").name]);
-        const p = s.find((o) => o.key === n);
-        return p ? p.data.push(i) : s.push({ key: n, data: [i] }), s;
+        const p = r.find((o) => o.key === n);
+        return p ? p.data.push(i) : r.push({ key: n, data: [i] }), r;
       },
       []
     );
@@ -193,14 +198,14 @@ const y = class y {
     e.storage && e.storage.setField && e.storage.setType !== 0 && (e.storage.setType === 1 && localStorage.setItem("Local_" + e.storage.setField, JSON.stringify(a)), e.storage.setType === 2 && sessionStorage.setItem("Session_" + e.storage.setField, JSON.stringify(a)));
   }
 };
-S(y, "wsInstances", /* @__PURE__ */ new Map()), S(y, "datasourceTimer", []), S(y, "parsers", /* @__PURE__ */ new Set([
-  { type: "url", parser: j },
-  { type: "static", parser: U },
-  { type: "variable", parser: E },
-  { type: "api", parser: W },
-  { type: "storage", parser: v }
+I(D, "wsInstances", /* @__PURE__ */ new Map()), I(D, "datasourceTimer", []), I(D, "parsers", /* @__PURE__ */ new Set([
+  { type: "url", parser: U },
+  { type: "static", parser: E },
+  { type: "variable", parser: W },
+  { type: "api", parser: $ },
+  { type: "storage", parser: O }
 ]));
-let F = y;
+let x = D;
 export {
-  F as SHJDatasourceV2
+  x as SHJDatasourceV2
 };

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

@@ -1,7 +1,7 @@
-import { SHJDatasourceV2 as T } from "../index.mjs";
-import { httpRequest as s } from "../utils/request.mjs";
+import { SHJDatasourceV2 as U } from "../index.mjs";
+import { httpRequest as p } from "../utils/request.mjs";
 import { DataSourceUtils as t } from "../utils/utils.mjs";
-const q = (f, e, y) => new Promise(function(r, U) {
+const q = (f, e, y) => new Promise(function(r, j) {
   const { api: n } = f.source;
   try {
     if (n) {
@@ -9,8 +9,8 @@ const q = (f, e, y) => new Promise(function(r, U) {
       const E = t.getEnvironments(), l = t.getVariableData(), i = (P) => {
         P.then((D) => {
           if (D.status === 200) {
-            const { filter: V, mapping: g } = f.source;
-            T.processData(V, D.data, g, e, f.source.dynamicMapping, y).then((b) => {
+            const { filter: V, mapping: g, isUserdata: T } = f.source;
+            U.processData(V, D.data, g, e, f.source.dynamicMapping, y, T).then((b) => {
               b && r(b);
             }).catch(() => r(t.noneData(e)));
             return;
@@ -19,8 +19,8 @@ const q = (f, e, y) => new Promise(function(r, U) {
         }).catch(() => {
           r(t.noneData(e));
         });
-      }, p = t.replaceEnvVariables(a, E);
-      a = t.replaceURLVariables(a, l), h && (o = t.replaceObjectVariables(o, l)), m && (c = t.replaceObjectVariables(c, l)), n.type === "GET" && i(s.get(p + a, { headers: c })), n.type === "POST" && i(s.post(p + a, o, { headers: c }, u)), n.type === "PUT" && i(s.put(p + a, o, { headers: c }, u)), n.type === "DELETE" && i(s.delete(p + a, { headers: c }));
+      }, s = t.replaceEnvVariables(a, E);
+      a = t.replaceURLVariables(a, l), h && (o = t.replaceObjectVariables(o, l)), m && (c = t.replaceObjectVariables(c, l)), n.type === "GET" && i(p.get(s + a, { headers: c })), n.type === "POST" && i(p.post(s + a, o, { headers: c }, u)), n.type === "PUT" && i(p.put(s + a, o, { headers: c }, u)), n.type === "DELETE" && i(p.delete(s + a, { headers: c }));
     } else
       r(t.noneData(e));
   } catch {

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

@@ -1,9 +1,9 @@
-import { SHJDatasourceV2 as e } from "../index.mjs";
+import { SHJDatasourceV2 as i } from "../index.mjs";
 import { DataSourceUtils as n } from "../utils/utils.mjs";
-const m = (t, a, c) => new Promise(function(r, i) {
+const m = (t, a, c) => new Promise(function(r, o) {
   if (t.source.static !== void 0) {
-    e.processData(t.source.filter, t.source.static, t.source.mapping, a, t.source.dynamicMapping, c).then((o) => {
-      r(o);
+    i.processData(t.source.filter, t.source.static, t.source.mapping, a, t.source.dynamicMapping, c, t.source.isUserdata).then((e) => {
+      r(e);
     }).catch(() => {
       r(n.noneData(a));
     });

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

@@ -1,6 +1,6 @@
-import { SHJDatasourceV2 as f } from "../index.mjs";
+import { SHJDatasourceV2 as m } from "../index.mjs";
 import { DataSourceUtils as n } from "../utils/utils.mjs";
-const S = (e, t, i) => new Promise(function(a, m) {
+const l = (e, t, c) => new Promise(function(a, u) {
   if (!e.source.storage) {
     a(n.noneData(t));
     return;
@@ -14,15 +14,15 @@ const S = (e, t, i) => new Promise(function(a, m) {
     a(n.noneData(t));
     return;
   }
-  let c = null;
-  o === 1 && (c = localStorage.getItem("Local_" + r)), o === 2 && (c = sessionStorage.getItem("Session_" + r));
-  const { filter: s, mapping: g } = e.source;
-  f.processData(s, c, g, t, e.source.dynamicMapping, i).then((p) => {
-    a(p);
+  let s = null;
+  o === 1 && (s = localStorage.getItem("Local_" + r)), o === 2 && (s = sessionStorage.getItem("Session_" + r));
+  const { filter: i, mapping: g, isUserdata: p } = e.source;
+  m.processData(i, s, g, t, e.source.dynamicMapping, c, p).then((f) => {
+    a(f);
   }).catch(() => {
     a(n.noneData(t));
   });
 });
 export {
-  S as parseStorage
+  l as parseStorage
 };

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

@@ -1,16 +1,16 @@
 import { SHJDatasourceV2 as i } from "../index.mjs";
 import { DataSourceUtils as n } from "../utils/utils.mjs";
-const f = (t, a, c) => new Promise(function(r, m) {
+const f = (a, t, c) => new Promise(function(r, m) {
   const o = new URLSearchParams(window.location.search), e = Object.fromEntries(o.entries());
   if (Object.keys(e).length > 0) {
-    i.processData(t.source.filter, e, t.source.mapping, a, t.source.dynamicMapping, c).then((s) => {
+    i.processData(a.source.filter, e, a.source.mapping, t, a.source.dynamicMapping, c, a.source.isUserdata).then((s) => {
       r(s);
     }).catch(() => {
-      r(n.noneData(a));
+      r(n.noneData(t));
     });
     return;
   }
-  r(n.noneData(a));
+  r(n.noneData(t));
 });
 export {
   f as parseUrlData

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

@@ -1,17 +1,17 @@
 import { SHJDatasourceV2 as c } from "../index.mjs";
 import { DataSourceUtils as n } from "../utils/utils.mjs";
-const s = (a, r, o) => new Promise(function(e, D) {
+const m = (a, r, o) => new Promise(function(e, s) {
   const i = n.getVariableData().find((t) => t.id === a.source.variableId || t.name === a.source.variableId);
-  if (i) {
-    c.processData(a.source.filter, i._value, a.source.mapping, r, a.source.dynamicMapping, o).then((t) => {
-      e(t);
-    }).catch(() => {
-      e(n.noneData(r));
-    });
+  if (!i) {
+    e(n.noneData(r));
     return;
   }
-  e(n.noneData(r));
+  c.processData(a.source.filter, i._value, a.source.mapping, r, a.source.dynamicMapping, o, a.source.isUserdata).then((t) => {
+    e(t);
+  }).catch(() => {
+    e(n.noneData(r));
+  });
 });
 export {
-  s as parseVariableData
+  m as parseVariableData
 };

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

@@ -2,7 +2,7 @@ var p = Object.defineProperty;
 var g = (c, t, e) => t in c ? p(c, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[t] = e;
 var d = (c, t, e) => g(c, typeof t != "symbol" ? t + "" : t, e);
 import { SHJDatasourceV2 as f } from "../index.mjs";
-import { wsManager as m } from "../utils/wsManager.mjs";
+import { wsManager as u } from "../utils/wsManager.mjs";
 import { DataSourceUtils as l } from "../utils/utils.mjs";
 class w {
   constructor(t, e, s, i, n, o) {
@@ -54,11 +54,11 @@ class w {
       binaryType: s = "blob",
       timeout: i = 3e4
     } = this.config, n = e ? this.injectHeadersToUrl(t) : t, o = this.processProtocols();
-    m.closeByComponentIds(this.tId);
+    u.closeByComponentIds(this.tId);
     try {
-      this.ws = o.length > 0 ? new WebSocket(n, o) : new WebSocket(n), this.ws && (m.add(this.ws, this.tId), this.ws.binaryType = s, this.timeoutTimer = setTimeout(() => {
-        var a, u;
-        ((a = this.ws) == null ? void 0 : a.readyState) === WebSocket.CONNECTING && (this.ws.close(), (u = this.onEvent) == null || u.call(this, "error", "Connection timeout"), this.handleClose({ code: 4001, reason: "Timeout" }));
+      this.ws = o.length > 0 ? new WebSocket(n, o) : new WebSocket(n), this.ws && (u.add(this.ws, this.tId), this.ws.binaryType = s, this.timeoutTimer = setTimeout(() => {
+        var a, m;
+        ((a = this.ws) == null ? void 0 : a.readyState) === WebSocket.CONNECTING && (this.ws.close(), (m = this.onEvent) == null || m.call(this, "error", "Connection timeout"), this.handleClose({ code: 4001, reason: "Timeout" }));
       }, i), this.ws.onopen = this.handleOpen.bind(this), this.ws.onmessage = this.handleMessage.bind(this), this.ws.onerror = this.handleError.bind(this), this.ws.onclose = this.handleClose.bind(this), (r = this.onEvent) == null || r.call(this, "connecting"));
     } catch (a) {
       (h = this.onEvent) == null || h.call(this, "error", a), this.scheduleReconnect();
@@ -91,7 +91,8 @@ class w {
         this.source.source.mapping,
         this.id,
         this.source.source.dynamicMapping,
-        this.noUseMapping
+        this.noUseMapping,
+        this.source.source.isUserdata
       );
       (e = this.onData) == null || e.call(this, r), (s = this.onEvent) == null || s.call(this, "data", r);
     } catch {
@@ -125,7 +126,7 @@ class w {
     this.ws.send(e);
   }
   disconnect() {
-    this.isDisconnecting = !0, this.ws && (this.ws.close(1e3, "Manual close"), this.timeoutTimer && clearTimeout(this.timeoutTimer), m.closeByComponentIds(this.tId));
+    this.isDisconnecting = !0, this.ws && (this.ws.close(1e3, "Manual close"), this.timeoutTimer && clearTimeout(this.timeoutTimer), u.closeByComponentIds(this.tId));
   }
   getWebSocket() {
     return this.ws;

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

@@ -11,11 +11,11 @@ class o {
       const t = e.match(/\${(.*?)}/g);
       if (t)
         for (let a = 0; a < t.length; a++) {
-          const r = t[a].substring(2, t[a].length - 1), i = o.extractVariableName(r), c = n.find((l) => l.name === i);
-          if (!c)
+          const r = t[a].substring(2, t[a].length - 1), i = o.extractVariableName(r), s = n.find((l) => l.name === i);
+          if (!s)
             continue;
-          const s = o.getNestedValue(c._value, r.substring(i.length));
-          e = e.replaceAll(t[a], s);
+          const c = o.getNestedValue(s._value, r.substring(i.length));
+          e = e.replaceAll(t[a], c);
         }
       return e;
     } catch {
@@ -34,10 +34,10 @@ class o {
       const a = t.match(/\$g{(.*?)}/g);
       if (a) {
         for (let r = 0; r < a.length; r++) {
-          const i = a[r].substring(3, a[r].length - 1), c = this.extractVariableName(i), s = n.find((u) => u.name === c);
-          if (!s)
+          const i = a[r].substring(3, a[r].length - 1), s = this.extractVariableName(i), c = n.find((u) => u.name === s);
+          if (!c)
             continue;
-          const l = this.getNestedValue(s._value, i.substring(c.length));
+          const l = this.getNestedValue(c._value, i.substring(s.length));
           t = t.replaceAll(a[r], l);
         }
         return JSON.parse(t);
@@ -58,11 +58,11 @@ class o {
       const t = e.match(/\$g{(.*?)}/g);
       if (t)
         for (let a = 0; a < t.length; a++) {
-          const r = t[a].substring(3, t[a].length - 1), i = this.extractVariableName(r), c = n.find((l) => l.name === i);
-          if (!c)
+          const r = t[a].substring(3, t[a].length - 1), i = this.extractVariableName(r), s = n.find((l) => l.name === i);
+          if (!s)
             continue;
-          const s = this.getNestedValue(c._value, r.substring(i.length));
-          e = e.replaceAll(t[a], s);
+          const c = this.getNestedValue(s._value, r.substring(i.length));
+          e = e.replaceAll(t[a], c);
         }
       return e;
     } catch {
@@ -107,7 +107,7 @@ class o {
    * @returns 环境变量
    */
   static getEnvironments() {
-    let e = localStorage.getItem("currentApiEnvironments");
+    let e = sessionStorage.getItem("currentApiEnvironments");
     return e && (e = JSON.parse(e)), e;
   }
   /**
@@ -115,14 +115,14 @@ class o {
    * @param environments 环境变量
    */
   static setEnvironments(e) {
-    localStorage.setItem("currentApiEnvironments", JSON.stringify(e));
+    sessionStorage.setItem("currentApiEnvironments", JSON.stringify(e));
   }
   /**
    * 获取变量数据
    * @returns 变量数据
    */
   static getVariableData() {
-    let e = localStorage.getItem("currentVariableData");
+    let e = sessionStorage.getItem("currentVariableData");
     return e && (e = JSON.parse(e)), e;
   }
   /**
@@ -130,7 +130,7 @@ class o {
    * @param variableData 变量数据
    */
   static setVariableData(e) {
-    localStorage.setItem("currentVariableData", JSON.stringify(e));
+    sessionStorage.setItem("currentVariableData", JSON.stringify(e));
   }
   /**
    * 检查 WebSocket 是否已存在且有效
@@ -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/actions/invokeAction.mjs

@@ -2,7 +2,7 @@ import { ComponentRefs as r } from "../../../utils/componentRefs.mjs";
 const f = (e, n) => {
   try {
     const { invokeAction: o } = e, t = r.getComponentRef(o.targetLayerId);
-    t && t.ref[o.functionName](o.functionArgs, n);
+    t && t.ref[o.functionName](n, o.functionArgs);
   } catch {
   }
 };

package/es/components/chart/commons/components/common-chart/hooks/useCommonChart.mjs

@@ -1,27 +1,16 @@
-import { watch as u, defineExpose as f } from "vue";
-import { cloneDeep as s, isEqual as h } from "lodash";
-const a = (e, o, t, c) => {
-  u(() => e.sources, () => {
-    e.sources && e.sources.length > 0 && o(e.option);
+import { watch as t } from "vue";
+import { cloneDeep as u, isEqual as m } from "lodash";
+const f = (e, r, c, n) => {
+  t(() => e.sources, () => {
+    e.sources && e.sources.length > 0 && r(e.option);
   }, {
     deep: !0
-  }), u(() => s(e.option), (r, n) => {
-    h(r, n) || t(r);
+  }), t(() => u(e.option), (o, i) => {
+    m(o, i) || c(o);
   }, {
     deep: !0
-  }), f({
-    getEchartsInstance: () => c.value,
-    refresh: () => {
-      e.sources && e.sources.length > 0 && o(e.option), t(e.option);
-    },
-    refreshView: () => {
-      t(e.option);
-    },
-    refreshData: () => {
-      o(e.option);
-    }
   });
 };
 export {
-  a as useCommonChart
+  f as useCommonChart
 };