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

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

@@ -1,6 +1,6 @@
-import { defineComponent as g, ref as a, computed as m, watch as v } from "vue";
-import f, { useI18n as I } from "../../utils/i18n.js";
-import h from "../code-editor/code-modal-editor.vue.js";
+import { defineComponent as g, ref as a, computed as m, watch as f } from "vue";
+import h, { useI18n as v } from "../../utils/i18n.js";
+import I from "../code-editor/code-modal-editor.vue.js";
 import { generateId as B } from "../../utils/util.js";
 import { TpfSelectIcon as x } from "tmgc2-share";
 const z = g({
@@ -15,11 +15,11 @@ const z = g({
       required: !0
     }
   },
-  components: { CodeModalEditor: h, TpfSelectIcon: x },
-  mixins: [f],
+  components: { CodeModalEditor: I, TpfSelectIcon: x },
+  mixins: [h],
   emits: ["update:data"],
   setup(r, { emit: u }) {
-    const { i18nt: t } = I(), o = a(), d = a(), i = a(), c = [
+    const { i18nt: t } = v(), o = a(), d = a(), i = a(), p = [
       {
         dataIndex: "label",
         title: t("designer.setting.operationButtonLabel"),
@@ -35,6 +35,11 @@ const z = g({
         title: t("designer.setting.operationButtonSize"),
         width: 80
       },
+      {
+        dataIndex: "ghost",
+        title: t("designer.setting.operationButtonGhost"),
+        width: 80
+      },
       {
         dataIndex: "danger",
         title: t("designer.setting.danger"),
@@ -66,7 +71,7 @@ const z = g({
         width: 80
       }
     ], n = m(() => r.data);
-    return v(
+    return f(
       () => n.value,
       () => {
         u("update:data", n.value);
@@ -81,6 +86,7 @@ const z = g({
           label: "new btn",
           type: "primary",
           size: "small",
+          ghost: !1,
           shape: "default",
           hidden: !1,
           disabled: !1,
@@ -90,11 +96,11 @@ const z = g({
       saveColumnRender: (e) => {
         console.log(n.value, i.value, o.value), n.value[i.value][o.value] = e;
       },
-      columns: c,
+      columns: p,
       buttonList: n,
-      editClickEvent: (e, s, p) => {
+      editClickEvent: (e, s, c) => {
         var l;
-        i.value = p[0], o.value = e, console.log({ code: s[e] }), (l = d.value) == null || l.open(s[e]);
+        i.value = c[0], o.value = e, console.log({ code: s[e] }), (l = d.value) == null || l.open(s[e]);
       },
       codeModalEditorRef: d,
       currentEditBtn: o,

package/src/components/public/ActionButtonListRender.vue.js

@@ -1,45 +1,46 @@
 import d from "./ActionButtonListRender.vue2.js";
-import { resolveComponent as n, createElementBlock as s, openBlock as t, normalizeStyle as p, normalizeClass as u, createBlock as a, Teleport as b, createVNode as f, withCtx as l, Fragment as _, renderList as m, createCommentVNode as y, createTextVNode as k, toDisplayString as C } from "vue";
+import { resolveComponent as n, createElementBlock as a, openBlock as t, normalizeStyle as p, normalizeClass as u, createBlock as s, Teleport as b, createVNode as f, withCtx as l, Fragment as _, renderList as g, createCommentVNode as m, createTextVNode as y, toDisplayString as k } from "vue";
 /* empty css                            */
-import g from "../../../_virtual/_plugin-vue_export-helper.js";
-function v(o, B, S, $, h, z) {
+import C from "../../../_virtual/_plugin-vue_export-helper.js";
+function h(o, v, B, S, $, z) {
   const r = n("SvgIcon"), c = n("a-button"), i = n("a-space");
-  return t(), s("div", {
+  return t(), a("div", {
     ref: "fieldEditor",
     class: u(["button-list-container", ...o.customClass]),
     style: p(o.containerStyle)
   }, [
-    (t(), a(b, {
+    (t(), s(b, {
       disabled: o.isDisabled,
       to: o.getContainer
     }, [
       f(i, { size: 8 }, {
         default: l(() => [
-          (t(!0), s(_, null, m(o.visibleButtons, (e) => (t(), a(c, {
+          (t(!0), a(_, null, g(o.visibleButtons, (e) => (t(), s(c, {
             key: e.key,
             type: e.type,
             danger: e.danger,
+            ghost: e.ghost,
             class: "tpf-button",
             disabled: o.handleDisabled(e),
             onClick: (D) => o.handleClick(e)
           }, {
             default: l(() => [
-              e.icon ? (t(), a(r, {
+              e.icon ? (t(), s(r, {
                 key: 0,
                 "icon-class": e.icon,
                 class: "button-icon"
-              }, null, 8, ["icon-class"])) : y("", !0),
-              k(" " + C(e.label), 1)
+              }, null, 8, ["icon-class"])) : m("", !0),
+              y(" " + k(e.label), 1)
             ]),
             _: 2
-          }, 1032, ["type", "danger", "disabled", "onClick"]))), 128))
+          }, 1032, ["type", "danger", "ghost", "disabled", "onClick"]))), 128))
         ]),
         _: 1
       })
     ], 8, ["disabled", "to"]))
   ], 6);
 }
-const L = /* @__PURE__ */ g(d, [["render", v], ["__scopeId", "data-v-a5c375c2"]]);
+const L = /* @__PURE__ */ C(d, [["render", h], ["__scopeId", "data-v-698b66f2"]]);
 export {
   L 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(null), _ = 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/hooks/useLowcode.js

@@ -1,13 +1,14 @@
-import v from "../components/form-render/index.vue.js";
+import w from "../components/form-render/index.vue.js";
 import { basicFieldsEnums as y } from "../components/form-designer/widget-panel/basicFieldsEnums.js";
-import { getUuidKey as w } from "@kp-ui/tool";
-import { useDataQueryApi as L, useComRef as R, useRouteBackTab as P, routerReloadStatus as N } from "tmgc2-share";
+import { getUuidKey as L } from "@kp-ui/tool";
+import { useDataQueryApi as R, useComRef as P, useRouteBackTab as N, routerReloadStatus as j } from "tmgc2-share";
 import { ref as g } from "vue";
-const Q = (C) => {
-  const { formCode: d, entityCode: l, type: h } = C, r = g(!1), f = L(), s = R(v), u = g(), { routeBackTab: b } = P(), F = (t = []) => {
-    const o = {
+const S = (C) => {
+  let { formCode: i, entityCode: l, type: h = "add" } = C;
+  const a = g(!1), f = R(), r = P(w), u = g(), { routeBackTab: b } = N(), F = (o = []) => {
+    const e = {
       label: "提交",
-      name: w(),
+      name: L(),
       onCreated: `
             const hidden = this.getFormRef().vfCtx?.type==='view';
             this.setHidden(hidden)
@@ -21,64 +22,64 @@ const Q = (C) => {
                 }
                 })()`
     };
-    return t.push(y.button(o)), t;
-  }, m = (t = []) => {
-    const e = t.reduce((o, n) => {
-      const i = y[n.componentType];
-      if (i) {
-        const c = i({
+    return o.push(y.button(e)), o;
+  }, m = (o = []) => {
+    const t = o.reduce((e, n) => {
+      const s = y[n.componentType];
+      if (s) {
+        const d = s({
           name: n.entityPropertyCode,
           label: n.entityPropertyName,
           ...n.options
         });
-        o = [...o, c];
+        e = [...e, d];
       }
-      return o;
+      return e;
     }, []);
-    return e.length ? F(e) : e;
-  }, a = async (t = []) => {
-    var o, n;
+    return t.length ? F(t) : t;
+  }, c = async (o = [], t) => {
+    var n, s;
     let e = { widgetList: [], formConfig: {} };
-    if (d && h) {
-      (o = s.value) == null || o.setLoading(!0);
+    if (i = t || i, i && h) {
+      (n = r.value) == null || n.setLoading(!0);
       try {
-        const i = await f.dataQueryDetail({ code: d }, "FormDefinitionManagement").then((c) => c.data.object || {});
-        e = JSON.parse(i.frontendDefinition || "{}");
+        const d = await f.dataQueryDetail({ code: i }, "FormDefinitionManagement").then((v) => v.data.object || {});
+        e = JSON.parse(d.frontendDefinition || "{}");
       } finally {
-        (n = s.value) == null || n.setLoading(!1);
+        (s = r.value) == null || s.setLoading(!1);
       }
     } else
-      e.widgetList = m(t);
-    return r.value = !1, console.log("json: ", e), u.value = e.formConfig, s.value.setFormJson(e), e;
+      e.widgetList = m(o);
+    return a.value = !1, console.log("json: ", e), u.value = e.formConfig, r.value.setFormJson(e), e;
   }, p = async () => {
-    if (r.value = !0, !l)
-      return a([]), [];
-    const t = {
+    if (a.value = !0, !l)
+      return c([]), [];
+    const o = {
       pageCode: "EntityPropertyFormItem",
       conditions: [{ fieldCode: "entityCode", type: "EQ", value: l }],
       requiredFields: ["entityPropertyCode", "entityPropertyName", "valueType"],
       page: 1,
       pageSize: null,
       sorts: []
-    }, e = await f.execute(t).then((o) => o.data.object.list);
-    return a(e), e;
+    }, t = await f.execute(o).then((e) => e.data.object.list);
+    return c(t), t;
   };
   return {
-    isLoading: r,
-    goBack: (t = N.view) => {
-      b(t);
+    isLoading: a,
+    goBack: (o = j.view) => {
+      b(o);
     },
     formConfig: u,
     getInitRenderJSON: m,
-    vfdRef: s,
-    getComponentJson: a,
+    vfdRef: r,
+    getComponentJson: c,
     getFieldList: p,
-    fieldListApi: async () => (await p()).map((e) => ({
-      showName: e.entityPropertyName,
-      fieldCode: e.entityPropertyCode
+    fieldListApi: async () => (await p()).map((t) => ({
+      showName: t.entityPropertyName,
+      fieldCode: t.entityPropertyCode
     }))
   };
 };
 export {
-  Q as useLowcode
+  S as useLowcode
 };

package/src/lang/en-US.js

@@ -171,6 +171,8 @@ const e = {
       generateSFC: "Generate SFC"
     },
     setting: {
+      // 序号
+      seq: "Seq",
       containerInputPlaceholder: "Enter the container selector",
       langMode: "language Mode",
       editAPIConfig: "Edit API Config",
@@ -182,6 +184,7 @@ const e = {
       tags: "Tags Mode",
       buttonList: "Button Group",
       buttonPosition: "Position",
+      autoWidth: "Auto Width",
       fixed: "Fixed Position",
       fixedRight: "Fixed Right",
       resizableColumn: "Resizable Column",
@@ -306,7 +309,6 @@ const e = {
       customLabelIcon: "Custom Label",
       labelIconClass: "Label Icon Class",
       labelIconPosition: "Label Icon Position",
-      labelTooltip: "Label Tooltip",
       minValue: "Min Value",
       maxValue: "Max Value",
       precision: "Precision",
@@ -425,6 +427,7 @@ const e = {
       actionColumn: "Action",
       addTableColumn: "Add New Column",
       deleteTableColumn: "Delete This Column",
+      addSubsets: "Add Subsets",
       onlyOneColumnCannotBeDeleted: "The last column cannot be deleted.",
       treeDataEnabled: "Enable Tree Data",
       rowKeyOfTreeData: "Row Key Of Data",
@@ -438,6 +441,7 @@ const e = {
       operationButtonLabel: "Text",
       operationButtonType: "Type",
       operationButtonSize: "Size",
+      operationButtonGhost: "Ghost",
       operationButtonRound: "Round",
       operationButtonHidden: "Hidden",
       operationButtonDisabled: "Disabled",

package/src/lang/zh-CN.js

@@ -169,6 +169,8 @@ const e = {
       generateSFC: "生成SFC"
     },
     setting: {
+      // 序号
+      seq: "序号",
       containerInputPlaceholder: "请输入要渲染的目标",
       langMode: "语法模式",
       editAPIConfig: "编辑API",
@@ -309,7 +311,6 @@ const e = {
       customLabelIcon: "定制字段标签",
       labelIconClass: "标签Icon样式",
       labelIconPosition: "标签Icon位置",
-      labelTooltip: "标签文字提示",
       minValue: "最小值",
       maxValue: "最大值",
       precision: "精度",
@@ -396,6 +397,7 @@ const e = {
       drawSize: "抽屉大小（px/%）",
       drawDirection: "抽屉滑出方向",
       isEnterSubmit: "回车键提交",
+      autoWidth: "自动宽度",
       //data-table
       tableWidth: "宽度(px/%)",
       tableHeight: "高度(px/%)",
@@ -423,6 +425,7 @@ const e = {
       actionColumn: "操作",
       addTableColumn: "增加列",
       deleteTableColumn: "删除列",
+      addSubsets: "增加子集",
       onlyOneColumnCannotBeDeleted: "表格只有一列时不可删除.",
       treeDataEnabled: "允许加载树形数据",
       rowKeyOfTreeData: "树形数据ID键",
@@ -436,6 +439,7 @@ const e = {
       operationButtonLabel: "文字",
       operationButtonType: "类型",
       operationButtonSize: "大小",
+      operationButtonGhost: "幽灵按钮",
       operationButtonRound: "圆角",
       operationButtonHidden: "隐藏",
       operationButtonDisabled: "禁用",

package/src/mixins/useDataTableMixin.js

@@ -1,9 +1,9 @@
 import { createVNode as w } from "vue";
-import { omit as r, isArray as g, isEmpty as u } from "lodash-es";
+import { omit as u, isArray as g, isEmpty as d } from "lodash-es";
 import { fmtHttpParams as p } from "../utils/request/fmtHttpParams.js";
-import { TpfConfirm as m } from "../hooks/TpfConfirm.js";
-import f from "../components/CustomRender/RenderBodyCell.js";
-import { executeFunction as l } from "../utils/executeFunction.js";
+import { TpfConfirm as f } from "../hooks/TpfConfirm.js";
+import m from "../components/CustomRender/RenderBodyCell.js";
+import { executeFunction as r } from "../utils/executeFunction.js";
 import R from "../components/public/ActionButtonListRender.vue.js";
 const I = {
   data() {
@@ -17,7 +17,7 @@ const I = {
     };
   },
   components: {
-    RenderBodyCell: f
+    RenderBodyCell: m
   },
   inject: ["refList"],
   computed: {
@@ -39,7 +39,7 @@ const I = {
       })), s = [];
       if (e.showButtonsColumn) {
         const i = e.operationButtons ?? [];
-        let d = this;
+        let a = this;
         s.push({
           fixed: "right",
           align: "center",
@@ -50,26 +50,23 @@ const I = {
               buttonList: i,
               flex: "center",
               scope: h,
-              ctx: d
+              ctx: a
             }, null);
           }
         });
       }
       let n = {};
       return {
-        columns: [...t, ...o, ...s].map((i) => (i.bodyCell && (n[i.dataIndex] = i.bodyCell, delete i.customRender), i)),
+        columns: [...t, ...o, ...s].map((i) => {
+          var a;
+          return (a = i.children) != null && a.length || delete i.children, i.bodyCell && (n[i.dataIndex] = i.bodyCell, delete i.customRender), i;
+        }),
         bodyCell: n
       };
     },
     tableHeight() {
       return parseFloat(this.widget.options.tableHeight || 0);
     },
-    // rowClassName() {
-    //   if (this.widget.options.stripe) {
-    //     return (_record, index) => (index % 2 === 1 ? 'table-striped' : null);
-    //   }
-    //   return null;
-    // },
     customClass() {
       return this.widget.options.customClass || "";
     },
@@ -108,7 +105,14 @@ const I = {
         onHidden: t,
         hidden: e
       } = this.widget.options;
-      return e ? !0 : t ? new Function(t).call(this) : !1;
+      if (e) return !0;
+      if (t)
+        try {
+          return new Function(t).call(this);
+        } catch {
+          return !1;
+        }
+      return !1;
     },
     rowClassName(t) {
       const {
@@ -129,7 +133,7 @@ const I = {
       const {
         hasRowSelection: t
       } = this.widget.options.rowSelection;
-      return t ? u(this.selectedRowInfo.selectedRowKeys) : u(this.selectRow);
+      return t ? d(this.selectedRowInfo.selectedRowKeys) : d(this.selectRow);
     },
     getSelectedRowKeys() {
       return this.selectedRowInfo.selectedRowKeys;
@@ -144,7 +148,7 @@ const I = {
       this.widget.options.tableColumns = t;
     },
     async delSelectRow(t) {
-      if (await m({
+      if (await f({
         content: "确定删除选中的数据吗"
       }), t = t || this.selectedRowInfo.selectedRowKeys, !t.length) return;
       const {
@@ -227,10 +231,10 @@ const I = {
     },
     // 处理列配置
     handleColumnItem(t) {
-      const e = r(t, ["customRender"]), o = t.customRender;
+      const e = u(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,
-        bodyCell: (s) => l({
+        bodyCell: (s) => r({
           functionBody: o,
           params: s,
           context: this,
@@ -251,7 +255,7 @@ const I = {
       this.skipSelectionChangeEvent = !0;
       try {
         if (n.onClick) {
-          await l({
+          await r({
             functionBody: n.onClick,
             params: {
               record: o,
@@ -264,10 +268,10 @@ const I = {
           return;
         }
         const {
-          onOperationButtonClick: a
+          onOperationButtonClick: l
         } = this.widget.options;
-        a ? await l({
-          functionBody: a,
+        l ? await r({
+          functionBody: l,
           params: {
             buttonName: t,
             rowIndex: e,
@@ -306,16 +310,10 @@ const I = {
     getFormRef() {
       return this.refList.v_form_ref;
     },
-    handlePageSizeChange(t) {
-      this.pageSize = t;
-      const {
-        onPageSizeChange: e
-      } = this.widget.options;
-      e ? new Function("pageSize", "currentPage", e).call(this, t, this.currentPage) : this.dispatch("VFormRender", "dataTablePageSizeChange", [this, t, this.currentPage]);
-    },
     handleTablePageChange(t, e, o, {
       currentDataSource: s
     }) {
+      console.log(2442342);
       const n = this.widget.options.onTableChange;
       this.widget.options.pagination.current = t.current, this.widget.options.pagination.pageSize = t.pageSize, n && new Function("pagination", "filters", "sorter", "currentDataSource", n).call(this, t, e, o, {
         currentDataSource: s
@@ -325,7 +323,7 @@ const I = {
       const t = this.widget.options.rowSelection;
       if (t.hasRowSelection)
         return {
-          ...r(t, ["onChange"]),
+          ...u(t, ["onChange"]),
           onChange: (e, o) => {
             this.selectedRowInfo = {
               selectedRowKeys: e,

package/src/utils/asyncExecuteFunction.js

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