@shjjs/visual-ui 3.0.5 → 3.0.8

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

@@ -1,21 +1,21 @@
-var y = Object.defineProperty;
-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 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";
+var w = Object.defineProperty;
+var x = (p, t, e) => t in p ? w(p, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[t] = e;
+var f = (p, t, e) => x(p, typeof t != "symbol" ? t + "" : t, e);
+import { cloneDeep as k, isString as C } from "lodash";
+import { parseStaticData as M } from "./sources/static.mjs";
+import { parseUrlData as v } from "./sources/url.mjs";
+import { parseVariableData as A } from "./sources/variable.mjs";
+import { parseAPIPort as E } from "./sources/api.mjs";
+import { DataSourceUtils as U } from "./utils/utils.mjs";
+import { parseStorage as B } from "./sources/storage.mjs";
+import { parseMqttData as T } from "./sources/mqtt.mjs";
+import { parseWebSocketData as W } from "./sources/websocket.mjs";
+import { MqttConnectionPoolManager as d } from "./utils/mqttConnectionPool.mjs";
 import { WebSocketConnectionPoolManager as S } from "./utils/websocketConnectionPool.mjs";
-import { mappingData as W } from "./utils/mappingData.mjs";
-import { groupData as q } from "./utils/groupData.mjs";
-import { storageData as g } from "./utils/storageData.mjs";
-const c = class c {
+import { mappingData as q } from "./utils/mappingData.mjs";
+import { groupData as K } from "./utils/groupData.mjs";
+import { storageData as m } from "./utils/storageData.mjs";
+const l = class l {
   /**
    * 添加数据源解析器
    * @param type - 数据源类型
@@ -44,21 +44,21 @@ const c = class c {
    */
   static parse({
     sources: t,
-    callback: e = (o) => o || [],
+    callback: e = (i) => i || [],
     noUseMapping: a = !1,
     isInterval: r = !0,
-    isEditor: i = !1
+    isEditor: o = !1
   }) {
     try {
       if (t.length <= 0)
         throw new Error("未找到数据源");
-      t.forEach((o) => {
+      t.forEach((i) => {
         this.handleDataSourceExecution(
-          o,
+          i,
           e,
           a,
           r,
-          i
+          o
         );
       });
     } catch {
@@ -68,27 +68,27 @@ const c = class c {
   /**
    * 处理数据源执行逻辑，根据pid确定执行顺序
    */
-  static handleDataSourceExecution(t, e, a, r, i) {
-    if (i) {
+  static handleDataSourceExecution(t, e, a, r, o) {
+    if (o) {
       this.executeDataSource(
         t,
         e,
         a,
         r,
-        i
+        o
       );
       return;
     }
-    const { id: o, pid: n } = t;
-    if (this.initializeDataSourceState(o), this.checkAndExecuteWaitingChildren(o), n && n.toString() !== "-1") {
+    const { id: i, pid: n } = t;
+    if (this.initializeDataSourceState(i), this.checkAndExecuteWaitingChildren(i), n && n.toString() !== "-1") {
       const s = this.dataSourceStatePool.get(n);
       if (!s) {
-        this.waitingPool.set(o, {
+        this.waitingPool.set(i, {
           item: t,
           callback: e,
           noUseMapping: a,
           isInterval: r,
-          isEditor: i
+          isEditor: o
         });
         return;
       }
@@ -97,20 +97,20 @@ const c = class c {
         e,
         a,
         r,
-        i
-      ) : (this.waitingPool.set(o, {
+        o
+      ) : (this.waitingPool.set(i, {
         item: t,
         callback: e,
         noUseMapping: a,
         isInterval: r,
-        isEditor: i
+        isEditor: o
       }), s.callbacks.push(() => {
-        this.waitingPool.delete(o), this.executeDataSource(
+        this.waitingPool.delete(i), this.executeDataSource(
           t,
           e,
           a,
           r,
-          i
+          o
         );
       }));
     } else
@@ -119,7 +119,7 @@ const c = class c {
         e,
         a,
         r,
-        i
+        o
       );
   }
   /**
@@ -188,27 +188,27 @@ const c = class c {
   /**
    * 执行数据源
    */
-  static executeDataSource(t, e, a, r, i) {
-    if (i) {
-      this.executeTask(t, a, i, (o) => {
-        e(o);
+  static executeDataSource(t, e, a, r, o) {
+    if (o) {
+      this.executeTask(t, a, o, (i) => {
+        e(i);
       });
       return;
     }
-    this.markDataSourceExecuting(t.id), this.setupInterval(t, r, a, i, e), this.executeTask(t, a, i, (o) => {
-      e(o), this.markDataSourceCompleted(t.id);
+    this.markDataSourceExecuting(t.id), this.setupInterval(t, r, a, o, e), this.executeTask(t, a, o, (i) => {
+      e(i), this.markDataSourceCompleted(t.id);
     });
   }
   /**
    * 设置定时任务
    */
-  static setupInterval(t, e, a, r, i) {
+  static setupInterval(t, e, a, r, o) {
     if (!e) return;
-    const o = this.timerPool.get(t.id);
-    if (o && (clearInterval(o), this.timerPool.delete(t.id)), t.source.isAutoUpdate) {
+    const i = this.timerPool.get(t.id);
+    if (i && (clearInterval(i), this.timerPool.delete(t.id)), t.source.isAutoUpdate) {
       const n = setInterval(() => {
         this.markDataSourceExecuting(t.id), this.executeTask(t, a, r, (s) => {
-          i(s), this.markDataSourceCompleted(t.id);
+          o(s), this.markDataSourceCompleted(t.id);
         });
       }, t.source.autoUpdateTime * 1e3);
       this.timerPool.set(t.id, n);
@@ -218,14 +218,13 @@ const c = class c {
    * 执行任务
    */
   static executeTask(t, e, a, r) {
-    const i = t, { source: o } = i, n = this.getParser(o.type);
-    n && n(i, e, (s) => {
-      var f;
+    const o = t, { source: i } = o, n = this.getParser(i.type);
+    n && n(o, e, (s) => {
       if (a) {
         r(s);
         return;
       }
-      !e && ((f = i.source.mapping) != null && f.length) ? (g(i.source.storage, s.finalKeyData), r(s.finalKeyData)) : (g(i.source.storage, s.noMappingData), r(s.noMappingData));
+      e ? (m(o.source.storage, s.noMappingData), r(s.noMappingData)) : (m(o.source.storage, s.finalKeyData), r(s.finalKeyData));
     });
   }
   /**
@@ -237,30 +236,31 @@ const c = class c {
    * @returns
    */
   static processData(t, e, a, r) {
-    const { filter: i, mapping: o, dynamicMapping: n, isUserdata: s } = x(t);
-    return new Promise(function(f) {
-      const P = e;
-      c.filterData(i, e).then(
-        (l) => {
-          const p = {
+    const { filter: o, mapping: i, dynamicMapping: n, isUserdata: s } = k(t);
+    return new Promise(function(P) {
+      const D = e;
+      l.filterData(o, e).then(
+        (u) => {
+          const h = {
             id: a,
             finalKeyData: { id: a, data: null },
             finalUserData: { id: a, data: null },
-            filteredData: { id: a, data: l },
-            rawData: { id: a, data: P },
+            filteredData: { id: a, data: u },
+            rawData: { id: a, data: D },
             noMappingData: null
           };
-          if (!r && o.length) {
-            const d = W(
-              l,
-              o,
+          if (r)
+            h.finalUserData.data = u, h.noMappingData = u;
+          else {
+            const { mappedData: c, finalMapping: y } = q(
+              u,
+              i,
               n,
               s
             );
-            p.finalKeyData.data = d.length ? q(d, o) : l, p.finalUserData.data = d.length ? d : l;
-          } else
-            p.finalUserData.data = l, p.noMappingData = l;
-          f(p);
+            h.finalKeyData.data = c != null && c.length ? K(c, y) : u, h.finalUserData.data = c != null && c.length ? c : u;
+          }
+          P(h);
         }
       );
     });
@@ -272,19 +272,19 @@ const c = class c {
    * @returns
    */
   static async filterData(t, e) {
-    if (!k(t))
+    if (!C(t))
       return e;
     try {
       let a = t.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, "");
-      a = E.replaceStringVariables(a);
+      a = U.replaceStringVariables(a);
       const r = `
         ${a}
         if (typeof filter !== 'function') {
           throw new Error('filter function is not defined in the provided code');
         }
         return filter(data);
-      `, o = new Function("data", r)(e);
-      return o instanceof Promise ? await o : o;
+      `, i = new Function("data", r)(e);
+      return i instanceof Promise ? await i : i;
     } catch {
       return e;
     }
@@ -295,10 +295,10 @@ const c = class c {
   static destroy() {
     this.timerPool.forEach((t) => {
       clearInterval(t);
-    }), this.timerPool.clear(), this.dataSourceStatePool.clear(), this.dataSourceStatePool = /* @__PURE__ */ new Map(), this.waitingPool.clear(), this.waitingPool = /* @__PURE__ */ new Map(), m.closeAllConnections(), S.closeAllConnections();
+    }), this.timerPool.clear(), this.dataSourceStatePool.clear(), this.dataSourceStatePool = /* @__PURE__ */ new Map(), this.waitingPool.clear(), this.waitingPool = /* @__PURE__ */ new Map(), d.closeAllConnections(), S.closeAllConnections();
   }
   static clearMqttConnectionById(t) {
-    m.removeConnectionByUUID(t);
+    d.removeConnectionByUUID(t);
   }
   static clearWebSocketConnectionById(t) {
     S.removeConnectionByUUID(t);
@@ -307,26 +307,26 @@ const c = class c {
 /**
  * 定时器池
  */
-h(c, "timerPool", /* @__PURE__ */ new Map()), /**
+f(l, "timerPool", /* @__PURE__ */ new Map()), /**
  * 数据源状态池 - 跟踪所有数据源的执行状态
  */
-h(c, "dataSourceStatePool", /* @__PURE__ */ new Map()), /**
+f(l, "dataSourceStatePool", /* @__PURE__ */ new Map()), /**
  * 等待执行的数据源池 - 存储因依赖关系而等待的数据源
  */
-h(c, "waitingPool", /* @__PURE__ */ new Map()), /**
+f(l, "waitingPool", /* @__PURE__ */ new Map()), /**
  * 数据源解析器
  */
-h(c, "parsers", /* @__PURE__ */ new Set([
-  { type: "url", parser: M },
-  { type: "static", parser: C },
-  { type: "variable", parser: v },
-  { type: "api", parser: A },
-  { type: "storage", parser: U },
-  { type: "mqtt", parser: B },
-  { type: "ws", parser: T }
+f(l, "parsers", /* @__PURE__ */ new Set([
+  { type: "url", parser: v },
+  { type: "static", parser: M },
+  { type: "variable", parser: A },
+  { type: "api", parser: E },
+  { type: "storage", parser: B },
+  { type: "mqtt", parser: T },
+  { type: "ws", parser: W }
 ]));
-let D = c;
+let g = l;
 export {
-  E as DataSourceUtils,
-  D as SHJDatasourceV2
+  U as DataSourceUtils,
+  g as SHJDatasourceV2
 };

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

@@ -1,23 +1,23 @@
 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));
+const L = async (t, P, c) => {
+  var d;
+  const e = t == null ? void 0 : t.id, l = (d = t == null ? void 0 : t.source) == null ? void 0 : d.api, a = (m) => {
+    c(n.noneData(m));
   };
-  if (!p || !e)
+  if (!l || !e)
     return a(e || "");
   const {
     isHeaders: U,
     isBody: u,
     headers: v,
-    contentType: d,
+    contentType: p,
     url: D,
     postParam: E,
     type: y,
     isUseEnv: T = !0
-  } = p;
+  } = l;
   try {
     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)
@@ -32,7 +32,7 @@ const L = async (t, P, l) => {
           s,
           f,
           { headers: i },
-          d
+          p
         );
         break;
       case "PUT":
@@ -40,7 +40,7 @@ const L = async (t, P, l) => {
           s,
           f,
           { headers: i },
-          d
+          p
         );
         break;
       case "DELETE":
@@ -59,7 +59,7 @@ const L = async (t, P, l) => {
         e,
         P
       );
-      h ? l(h) : a(e);
+      h ? c(h) : a(e);
     } else
       a(e);
   } catch {

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

@@ -1,31 +1,34 @@
 import { isArray as c } from "lodash";
-const m = (n, s, e, a) => {
-  if (!c(n))
-    return n;
+const m = (s, n, r, a) => {
+  if (!c(s))
+    return s;
   let l = null;
-  return l = n.map((r, p) => {
+  return l = s.map((e, p) => {
     const i = {};
-    return e && p === 0 && (s = f(r, s)), Object.keys(s).forEach((o) => {
-      const t = s[o];
-      t.alias ? i[t.alias] = r[t.mapping] : i[t.name] = r[t.mapping];
-    }), a && (i.userdata = r), i;
-  }), l;
-}, f = (n, s) => {
-  const e = [];
-  return n ?? (n = []), Object.keys(n).forEach((a) => {
-    const l = s.find((r) => r.name === a);
-    l ? e.push({
+    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;
+  }), {
+    mappedData: l,
+    finalMapping: n
+  };
+}, f = (s, n) => {
+  const r = [];
+  return s ?? (s = []), Object.keys(s).forEach((a) => {
+    const l = n.find((e) => e.name === a);
+    l ? r.push({
       alias: l.alias,
       name: a,
       label: a,
       mapping: l.mapping
-    }) : e.push({
+    }) : r.push({
       alias: a,
       name: a,
       label: a,
       mapping: a
     });
-  }), e;
+  }), r;
 };
 export {
   f as dynamicMappingData,

package/es/components/Commons/components/CustomComponentRender/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 _ = /* @__PURE__ */ t(o, [["__scopeId", "data-v-79619911"]]);
+const r = /* @__PURE__ */ t(o, [["__scopeId", "data-v-dde8cdcf"]]);
 export {
-  _ as default
+  r as default
 };

package/es/components/Commons/components/CustomComponentRender/index.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as d, onMounted as J, computed as a, shallowRef as b, ref as u, watch as j, createElementBlock as E, openBlock as c, createElementVNode as H, createBlock as V, createCommentVNode as O, unref as P } from "vue";
-import { useVueImportMap as x, Sandbox as N, useStore as k } from "@vue/repl";
+import { defineComponent as d, onMounted as J, computed as a, shallowRef as b, ref as u, watch as j, createElementBlock as E, openBlock as c, createElementVNode as H, createBlock as V, createCommentVNode as k, unref as O } from "vue";
+import { useVueImportMap as P, Sandbox as x, useStore as N } from "@vue/repl";
 import { useWatch as D } from "./hooks/useWatch.mjs";
 /* empty css                                     */
 /* empty css                                     */
@@ -171,7 +171,7 @@ const B = { class: "custom-component-render" }, R = { class: "preview-content" }
     J(() => {
       window.SHJDatasourceV2 = M, window.SHJParseEvent = T;
     });
-    const e = a(() => _(i.option)), { productionMode: p, vueVersion: v, importMap: h } = x(), w = a(() => ({
+    const e = a(() => _(i.option)), { productionMode: p, vueVersion: v, importMap: h } = P(), w = a(() => ({
       script: {
         inlineTemplate: p.value,
         isProd: p.value,
@@ -188,7 +188,7 @@ const B = { class: "custom-component-render" }, R = { class: "preview-content" }
       if (!(l.value === s && o.value)) {
         l.value = s, t.value = !0;
         try {
-          const r = k(
+          const r = N(
             { builtinImportMap: h, vueVersion: v, sfcOptions: w },
             s
           );
@@ -265,6 +265,7 @@ const B = { class: "custom-component-render" }, R = { class: "preview-content" }
       #app {
         height: 100%;
         overflow: hidden;
+        background-color: transparent !important;
       }
     </style>
     ${g}
@@ -273,12 +274,13 @@ const B = { class: "custom-component-render" }, R = { class: "preview-content" }
     }));
     return (s, r) => (c(), E("div", B, [
       H("div", R, [
-        !t.value && o.value ? (c(), V(P(N), {
+        !t.value && o.value ? (c(), V(O(x), {
           key: 0,
           store: o.value,
+          theme: "dark",
           "clear-console": !1,
           "preview-options": C.value
-        }, null, 8, ["store", "preview-options"])) : O("", !0)
+        }, null, 8, ["store", "preview-options"])) : k("", !0)
       ])
     ]));
   }