@shjjs/visual-ui 3.0.3 → 3.0.4

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

@@ -207,8 +207,8 @@ const c = class c {
     const o = this.timerPool.get(t.id);
     if (o && (clearInterval(o), this.timerPool.delete(t.id)), t.source.isAutoUpdate) {
       const n = setInterval(() => {
-        this.executeTask(t, a, r, (s) => {
-          i(s);
+        this.markDataSourceExecuting(t.id), this.executeTask(t, a, r, (s) => {
+          i(s), this.markDataSourceCompleted(t.id);
         });
       }, t.source.autoUpdateTime * 1e3);
       this.timerPool.set(t.id, n);

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

@@ -1,51 +1,72 @@
-import { SHJDatasourceV2 as l } from "../index.mjs";
-import { httpRequest as f } from "../utils/request.mjs";
-import { DataSourceUtils as t } from "../utils/utils.mjs";
-const v = (e, h, n) => {
-  const { api: i } = e.source;
+import { SHJDatasourceV2 as k } from "../index.mjs";
+import { httpRequest as o } from "../utils/request.mjs";
+import { DataSourceUtils as n } from "../utils/utils.mjs";
+const L = async (t, P, l) => {
+  var m;
+  const e = t == null ? void 0 : t.id, p = (m = t == null ? void 0 : t.source) == null ? void 0 : m.api, a = (c) => {
+    l(n.noneData(c));
+  };
+  if (!p || !e)
+    return a(e || "");
+  const {
+    isHeaders: U,
+    isBody: u,
+    headers: v,
+    contentType: d,
+    url: D,
+    postParam: E,
+    type: y,
+    isUseEnv: T = !0
+  } = p;
   try {
-    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) {
-            l.processData(
-              e.source,
-              m.data,
-              e.id,
-              h
-            ).then((D) => {
-              D && n(D);
-            }).catch(() => n(t.noneData(e.id)));
-            return;
-          }
-          n(t.noneData(e.id));
-        }).catch(() => {
-          n(t.noneData(e.id));
-        });
-      }, 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(
-          p + a,
+    const S = n.getEnvironments().envBaseUrl ?? "", V = T ? S : "", g = n.replaceStringVariables(D), i = U ? n.replaceObjectVariables(v) : {}, f = u ? n.replaceObjectVariables(E) : {}, s = V + g;
+    if (!s)
+      return a(e);
+    let r;
+    switch (y) {
+      case "GET":
+        r = o.get(s, { headers: i });
+        break;
+      case "POST":
+        r = o.post(
           s,
-          { headers: r },
+          f,
+          { headers: i },
           d
-        )
-      ), i.type === "PUT" && o(
-        f.put(
-          p + a,
+        );
+        break;
+      case "PUT":
+        r = o.put(
           s,
-          { headers: r },
+          f,
+          { headers: i },
           d
-        )
-      ), i.type === "DELETE" && o(f.delete(p + a, { headers: r }));
+        );
+        break;
+      case "DELETE":
+        r = o.delete(s, {
+          headers: i
+        });
+        break;
+      default:
+        return a(e);
+    }
+    const b = await r;
+    if (b.status === 200) {
+      const h = await k.processData(
+        t.source,
+        b.data,
+        e,
+        P
+      );
+      h ? l(h) : a(e);
     } else
-      n(t.noneData(e.id));
+      a(e);
   } catch {
-    n(t.noneData(e.id));
+    a(e);
   }
 };
 export {
-  f as httpRequest,
-  v as parseAPIPort
+  o as httpRequest,
+  L as parseAPIPort
 };

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

@@ -1,32 +1,33 @@
-import { isArray as u } from "lodash";
-const m = (r, a, e, s) => {
-  if (!u(r))
-    return r;
-  let l = null;
-  return l = r.map((n, c) => {
+import { isArray as c } from "lodash";
+const u = (l, n, r, a) => {
+  if (!c(l))
+    return l;
+  let s = null;
+  return s = l.map((e, p) => {
     const i = {};
-    return e && c === 0 && (a = f(n, a)), Object.keys(a).forEach((o) => {
-      const t = a[o];
-      t.alias ? i[t.alias] = n[t.mapping] : i[t.name] = n[t.mapping];
-    }), s && (i.userdata = n), i;
-  }), l;
-}, f = (r, a) => {
-  const e = [];
-  return Object.keys(r).forEach((s) => {
-    const l = a.find((n) => n.name === s);
-    l ? e.push({
-      alias: l.alias,
-      name: s,
-      label: s,
-      mapping: l.mapping
-    }) : e.push({
-      alias: s,
-      name: s,
-      label: s,
-      mapping: s
+    return r && p === 0 && (n = f(e, n)), Object.keys(n).forEach((o) => {
+      const t = n[o];
+      t.alias ? i[t.alias] = e[t.mapping] : i[t.name] = e[t.mapping];
+    }), a && (i.userdata = e), i;
+  }), s;
+}, f = (l, n) => {
+  const r = [];
+  return Object.keys(l).forEach((a) => {
+    const s = n.find((e) => e.name === a);
+    s ? r.push({
+      alias: s.alias,
+      name: a,
+      label: a,
+      mapping: s.mapping
+    }) : r.push({
+      alias: a,
+      name: a,
+      label: a,
+      mapping: a
     });
-  }), a.splice(0, a.length), a.push(...e), e;
+  }), r;
 };
 export {
-  m as mappingData
+  f as dynamicMappingData,
+  u as mappingData
 };

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

@@ -1,283 +1,137 @@
 var f = Object.defineProperty;
-var d = (l, e, a) => e in l ? f(l, e, { enumerable: !0, configurable: !0, writable: !0, value: a }) : l[e] = a;
-var c = (l, e, a) => d(l, typeof e != "symbol" ? e + "" : e, a);
-import { cloneDeep as h } from "lodash";
-import { SHJDatasourceV2 as b } from "../index.mjs";
-import { storageData as m } from "./storageData.mjs";
+var b = (l, a, e) => a in l ? f(l, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[a] = e;
+var d = (l, a, e) => b(l, typeof a != "symbol" ? a + "" : a, e);
+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 V } from "../../event/utils/utils.mjs";
-const r = class r {
-  static replaceURLVariables(e) {
-    try {
-      const a = e.match(/\${(.*?)}/g);
-      if (a)
-        for (let t = 0; t < a.length; t++) {
-          const i = a[t].substring(2, a[t].length - 1), s = r.extractVariableName(i), n = this.getVariables().find(
-            (u) => u.name === s
-          );
-          if (!n)
-            continue;
-          const o = r.getNestedValue(
-            n._value,
-            i.substring(s.length)
-          );
-          e = e.replaceAll(a[t], o);
+import { EventUtils as m } from "../../event/utils/utils.mjs";
+const i = class i {
+  static executeAllVariable(a) {
+    a.forEach((e) => {
+      e.sources.isVariable = !0;
+    }), i.setVariables(a), a.forEach((e) => {
+      u.parse({
+        sources: [e.sources],
+        noUseMapping: !0,
+        callback: (t) => {
+          i.setVariableById(e, t, !1);
         }
-      return e;
-    } catch {
-      return e;
-    }
+      });
+    });
   }
-  static replaceObjectVariables(e) {
-    const a = this.replaceStringVariables(JSON.stringify(e));
-    return JSON.parse(a);
+  static replaceObjectVariables(a) {
+    const e = this.replaceStringVariables(JSON.stringify(a));
+    return JSON.parse(e);
   }
-  static replaceStringVariables(e) {
-    try {
-      const a = e.match(/\$g{(.*?)}/g);
-      if (a)
-        for (let t = 0; t < a.length; t++) {
-          const i = a[t].substring(3, a[t].length - 1), s = this.extractVariableName(i), n = this.getVariables().find(
-            (u) => u.name === s
-          );
-          if (!n)
-            continue;
-          const o = this.getNestedValue(
-            n._value,
-            i.substring(s.length)
-          );
-          e = e.replaceAll(a[t], o);
+  static replaceStringVariables(a) {
+    return a.replace(/\$g\{([^}]+)\}/g, (e, t) => {
+      const { varName: r, propPath: n } = this.parseVariablePath(t), c = this.getVariables().find((o) => o.name === r);
+      if (!c)
+        return e;
+      let s = c._value;
+      try {
+        for (const o of n) {
+          if (s == null) {
+            s = void 0;
+            break;
+          }
+          s = s[o];
         }
-      return e;
-    } catch {
-      return e;
-    }
-  }
-  static getURLVariableNames(e) {
-    const a = [], t = e.match(/\${(.*?)}/g);
-    if (t)
-      for (let i = 0; i < t.length; i++) {
-        const s = t[i].substring(2, t[i].length - 1), n = r.extractVariableName(s);
-        a.push(n);
+      } catch {
+        return "undefined";
       }
-    return a;
+      return typeof s == "object" ? JSON.stringify(s) : s === void 0 ? "undefined" : String(s);
+    });
   }
-  static getObjectVariableNames(e) {
-    return this.getStringVariableNames(JSON.stringify(e));
+  static getObjectVariableNames(a) {
+    return this.getStringVariableNames(JSON.stringify(a));
   }
-  static getStringVariableNames(e) {
-    const a = [], t = e.match(/\$g{(.*?)}/g);
-    if (t)
-      for (let i = 0; i < t.length; i++) {
-        const s = t[i].substring(3, t[i].length - 1), n = this.extractVariableName(s);
-        a.push(n);
-      }
-    return a;
+  static getStringVariableNames(a) {
+    const e = /* @__PURE__ */ new Set(), t = /\$g\{([^}]+)\}/g;
+    for (const r of a.matchAll(t)) {
+      const n = r[1], { varName: c } = this.parseVariablePath(n);
+      c && e.add(c);
+    }
+    return Array.from(e);
+  }
+  static parseVariablePath(a) {
+    const t = a.replace(/\[/g, ".").replace(/\]/g, "").split("."), r = t[0], n = t.slice(1);
+    return { varName: r, propPath: n };
   }
-  /**
-   * 获取环境变量
-   * @returns 环境变量
-   */
   static getEnvironments() {
     return window._apiEnvironment;
   }
-  /**
-   * 设置环境变量
-   * @param environments 环境变量
-   */
-  static setEnvironments(e) {
-    const a = e.find((t) => t.selected);
-    a && (window._apiEnvironment = {
-      envName: a.envName,
-      envBaseUrl: a.envBaseUrl
+  static setEnvironments(a) {
+    const e = a.find((t) => t.selected);
+    e && (window._apiEnvironment = {
+      envName: e.envName,
+      envBaseUrl: e.envBaseUrl
     });
   }
-  /**
-   * 获取变量数据
-   * @returns 变量数据
-   */
   static getVariables() {
     return window._variables || [];
   }
-  /**
-   * 设置变量数据
-   * @param variable 变量数据
-   */
-  static setVariables(e) {
-    window._variables = h(e), window._variables.forEach((a) => {
-      a._callbacks ?? (a._callbacks = /* @__PURE__ */ new Map());
+  static setVariables(a) {
+    window._variables = g(a), window._variables.forEach((e) => {
+      e._callbacks ?? (e._callbacks = /* @__PURE__ */ new Map());
     });
   }
-  /**
-   *
-   * @param id
-   * @returns
-   */
-  static getVariableById(e) {
-    return window._variables.find((a) => a.id === e);
-  }
-  /**
-   *
-   * @param name
-   * @returns
-   */
-  static getVariableByName(e) {
-    return window._variables.find((a) => a.name === e);
-  }
-  /**
-   *
-   * @param name
-   * @returns
-   */
-  static getVariableValueByName(e) {
-    const a = window._variables.find((t) => t.name === e);
-    return a ? a._value : null;
-  }
-  /**
-   *
-   * @param name
-   * @returns
-   */
-  static getVariableInitialStateByName(e) {
-    const a = window._variables.find((t) => t.name === e);
-    return a ? a._initialState : null;
-  }
-  /**
-   * 设置变量数据
-   * @param id 变量 ID
-   * @param variable 变量数据
-   */
-  static setVariableById(e, a, t = !0) {
-    const i = this.getVariableById(e.id);
-    if (i) {
-      i._value = a, i._initialState ?? (i._initialState = !0);
+  static setVariableById(a, e, t = !0) {
+    const r = this.getVariableById(a.id);
+    if (r) {
+      r._value = e, r._initialState ?? (r._initialState = !0);
       try {
-        m(e.sources.source.storage, a);
+        V(a.sources.source.storage, e);
       } catch {
       }
-      i._callbacks ?? (i._callbacks = /* @__PURE__ */ new Map()), i._callbacks.forEach(
-        (s) => s(e._value)
-      ), t && V.updateWidgetVariableData(i);
+      r._callbacks ?? (r._callbacks = /* @__PURE__ */ new Map()), r._callbacks.forEach(
+        (n) => n(a._value)
+      ), t && m.updateWidgetVariableData(r);
     }
   }
-  /**
-   * 检查 WebSocket 是否已存在且有效
-   * @param wsInstances WebSocket 实例
-   * @param tId WebSocket 实例的 ID
-   * @param sourceId WebSocket 实例的源 ID
-   * @returns 是否有效
-   */
-  static hasValidWebSocket(e, a, t) {
-    const i = e.get(a);
-    if (!i) return !1;
-    for (const s of i)
-      if (s.getId() === t && s.isConnected())
-        return !0;
-    return !1;
-  }
-  /**
-   * 只在必要时清理 WebSocket 连接
-   * @param wsInstances WebSocket 实例
-   * @param sourceIds 源 ID
-   * @param tId WebSocket 实例的 ID
-   */
-  static cleanupPreviousWebSockets(e, a, t) {
-    const i = e.get(t);
-    i && (i.forEach((s) => {
-      a.includes(s.getId()) || (s.disconnect(), i.delete(s));
-    }), i.size === 0 && e.delete(t));
-  }
-  /**
-   * 使用 Function 构造函数获取对象中的嵌套值（更简洁但安全性较低）
-   * @param obj 源对象
-   * @param path 路径字符串，例如 ".a[0].value"
-   * @returns 获取到的值，如果路径不存在则返回 undefined
-   */
-  static getNestedValue(e, a) {
-    try {
-      return a ? new Function("obj", `return obj${a}`)(e) : e;
-    } catch {
-      return;
-    }
+  static getVariableById(a) {
+    return window._variables.find((e) => e.id === a);
   }
-  /**
-   * 从路径字符串中提取变量名
-   * @param path 路径字符串，例如 "测试.test" 或 "333[0].aa"
-   * @returns 提取出的变量名
-   */
-  static extractVariableName(e) {
-    const a = e.match(
-      /^([\u4e00-\u9fa5a-zA-Z0-9_][\u4e00-\u9fa5a-zA-Z0-9_]*)/
-    );
-    return a ? a[1] : "";
+  static getVariableByName(a) {
+    return window._variables.find((e) => e.name === a);
   }
-  /**
-   * 初始化所有变量
-   * @param variableData
-   * @returns
-   */
-  static executeAllVariable(e) {
-    e.forEach((a) => {
-      a.sources.isVariable = !0;
-    }), r.setVariables(e), e.forEach((a) => {
-      b.parse({
-        sources: [a.sources],
-        noUseMapping: !0,
-        callback: (t) => {
-          r.setVariableById(a, t, !1);
-        }
-      });
-    });
+  static getVariableValueByName(a) {
+    const e = window._variables.find((t) => t.name === a);
+    return e ? e._value : null;
   }
-  /**
-   * 返回空数据
-   * @param id 数据源 ID
-   * @returns 空数据
-   */
-  static noneData(e) {
+  static noneData(a) {
     return {
-      id: e,
-      finalKeyData: { id: e, data: null },
-      finalUserData: { id: e, data: null },
+      id: a,
+      finalKeyData: { id: a, data: null },
+      finalUserData: { id: a, data: null },
       filteredData: null,
       rawData: null,
       noMappingData: null
     };
   }
 };
-/**
- * 新增变量
- * @param data
- */
-c(r, "addVariable", (e) => {
-  b.parse({
-    sources: [e.sources],
+d(i, "addVariable", (a) => {
+  u.parse({
+    sources: [a.sources],
     noUseMapping: !0,
-    callback: (a) => {
-      r.getVariables().push(e), r.setVariableById(e, a, !1);
+    callback: (e) => {
+      i.getVariables().push(a), i.setVariableById(a, e, !1);
     }
   });
-}), /**
- * 更新变量
- * @param data
- */
-c(r, "updateVariable", (e) => {
-  b.parse({
-    sources: [e.sources],
+}), d(i, "updateVariable", (a) => {
+  u.parse({
+    sources: [a.sources],
     noUseMapping: !0,
-    callback: (a) => {
-      r.setVariableById(e, a, !1);
+    callback: (e) => {
+      i.setVariableById(a, e, !1);
     }
   });
-}), /**
- * 更新变量
- * @param data
- */
-c(r, "deleteVariableById", (e) => {
-  const a = window._variables.findIndex((t) => t.id === e);
-  a > -1 && window._variables.splice(a, 1);
+}), d(i, "deleteVariableById", (a) => {
+  const e = window._variables.findIndex((t) => t.id === a);
+  e > -1 && window._variables.splice(e, 1);
 });
-let g = r;
+let p = i;
 export {
-  g as DataSourceUtils
+  p as DataSourceUtils
 };

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;
+}[];