@shjjs/visual-ui 3.0.21 → 3.0.22

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

@@ -1,71 +1,82 @@
-import { SHJDatasourceV2 as g } from "../index.mjs";
-import { httpRequest as o } from "../utils/request.mjs";
-import { DataSourceUtils as r } from "../utils/utils.mjs";
-const H = async (c, b, i) => {
-  const e = c?.id, l = c?.source?.api, s = (d) => {
-    i(r.noneData(d));
-  };
-  if (!l || !e)
-    return s(e || "");
-  const {
-    isHeaders: h,
-    isBody: P,
-    headers: U,
-    contentType: p,
-    url: v,
-    postParam: D,
-    type: E,
-    isUseEnv: y = !0
-  } = l;
-  try {
-    const T = r.getEnvironments().envBaseUrl ?? "", S = y ? T : "", V = r.replaceStringVariables(v), n = h ? r.replaceObjectVariables(U) : {}, u = P ? r.replaceObjectVariables(D) : {}, t = S + V;
-    if (!t)
-      return s(e);
-    let a;
-    switch (E) {
-      case "GET":
-        a = o.get(t, { headers: n });
-        break;
-      case "POST":
-        a = o.post(
-          t,
-          u,
-          { headers: n },
-          p
-        );
-        break;
-      case "PUT":
-        a = o.put(
-          t,
-          u,
-          { headers: n },
-          p
-        );
-        break;
-      case "DELETE":
-        a = o.delete(t, {
-          headers: n
-        });
-        break;
-      default:
-        return s(e);
-    }
-    const m = await a;
-    if (m.status === 200) {
-      const f = await g.processData(
-        c.source,
-        m.data,
-        e,
-        b
-      );
-      f ? i(f) : s(e);
-    } else
-      s(e);
-  } catch {
-    s(e);
-  }
-};
-export {
-  o as httpRequest,
-  H as parseAPIPort
-};
+import { SHJDatasourceV2 as w } from "../index.mjs";
+import { httpRequest as c } from "../utils/request.mjs";
+import { DataSourceUtils as i } from "../utils/utils.mjs";
+function T(s) {
+  const [p, l = ""] = s.split("?"), e = new URLSearchParams();
+  new URLSearchParams(l).forEach((t, d) => {
+    t.trim() && e.append(d, t);
+  });
+  const n = e.toString();
+  return n ? `${p}?${n}` : p;
+}
+const G = async (s, p, l) => {
+  const e = s?.id, n = s?.source?.api, t = (f) => {
+    l(i.noneData(f));
+  };
+  if (!n || !e)
+    return t(e || "");
+  const {
+    isHeaders: d,
+    isBody: U,
+    headers: b,
+    contentType: m,
+    url: E,
+    postParam: S,
+    type: y,
+    isUseEnv: D = !0,
+    isGetFilterURL: L = !0
+  } = n;
+  try {
+    const R = i.getEnvironments().envBaseUrl ?? "", g = D ? R : "", v = i.replaceStringVariables(E), o = d ? i.replaceObjectVariables(b) : {}, h = U ? i.replaceObjectVariables(S) : {}, a = g + v;
+    if (!a)
+      return t(e);
+    let r;
+    switch (y) {
+      case "GET":
+        L ? r = c.get(T(a), {
+          headers: o
+        }) : r = c.get(a, { headers: o });
+        break;
+      case "POST":
+        r = c.post(
+          a,
+          h,
+          { headers: o },
+          m
+        );
+        break;
+      case "PUT":
+        r = c.put(
+          a,
+          h,
+          { headers: o },
+          m
+        );
+        break;
+      case "DELETE":
+        r = c.delete(a, {
+          headers: o
+        });
+        break;
+      default:
+        return t(e);
+    }
+    const u = await r;
+    if (u.status === 200) {
+      const P = await w.processData(
+        s.source,
+        u.data,
+        e,
+        p
+      );
+      P ? l(P) : t(e);
+    } else
+      t(e);
+  } catch {
+    t(e);
+  }
+};
+export {
+  c as httpRequest,
+  G as parseAPIPort
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shjjs/visual-ui",
-  "version": "3.0.21",
+  "version": "3.0.22",
   "description": "国产自研零代码可视化源码工具",
   "keywords": [
     "three",