@kp-ui/lowcode 2.14.0-beta.16 → 2.14.0-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kp-ui/lowcode",
-  "version": "2.14.0-beta.16",
+  "version": "2.14.0-beta.18",
   "publishConfig": {
     "access": "public"
   },

package/src/components/form-designer/form-widget/container-widget/vf-dialog-widget.vue.js

@@ -5,7 +5,7 @@ import h from "./container-wrapper.vue.js";
 import { resolveComponent as m, createBlock as f, openBlock as d, withCtx as p, createElementBlock as w, withModifiers as L, normalizeClass as x, createElementVNode as a, toDisplayString as C } from "vue";
 /* empty css                      */
 import W from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const v = {
+const u = {
   name: "vf-dialog-widget",
   componentName: "VfDialogWidget",
   mixins: [l, g],
@@ -75,7 +75,7 @@ const v = {
       }
     }
   }
-}, u = { class: "dialog-title" };
+}, v = { class: "dialog-title" };
 function k(e, i, t, n, D, s) {
   const o = m("container-wrapper");
   return d(), f(o, {
@@ -91,8 +91,8 @@ function k(e, i, t, n, D, s) {
         key: t.widget.id,
         onClick: i[1] || (i[1] = L((r) => s.selectWidget(t.widget), ["stop"]))
       }, [
-        a("div", u, [
-          a("div", {
+        a("div", v, [
+          a("span", {
             class: "tpf-link",
             onClick: i[0] || (i[0] = (...r) => s.handleClickTitle && s.handleClickTitle(...r))
           }, C(t.widget.options.title), 1)
@@ -102,7 +102,7 @@ function k(e, i, t, n, D, s) {
     _: 1
   }, 8, ["designer", "widget", "parent-widget", "parent-list", "index-of-parent-list"]);
 }
-const j = /* @__PURE__ */ W(v, [["render", k], ["__scopeId", "data-v-cf739d00"]]);
+const j = /* @__PURE__ */ W(u, [["render", k], ["__scopeId", "data-v-3833bfd1"]]);
 export {
   j as default
 };

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

@@ -3,7 +3,7 @@ import m from "../../../../utils/emitter.js";
 import s from "../../../../utils/i18n.js";
 import a from "./fieldMixin.js";
 import { executeFunction as f } from "../../../../utils/executeFunction.js";
-import { resolveComponent as l, createBlock as t, openBlock as n, withCtx as c, createElementVNode as u, resolveDynamicComponent as p } from "vue";
+import { resolveComponent as l, createBlock as t, openBlock as n, withCtx as u, createElementVNode as c, resolveDynamicComponent as p } from "vue";
 import b from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const x = {
   name: "diy-compontent-widget",
@@ -80,9 +80,9 @@ function w(o, _, e, h, y, r) {
     "sub-form-col-index": e.subFormColIndex,
     "sub-form-row-id": e.subFormRowId
   }, {
-    default: c(() => [
-      u("div", g, [
-        (n(), t(p(r.renderCompont)))
+    default: u(() => [
+      c("div", g, [
+        (n(), t(p(r.renderCompont), { ref: "fieldEditor" }, null, 512))
       ])
     ]),
     _: 1

package/src/components/form-designer/widget-panel/containers/vf-dialog.js

@@ -1,5 +1,5 @@
 import { getUuidKey as o } from "@kp-ui/tool";
-const l = (e = {}) => ({
+const t = (e = {}) => ({
   key: o(),
   type: "vf-dialog",
   category: "container",
@@ -17,6 +17,7 @@ const l = (e = {}) => ({
     closeOnPressEscape: !1,
     readMode: !1,
     disabledMode: !1,
+    disabled: !1,
     okButtonLabel: "",
     okButtonHidden: !1,
     cancelButtonLabel: "",
@@ -29,5 +30,5 @@ const l = (e = {}) => ({
   }
 });
 export {
-  l as vfDialog
+  t as vfDialog
 };

package/src/components/form-render/SubmitButtonRender.vue.js

@@ -1,7 +1,8 @@
-import { defineComponent as F, ref as p, computed as a, resolveComponent as B, createBlock as u, openBlock as r, withCtx as s, createCommentVNode as m, createTextVNode as k, toDisplayString as v } from "vue";
+import { defineComponent as L, ref as p, computed as a, resolveComponent as m, createBlock as u, openBlock as r, withCtx as s, createCommentVNode as B, createTextVNode as k, toDisplayString as v } from "vue";
+import { asyncExecuteFunction as y } from "../../utils/asyncExecuteFunction.js";
 import { executeFunction as C } from "../../utils/executeFunction.js";
-import { useI18n as L } from "../../utils/i18n.js";
-const D = /* @__PURE__ */ F({
+import { useI18n as V } from "../../utils/i18n.js";
+const E = /* @__PURE__ */ L({
   __name: "SubmitButtonRender",
   props: {
     goBack: { type: Function },
@@ -11,8 +12,8 @@ const D = /* @__PURE__ */ F({
     ctx: {}
   },
   emits: ["update:dialogVisible"],
-  setup(y, { emit: g }) {
-    const e = y, _ = g, l = p(!1), i = p(!1), { i18nt: d } = L(), c = a(() => (e == null ? void 0 : e.options) ?? {}), h = a(() => c.value.cancelButtonHidden != null ? c.value.cancelButtonHidden === 0 : 0), x = a(() => c.value.okButtonHidden != null ? c.value.okButtonHidden === 0 : 0), b = a(
+  setup(g, { emit: _ }) {
+    const e = g, h = _, l = p(!1), i = p(!1), { i18nt: d } = V(), c = a(() => (e == null ? void 0 : e.options) ?? {}), x = a(() => c.value.cancelButtonHidden != null ? c.value.cancelButtonHidden === 0 : 1), b = a(() => c.value.okButtonHidden != null ? c.value.okButtonHidden === 0 : 1), w = a(
       () => {
         var t;
         return ((t = e.options) == null ? void 0 : t.cancelButtonLabel) || d("designer.hint.cancel");
@@ -23,15 +24,18 @@ const D = /* @__PURE__ */ F({
         return ((t = e.options) == null ? void 0 : t.okButtonLabel) || d("designer.hint.confirm");
       }
     ), f = () => {
-      _("update:dialogVisible", !1), e.deleteWrapperNode && setTimeout(e.deleteWrapperNode, 150);
-    }, w = async () => {
+      h("update:dialogVisible", !1), e.deleteWrapperNode && setTimeout(e.deleteWrapperNode, 150);
+    }, F = async () => {
       var t, n;
       if (!i.value)
         try {
-          if (i.value = !0, e.handleBeforeClose && !((t = e == null ? void 0 : e.handleBeforeClose) != null && t.call(e)) || await C({
+          if (i.value = !0, e.handleBeforeClose && !((t = e == null ? void 0 : e.handleBeforeClose) != null && t.call(e)))
+            return;
+          const o = await C({
             context: e.ctx,
             functionBody: ((n = e.options) == null ? void 0 : n.onCancelButtonClick) || ""
-          }) === !1) return;
+          });
+          if (await y(o) === !1) return;
           e.goBack ? e.goBack() : f();
         } catch (o) {
           console.error("取消操作失败:", o);
@@ -42,10 +46,12 @@ const D = /* @__PURE__ */ F({
       var t;
       if (!l.value)
         try {
-          if (l.value = !0, await C({
+          l.value = !0;
+          const n = C({
             context: e.ctx,
             functionBody: ((t = e.options) == null ? void 0 : t.onOkButtonClick) || ""
-          }) === !1) return;
+          });
+          if (await y(n) === !1) return;
           f();
         } catch (n) {
           console.error("提交操作失败:", n);
@@ -54,20 +60,20 @@ const D = /* @__PURE__ */ F({
         }
     };
     return (t, n) => {
-      const o = B("a-button"), S = B("a-space");
+      const o = m("a-button"), S = m("a-space");
       return r(), u(S, { x: 8 }, {
         default: s(() => [
-          h.value ? (r(), u(o, {
+          x.value ? (r(), u(o, {
             key: "cancelButtonHidden",
             loading: i.value,
-            onClick: w
+            onClick: F
           }, {
             default: s(() => [
-              k(v(b.value), 1)
+              k(v(w.value), 1)
             ]),
             _: 1
-          }, 8, ["loading"])) : m("", !0),
-          x.value ? (r(), u(o, {
+          }, 8, ["loading"])) : B("", !0),
+          b.value ? (r(), u(o, {
             type: "primary",
             key: "okButtonHidden",
             loading: l.value,
@@ -77,7 +83,7 @@ const D = /* @__PURE__ */ F({
               k(v(H.value), 1)
             ]),
             _: 1
-          }, 8, ["loading"])) : m("", !0)
+          }, 8, ["loading"])) : B("", !0)
         ]),
         _: 1
       });
@@ -85,5 +91,5 @@ const D = /* @__PURE__ */ F({
   }
 });
 export {
-  D as default
+  E as default
 };

package/src/components/form-render/dynamic-dialog.vue.js

@@ -1,8 +1,8 @@
-import { defineComponent as E, defineAsyncComponent as M, computed as c, ref as v, getCurrentInstance as S, onBeforeUnmount as L, resolveDirective as V, createBlock as H, openBlock as b, unref as f, mergeProps as I, withCtx as C, withDirectives as J, createElementBlock as P, createVNode as y, nextTick as U } from "vue";
+import { defineComponent as M, defineAsyncComponent as S, computed as c, ref as u, getCurrentInstance as I, onBeforeUnmount as L, resolveDirective as N, createBlock as V, openBlock as b, unref as i, mergeProps as H, withCtx as C, withDirectives as J, createElementBlock as P, createVNode as y, nextTick as U } from "vue";
 import { TpfModal as W } from "tmgc2-share";
 import A from "./SubmitButtonRender.vue.js";
-import { useLowcode as N } from "../../hooks/useLowcode.js";
-const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
+import { useLowcode as $ } from "../../hooks/useLowcode.js";
+const q = { class: "dialog-content" }, ne = /* @__PURE__ */ M({
   name: "dynamic-dialog",
   __name: "dynamic-dialog",
   props: {
@@ -44,60 +44,69 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
       default: null
     }
   },
-  setup(n, { expose: F }) {
-    const R = M(() => import("./index.vue.js")), e = n, x = c(() => e.options.height || "500px"), u = v(!1), a = v(!1), i = S(), { vfdRef: l, formConfig: q, getComponentJson: D, goBack: z } = N({
-      formCode: e.options.formCode,
-      ...e.vfCtx
-    }), h = c(() => ({
-      ...e.parentFormRef,
-      parentDom: i,
-      getParentFormRef: g
-    })), O = c(() => e.options.cancelButtonHidden && e.options.okButtonHidden ? { footer: null } : {});
+  setup(n, { expose: R }) {
+    const F = S(() => import("./index.vue.js")), t = n, x = c(() => t.options.height || "500px"), D = u(null), p = u(!1), l = u(!1), r = I(), { vfdRef: a, formConfig: z, getComponentJson: h, goBack: G } = $({
+      formCode: t.options.formCode,
+      ...t.vfCtx
+    }), O = c(() => ({
+      ...t.parentFormRef,
+      parentDom: r,
+      getParentFormRef: v
+    })), w = c(() => t.options.cancelButtonHidden && t.options.okButtonHidden ? { footer: null } : {});
     L(() => {
-      var t, o;
-      console.log(e.parentFormRef), (o = (t = e.parentFormRef) == null ? void 0 : t.setChildFormRef) == null || o.call(t, null);
+      var e, o;
+      console.log(t.parentFormRef), (o = (e = t.parentFormRef) == null ? void 0 : e.setChildFormRef) == null || o.call(e, null);
     });
-    const w = (t) => {
-      console.log("setLoading", t), u.value = t;
-    }, k = (t) => {
-      e.options.title = t;
-    }, B = () => {
-      a.value = !0;
+    const k = (e) => {
+      console.log("setLoading", e), p.value = e;
+    }, B = (e) => {
+      t.options.title = e;
+    }, T = () => {
+      l.value = !0;
     }, j = async () => {
-      a.value = !0, U(async () => {
-        var t, o;
-        e.options.readMode && ((t = l.value) == null || t.setReadMode(!0)), await D([], e.options.formCode), (o = l.value) == null || o.setDialogOrDrawerRef(i), e.parentFormRef && e.parentFormRef.setChildFormRef(l.value), m();
+      l.value = !0, U(async () => {
+        var e, o;
+        t.options.readMode && ((e = a.value) == null || e.setReadMode(!0)), await h([], t.options.formCode), (o = a.value) == null || o.setDialogOrDrawerRef(r), t.parentFormRef && t.parentFormRef.setChildFormRef(a.value), g();
       });
-    }, T = () => {
-      e.options.onDialogBeforeClose && new Function("done", e.options.onDialogBeforeClose).call(i) === !1 || (a.value = !1);
-    }, r = () => e.options.onDialogBeforeClose ? new Function(e.options.onDialogBeforeClose).call(i) : !0, p = () => {
-      r() && (a.value = !1);
+    }, E = () => {
+      t.options.onDialogBeforeClose && new Function("done", t.options.onDialogBeforeClose).call(r) === !1 || (l.value = !1);
+    }, d = () => {
+      if (t.options.onDialogBeforeClose) {
+        const e = new Function(t.options.onDialogBeforeClose);
+        return console.log(e), e.call(r);
+      }
+      return !0;
     }, m = () => {
-      e.options.onDialogOpened && new Function(e.options.onDialogOpened).call(i);
-    }, g = () => e.parentFormRef;
-    return F({
-      setLoading: w,
-      setTitle: k,
-      beforeOpen: B,
+      d() && (l.value = !1);
+    }, g = () => {
+      t.options.onDialogOpened && new Function(t.options.onDialogOpened).call(r);
+    }, v = () => t.parentFormRef;
+    return R({
+      setleftText: (e) => {
+        D.value = e;
+      },
+      setLoading: k,
+      setTitle: B,
+      beforeOpen: T,
       show: j,
-      close: T,
-      handleBeforeClose: r,
-      handleCloseEvent: p,
-      handleOpenedEvent: m,
-      getParentFormRef: g,
-      getFormRef: () => (console.log("getFormRef"), l.value),
-      getWidgetRef: (t, o = !1) => {
+      close: E,
+      handleBeforeClose: d,
+      handleCloseEvent: m,
+      handleOpenedEvent: g,
+      getParentFormRef: v,
+      getFormRef: () => (console.log("getFormRef"), a.value),
+      getWidgetRef: (e, o = !1) => {
         var s;
-        return (s = l.value) == null ? void 0 : s.getWidgetRef(t, o);
+        return (s = a.value) == null ? void 0 : s.getWidgetRef(e, o);
       },
       updateTable: () => {
-        var t, o, s;
-        (s = (o = (t = e.vfCtx) == null ? void 0 : t.parent) == null ? void 0 : o.exposed) != null && s.updateTable && e.vfCtx.parent.exposed.updateTable();
+        var e, o, s;
+        (s = (o = (e = t.vfCtx) == null ? void 0 : e.parent) == null ? void 0 : o.exposed) != null && s.updateTable && t.vfCtx.parent.exposed.updateTable();
       },
-      getExtraData: () => e.extraData
-    }), (t, o) => {
-      const s = V("loading");
-      return b(), H(f(W), I({
+      getExtraData: () => t.extraData
+    }), (e, o) => {
+      const s = N("loading");
+      return b(), V(i(W), H({
         class: "tpf-model design-model",
         destroyOnClose: !0,
         title: n.options.title,
@@ -107,42 +116,46 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
           ...JSON.parse(n.options.bodyStyle || "{}")
         },
         centered: !0,
-        visible: a.value,
-        "onUpdate:visible": o[1] || (o[1] = (d) => a.value = d),
+        visible: l.value,
+        "onUpdate:visible": o[1] || (o[1] = (f) => l.value = f),
         width: n.options.width,
         mask: n.options.showModal,
         maskClosable: n.options.closeOnClickModal,
         keyboard: n.options.closeOnPressEscape,
-        onCancel: p
-      }, O.value), {
+        onCancel: m,
+        "left-num": e.leftNumber
+      }, w.value), {
         footerRight: C(() => [
           y(A, {
-            "dialog-visible": a.value,
-            "onUpdate:dialogVisible": o[0] || (o[0] = (d) => a.value = d),
-            handleBeforeClose: r,
+            "dialog-visible": l.value,
+            "onUpdate:dialogVisible": o[0] || (o[0] = (f) => l.value = f),
+            handleBeforeClose: d,
             options: n.options,
-            ctx: f(l)
+            ctx: i(a)
           }, null, 8, ["dialog-visible", "options", "ctx"])
         ]),
         default: C(() => [
-          J((b(), P("div", $, [
-            y(f(R), {
+          J((b(), P("div", q, [
+            y(i(F), {
               ref_key: "vfdRef",
-              ref: l,
-              vfCtx: n.vfCtx,
-              "parent-form": h.value,
+              ref: a,
+              vfCtx: {
+                ...n.vfCtx,
+                currentInstance: i(r)
+              },
+              "parent-form": O.value,
               "disabled-mode": n.options.disabledMode,
               "dynamic-creation": !0
             }, null, 8, ["vfCtx", "parent-form", "disabled-mode"])
           ])), [
-            [s, u.value]
+            [s, p.value]
           ])
         ]),
         _: 1
-      }, 16, ["title", "bodyStyle", "visible", "width", "mask", "maskClosable", "keyboard"]);
+      }, 16, ["title", "bodyStyle", "visible", "width", "mask", "maskClosable", "keyboard", "left-num"]);
     };
   }
 });
 export {
-  te as default
+  ne as default
 };

package/src/components/public/CustomerModal/CustomerModal.vue2.js

@@ -1,72 +1,79 @@
-import { defineComponent as x, getCurrentInstance as _, useAttrs as b, ref as w, computed as p, onMounted as k, createBlock as V, openBlock as R, unref as o, withCtx as l, createVNode as s, mergeProps as $, nextTick as M } from "vue";
-import { useLowcode as T } from "../../../hooks/useLowcode.js";
-import B from "../../form-render/SubmitButtonRender.vue.js";
-import L from "../../form-render/index.vue.js";
-import { TpfConfigProvider as P, TpfModal as U } from "tmgc2-share";
-import { Skeleton as A } from "ant-design-vue";
+import { defineComponent as k, getCurrentInstance as V, useAttrs as N, ref as d, computed as m, onMounted as R, createBlock as T, openBlock as $, unref as r, withCtx as l, createVNode as s, mergeProps as M, nextTick as B } from "vue";
+import { useLowcode as L } from "../../../hooks/useLowcode.js";
+import P from "../../form-render/SubmitButtonRender.vue.js";
+import U from "../../form-render/index.vue.js";
+import { TpfConfigProvider as A, TpfModal as F } from "tmgc2-share";
+import { Skeleton as I } from "ant-design-vue";
 import "../../../utils/i18n.js";
-const q = /* @__PURE__ */ x({
+const E = /* @__PURE__ */ k({
   __name: "CustomerModal",
   props: {
     title: {},
     type: {},
     formCode: {}
   },
-  setup(d) {
-    const a = _(), r = b() || {}, i = w(!1), e = d, m = p(() => {
-      var n, t;
+  setup(c, {
+    expose: v
+  }) {
+    const u = V(), i = N() || {}, n = d(!1), e = c, g = m(() => {
+      var o, t;
       return {
-        $router: a.proxy.$router,
-        _id: ((t = (n = r == null ? void 0 : r.row) == null ? void 0 : n.record) == null ? void 0 : t._id) || null,
+        $router: u.proxy.$router,
+        _id: ((t = (o = i == null ? void 0 : i.row) == null ? void 0 : o.record) == null ? void 0 : t._id) || null,
         type: e.type,
-        instance: a,
-        ...r
+        instance: u,
+        ...i
       };
     }), {
-      vfdRef: u,
-      formConfig: c,
-      getComponentJson: v,
-      isLoading: g
-    } = T({
+      vfdRef: a,
+      formConfig: C,
+      getComponentJson: x,
+      isLoading: y
+    } = L({
       formCode: e.formCode,
       type: e.type
-    }), C = p(() => (console.log({
+    }), p = d(0), _ = m(() => (console.log({
       props: e
-    }), e.title ? e.title : e.type === "add" ? "新增" : e.type === "edit" ? "编辑" : e.type === "view" ? "查看" : "新增")), y = async () => {
-      i.value = !0, await M(), await v([]), console.log("attrs", r);
+    }), e.title ? e.title : e.type === "add" ? "新增" : e.type === "edit" ? "编辑" : e.type === "view" ? "查看" : "新增")), b = async () => {
+      n.value = !0, await B(), await x([]), console.log("attrs", i);
+    }, w = (o) => {
+      p.value = o;
     };
-    return k(() => {
-      y();
-    }), (n, t) => (R(), V(o(P), null, {
-      default: l(() => [s(o(U), $({
-        visible: i.value,
-        "onUpdate:visible": t[1] || (t[1] = (f) => i.value = f)
-      }, n.$attrs, {
-        title: C.value
+    return R(() => {
+      b();
+    }), v({
+      setleftText: w
+    }), (o, t) => ($(), T(r(A), null, {
+      default: l(() => [s(r(F), M({
+        visible: n.value,
+        "onUpdate:visible": t[1] || (t[1] = (f) => n.value = f)
+      }, o.$attrs, {
+        title: _.value,
+        leftNum: p.value
       }), {
-        footerRight: l(() => [s(B, {
-          dialogVisible: i.value,
-          "onUpdate:dialogVisible": t[0] || (t[0] = (f) => i.value = f),
-          options: o(c),
-          ctx: o(u)
+        footerRight: l(() => [s(P, {
+          dialogVisible: n.value,
+          "onUpdate:dialogVisible": t[0] || (t[0] = (f) => n.value = f),
+          options: r(C),
+          ctx: r(a)
         }, null, 8, ["dialogVisible", "options", "ctx"])]),
-        default: l(() => [s(o(A), {
+        default: l(() => [s(r(I), {
           active: "",
-          loading: o(g)
+          loading: r(y)
         }, {
-          default: l(() => [s(L, {
-            vfCtx: m.value,
+          default: l(() => [s(U, {
+            vfCtx: g.value,
             ref_key: "vfdRef",
-            ref: u
+            ref: a
           }, null, 8, ["vfCtx"])]),
           _: 1
         }, 8, ["loading"])]),
         _: 1
-      }, 16, ["visible", "title"])]),
+      }, 16, ["visible", "title", "leftNum"])]),
       _: 1
     }));
   }
 });
 export {
-  q as default
+  E as default
 };

package/src/utils/asyncExecuteFunction.js

@@ -0,0 +1,4 @@
+const e = async (t) => typeof t != "function" ? t : await t();
+export {
+  e as asyncExecuteFunction
+};