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

package/package.json

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

package/src/components/FormRender/useFormContext.js

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

package/src/components/form-designer/form-widget/field-widget/button-list-widget.vue.js

@@ -1,7 +1,7 @@
 import t from "./button-list-widget.vue2.js";
 /* empty css                        */
 import o from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const i = /* @__PURE__ */ o(t, [["__scopeId", "data-v-15ea0ae1"]]);
+const m = /* @__PURE__ */ o(t, [["__scopeId", "data-v-cf651b67"]]);
 export {
-  i as default
+  m as default
 };

package/src/components/form-designer/form-widget/field-widget/button-list-widget.vue2.js

@@ -1,11 +1,12 @@
-import { defineComponent as u, computed as a, createBlock as c, createCommentVNode as l, unref as t, openBlock as f, normalizeProps as x, mergeProps as b, withCtx as g, createVNode as C } from "vue";
-import { ComponentNameEnum as L, WidgetTypeEnum as _ } from "../../../../constants/WidgetTypeEnum.js";
-import w from "./static-content-wrapper.vue.js";
-import E from "../../../public/ActionButtonListRender.vue.js";
-import { useField as F } from "./useField.js";
-const I = /* @__PURE__ */ u({
-  name: _.buttonList,
-  componentName: L.FieldWidget,
+import { defineComponent as c, computed as a, createBlock as f, createCommentVNode as l, unref as t, openBlock as x, normalizeProps as b, mergeProps as g, withCtx as C, createVNode as L } from "vue";
+import { ComponentNameEnum as _, WidgetTypeEnum as E } from "../../../../constants/WidgetTypeEnum.js";
+import F from "./static-content-wrapper.vue.js";
+import w from "../../../public/ActionButtonListRender.vue.js";
+import { useField as k } from "./useField.js";
+import { useExecFunction as N } from "tmgc2-share";
+const V = /* @__PURE__ */ c({
+  name: E.buttonList,
+  componentName: _.FieldWidget,
   __name: "button-list-widget",
   props: {
     widget: {},
@@ -18,22 +19,22 @@ const I = /* @__PURE__ */ u({
     subFormRowId: {},
     subFormColIndex: {}
   },
-  setup(i, { expose: s }) {
-    const o = i, r = a(() => e.options.buttonList || []), { fieldEditor: d, field: e, designState: p, handleHidden: m, defineExposed: n } = F(o);
-    return s({
-      buttonList: r,
-      ...n
-    }), (k, N) => t(m) ? l("", !0) : (f(), c(w, x(b({ key: 0 }, o)), {
-      default: g(() => [
-        C(E, {
+  setup(n, { expose: i }) {
+    const o = n, s = a(() => e.options.buttonList || []), { fieldEditor: r, field: e, designState: d, handleHidden: m, defineExposed: p } = k(o), { context: u } = N();
+    return i({
+      buttonList: s,
+      ...p
+    }), (S, W) => t(m) ? l("", !0) : (x(), f(F, b(g({ key: 0 }, o)), {
+      default: C(() => [
+        L(w, {
           ref_key: "fieldEditor",
-          ref: d,
+          ref: r,
           options: t(e).options,
-          designState: t(p),
+          designState: t(d),
           buttonList: t(e).options.buttonList || [],
           customClass: t(e).options.customClass || [],
           flex: t(e).options.flex,
-          ctx: t(n)
+          ctx: t(u)
         }, null, 8, ["options", "designState", "buttonList", "customClass", "flex", "ctx"])
       ]),
       _: 1
@@ -41,5 +42,5 @@ const I = /* @__PURE__ */ u({
   }
 });
 export {
-  I as default
+  V as default
 };

package/src/components/form-designer/form-widget/field-widget/button-widget.vue.js

@@ -1,7 +1,7 @@
 import t from "./button-widget.vue2.js";
 /* empty css                   */
 import o from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const m = /* @__PURE__ */ o(t, [["__scopeId", "data-v-a67ba8ea"]]);
+const _ = /* @__PURE__ */ o(t, [["__scopeId", "data-v-06b0b085"]]);
 export {
-  m as default
+  _ as default
 };

package/src/components/form-designer/form-widget/field-widget/button-widget.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as _, resolveComponent as x, createBlock as i, createCommentVNode as s, unref as e, openBlock as r, normalizeProps as k, mergeProps as y, withCtx as a, createVNode as F, normalizeClass as w, createTextVNode as z, toDisplayString as E } from "vue";
+import { defineComponent as _, resolveComponent as x, createBlock as i, createCommentVNode as s, unref as e, openBlock as a, normalizeProps as y, mergeProps as k, withCtx as r, createVNode as w, normalizeClass as E, createTextVNode as F, toDisplayString as z } from "vue";
 import N from "./static-content-wrapper.vue.js";
 import { SvgIcon as W } from "tmgc2-share";
 import { ComponentNameEnum as B, WidgetTypeEnum as I } from "../../../../constants/WidgetTypeEnum.js";
@@ -21,7 +21,7 @@ const H = /* @__PURE__ */ _({
   setup(d, { expose: p }) {
     const t = d, {
       loading: l,
-      executeFunction: c,
+      asyncExecuteFunction: c,
       fieldEditor: m,
       field: o,
       size: u,
@@ -29,8 +29,8 @@ const H = /* @__PURE__ */ _({
       handleHidden: g,
       handleDisabled: b,
       defineExposed: h
-    } = S(t), n = () => {
-      f || o.options.onClick && c({
+    } = S(t), n = async () => {
+      f || o.options.onClick && await c({
         functionBody: o.options.onClick || ""
       });
     };
@@ -39,14 +39,14 @@ const H = /* @__PURE__ */ _({
       handleButtonWidgetClick: n
     }), (P, V) => {
       const C = x("a-button");
-      return e(g) ? s("", !0) : (r(), i(N, k(y({ key: 0 }, t)), {
-        default: a(() => [
-          F(C, {
+      return e(g) ? s("", !0) : (a(), i(N, y(k({ key: 0 }, t)), {
+        default: r(() => [
+          w(C, {
             ref_key: "fieldEditor",
             ref: m,
             type: e(o).options.type,
             size: e(u),
-            class: w([e(o).options.label === "" ? "hide-text-span" : "", "tpf-button"]),
+            class: E([e(o).options.label === "" ? "hide-text-span" : "", "tpf-button"]),
             shape: e(o).options.shape,
             danger: e(o).options.danger,
             ghost: e(o).options.ghost,
@@ -54,12 +54,12 @@ const H = /* @__PURE__ */ _({
             loading: e(l),
             onClick: n
           }, {
-            default: a(() => [
-              e(o).options.icon ? (r(), i(e(W), {
+            default: r(() => [
+              e(o).options.icon ? (a(), i(e(W), {
                 key: 0,
                 "icon-class": e(o).options.icon
               }, null, 8, ["icon-class"])) : s("", !0),
-              z(" " + E(e(o).options.label), 1)
+              F(" " + z(e(o).options.label), 1)
             ]),
             _: 1
           }, 8, ["type", "size", "class", "shape", "danger", "ghost", "disabled", "loading"])

package/src/components/form-designer/form-widget/field-widget/useField.js

@@ -7,12 +7,12 @@ import { useEmitter as $e } from "../../../../utils/useEmitter.js";
 import { useAppRef as je } from "../../useAppRef.js";
 import { useExecFunction as Ge } from "tmgc2-share";
 function et(t) {
-  const K = c("getFormConfig", () => ({})), y = c("formData", f({})), Q = c("getReadMode", () => !1), k = c("isSubFormField", !1), D = c("getSubFormName", () => ""), o = c("designState", !1), { registerToRefList: X, getWidgetRef: Y, getFormRef: B, unregisterFromRefList: Z } = je(), { executeFunction: u, asyncExecuteFunction: m } = Ge(), { i18nt: M, i18n2t: _ } = Je(), { field: d } = t, v = f(null), A = f(null), R = f(!1), w = f(!1), l = f([]), O = f({}), H = f({}), p = f(null), h = ze(), { dispatch: E } = $e(), q = s(() => K()), ee = s(() => {
+  const K = c("getFormConfig", () => ({})), y = c("formData", f({})), Q = c("getReadMode", () => !1), k = c("isSubFormField", !1), D = c("getSubFormName", () => ""), o = c("designState", !1), { registerToRefList: X, getWidgetRef: Y, getFormRef: B, unregisterFromRefList: Z } = je(), { executeFunction: u, asyncExecuteFunction: g } = Ge(), { i18nt: M, i18n2t: _ } = Je(), { field: d } = t, v = f(null), A = f(null), R = f(!1), w = f(!1), l = f([]), O = f({}), H = f({}), p = f(null), h = ze(), { dispatch: E } = $e(), q = s(() => K()), ee = s(() => {
     var e;
     return (e = d == null ? void 0 : d.options) != null && e.size ? d.options.size : q.value.size || "middle";
   }), b = s(() => D ? D() : ""), a = s({
     get() {
-      return Le(y.value, g.value);
+      return Le(y.value, m.value);
     },
     set(e) {
       x(e);
@@ -54,17 +54,17 @@ function et(t) {
     return e.forEach((r, Ne) => {
       r === n && (i = Ne);
     }), i;
-  }, g = s(() => k && !o ? b.value + "." + t.subFormRowIndex + "." + t.field.options.name : t.field.options.name);
+  }, m = s(() => k && !o ? b.value + "." + t.subFormRowIndex + "." + t.field.options.name : t.field.options.name);
   function oe() {
     o || t.field.options.onCreated && j(async () => {
-      await m({
+      await g({
         functionBody: t.field.options.onCreated
       });
     });
   }
   function le() {
     o || t.field.options.onMounted && j(async () => {
-      await m({
+      await g({
         functionBody: t.field.options.onMounted
       });
     });
@@ -135,8 +135,8 @@ function et(t) {
       t.subFormRowIndex
     ]);
   }, x = (e) => {
-    o || (E("VFormRender", "fieldValidation", [g.value]), E("VFormRender", "fieldChange", {
-      fieldName: g.value,
+    o || (E("VFormRender", "fieldValidation", [m.value]), E("VFormRender", "fieldChange", {
+      fieldName: m.value,
       value: e,
       oldValue: $(a.value),
       field: d
@@ -170,11 +170,11 @@ function et(t) {
     });
   }, me = async () => {
     if (!o && t.field.options.onClick)
-      return await m({
+      return await g({
         functionBody: t.field.options.onClick
       });
   }, ve = async () => {
-    o || V.value || d.options.onClickIcon && await m({
+    o || V.value || d.options.onClickIcon && await g({
       functionBody: d.options.onClickIcon
     });
   }, F = () => v.value, T = (e) => (typeof e == "string" && (e = JSON.parse(e)), We(e) ? e.map((i, r) => ({
@@ -209,7 +209,7 @@ function et(t) {
   }, xe = (e) => {
     t.field.options.required = e, C(), !o && !e && P();
   }, P = () => {
-    o || B().clearValidate(g.value);
+    o || B().clearValidate(m.value);
   }, Ie = () => B().vfCtx, ke = (e) => {
     t.field.options.label = e;
   }, W = () => {
@@ -275,6 +275,7 @@ function et(t) {
     focus: W
   };
   return {
+    asyncExecuteFunction: g,
     executeFunction: u,
     options: J,
     customClass: He,
@@ -302,7 +303,7 @@ function et(t) {
     handleHidden: ne,
     handleDisabled: V,
     findInArray: ie,
-    getPropName: g,
+    getPropName: m,
     refreshDefaultValue: ae,
     clearFieldRules: N,
     buildFieldRules: C,

package/src/components/form-designer/setting-panel/property-editor/container-data-table/data-table-tableColumns-editor.vue.js

@@ -1,7 +1,7 @@
 import o from "./data-table-tableColumns-editor.vue2.js";
 /* empty css                                    */
-import a from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const e = /* @__PURE__ */ a(o, [["__scopeId", "data-v-ac7b3122"]]);
+import t from "../../../../../../_virtual/_plugin-vue_export-helper.js";
+const m = /* @__PURE__ */ t(o, [["__scopeId", "data-v-ff49f09d"]]);
 export {
-  e as default
+  m as default
 };

package/src/components/form-render/container-items/grid-sub-form-widget.vue.js

@@ -1,7 +1,7 @@
 import o from "./grid-sub-form-widget.vue2.js";
 /* empty css                          */
 import r from "../../../../_virtual/_plugin-vue_export-helper.js";
-const f = /* @__PURE__ */ r(o, [["__scopeId", "data-v-6cbdf359"]]);
+const d = /* @__PURE__ */ r(o, [["__scopeId", "data-v-4483eccd"]]);
 export {
-  f as default
+  d as default
 };