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

package/package.json

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

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

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

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

@@ -1,4 +1,87 @@
-import f from "./index.vue.js";
+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 { Skeleton as z } from "ant-design-vue";
+import I from "../form-render/dynamic-dialog.vue.js";
+/* empty css                                 */
+import v from "./FormContainer.js";
+import { useFormContext as U } 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 = {
+  key: 0,
+  class: "loading-wrapper"
+}, ae = /* @__PURE__ */ S({
+  name: "VFormRender",
+  componentName: "VFormRender",
+  __name: "index",
+  props: {
+    vfCtx: { default: () => ({}) },
+    formJson: { default: () => ({ widgetList: [], formConfig: {} }) },
+    formData: { default: () => ({}) },
+    optionData: { default: () => ({}) },
+    disabledMode: { type: Boolean, default: !1 },
+    renderConfig: { default: () => ({ languageName: "zh-CN" }) },
+    globalDsv: { default: () => ({}) },
+    parentForm: { default: null },
+    dynamicCreation: { type: Boolean, default: !1 },
+    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({
+      props: a,
+      renderForm: i
+    }), R = (c) => {
+      N("form-submit", c);
+    }, B = () => l.value;
+    w(() => {
+      o.registerToRefList("v_form_ref");
+    }), J(
+      n,
+      () => {
+        F(n.value);
+      },
+      {
+        immediate: !0
+      }
+    );
+    const { dynamicDialgRef: s, dialogProps: D, emitter: L, isLoading: f } = o;
+    return C({
+      ...L,
+      ...o,
+      dynamicDialgRef: s,
+      getNativeForm: B,
+      formJson: a.formJson,
+      renderForm: i
+    }), (c, u) => (t(), p(E, null, [
+      M("div", H, [
+        e(f) ? (t(), p("div", K, [
+          r(e(z), { active: e(f) }, null, 8, ["active"])
+        ])) : g("", !0),
+        r(e(v), {
+          ref_key: "formContainer",
+          ref: l,
+          context: e(o),
+          onFormSubmit: R
+        }, null, 8, ["context"]),
+        r(I, T(e(D), {
+          ref_key: "dynamicDialgRef",
+          ref: s
+        }), null, 16)
+      ]),
+      k.value ? (t(), P(A, {
+        key: 0,
+        visible: m.value,
+        "onUpdate:visible": u[0] || (u[0] = (V) => m.value = V)
+      }, null, 8, ["visible"])) : g("", !0)
+    ], 64));
+  }
+});
 export {
-  f as default
+  ae as default
 };

package/src/components/form-designer/form-widget/container-widget/data-table-widget.vue.js

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

package/src/components/form-designer/form-widget/container-widget/data-table-widget.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent as R, watchEffect as _, onMounted as E, createBlock as P, createCommentVNode as W, unref as e, openBlock as z, normalizeProps as N, mergeProps as y, withCtx as F, createElementVNode as V, normalizeStyle as k, createVNode as D } from "vue";
+import { defineComponent as R, watchEffect as l, onMounted as _, createBlock as E, createCommentVNode as W, unref as e, openBlock as z, normalizeProps as N, mergeProps as y, withCtx as F, createElementVNode as V, normalizeStyle as k, createVNode as D } from "vue";
 import I from "./container-wrapper.vue.js";
 import { ComponentNameEnum as L, ContainerTypeEnum as B } from "../../../../constants/WidgetTypeEnum.js";
 import { useTableWidget as M } from "./useTableWidget.js";
@@ -17,52 +17,58 @@ const Q = /* @__PURE__ */ R({
     subFormRowIndex: {},
     subFormRowId: {}
   },
-  setup(r, { expose: l }) {
-    const t = r, { fieldModel: d, handleHidden: s, defineExposed: p } = S(t), {
-      isLoading: m,
+  setup(d, { expose: s }) {
+    const t = d, { fieldModel: p, handleHidden: m, defineExposed: f } = S(t), {
+      isLoading: u,
       tableProps: n,
-      pagintion: u,
-      tableWidth: f,
-      setPagination: c,
-      handleTableChange: g,
-      setTableRef: b,
-      loadDataTableDataSource: h
+      pagintion: c,
+      tableWidth: g,
+      setPagination: i,
+      handleTableChange: b,
+      setTableRef: h,
+      loadDataTableDataSource: C
     } = M({
-      fieldModel: d,
+      fieldModel: p,
       props: t
-    }), { tableRef: o, setTableProps: C, register: w } = H({
+    });
+    l(() => {
+      i({
+        total: t.field.options.showPagination ? 1 : 0
+      });
+    });
+    const { tableRef: o, setTableProps: w, register: x } = H({
       props: n.value,
       events: {
-        columnResizableChange: (i) => {
-          const { field: a, resizeWidth: x } = i.resizeColumn;
+        columnResizableChange: (r) => {
+          const { field: a, resizeWidth: T } = r.resizeColumn;
           if (a) {
-            const T = t.field.options.tableColumns.find(
-              (v) => v.dataIndex === a
+            const v = t.field.options.tableColumns.find(
+              (P) => P.dataIndex === a
             );
-            T.width = x;
+            v.width = T;
           }
         }
       }
     });
-    return _(() => {
-      C(n.value), o.value && b(o.value);
-    }), E(() => {
-    }), l({
-      ...p,
-      setPagination: c,
-      loadDataTableDataSource: h,
+    return l(() => {
+      w(n.value), o.value && h(o.value);
+    }), _(() => {
+    }), s({
+      ...f,
+      setPagination: i,
+      loadDataTableDataSource: C,
       fieldEditor: o.value
-    }), (i, a) => e(s) ? W("", !0) : (z(), P(I, N(y({ key: 0 }, t)), {
+    }), (r, a) => e(m) ? W("", !0) : (z(), E(I, N(y({ key: 0 }, t)), {
       default: F(() => [
         V("div", {
           class: "talbe-wrapper",
-          style: k({ width: e(f) })
+          style: k({ width: e(g) })
         }, [
           D(e(O), {
-            onRegister: e(w),
-            loading: e(m),
-            pagination: e(u),
-            onChange: e(g)
+            onRegister: e(x),
+            loading: e(u),
+            pagination: e(c),
+            onChange: e(b)
           }, null, 8, ["onRegister", "loading", "pagination", "onChange"])
         ], 4)
       ]),

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

@@ -1,14 +1,14 @@
-import { inject as A, ref as C, computed as c, h as H } from "vue";
-import { omit as N, cloneDeep as g } from "lodash-es";
-import V from "../../../public/ActionButtonListRender.vue.js";
-import { useI18n as q } from "../../../../utils/i18n.js";
-import { useExecFunction as L, tranformAntTableColumnToVxetableColumn as K, tranformAntSizzVxetableSize as j } from "tmgc2-share";
-import { useDataHttp as _ } from "../../../../hooks/useDataHttp.js";
-function nt({ props: l, fieldModel: i }) {
-  const w = A("designState", !1), d = C(), h = C(!1), { widget: n } = l, { i18nt: S } = q(), { executeFunction: u, context: D } = L(), { loadataSource: T, setPagination: f, getPagination: p, pagintion: v } = _({
-    props: l
-  }), y = c(() => {
-    const t = [], e = (n == null ? void 0 : n.options) || {}, { rowSelection: o, showIndex: a, tableColumns: s = [] } = (n == null ? void 0 : n.options) ?? {};
+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 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({
+    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) ?? {};
     o != null && o.hasRowSelection && t.push({
       title: o.columnTitle,
       width: o.columnWidth,
@@ -17,7 +17,7 @@ function nt({ props: l, fieldModel: i }) {
       dataIndex: "checkbox",
       type: "checkbox"
     }), a && t.push({
-      title: S("designer.setting.seq"),
+      title: y("designer.setting.seq"),
       align: "left",
       width: 90,
       fixed: "left",
@@ -26,69 +26,68 @@ function nt({ props: l, fieldModel: i }) {
       resizable: !0,
       type: "seq"
     });
-    const m = s.filter((r) => r.show).map((r) => ({
-      ...r,
-      ...R(r)
-    })), x = [];
+    const m = r.filter((i) => i.show).map((i) => ({
+      ...i,
+      ...R(i)
+    })), w = [];
     if (e.showButtonsColumn) {
-      const r = e.operationButtons ?? [];
-      x.push({
+      const i = e.operationButtons ?? [];
+      w.push({
         fixed: "right",
         align: "center",
         title: e.buttonsColumnTitle,
         width: e.buttonsColumnWidth,
         slots: {
-          default: (E) => H(V, {
-            buttonList: r,
+          default: (A) => K(q, {
+            buttonList: i,
             flex: "center",
-            scope: E,
-            ctx: D.value
+            scope: A,
+            ctx: S.value
           })
         }
       });
     }
-    let I = [...t, ...m, ...x];
-    return K(I);
+    const V = [...t, ...m, ...w];
+    return _(V);
   }), R = (t) => {
-    const e = N(t, ["customRender"]), o = t.customRender;
+    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) {
           return u({
-            source: l.field.options.name,
+            source: c.field.options.name,
             functionBody: o,
             params: {
               index: a.rowIndex,
               record: a.row,
               ...a
             },
-            errorCallback: (s) => {
-              console.error("Custom render error:", s);
+            errorCallback: (r) => {
+              console.error("Custom render error:", r);
             }
           });
         }
       }
     } : t;
-  }, k = c(() => n.options.tableWidth), z = c(() => n.options.tableSize), W = () => {
+  }, k = l(() => n.options.tableWidth), z = l(() => n.options.tableSize), W = () => {
     b();
-  }, B = c(() => {
+  }, B = l(() => n.options.rowKey), P = l(() => {
     const {
       tableSize: t,
       rowKey: e,
       tableHeight: o = 300,
       border: a = !1,
-      lineHeight: s = 50,
+      lineHeight: r = 50,
       colorRow: m = !1
     } = n.options;
     return {
-      id: n.id,
       showPagination: n.options.showPagination,
-      size: j(t),
+      size: G(t),
       height: o,
       border: a ?? !1,
-      data: i.value || [],
-      columns: y.value,
+      data: s.value || [],
+      columns: T.value,
       sortConfig: {
         trigger: "cell",
         remote: !0,
@@ -100,25 +99,25 @@ function nt({ props: l, fieldModel: i }) {
         isHover: !0
       },
       cellConfig: {
-        height: s
+        height: r
       }
     };
-  }), P = (t) => {
+  }), F = (t) => {
     d.value = t;
   }, b = async () => {
     var t;
-    if (l.field.options.dsEnabled) {
+    if (c.field.options.dsEnabled) {
       h.value = !0;
       try {
-        const e = await T(), o = e.list || [];
-        w ? await ((t = d.value) == null ? void 0 : t.loadData(o)) : i.value = g(o || []), f(e);
+        const e = await v(), o = e.list || [];
+        C ? await ((t = d.value) == null ? void 0 : t.loadData(o)) : s.value = g(o || []), f(e);
       } catch (e) {
         console.error(e);
       }
     } else
-      i.value = n.options.dataSource || [];
+      s.value = n.options.dataSource || [];
     h.value = !1;
-  }, F = ({ row: t, $event: e }, o) => {
+  }, I = ({ row: t, $event: e }, o) => {
     u({
       functionBody: n.options.customRow[o],
       params: [t, e],
@@ -126,6 +125,7 @@ function nt({ props: l, fieldModel: i }) {
     });
   };
   return {
+    rowKey: B,
     onCheckboxChange: (t) => {
       u({
         functionBody: n.options.rowSelection.onChange,
@@ -134,21 +134,25 @@ function nt({ props: l, fieldModel: i }) {
       });
     },
     tableDefinExpoed: {
+      setValue: (t) => {
+        if (!N(t))
+          return console.error("表格数据类型错误");
+      },
       insertTableValue: (t) => {
-        i.value.push(g(t));
+        s.value || (s.value = []), s.value.push(g(t));
       },
       setPagination: f,
-      getDataSource: () => i.value,
+      getDataSource: () => s.value,
       getPagination: p
     },
     onSortChange: W,
-    pagintion: v,
+    pagintion: D,
     setPagination: f,
     getPagination: p,
     handleTableChange: (t, e, o, a) => {
-      const s = n.options.onTableChange;
-      s && u({
-        functionBody: s,
+      const r = n.options.onTableChange;
+      r && u({
+        functionBody: r,
         params: {
           pagination: t,
           filters: e,
@@ -159,22 +163,22 @@ function nt({ props: l, fieldModel: i }) {
       });
     },
     setTableData: (t) => {
-      i.value = g(t);
+      s.value = g(t);
     },
     loadDataTableDataSource: () => {
       b();
     },
-    showPagination: c(() => !!l.field.options.showPagination),
-    onRunEvent: F,
+    showPagination: l(() => !!c.field.options.showPagination),
+    onRunEvent: I,
     isLoading: h,
     initTableSoureData: b,
-    setTableRef: P,
+    setTableRef: F,
     tableSize: z,
     tableWidth: k,
-    tableProps: B,
+    tableProps: P,
     tableRef: d
   };
 }
 export {
-  nt as useTableWidget
+  rt as useTableWidget
 };

package/src/components/form-designer/form-widget/field-widget/hooks/useSelect.js

@@ -6,22 +6,22 @@ function D(t, g) {
   if (!Array.isArray(t))
     return -1;
   let l = -1;
-  return t.forEach((i, r) => {
-    i === g && (l = r);
+  return t.forEach((i, s) => {
+    i === g && (l = s);
   }), l;
 }
 function U({ field: t, designState: g, fieldModel: l }) {
   const i = m({
     val: ""
-  }), r = m(!1), s = m({
+  }), s = m(!1), r = m({
     page: 1,
     pageSize: 20,
     totalPage: 0,
     total: 0
   }), { execHttpFunction: P } = q(), h = async () => {
     var e;
-    if (console.log(32321321), !r.value) {
-      if (r.value = !0, t.options.dsEnabled && ((e = t.options.http) != null && e.url))
+    if (!s.value) {
+      if (s.value = !0, t.options.dsEnabled && ((e = t.options.http) != null && e.url))
         try {
           const { http: o, dataHandlerCode: n, dataReqHandlerCode: u } = t.options, a = await P(
             {
@@ -32,28 +32,28 @@ function U({ field: t, designState: g, fieldModel: l }) {
             {}
           );
           if (!a) {
-            r.value = !1;
+            s.value = !1;
             return;
           }
           if (O(a)) {
-            c(a);
+            c(a), s.value = !1;
             return;
           }
-          O(a.list) && (t.options.loadingPage ? (s.value.total = a.total || 0, s.value.totalPage = a.totalPage || 0, c([...v(), ...a.list])) : c(a.list));
+          O(a.list) && (t.options.loadingPage ? (r.value.total = a.total || 0, r.value.totalPage = a.totalPage || 0, c([...v(), ...a.list])) : c(a.list));
         } catch (o) {
           console.error("err: ", o);
         }
       else
         c([...v()]);
-      r.value = !1;
+      s.value = !1;
     }
   }, w = N(function() {
-    s.value.page += 1, h();
+    r.value.page += 1, h();
   }, 500), E = (e) => {
     if (!t.options.loadingPage) return;
     const { target: o } = e, { scrollTop: n, scrollHeight: u, clientHeight: a } = o;
-    if (u - (n + a) <= 30 && s.value.totalPage > s.value.page) {
-      if (s.value.totalPage === s.value.page)
+    if (u - (n + a) <= 30 && r.value.totalPage > r.value.page) {
+      if (r.value.totalPage === r.value.page)
         return;
       w();
     }
@@ -62,14 +62,14 @@ function U({ field: t, designState: g, fieldModel: l }) {
     value: (t == null ? void 0 : t.options.valueKey) || "value",
     options: "options"
   })), K = (e, o) => o[y.value.label].toLowerCase().indexOf(e.toLowerCase()) >= 0, C = () => {
-    s.value = { page: 1, pageSize: 20, total: 0, totalPage: 0 }, c([]);
+    r.value = { page: 1, pageSize: 20, total: 0, totalPage: 0 }, c([]);
   }, L = (e) => {
     t.options.showSearch && (g || (C(), i.value.val = e, h()));
   }, A = p(() => {
     var n;
     const o = (n = t == null ? void 0 : t.options) == null ? void 0 : n.showSearch;
     return {
-      loading: r.value,
+      loading: s.value,
       fieldNames: y.value,
       showSearch: !0,
       onPopupScroll: E,
@@ -125,8 +125,8 @@ function U({ field: t, designState: g, fieldModel: l }) {
     loadOptions: c,
     filterOption: K,
     keyword: i,
-    pager: s,
-    loading: r,
+    pager: r,
+    loading: s,
     fieldNames: y,
     selectOps: A,
     initOptionItems: h,