@kp-ui/lowcode 2.14.0-beta.2 → 2.14.0-beta.21

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

@@ -1,6 +1,8 @@
-import { defineComponent as S, ref as m, computed as a, resolveComponent as B, createBlock as u, openBlock as r, withCtx as s, createCommentVNode as k, createTextVNode as v, toDisplayString as C } from "vue";
+import { defineComponent as D, 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 W = /* @__PURE__ */ S({
+const E = /* @__PURE__ */ D({
   __name: "SubmitButtonRender",
   props: {
     goBack: { type: Function },
@@ -10,39 +12,47 @@ const W = /* @__PURE__ */ S({
     ctx: {}
   },
   emits: ["update:dialogVisible"],
-  setup(g, { emit: _ }) {
-    const e = g, y = _, l = m(!1), c = m(!1), { i18nt: d } = L(), i = a(() => (e == null ? void 0 : e.options) ?? {}), h = a(() => i.value.cancelButtonHidden != null ? i.value.cancelButtonHidden === 0 : 0), b = a(() => i.value.okButtonHidden != null ? i.value.okButtonHidden === 0 : 0), x = a(
+  setup(b, { emit: g }) {
+    const e = b, h = g, l = p(!1), i = p(!1), { i18nt: d } = L(), c = a(() => (e == null ? void 0 : e.options) ?? {}), _ = a(() => c.value.cancelButtonHidden != null ? c.value.cancelButtonHidden === 0 : 1), x = 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");
       }
-    ), w = a(
+    ), H = a(
       () => {
         var t;
         return ((t = e.options) == null ? void 0 : t.okButtonLabel) || d("designer.hint.confirm");
       }
-    ), f = async (t, n) => n ? (console.log("functionBody", n), await new Function(n).call(t)) : !0, p = () => {
-      y("update:dialogVisible", !1), e.deleteWrapperNode && setTimeout(e.deleteWrapperNode, 150);
+    ), f = () => {
+      h("update:dialogVisible", !1), e.deleteWrapperNode && setTimeout(e.deleteWrapperNode, 150);
     }, F = async () => {
       var t, n;
-      if (!c.value)
+      if (!i.value)
         try {
-          if (c.value = !0, e.handleBeforeClose && !((t = e == null ? void 0 : e.handleBeforeClose) != null && t.call(e)) || await f(
-            e.ctx,
-            (n = e.options) == null ? void 0 : n.onCancelButtonClick
-          ) === !1) return;
-          e.goBack ? e.goBack() : p();
+          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) || ""
+          });
+          if (await y(o) === !1) return;
+          e.goBack ? e.goBack() : f();
         } catch (o) {
           console.error("取消操作失败:", o);
         } finally {
-          c.value = !1;
+          i.value = !1;
         }
-    }, H = async () => {
+    }, N = async () => {
       var t;
       if (!l.value)
         try {
-          if (l.value = !0, await f(e.ctx, (t = e.options) == null ? void 0 : t.onOkButtonClick) === !1) return;
-          p();
+          l.value = !0;
+          const n = C({
+            context: e.ctx,
+            functionBody: ((t = e.options) == null ? void 0 : t.onOkButtonClick) || ""
+          });
+          if (await y(n) === !1) return;
+          f();
         } catch (n) {
           console.error("提交操作失败:", n);
         } finally {
@@ -50,30 +60,32 @@ const W = /* @__PURE__ */ S({
         }
     };
     return (t, n) => {
-      const o = B("a-button"), N = B("a-space");
-      return r(), u(N, { x: 8 }, {
+      const o = m("a-button"), S = m("a-space");
+      return r(), u(S, { x: 8 }, {
         default: s(() => [
-          h.value ? (r(), u(o, {
+          _.value ? (r(), u(o, {
             key: "cancelButtonHidden",
-            loading: c.value,
-            onClick: F
+            loading: i.value,
+            onClick: F,
+            disabled: t.handleDisabled
           }, {
             default: s(() => [
-              v(C(x.value), 1)
+              k(v(w.value), 1)
             ]),
             _: 1
-          }, 8, ["loading"])) : k("", !0),
-          b.value ? (r(), u(o, {
+          }, 8, ["loading", "disabled"])) : B("", !0),
+          x.value ? (r(), u(o, {
             type: "primary",
             key: "okButtonHidden",
             loading: l.value,
-            onClick: H
+            onClick: N,
+            disabled: t.handleDisabled
           }, {
             default: s(() => [
-              v(C(w.value), 1)
+              k(v(H.value), 1)
             ]),
             _: 1
-          }, 8, ["loading"])) : k("", !0)
+          }, 8, ["loading", "disabled"])) : B("", !0)
         ]),
         _: 1
       });
@@ -81,5 +93,5 @@ const W = /* @__PURE__ */ S({
   }
 });
 export {
-  W as default
+  E as default
 };

package/src/components/form-render/container-item/container-item-wrapper.vue.js

@@ -1,25 +1,4 @@
-import { createElementBlock as s, openBlock as o, normalizeStyle as r, normalizeClass as n, renderSlot as a } from "vue";
-import c from "../../../../_virtual/_plugin-vue_export-helper.js";
-const i = {
-  name: "container-item-wrapper",
-  props: {
-    widget: Object
-  },
-  computed: {
-    customClass() {
-      return this.widget.options.customClass ? this.widget.options.customClass.join(" ") : "";
-    }
-  }
-};
-function p(t, l, m, d, u, e) {
-  return o(), s("div", {
-    class: n(["container-wrapper", [e.customClass]]),
-    style: r(t.$attrs.containerStyle)
-  }, [
-    a(t.$slots, "default")
-  ], 6);
-}
-const _ = /* @__PURE__ */ c(i, [["render", p]]);
+import f from "./container-item-wrapper.vue2.js";
 export {
-  _ as default
+  f as default
 };

package/src/components/form-render/container-item/container-item-wrapper.vue2.js

@@ -0,0 +1,20 @@
+import { defineComponent as r, computed as s, createElementBlock as a, openBlock as i, normalizeStyle as l, normalizeClass as p, renderSlot as c } from "vue";
+const d = /* @__PURE__ */ r({
+  name: "container-item-wrapper",
+  __name: "container-item-wrapper",
+  props: {
+    widget: {}
+  },
+  setup(o) {
+    const e = o, n = s(() => e.widget.options.customClass ? e.widget.options.customClass.join(" ") : "");
+    return (t, m) => (i(), a("div", {
+      class: p(["container-wrapper", [n.value]]),
+      style: l(t.$attrs.containerStyle)
+    }, [
+      c(t.$slots, "default")
+    ], 6));
+  }
+});
+export {
+  d as default
+};

package/src/components/form-render/container-item/data-table-item.vue.js

@@ -1,46 +1,28 @@
-import p from "./container-item-wrapper.vue.js";
+import p from "./container-item-wrapper.vue2.js";
 import h from "../../../utils/emitter.js";
 import g from "../../../utils/i18n.js";
 import w from "../../form-designer/form-widget/field-widget/index.js";
 import f from "../refMixin.js";
-import b from "./containerItemMixin.js";
-import C from "../../../mixins/useDataTableMixin.js";
-import { resolveComponent as n, withDirectives as y, createBlock as a, openBlock as r, normalizeStyle as s, withCtx as i, createVNode as l, normalizeClass as R, createCommentVNode as F, vShow as S } from "vue";
+import C from "./containerItemMixin.js";
+import b from "../../../mixins/useDataTableMixin.js";
+import { resolveComponent as n, withDirectives as y, createBlock as a, openBlock as s, normalizeStyle as l, withCtx as i, createVNode as r, normalizeClass as R, createCommentVNode as S, vShow as F } from "vue";
 /* empty css                     */
 /* empty css                     */
-import I from "../../../../_virtual/_plugin-vue_export-helper.js";
-const T = {
+import z from "../../../../_virtual/_plugin-vue_export-helper.js";
+const _ = {
   name: "DataTableItem",
   componentName: "ContainerItem",
   // 必须固定为ContainerItem，用于接收父级组件的broadcast事件
-  mixins: [h, g, f, b, C],
+  mixins: [h, g, f, C, b],
   components: {
     ContainerItemWrapper: p,
     ...w
   },
   props: {
     widget: Object,
-    parentWidget: Object,
-    parentList: Array,
-    indexOfParentList: Number,
     data: {
       type: Array,
       default: () => []
-    },
-    subFormRowIndex: {
-      /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
-    },
-    subFormColIndex: {
-      /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
-    },
-    subFormRowId: {
-      /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ""
     }
   },
   inject: ["refList", "sfRefList", "globalModel", "getFormConfig", "getGlobalDsv"],
@@ -56,7 +38,11 @@ const T = {
     this.initRefList(), this.handleOnCreated();
   },
   mounted() {
-    this.loadDataTableDataSource(), this.$nextTick(() => {
+    this.setPagination({
+      pageSize: this.widget.options.pagination.pageSize,
+      page: 1,
+      total: 1
+    }), this.$nextTick(() => {
       this.handleOnMounted();
     });
   },
@@ -98,14 +84,14 @@ const T = {
     // --------------------- 以上为组件支持外部调用的API方法 end ------------------//
   }
 };
-function z(e, M, t, _, D, N) {
+function I(e, T, t, M, v, B) {
   const d = n("a-empty"), m = n("RenderBodyCell"), c = n("s-table"), u = n("container-item-wrapper");
-  return y((r(), a(u, {
-    style: s({ display: "flex", minWidth: 0, height: parseFloat(e.tableHeight || 0) + "px" }),
+  return y((s(), a(u, {
+    style: l({ display: "flex", minWidth: 0, height: parseFloat(e.tableHeight || 0) + "px" }),
     widget: t.widget
   }, {
     default: i(() => [
-      l(c, {
+      r(c, {
         class: R(["tpf-surely-table", [e.customClass]]),
         ref: "dataTable2",
         columns: e.columns.columns,
@@ -115,7 +101,7 @@ function z(e, M, t, _, D, N) {
         rowKey: (o) => o[t.widget.options.rowKey],
         scroll: { y: parseFloat(e.tableHeight || 0), x: 300 },
         bordered: t.widget.options.border,
-        style: s({ width: t.widget.options.tableWidth }),
+        style: l({ width: t.widget.options.tableWidth }),
         "row-class-name": e.rowClassName,
         rowSelection: e.handleRowSelection(),
         pagination: e.fmtPagination,
@@ -126,24 +112,24 @@ function z(e, M, t, _, D, N) {
         "row-height": e.lineHeight
       }, {
         emptyText: i(() => [
-          l(d)
+          r(d)
         ]),
         bodyCell: i((o) => [
-          e.isShowBodyCell(o.column.dataIndex) ? (r(), a(m, {
+          e.isShowBodyCell(o.column.dataIndex) ? (s(), a(m, {
             key: 0,
             bodyCell: e.columns.bodyCell,
             scope: o
-          }, null, 8, ["bodyCell", "scope"])) : F("", !0)
+          }, null, 8, ["bodyCell", "scope"])) : S("", !0)
         ]),
         _: 1
       }, 8, ["columns", "class", "size", "dataSource", "rowKey", "scroll", "bordered", "style", "row-class-name", "rowSelection", "pagination", "customRow", "onChange", "onResizeColumn", "loading", "row-height"])
     ]),
     _: 1
   }, 8, ["style", "widget"])), [
-    [S, !e.handleHidden()]
+    [F, !e.handleHidden()]
   ]);
 }
-const A = /* @__PURE__ */ I(T, [["render", z], ["__scopeId", "data-v-8e1059ce"]]);
+const A = /* @__PURE__ */ z(_, [["render", I], ["__scopeId", "data-v-de3544fc"]]);
 export {
   A as default
 };

package/src/components/form-render/container-item/grid-item.vue.js

@@ -1,7 +1,7 @@
 import g from "../../../utils/emitter.js";
 import w from "../../../utils/i18n.js";
-import b from "../refMixin.js";
-import _ from "./container-item-wrapper.vue.js";
+import _ from "../refMixin.js";
+import b from "./container-item-wrapper.vue2.js";
 import p from "./grid-col-item.vue.js";
 import h from "./containerItemMixin.js";
 import { resolveComponent as i, createBlock as r, openBlock as t, withCtx as n, withDirectives as x, normalizeClass as I, createElementBlock as C, Fragment as F, renderList as a, createSlots as R, renderSlot as k, mergeProps as y, vShow as j } from "vue";
@@ -10,9 +10,9 @@ const v = {
   name: "vf-grid-item",
   //grid-item跟VueGridLayout全局注册组件重名，故特殊处理！！
   componentName: "ContainerItem",
-  mixins: [g, w, b, h],
+  mixins: [g, w, _, h],
   components: {
-    ContainerItemWrapper: _,
+    ContainerItemWrapper: b,
     GridColItem: p
   },
   props: {
@@ -47,10 +47,10 @@ const v = {
   methods: {}
 };
 function O(o, S, e, B, M, N) {
-  const s = i("grid-col-item"), l = i("a-row"), c = i("container-item-wrapper");
-  return t(), r(c, { widget: e.widget }, {
+  const s = i("grid-col-item"), c = i("a-row"), l = i("container-item-wrapper");
+  return t(), r(l, { widget: e.widget }, {
     default: n(() => [
-      x((t(), r(l, {
+      x((t(), r(c, {
         key: e.widget.id,
         gutter: e.widget.options.gutter,
         class: I(["grid-container", [o.customClass]]),

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

@@ -2,7 +2,7 @@ import v from "../../../utils/emitter.js";
 import I from "../../../utils/i18n.js";
 import { deepClone as F, generateId as m, traverseFieldWidgetsOfContainer as T } from "../../../utils/util.js";
 import y from "../refMixin.js";
-import A from "./container-item-wrapper.vue.js";
+import A from "./container-item-wrapper.vue2.js";
 import M from "./containerItemMixin.js";
 import E from "../../form-designer/form-widget/field-widget/index.js";
 import { TpfConfirm as B } from "../../../hooks/TpfConfirm.js";