@kp-ui/lowcode 2.15.0-alpha.17 → 2.15.0-alpha.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kp-ui/lowcode",
-  "version": "2.15.0-alpha.17",
+  "version": "2.15.0-alpha.18",
   "publishConfig": {
     "access": "public"
   },

package/src/components/FormRender/index.vue.js

@@ -1,7 +1,7 @@
 import o from "./index.vue2.js";
 /* empty css           */
 import r from "../../../_virtual/_plugin-vue_export-helper.js";
-const p = /* @__PURE__ */ r(o, [["__scopeId", "data-v-74715541"]]);
+const a = /* @__PURE__ */ r(o, [["__scopeId", "data-v-eab1c859"]]);
 export {
-  p as default
+  a as default
 };

package/src/components/FormRender/index.vue2.js

@@ -1,19 +1,19 @@
-import { defineComponent as S, computed as h, ref as d, onMounted as w, watch as J, createElementBlock as p, openBlock as t, Fragment as E, createElementVNode as M, createBlock as P, createCommentVNode as g, createVNode as r, unref as e, mergeProps as T } from "vue";
+import { defineComponent as h, computed as w, ref as c, onMounted as J, watch as E, createElementBlock as p, openBlock as t, Fragment as I, createElementVNode as M, createBlock as P, createCommentVNode as g, createVNode as r, unref as e, mergeProps as T } from "vue";
 import { Skeleton as z } from "ant-design-vue";
-import I from "../form-render/dynamic-dialog.vue.js";
+import U from "../form-render/dynamic-dialog.vue.js";
 /* empty css                                 */
-import v from "./FormContainer.js";
-import { useFormContext as U } from "./useFormContext.js";
+import b from "./FormContainer.js";
+import { useFormContext as W } from "./useFormContext.js";
 import { useI18n as $ } from "../../utils/i18n.js";
 import { storeToRefs as j } from "pinia";
 import { useLocaleStore as q } from "@kp-ui/i18n";
-import { getLocat as b } from "@kp-ui/tool";
-import A from "./Debugger.vue.js";
-import { useComRef as G } from "tmgc2-share";
-const H = { class: "form-render-wrapper" }, K = {
+import { getLocat as A } from "@kp-ui/tool";
+import G from "./Debugger.vue.js";
+import { useComRef as H } from "tmgc2-share";
+const K = { class: "form-render-wrapper" }, O = {
   key: 0,
   class: "loading-wrapper"
-}, ae = /* @__PURE__ */ S({
+}, le = /* @__PURE__ */ h({
   name: "VFormRender",
   componentName: "VFormRender",
   __name: "index",
@@ -30,58 +30,54 @@ const H = { class: "form-render-wrapper" }, K = {
     debug: { type: Boolean }
   },
   emits: ["form-submit", "form-cancel"],
-  setup(_, { expose: C, emit: y }) {
-    const { initLocale: F } = $(), x = q(), { locale: n } = j(x);
-    console.log(b());
-    const k = h(() => b().debug === "1"), m = d(!1), a = _, i = d(), l = G(v), N = y, o = U({
+  setup(v, { expose: C, emit: _ }) {
+    const { initLocale: y } = $(), F = q(), { locale: n } = j(F), x = w(() => A().debug === "1"), m = c(!1), a = v, i = c(), l = H(b), k = _, o = W({
       props: a,
       renderForm: i
-    }), R = (c) => {
-      N("form-submit", c);
-    }, B = () => l.value;
-    w(() => {
-      o.registerToRefList("v_form_ref");
-    }), J(
+    }), N = (d) => {
+      k("form-submit", d);
+    }, R = () => l.value, { dynamicDialgRef: s, dialogProps: B, emitter: D, isLoading: f, registerToRefList: L, formWidgetId: V } = o;
+    return J(() => {
+      L(V);
+    }), E(
       n,
       () => {
-        F(n.value);
+        y(n.value);
       },
       {
         immediate: !0
       }
-    );
-    const { dynamicDialgRef: s, dialogProps: D, emitter: L, isLoading: f } = o;
-    return C({
-      ...L,
+    ), C({
+      ...D,
       ...o,
       dynamicDialgRef: s,
-      getNativeForm: B,
+      getNativeForm: R,
       formJson: a.formJson,
       renderForm: i
-    }), (c, u) => (t(), p(E, null, [
-      M("div", H, [
-        e(f) ? (t(), p("div", K, [
+    }), (d, u) => (t(), p(I, null, [
+      M("div", K, [
+        e(f) ? (t(), p("div", O, [
           r(e(z), { active: e(f) }, null, 8, ["active"])
         ])) : g("", !0),
-        r(e(v), {
+        r(e(b), {
           ref_key: "formContainer",
           ref: l,
           context: e(o),
-          onFormSubmit: R
+          onFormSubmit: N
         }, null, 8, ["context"]),
-        r(I, T(e(D), {
+        r(U, T(e(B), {
           ref_key: "dynamicDialgRef",
           ref: s
         }), null, 16)
       ]),
-      k.value ? (t(), P(A, {
+      x.value ? (t(), P(G, {
         key: 0,
         visible: m.value,
-        "onUpdate:visible": u[0] || (u[0] = (V) => m.value = V)
+        "onUpdate:visible": u[0] || (u[0] = (S) => m.value = S)
       }, null, 8, ["visible"])) : g("", !0)
     ], 64));
   }
 });
 export {
-  ae as default
+  le as default
 };

package/src/components/FormRender/useFormContext.js

@@ -1,108 +1,108 @@
-import { ref as i, provide as f, computed as m, watchEffect as le, onMounted as fe, nextTick as ce } from "vue";
-import { useFormValidation as W } from "./formValidation.js";
-import { useFormDataProcessor as me } from "./useFormDataProcessor.js";
-import { insertCustomCssToHead as ue, insertGlobalFunctionsToHtml as de, getContainerWidgetByName as H, cloneFormConfigWithoutEventHandler as ve, generateId as ge } from "../../utils/util.js";
-import { set as Fe, cloneDeep as pe } from "lodash-es";
-import { message as I } from "ant-design-vue";
-import { useI18n as Ce } from "../../utils/i18n.js";
-import { getUuidKey as he } from "@kp-ui/tool";
-import { useComRef as De, useRef as Re, useExecFunction as we } from "tmgc2-share";
-import xe from "../form-render/dynamic-dialog.vue.js";
+import { ref as i, provide as l, computed as m, watchEffect as fe, onMounted as ce, nextTick as me } from "vue";
+import { useFormValidation as V } from "./formValidation.js";
+import { useFormDataProcessor as ue } from "./useFormDataProcessor.js";
+import { insertCustomCssToHead as de, insertGlobalFunctionsToHtml as ve, getContainerWidgetByName as H, cloneFormConfigWithoutEventHandler as ge, generateId as Fe } from "../../utils/util.js";
+import { set as pe, cloneDeep as Ce } from "lodash-es";
+import { message as J } from "ant-design-vue";
+import { useI18n as he } from "../../utils/i18n.js";
+import { getUuidKey as De } from "@kp-ui/tool";
+import { useComRef as Re, useRef as we, useExecFunction as xe } from "tmgc2-share";
+import be from "../form-render/dynamic-dialog.vue.js";
 /* empty css                                 */
-import { useEmitter as be } from "../../utils/useEmitter.js";
-import { useAppRef as Le } from "../form-designer/useAppRef.js";
-const $e = ({ renderForm: p, props: a }) => {
-  const { formJson: C, formData: J } = a, v = De(xe), { i18nt: h } = Ce(), [D, T] = Re(!1), g = be(), c = i(), s = i({}), R = i(!1), F = i(/* @__PURE__ */ new Map()), w = i({}), j = i();
-  f("refList", F), f("getFormConfig", () => o.value), f("formData", s), f("getReadMode", () => D.value), f("designState", !1);
-  const x = i(), { executeFunction: U, context: b, execHttpFunction: L } = we(), { getFormRef: M, getWidgetRef: $, registerToRefList: B } = Le(F, !0), o = m(() => {
+import { useEmitter as Le } from "../../utils/useEmitter.js";
+import { useAppRef as Me } from "../form-designer/useAppRef.js";
+const Be = ({ renderForm: C, props: a }) => {
+  const { formJson: h, formData: T } = a, v = Re(be), { i18nt: D } = he(), [R, j] = we(!1), g = Le(), c = i(), s = i({}), w = i(!1), F = i(/* @__PURE__ */ new Map()), x = i({}), U = i(), p = Symbol("formWidget");
+  l("refList", F), l("getFormConfig", () => t.value), l("formData", s), l("getReadMode", () => R.value), l("designState", !1);
+  const b = i(), { executeFunction: $, context: L, execHttpFunction: M } = xe(), { getFormRef: y, getWidgetRef: B, registerToRefList: S } = Me(F, p), t = m(() => {
     var e;
     return ((e = c.value) == null ? void 0 : e.formConfig) || {};
   });
-  f("formConfig", o);
+  l("formConfig", t), l("formWidgetId", p);
   const u = m(() => {
     var e;
     return ((e = c.value) == null ? void 0 : e.widgetList) || [];
   }), _ = m(() => {
     var e;
-    return ((e = o.value) == null ? void 0 : e.labelPosition) || "horizontal";
+    return ((e = t.value) == null ? void 0 : e.labelPosition) || "horizontal";
   }), z = (e) => {
-    j.value = e;
+    U.value = e;
   }, A = m(() => {
     var e;
-    return (e = o.value) != null && e.labelWidth ? `${o.value.labelWidth}px` : "80px";
+    return (e = t.value) != null && e.labelWidth ? `${t.value.labelWidth}px` : "80px";
   }), G = m(() => {
     var e;
-    return ((e = o.value) == null ? void 0 : e.customClass) || "";
-  }), y = me();
-  let d = W(p, u.value || []);
-  le(() => {
-    d = W(p, u.value || []);
+    return ((e = t.value) == null ? void 0 : e.customClass) || "";
+  }), W = ue();
+  let d = V(C, u.value || []);
+  fe(() => {
+    d = V(C, u.value || []);
   });
-  const O = async (e) => {
-    var t;
-    c.value = e || { widgetList: [], formConfig: {} }, s.value = {}, K(((t = c.value) == null ? void 0 : t.widgetList) || []), await ce(), ne();
+  const I = async (e) => {
+    var o;
+    c.value = e || { widgetList: [], formConfig: {} }, s.value = {}, K(((o = c.value) == null ? void 0 : o.widgetList) || []), await me(), se();
   }, K = (e) => {
     if ((e == null ? void 0 : e.length) > 0) {
-      const t = y.buildFormModel(e, J);
-      Object.assign(s.value, t);
+      const o = W.buildFormModel(e, T);
+      Object.assign(s.value, o);
     }
-  }, P = () => s.value || {}, S = (e) => {
-    e && Object.keys(e).forEach((t) => {
-      s.value.hasOwnProperty(t) && (s.value[t] = e[t]);
+  }, O = () => s.value || {}, k = (e) => {
+    e && Object.keys(e).forEach((o) => {
+      s.value.hasOwnProperty(o) && (s.value[o] = e[o]);
     });
-  }, k = (e) => {
-    R.value = e;
-  }, q = () => {
-    d.resetValidation();
+  }, q = (e) => {
+    w.value = e;
   }, Q = () => {
+    d.resetValidation();
+  }, X = () => {
     d.clearValidate();
-  }, X = (e) => {
-    x.value = e;
-  }, Y = () => {
+  }, Y = (e) => {
+    b.value = e;
+  }, Z = () => {
     if (!a.parentForm)
-      return M();
+      return y();
     let e = a.parentForm;
     for (; e.parentForm; )
       e = e.parentForm;
     return e;
-  }, Z = (e, t = {}, n = {}) => {
-    var E, V;
-    const r = Y(), l = H((r == null ? void 0 : r.widgetList) || [], e) || H(u.value || [], e);
-    if (l === null) {
-      I.error(h("render.hint.refNotFound") + e);
+  }, N = (e, o = {}, n = {}) => {
+    var P, E;
+    const r = Z(), f = H((r == null ? void 0 : r.widgetList) || [], e) || H(u.value || [], e);
+    if (f === null) {
+      J.error(D("render.hint.refNotFound") + e);
       return;
     }
-    if (!e || l.type !== "vf-dialog") {
-      I.error(h("render.hint.refNotFound") + e);
+    if (!e || f.type !== "vf-dialog") {
+      J.error(D("render.hint.refNotFound") + e);
       return;
     }
-    const ae = {
-      widgetList: pe((l == null ? void 0 : l.widgetList) || []),
-      formConfig: ve(((E = r == null ? void 0 : r.formConfig) == null ? void 0 : E.value) || {})
-    }, ie = he();
-    w.value = {
-      options: l.options,
-      formJson: ae,
-      formData: { ...t },
+    const ie = {
+      widgetList: Ce((f == null ? void 0 : f.widgetList) || []),
+      formConfig: ge(((P = r == null ? void 0 : r.formConfig) == null ? void 0 : P.value) || {})
+    }, le = De();
+    x.value = {
+      options: f.options,
+      formJson: ie,
+      formData: { ...o },
       optionData: r.optionData,
       globalDsv: r.globalDsv,
-      parentFormRef: b.value,
+      parentFormRef: L.value,
       extraData: n,
-      wrapperId: ie,
-      vfCtx: { ...t }
-    }, (V = v.value) == null || V.show();
-  }, N = () => a.parentForm, ee = () => {
+      wrapperId: le,
+      vfCtx: { ...o }
+    }, (E = v.value) == null || E.show();
+  }, ee = () => a.parentForm, oe = () => {
     var e;
     return (e = v.value) == null ? void 0 : e.getFormRef();
   }, te = () => {
-    g.off$("fieldChange"), g.on$("fieldChange", ({ fieldName: e, value: t }) => {
-      Fe(s.value, e, t);
+    g.off$("fieldChange"), g.on$("fieldChange", ({ fieldName: e, value: o }) => {
+      pe(s.value, e, o);
     });
-  }, oe = async () => {
-    var t;
-    const e = o.value.serveList;
-    if ((t = e.vformDetail.http) != null && t.url) {
-      const n = await L(
+  }, re = async () => {
+    var o;
+    const e = t.value.serveList;
+    if ((o = e.vformDetail.http) != null && o.url) {
+      const n = await M(
         {
           ...e.vformDetail
         },
@@ -112,69 +112,70 @@ const $e = ({ renderForm: p, props: a }) => {
       );
       return console.log("res: ", n), n;
     }
-  }, re = async () => {
+  }, ne = async () => {
     var n;
-    const e = await P(), t = o.value.serveList;
-    if ((n = t.vformDetail.http) != null && n.url) {
-      const r = await L(t.vformUpdate, {
+    const e = await O(), o = t.value.serveList;
+    if ((n = o.vformDetail.http) != null && n.url) {
+      const r = await M(o.vformUpdate, {
         data: e,
         vfCtx: a.vfCtx
       });
       return console.log("res: ", r), r;
     }
-  }, ne = () => {
-    var e, t;
-    (e = o.value) != null && e.onFormMounted && U({
-      functionBody: (t = o.value) == null ? void 0 : t.onFormMounted
-    });
   }, se = () => {
-    const e = "vfRender" + ge(), { cssCode: t, functions: n } = o.value;
-    t && ue(t, e || ""), n && de(n, e || "");
+    var e, o;
+    (e = t.value) != null && e.onFormMounted && $({
+      functionBody: (o = t.value) == null ? void 0 : o.onFormMounted
+    });
+  }, ae = () => {
+    const e = "vfRender" + Fe(), { cssCode: o, functions: n } = t.value;
+    o && de(o, e || ""), n && ve(n, e || "");
   };
-  return fe(() => {
-    C && O(C), te(), se();
+  return ce(() => {
+    h && I(h), te(), ae();
   }), {
+    formWidgetId: p,
     vfCtx: a.vfCtx,
-    getParentFormRef: N,
-    getFormRef: M,
-    getWidgetRef: $,
-    registerToRefList: B,
-    dialogOrDrawerRef: x,
-    setDialogOrDrawerRef: X,
-    showDialog: Z,
-    setFormData: S,
-    setReadMode: T,
-    setFormJson: O,
-    setLoading: k,
-    onFormDetail: oe,
-    onFormUpdate: re,
+    getParentFormRef: ee,
+    getFormRef: y,
+    getWidgetRef: B,
+    registerToRefList: S,
+    dialogOrDrawerRef: b,
+    setDialogOrDrawerRef: Y,
+    showDialog: N,
+    setFormData: k,
+    setReadMode: j,
+    setFormJson: I,
+    setLoading: q,
+    onFormDetail: re,
+    onFormUpdate: ne,
     emitter: g,
-    context: b,
-    getFormData: P,
-    getChildFormRef: ee,
+    context: L,
+    getFormData: O,
+    getChildFormRef: oe,
     // 状态
     formJsonObj: c,
     formDataModel: s,
-    isLoading: R,
-    readModeFlag: D,
+    isLoading: w,
+    readModeFlag: R,
     // 引用
     widgetRefList: F,
     // 处理器
-    formDataProcessor: y,
+    formDataProcessor: W,
     formValidator: d,
     // 计算属性
-    formConfig: o,
+    formConfig: t,
     widgetList: u,
     labelPosition: _,
     labelWidth: A,
     customClass: G,
     dynamicDialgRef: v,
-    dialogProps: w,
+    dialogProps: x,
     setChildFormRef: z,
-    resetValidation: q,
-    clearValidate: Q
+    resetValidation: Q,
+    clearValidate: X
   };
 };
 export {
-  $e as useFormContext
+  Be as useFormContext
 };

package/src/components/form-designer/form-widget/container-widget/useTableWidget.js

@@ -1,14 +1,14 @@
 import { inject as E, ref as x, computed as l, h as K } from "vue";
-import { omit as H, cloneDeep as g, isArray as N } from "lodash-es";
+import { omit as H, cloneDeep as d, isArray as N } from "lodash-es";
 import q from "../../../public/ActionButtonListRender.vue.js";
 import { useI18n as L } from "../../../../utils/i18n.js";
 import { useExecFunction as j, tranformAntTableColumnToVxetableColumn as _, tranformAntSizzVxetableSize as G } from "tmgc2-share";
 import { useDataHttp as J } from "../../../../hooks/useDataHttp.js";
-function rt({ props: c, fieldModel: s }) {
-  const C = E("designState", !1), d = x(), h = x(!1), { widget: n } = c, { i18nt: y } = L(), { executeFunction: u, context: S } = j(), { loadataSource: v, setPagination: f, getPagination: p, pagintion: D } = J({
+function rt({ props: c, fieldModel: a }) {
+  const C = E("designState", !1), h = x(), f = x(!1), { widget: n } = c, { i18nt: v } = L(), { executeFunction: u, context: y } = j(), { loadataSource: S, setPagination: b, getPagination: p, pagintion: D } = J({
     props: c
   }), T = l(() => {
-    const t = [], e = (n == null ? void 0 : n.options) || {}, { rowSelection: o, showIndex: a, tableColumns: r = [] } = (n == null ? void 0 : n.options) ?? {};
+    const t = [], e = (n == null ? void 0 : n.options) || {}, { rowSelection: o, showIndex: s, tableColumns: r = [] } = (n == null ? void 0 : n.options) ?? {};
     o != null && o.hasRowSelection && t.push({
       title: o.columnTitle,
       width: o.columnWidth,
@@ -16,8 +16,8 @@ function rt({ props: c, fieldModel: s }) {
       fixed: "left",
       dataIndex: "checkbox",
       type: "checkbox"
-    }), a && t.push({
-      title: y("designer.setting.seq"),
+    }), s && t.push({
+      title: v("designer.setting.seq"),
       align: "left",
       width: 90,
       fixed: "left",
@@ -26,7 +26,7 @@ function rt({ props: c, fieldModel: s }) {
       resizable: !0,
       type: "seq"
     });
-    const m = r.filter((i) => i.show).map((i) => ({
+    const g = r.filter((i) => i.show).map((i) => ({
       ...i,
       ...R(i)
     })), w = [];
@@ -42,26 +42,26 @@ function rt({ props: c, fieldModel: s }) {
             buttonList: i,
             flex: "center",
             scope: A,
-            ctx: S.value
+            ctx: y.value
           })
         }
       });
     }
-    const V = [...t, ...m, ...w];
+    const V = [...t, ...g, ...w];
     return _(V);
   }), R = (t) => {
     const e = H(t, ["customRender"]), o = t.customRender;
     return t.minWidth = 50, t.maxWidth = 1200, t.isAutoWidth ? (t.width = null, delete t.width) : t.width = isNaN(Number(t.width)) ? t.width : Number(t.width), o ? {
       ...e,
       slots: {
-        default(a) {
+        default(s) {
           return u({
             source: c.field.options.name,
             functionBody: o,
             params: {
-              index: a.rowIndex,
-              record: a.row,
-              ...a
+              index: s.rowIndex,
+              record: s.row,
+              ...s
             },
             errorCallback: (r) => {
               console.error("Custom render error:", r);
@@ -71,22 +71,22 @@ function rt({ props: c, fieldModel: s }) {
       }
     } : t;
   }, k = l(() => n.options.tableWidth), z = l(() => n.options.tableSize), W = () => {
-    b();
+    m();
   }, B = l(() => n.options.rowKey), P = l(() => {
     const {
       tableSize: t,
       rowKey: e,
       tableHeight: o = 300,
-      border: a = !1,
+      border: s = !1,
       lineHeight: r = 50,
-      colorRow: m = !1
+      colorRow: g = !1
     } = n.options;
     return {
       showPagination: n.options.showPagination,
       size: G(t),
       height: o,
-      border: a ?? !1,
-      data: s.value || [],
+      border: s ?? !1,
+      data: a.value || [],
       columns: T.value,
       sortConfig: {
         trigger: "cell",
@@ -95,7 +95,7 @@ function rt({ props: c, fieldModel: s }) {
       },
       rowConfig: {
         keyField: e,
-        isCurrent: m,
+        isCurrent: g,
         isHover: !0
       },
       cellConfig: {
@@ -103,20 +103,20 @@ function rt({ props: c, fieldModel: s }) {
       }
     };
   }), F = (t) => {
-    d.value = t;
-  }, b = async () => {
+    h.value = t;
+  }, m = async () => {
     var t;
     if (c.field.options.dsEnabled) {
-      h.value = !0;
+      f.value = !0;
       try {
-        const e = await v(), o = e.list || [];
-        C ? await ((t = d.value) == null ? void 0 : t.loadData(o)) : s.value = g(o || []), f(e);
+        const e = await S(), o = e.list || [];
+        C ? await ((t = h.value) == null ? void 0 : t.loadData(o)) : a.value = d(o || []), b(e);
       } catch (e) {
         console.error(e);
       }
     } else
-      s.value = n.options.dataSource || [];
-    h.value = !1;
+      a.value = n.options.dataSource || [];
+    f.value = !1;
   }, I = ({ row: t, $event: e }, o) => {
     u({
       functionBody: n.options.customRow[o],
@@ -137,19 +137,20 @@ function rt({ props: c, fieldModel: s }) {
       setValue: (t) => {
         if (!N(t))
           return console.error("表格数据类型错误");
+        a.value = d(t);
       },
       insertTableValue: (t) => {
-        s.value || (s.value = []), s.value.push(g(t));
+        a.value || (a.value = []), a.value.push(d(t));
       },
-      setPagination: f,
-      getDataSource: () => s.value,
+      setPagination: b,
+      getDataSource: () => a.value,
       getPagination: p
     },
     onSortChange: W,
     pagintion: D,
-    setPagination: f,
+    setPagination: b,
     getPagination: p,
-    handleTableChange: (t, e, o, a) => {
+    handleTableChange: (t, e, o, s) => {
       const r = n.options.onTableChange;
       r && u({
         functionBody: r,
@@ -157,26 +158,26 @@ function rt({ props: c, fieldModel: s }) {
           pagination: t,
           filters: e,
           sorter: o,
-          currentDataSource: a
+          currentDataSource: s
         },
         keys: ["pagination", "filters", "sorter", "currentDataSource"]
       });
     },
     setTableData: (t) => {
-      s.value = g(t);
+      a.value = d(t);
     },
     loadDataTableDataSource: () => {
-      b();
+      m();
     },
     showPagination: l(() => !!c.field.options.showPagination),
     onRunEvent: I,
-    isLoading: h,
-    initTableSoureData: b,
+    isLoading: f,
+    initTableSoureData: m,
     setTableRef: F,
     tableSize: z,
     tableWidth: k,
     tableProps: P,
-    tableRef: d
+    tableRef: h
   };
 }
 export {