@kp-ui/lowcode 2.14.0-beta.15 → 2.14.0-beta.17

package/package.json

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

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/PanelItemDrag.vue.js

@@ -1,16 +1,16 @@
 import { defineComponent as d, createBlock as g, openBlock as m, unref as o, withCtx as p, createElementVNode as i, createVNode as u, createTextVNode as f, toDisplayString as h } from "vue";
-import { SvgIcon as k } from "tmgc2-share";
-import { useI18n as C } from "../../../utils/i18n.js";
+import { SvgIcon as y } from "tmgc2-share";
+import { useI18n as k } from "../../../utils/i18n.js";
 import _ from "../../../lib/vuedraggable/src/vuedraggable.js";
-const y = ["title", "onDblclick"], x = /* @__PURE__ */ d({
+const C = ["title", "onDblclick"], x = /* @__PURE__ */ d({
   name: "PanelItemDrag",
   __name: "PanelItemDrag",
   props: {
     designer: {},
     items: {}
   },
-  setup(s) {
-    const { i18n2t: l } = C(), n = s, r = (e) => n.designer.copyNewContainerWidget(e), a = (e) => n.designer.checkWidgetMove(e), c = (e) => {
+  setup(r) {
+    const { i18n2t: s } = k(), n = r, l = (e) => e.category === "container" ? n.designer.copyNewContainerWidget(e) : n.designer.copyNewFieldWidget(e), a = (e) => n.designer.checkWidgetMove(e), c = (e) => {
       n.designer.addWidget(e);
     };
     return (e, v) => (m(), g(o(_), {
@@ -18,7 +18,7 @@ const y = ["title", "onDblclick"], x = /* @__PURE__ */ d({
       list: e.items,
       "item-key": "key",
       group: { name: "dragGroup", pull: "clone", put: !1 },
-      clone: r,
+      clone: l,
       "ghost-class": "ghost",
       sort: !1,
       move: a
@@ -27,19 +27,19 @@ const y = ["title", "onDblclick"], x = /* @__PURE__ */ d({
         i("li", {
           class: "container-widget-item",
           title: t.displayName,
-          onDblclick: (b) => c(t)
+          onDblclick: (w) => c(t)
         }, [
           i("span", null, [
-            u(o(k), {
+            u(o(y), {
               "icon-class": "icon-" + t.icon,
               class: "color-svg-icon"
             }, null, 8, ["icon-class"]),
-            f(" " + h(o(l)(
+            f(" " + h(o(s)(
               `designer.widgetLabel.${t.type}`,
               `extension.widgetLabel.${t.type}`
             )), 1)
           ])
-        ], 40, y)
+        ], 40, C)
       ]),
       _: 1
     }, 8, ["list"]));

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

@@ -2,7 +2,7 @@ import { defineComponent as E, defineAsyncComponent as M, computed as c, ref as
 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({
+const $ = { class: "dialog-content" }, oe = /* @__PURE__ */ E({
   name: "dynamic-dialog",
   __name: "dynamic-dialog",
   props: {
@@ -44,8 +44,8 @@ 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({
+  setup(n, { expose: R }) {
+    const F = 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(() => ({
@@ -54,28 +54,34 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
       getParentFormRef: g
     })), O = c(() => e.options.cancelButtonHidden && e.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 o, t;
+      console.log(e.parentFormRef), (t = (o = e.parentFormRef) == null ? void 0 : o.setChildFormRef) == null || t.call(o, null);
     });
-    const w = (t) => {
-      console.log("setLoading", t), u.value = t;
-    }, k = (t) => {
-      e.options.title = t;
+    const w = (o) => {
+      console.log("setLoading", o), u.value = o;
+    }, k = (o) => {
+      e.options.title = o;
     }, B = () => {
       a.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();
+        var o, t;
+        e.options.readMode && ((o = l.value) == null || o.setReadMode(!0)), await D([], e.options.formCode), (t = l.value) == null || t.setDialogOrDrawerRef(i), e.parentFormRef && e.parentFormRef.setChildFormRef(l.value), m();
       });
     }, 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 = () => {
+      if (e.options.onDialogBeforeClose) {
+        const o = new Function(e.options.onDialogBeforeClose);
+        return console.log(o), o.call(i);
+      }
+      return !0;
+    }, p = () => {
       r() && (a.value = !1);
     }, m = () => {
       e.options.onDialogOpened && new Function(e.options.onDialogOpened).call(i);
     }, g = () => e.parentFormRef;
-    return F({
+    return R({
       setLoading: w,
       setTitle: k,
       beforeOpen: B,
@@ -86,16 +92,16 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
       handleOpenedEvent: m,
       getParentFormRef: g,
       getFormRef: () => (console.log("getFormRef"), l.value),
-      getWidgetRef: (t, o = !1) => {
+      getWidgetRef: (o, t = !1) => {
         var s;
-        return (s = l.value) == null ? void 0 : s.getWidgetRef(t, o);
+        return (s = l.value) == null ? void 0 : s.getWidgetRef(o, t);
       },
       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 o, t, s;
+        (s = (t = (o = e.vfCtx) == null ? void 0 : o.parent) == null ? void 0 : t.exposed) != null && s.updateTable && e.vfCtx.parent.exposed.updateTable();
       },
       getExtraData: () => e.extraData
-    }), (t, o) => {
+    }), (o, t) => {
       const s = V("loading");
       return b(), H(f(W), I({
         class: "tpf-model design-model",
@@ -108,7 +114,7 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
         },
         centered: !0,
         visible: a.value,
-        "onUpdate:visible": o[1] || (o[1] = (d) => a.value = d),
+        "onUpdate:visible": t[1] || (t[1] = (d) => a.value = d),
         width: n.options.width,
         mask: n.options.showModal,
         maskClosable: n.options.closeOnClickModal,
@@ -118,7 +124,7 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
         footerRight: C(() => [
           y(A, {
             "dialog-visible": a.value,
-            "onUpdate:dialogVisible": o[0] || (o[0] = (d) => a.value = d),
+            "onUpdate:dialogVisible": t[0] || (t[0] = (d) => a.value = d),
             handleBeforeClose: r,
             options: n.options,
             ctx: f(l)
@@ -126,7 +132,7 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
         ]),
         default: C(() => [
           J((b(), P("div", $, [
-            y(f(R), {
+            y(f(F), {
               ref_key: "vfdRef",
               ref: l,
               vfCtx: n.vfCtx,
@@ -144,5 +150,5 @@ const $ = { class: "dialog-content" }, te = /* @__PURE__ */ E({
   }
 });
 export {
-  te as default
+  oe as default
 };

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

@@ -1,9 +1,9 @@
-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 x, getCurrentInstance as _, useAttrs as b, ref as w, computed as u, onMounted as k, createBlock as B, openBlock as V, unref as t, withCtx as l, createVNode as s, mergeProps as R, nextTick as $ } from "vue";
+import { useLowcode as h } from "../../../hooks/useLowcode.js";
+import M from "../../form-render/SubmitButtonRender.vue.js";
+import T from "../../form-render/index.vue.js";
+import { TpfConfigProvider as L, TpfModal as P } from "tmgc2-share";
+import { Skeleton as U } from "ant-design-vue";
 import "../../../utils/i18n.js";
 const q = /* @__PURE__ */ x({
   __name: "CustomerModal",
@@ -12,52 +12,53 @@ const q = /* @__PURE__ */ x({
     type: {},
     formCode: {}
   },
-  setup(d) {
-    const a = _(), r = b() || {}, i = w(!1), e = d, m = p(() => {
-      var n, t;
+  setup(p) {
+    const a = _(), r = b() || {}, i = w(!1), e = p, m = u(() => {
+      var n, o;
       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,
+        _id: ((o = (n = r == null ? void 0 : r.row) == null ? void 0 : n.record) == null ? void 0 : o._id) || null,
         type: e.type,
         instance: a,
         ...r
       };
     }), {
-      vfdRef: u,
+      vfdRef: d,
       formConfig: c,
       getComponentJson: v,
-      isLoading: g
-    } = T({
+      isLoading: C
+    } = h({
       formCode: e.formCode,
       type: e.type
-    }), C = p(() => (console.log({
+    }), g = u(() => (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);
+      i.value = !0, await $(), await v([]), console.log("attrs", r);
     };
     return k(() => {
       y();
-    }), (n, t) => (R(), V(o(P), null, {
-      default: l(() => [s(o(U), $({
+    }), (n, o) => (V(), B(t(L), null, {
+      default: l(() => [s(t(P), R({
         visible: i.value,
-        "onUpdate:visible": t[1] || (t[1] = (f) => i.value = f)
+        "onUpdate:visible": o[1] || (o[1] = (f) => i.value = f)
       }, n.$attrs, {
-        title: C.value
+        title: g.value
       }), {
-        footerRight: l(() => [s(B, {
+        footerRight: l(() => [s(M, {
           dialogVisible: i.value,
-          "onUpdate:dialogVisible": t[0] || (t[0] = (f) => i.value = f),
-          options: o(c),
-          ctx: o(u)
-        }, null, 8, ["dialogVisible", "options", "ctx"])]),
-        default: l(() => [s(o(A), {
+          "onUpdate:dialogVisible": o[0] || (o[0] = (f) => i.value = f),
+          options: t(c),
+          handleBeforeClose: n.handleBeforeClose,
+          ctx: t(d)
+        }, null, 8, ["dialogVisible", "options", "handleBeforeClose", "ctx"])]),
+        default: l(() => [s(t(U), {
           active: "",
-          loading: o(g)
+          loading: t(C)
         }, {
-          default: l(() => [s(L, {
+          default: l(() => [s(T, {
             vfCtx: m.value,
             ref_key: "vfdRef",
-            ref: u
+            ref: d
           }, null, 8, ["vfCtx"])]),
           _: 1
         }, 8, ["loading"])]),

package/src/utils/asyncExecuteFunction.js

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