sun-form-v3 1.0.95 → 1.0.96

package/dist/{index-CRe7mlio.js → index-AhX140yR.js}

@@ -1,5 +1,5 @@
 import { computed as N, ref as y, resolveComponent as i, openBlock as C, createElementBlock as k, Fragment as O, createVNode as e, withCtx as l, createTextVNode as m, unref as d, isRef as j, createElementVNode as _, pushScopeId as I, popScopeId as J } from "vue";
-import { _ as E } from "./index-mUiSTJoV.js";
+import { _ as E } from "./index-CfzANjnG.js";
 const H = (p) => (I("data-v-4c8b2df2"), p = p(), J(), p), B = /* @__PURE__ */ H(() => /* @__PURE__ */ _("span", null, "数据配置", -1)), T = { class: "h-full flex flex-col" }, D = { class: "flex-1 overflow-hidden" }, F = {
   __name: "dataConfig",
   props: {

package/dist/{index-pvDKBz_X.js → index-B1400HnI.js}

@@ -1,5 +1,5 @@
 import { computed as j, ref as y, resolveComponent as i, openBlock as h, createElementBlock as k, Fragment as U, createVNode as e, withCtx as l, createTextVNode as V, unref as d, isRef as z, createElementVNode as m, pushScopeId as I, popScopeId as J } from "vue";
-import { _ as E, c as H } from "./index-mUiSTJoV.js";
+import { _ as E, c as H } from "./index-CfzANjnG.js";
 const B = (r) => (I("data-v-657a5bea"), r = r(), J(), r), T = /* @__PURE__ */ B(() => /* @__PURE__ */ m("span", null, "数据配置", -1)), D = { class: "h-full flex flex-col" }, F = { class: "flex-1 overflow-hidden" }, M = /* @__PURE__ */ Object.assign({ name: "commonStyleConfig" }, {
   __name: "dataConfig",
   props: {

package/dist/{index-yoPZClGY.js → index-Bhi1d8kQ.js}

@@ -1,5 +1,5 @@
 import { computed as j, ref as g, onMounted as $, resolveComponent as f, openBlock as _, createElementBlock as v, Fragment as x, createVNode as r, withCtx as o, createTextVNode as C, createElementVNode as u, renderList as B, unref as V, toDisplayString as N, nextTick as U, createBlock as D } from "vue";
-import { e as E, i as M } from "./index-mUiSTJoV.js";
+import { e as E, i as M } from "./index-CfzANjnG.js";
 const R = /* @__PURE__ */ u("span", null, "图表选择", -1), S = { class: "flex-wrap flex" }, T = ["onClick"], z = { class: "inner cursor-pointer hover:shadow-md hover:shadow-blue-200 border w-full h-full p-1 flex flex-col overflow-hidden items-center rounded-md shadow-sm" }, F = { class: "lab border-t w-full text-center mt-1 font-bold" }, L = /* @__PURE__ */ Object.assign({ name: "chatChoose" }, {
   __name: "chartChoose",
   props: {

package/dist/{index-CKOWn9ta.js → index-CMS6qaFZ.js}

@@ -1,5 +1,5 @@
 import { ref as g, resolveComponent as u, openBlock as b, createElementBlock as V, Fragment as w, createVNode as e, withCtx as n, unref as a } from "vue";
-import { c } from "./index-mUiSTJoV.js";
+import { c } from "./index-CfzANjnG.js";
 const k = /* @__PURE__ */ Object.assign({ name: "config-text" }, {
   __name: "index",
   props: {

package/dist/{index-mUiSTJoV.js → index-CfzANjnG.js}

@@ -86599,23 +86599,23 @@ class cwt {
     });
   }
 }
-function fwt(e, t, n) {
-  let r = n.$utils.clone(ll, !0);
-  for (let y in r)
-    r[y].type = y;
-  let i = [], o = [], a = n.getChosenInitData(r.homepage);
-  a.props.style.height = "100%";
-  let s = n.getChosenInitData(r.modal);
-  s.props.hasFooter = !1;
-  let l = n.getChosenInitData(r.form);
-  l.props.style.height = "100%";
-  let u = n.getChosenInitData(r.datatable);
-  e.forEach((y) => {
-    (y.dataSource || y.dict) && (y.controlType = "select");
-    let _ = n.getChosenInitData(r[y.controlType]), x = _.props;
-    if (x.required = !0, x.label = y.comment, x.zdname = y.fieldName, y.dataSource && y.dataSourceShowField && y.dataSourceRealField && (x.apiSet = {
+function fwt(e, t, n, r) {
+  let i = r.$utils.clone(ll, !0);
+  for (let C in i)
+    i[C].type = C;
+  let o = [], a = [], s = r.getChosenInitData(i.homepage);
+  s.props.style.height = "100%";
+  let l = r.getChosenInitData(i.modal);
+  l.props.hasFooter = !1;
+  let u = r.getChosenInitData(i.form);
+  u.props.style.height = "100%";
+  let c = r.getChosenInitData(i.datatable), f = "", d = "";
+  e.forEach((C) => {
+    (C.dataSource || C.dict) && (C.controlType = "select");
+    let A = r.getChosenInitData(i[C.controlType]), M = A.props;
+    if (M.required = !0, M.label = C.comment, M.zdname = C.fieldName, C.dataSource && C.dataSourceShowField && C.dataSourceRealField && (M.apiSet = {
       method: "post",
-      apiurl: "/common/" + y.dataSource.replace("tb_", "") + "/list",
+      apiurl: "/common/" + C.dataSource.replace("tb_", "") + "/list",
       params: [],
       headers: [],
       contentType: "JSON",
@@ -86623,38 +86623,63 @@ function fwt(e, t, n) {
       headersFormat: "",
       successFormat: `return res.data.map(e => {
     return {
-        label:e.${y.dataSourceShowField},
-        value:e.${y.dataSourceRealField}
+        label:e.${C.dataSourceShowField},
+        value:e.${C.dataSourceRealField}
     }
 })`,
       errorFormat: ""
-    }), !y.isPrimary && y.fieldName != "createdAt" && y.fieldName != "updatedAt" && (l.widgetList.push(_), y.isCreate || i.push(_.id), y.isUpdate || o.push(_.id)), y.isTable) {
-      let S = n.getTableCompInitData("datatableitem", r.datatableitem, 2);
-      S.props.label = y.comment, S.props.zdname = y.fieldName, u.widgetList.push(S);
+    }), !C.isPrimary && C.fieldName != "createdAt" && C.fieldName != "updatedAt" && (u.widgetList.push(A), C.isCreate || o.push(A.id), C.isUpdate || a.push(A.id)), C.isTable) {
+      let P = r.getTableCompInitData("datatableitem", i.datatableitem, 2);
+      P.props.label = C.comment, P.props.zdname = C.fieldName, c.widgetList.push(P);
     }
-    if (y.isQuery) {
-      let S = n.getTableCompInitData(y.controlType, r[y.controlType], 1);
-      S.props.label = y.comment, S.props.zdname = y.fieldName, u.widgetList.push(S);
+    if (C.isQuery) {
+      let P = r.getTableCompInitData(C.controlType, i[C.controlType], 1);
+      C.dataSource && C.dataSourceShowField && C.dataSourceRealField && (P.props.apiSet = {
+        method: "post",
+        apiurl: "/common/" + C.dataSource.replace("tb_", "") + "/list",
+        params: [],
+        headers: [],
+        contentType: "JSON",
+        paramsFormat: "",
+        headersFormat: "",
+        successFormat: `return res.data.map(e => {
+    return {
+        label:e.${C.dataSourceShowField},
+        value:e.${C.dataSourceRealField}
     }
-  }), u.props.style.height = "100%", u.props.rows = "rows", u.props.count = "total", u.props.apiSet = {
+})`,
+        errorFormat: ""
+      });
+      let I = {};
+      I[C.fieldName] = {}, I[C.fieldName][C.matchType] = "params." + C.fieldName;
+      let R = `${C.fieldName}:{${C.matchType}:params.${C.fieldName}},
+`;
+      d += R, P.props.label = C.comment, P.props.zdname = C.fieldName, c.widgetList.push(P);
+    }
+  }), f = `{${d}}`, c.props.style.height = "100%", c.props.rows = "rows", c.props.count = "total";
+  let p = "";
+  n.forEach((C) => {
+    p && (p += ","), C.showInTable && (p += `"${C.tableName}"`);
+  }), console.log(p), c.props.apiSet = {
     method: "post",
     apiurl: "/common/" + t.replace("tb_", "") + "/pageList",
     params: [],
     headers: [],
     contentType: "JSON",
-    paramsFormat: "",
+    paramsFormat: `return {filters:${f},
+include:[${p}]}`,
     headersFormat: "",
     successFormat: "return res.data",
     errorFormat: ""
   };
-  let c = n.getTableCompInitData("button", r.button, 0);
-  c.props.label = "新增", c.props.icon = "Plus";
-  let f = "";
-  i.forEach((y) => {
-    f += `app.setVisible("${y}", false)
+  let g = r.getTableCompInitData("button", i.button, 0);
+  g.props.label = "新增", g.props.icon = "Plus";
+  let y = "";
+  o.forEach((C) => {
+    y += `app.setVisible("${C}", false)
 `;
-  }), c.props.onItemClick = `app.setFormType("${l.id}","Create");
-app.getMethodById("${s.id}").open(() => { ${f}})`, l.props.apiSetCreate = {
+  }), g.props.onItemClick = `app.setFormType("${u.id}","Create");
+app.getMethodById("${l.id}").open(() => { ${y}})`, u.props.apiSetCreate = {
     method: "post",
     apiurl: "/common/" + t.replace("tb_", "") + "/create",
     params: [],
@@ -86663,15 +86688,15 @@ app.getMethodById("${s.id}").open(() => { ${f}})`, l.props.apiSetCreate = {
     paramsFormat: "",
     headersFormat: "",
     successFormat: `if (res.success) {
-            app.getMethodById("${s.id}").close(() => {
+            app.getMethodById("${l.id}").close(() => {
             app.$message.success('新增数据成功');
-            app.getMethodById("${u.id}").refresh()
+            app.getMethodById("${c.id}").refresh()
         })
     } else {
         app.$message.err(res.msg);
     }`,
     errorFormat: ""
-  }, l.props.apiSetDetail = {
+  }, u.props.apiSetDetail = {
     method: "post",
     apiurl: "/common/" + t.replace("tb_", "") + "/detail",
     params: [],
@@ -86686,7 +86711,7 @@ app.getMethodById("${s.id}").open(() => { ${f}})`, l.props.apiSetCreate = {
             app.$message.error(res.msg)
         }`,
     errorFormat: ""
-  }, l.props.apiSetUpdate = {
+  }, u.props.apiSetUpdate = {
     method: "post",
     apiurl: "/common/" + t.replace("tb_", "") + "/update",
     params: [],
@@ -86696,38 +86721,38 @@ app.getMethodById("${s.id}").open(() => { ${f}})`, l.props.apiSetCreate = {
         return params`,
     headersFormat: "",
     successFormat: `if (res.success) {
-            app.getMethodById("${s.id}").close(() => {
+            app.getMethodById("${l.id}").close(() => {
             app.$message.success('修改数据成功');
-            app.getMethodById("${u.id}").refresh()
+            app.getMethodById("${c.id}").refresh()
         })
     } else {
         app.$message.err(res.msg);
     }`,
     errorFormat: ""
   };
-  let d = n.getTableCompInitData("button", r.button, 0);
-  d.props.label = "删除", d.props.icon = "Close", d.props.isSide = !0, d.props.type = "danger", d.props.onItemClick = `app.$confirm("是否确定删除?", "提示")
+  let _ = r.getTableCompInitData("button", i.button, 0);
+  _.props.label = "删除", _.props.icon = "Close", _.props.isSide = !0, _.props.type = "danger", _.props.onItemClick = `app.$confirm("是否确定删除?", "提示")
     .then(async () => {
         let res = await app.$http.post("/common/${t.replace("tb_", "")}/delete", { id: value.id })
         if (res.success) {
             app.$message.success('删除成功')
-            app.getMethodById("${u.id}").refresh()
+            app.getMethodById("${c.id}").refresh()
         } else {
             app.$message.warning(res.msg)
         }
     })
     .catch(() => { });`;
-  let p = n.getTableCompInitData("button", r.button, 0);
-  p.props.label = "修改", p.props.icon = "EditPen", p.props.isSide = !0, p.props.type = "warning";
-  let g = "";
-  o.forEach((y) => {
-    g += `app.setVisible("${y}", false)
+  let x = r.getTableCompInitData("button", i.button, 0);
+  x.props.label = "修改", x.props.icon = "EditPen", x.props.isSide = !0, x.props.type = "warning";
+  let S = "";
+  a.forEach((C) => {
+    S += `app.setVisible("${C}", false)
 `;
-  }), p.props.onItemClick = `app.setParam("id", value.id)
-    app.setFormType("${l.id}", "Update")
-    app.getMethodById("${s.id}").open(() => { ${g}})`, u.widgetList.push(c), u.widgetList.push(d), u.widgetList.push(p), s.widgetList.push(l), a.widgetList.push(s), a.widgetList.push(u), n.updateWidget(
+  }), x.props.onItemClick = `app.setParam("id", value.id)
+    app.setFormType("${u.id}", "Update")
+    app.getMethodById("${l.id}").open(() => { ${S}})`, c.widgetList.push(g), c.widgetList.push(_), c.widgetList.push(x), l.widgetList.push(u), s.widgetList.push(l), s.widgetList.push(c), r.updateWidget(
     "homepage",
-    a,
+    s,
     !0
   );
 }
@@ -86962,7 +86987,7 @@ class che {
     });
   }
   initFormFromTableFields(t) {
-    t && fwt(t.config, t.tableName, this);
+    t && fwt(t.config, t.tableName, t.associations, this);
   }
   /**
    * 根据ID获取组件
@@ -90515,7 +90540,7 @@ const h8 = /* @__PURE__ */ Object.assign({ name: "sunForm" }, {
   },
   setup(e) {
     const n = Object.fromEntries(
-      Object.entries(/* @__PURE__ */ Object.assign({ "../widgetConfigComps/config-alert/index.vue": () => import("./index-ZVIqhtUw.js"), "../widgetConfigComps/config-button/index.vue": () => import("./index-CvnfmMTc.js"), "../widgetConfigComps/config-card/index.vue": () => import("./index-BJ0vPF5A.js"), "../widgetConfigComps/config-checkCode/index.vue": () => import("./index-kUQct_cM.js"), "../widgetConfigComps/config-checkbox/index.vue": () => import("./index-DM5DPltp.js"), "../widgetConfigComps/config-codeEditor/index.vue": () => import("./index-CzkuANsf.js"), "../widgetConfigComps/config-datatable/index.vue": () => import("./index-D62T4a6W.js"), "../widgetConfigComps/config-date/index.vue": () => import("./index-C0NmmaE2.js"), "../widgetConfigComps/config-div/index.vue": () => import("./index-BAEL_Fhr.js"), "../widgetConfigComps/config-echarts/index.vue": () => import("./index-yoPZClGY.js"), "../widgetConfigComps/config-editor/index.vue": () => import("./index-CXNYHPLK.js"), "../widgetConfigComps/config-file/index.vue": () => import("./index-BU3xx_sm.js"), "../widgetConfigComps/config-form/index.vue": () => import("./index-CIaeKFCl.js"), "../widgetConfigComps/config-homepage/index.vue": () => import("./index-CifChfEv.js"), "../widgetConfigComps/config-image/index.vue": () => import("./index-dGJDj4ro.js"), "../widgetConfigComps/config-input/index.vue": () => import("./index-BYSQOsYK.js"), "../widgetConfigComps/config-modal/index.vue": () => import("./index-DIwhu60e.js"), "../widgetConfigComps/config-progress/index.vue": () => import("./index-c0zw96Jm.js"), "../widgetConfigComps/config-radio/index.vue": () => import("./index-DVgKDMax.js"), "../widgetConfigComps/config-rate/index.vue": () => import("./index-XP0bVDnU.js"), "../widgetConfigComps/config-select/index.vue": () => import("./index-Bb57DL9x.js"), "../widgetConfigComps/config-selects/index.vue": () => import("./index-eJQFWCeP.js"), "../widgetConfigComps/config-statistic/index.vue": () => import("./index-pvDKBz_X.js"), "../widgetConfigComps/config-steps/index.vue": () => import("./index-CRe7mlio.js"), "../widgetConfigComps/config-switch/index.vue": () => import("./index-BVfC-7wG.js"), "../widgetConfigComps/config-tag/index.vue": () => import("./index-CKOWn9ta.js"), "../widgetConfigComps/config-text/index.vue": () => import("./index-BYbxnzUx.js"), "../widgetConfigComps/config-time/index.vue": () => import("./index-zkXVDNsL.js"), "../widgetConfigComps/config-timeline/index.vue": () => import("./index-COY4ZzZo.js") })).map(([p, g]) => {
+      Object.entries(/* @__PURE__ */ Object.assign({ "../widgetConfigComps/config-alert/index.vue": () => import("./index-ZVIqhtUw.js"), "../widgetConfigComps/config-button/index.vue": () => import("./index-CvnfmMTc.js"), "../widgetConfigComps/config-card/index.vue": () => import("./index-BJ0vPF5A.js"), "../widgetConfigComps/config-checkCode/index.vue": () => import("./index-kUQct_cM.js"), "../widgetConfigComps/config-checkbox/index.vue": () => import("./index-DM5DPltp.js"), "../widgetConfigComps/config-codeEditor/index.vue": () => import("./index-CzkuANsf.js"), "../widgetConfigComps/config-datatable/index.vue": () => import("./index-id7WUfjP.js"), "../widgetConfigComps/config-date/index.vue": () => import("./index-C0NmmaE2.js"), "../widgetConfigComps/config-div/index.vue": () => import("./index-BAEL_Fhr.js"), "../widgetConfigComps/config-echarts/index.vue": () => import("./index-Bhi1d8kQ.js"), "../widgetConfigComps/config-editor/index.vue": () => import("./index-CXNYHPLK.js"), "../widgetConfigComps/config-file/index.vue": () => import("./index-BU3xx_sm.js"), "../widgetConfigComps/config-form/index.vue": () => import("./index-CIaeKFCl.js"), "../widgetConfigComps/config-homepage/index.vue": () => import("./index-CifChfEv.js"), "../widgetConfigComps/config-image/index.vue": () => import("./index-dGJDj4ro.js"), "../widgetConfigComps/config-input/index.vue": () => import("./index-BYSQOsYK.js"), "../widgetConfigComps/config-modal/index.vue": () => import("./index-DIwhu60e.js"), "../widgetConfigComps/config-progress/index.vue": () => import("./index-c0zw96Jm.js"), "../widgetConfigComps/config-radio/index.vue": () => import("./index-DVgKDMax.js"), "../widgetConfigComps/config-rate/index.vue": () => import("./index-XP0bVDnU.js"), "../widgetConfigComps/config-select/index.vue": () => import("./index-Bb57DL9x.js"), "../widgetConfigComps/config-selects/index.vue": () => import("./index-eJQFWCeP.js"), "../widgetConfigComps/config-statistic/index.vue": () => import("./index-B1400HnI.js"), "../widgetConfigComps/config-steps/index.vue": () => import("./index-AhX140yR.js"), "../widgetConfigComps/config-switch/index.vue": () => import("./index-BVfC-7wG.js"), "../widgetConfigComps/config-tag/index.vue": () => import("./index-CMS6qaFZ.js"), "../widgetConfigComps/config-text/index.vue": () => import("./index-BYbxnzUx.js"), "../widgetConfigComps/config-time/index.vue": () => import("./index-zkXVDNsL.js"), "../widgetConfigComps/config-timeline/index.vue": () => import("./index-Cgt0uLeE.js") })).map(([p, g]) => {
         const y = p.match(/\/([^/]+)\/index\.vue$/);
         return [y ? y[1] : null, b0e(g)];
       })

package/dist/{index-COY4ZzZo.js → index-Cgt0uLeE.js}

@@ -1,5 +1,5 @@
 import { computed as N, ref as h, resolveComponent as u, openBlock as C, createElementBlock as U, Fragment as k, createVNode as e, withCtx as l, createTextVNode as g, unref as d, isRef as j, createElementVNode as c, pushScopeId as I, popScopeId as J } from "vue";
-import { _ as T } from "./index-mUiSTJoV.js";
+import { _ as T } from "./index-CfzANjnG.js";
 const E = (m) => (I("data-v-ede8dcab"), m = m(), J(), m), H = /* @__PURE__ */ E(() => /* @__PURE__ */ c("span", null, "数据配置", -1)), B = { class: "h-full flex flex-col" }, D = { class: "flex-1 overflow-hidden" }, F = {
   __name: "dataConfig",
   props: {

package/dist/{index-D62T4a6W.js → index-id7WUfjP.js}

@@ -1,5 +1,5 @@
 import { ref as x, resolveComponent as s, openBlock as k, createElementBlock as T, Fragment as E, createVNode as e, unref as l, withCtx as a, createTextVNode as _, isRef as L, createElementVNode as f, toDisplayString as h, createCommentVNode as D, pushScopeId as B, popScopeId as J } from "vue";
-import { _ as R } from "./index-mUiSTJoV.js";
+import { _ as R } from "./index-CfzANjnG.js";
 const I = (c) => (B("data-v-75dc2686"), c = c(), J(), c), W = /* @__PURE__ */ I(() => /* @__PURE__ */ f("span", null, "复杂表头配置", -1)), q = {
   key: 0,
   class: "flex h-full flex-col"

package/dist/sun-form-v3.es.js

@@ -1,4 +1,4 @@
-import { a as f } from "./index-mUiSTJoV.js";
+import { a as f } from "./index-CfzANjnG.js";
 export {
   f as default
 };