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

package/src/components/form-designer/setting-panel/property-editor/container-vf-dialog/formCode-editor.vue.js

@@ -30,23 +30,25 @@ const h = {
         pageSize: null,
         sorts: []
       };
-      this.ops = await this.$http.post("/api/tmgc2-query/dataQuery/execute", o).then((e) => e.data.object.list || []).then((e) => e.map((t) => ({ formCode: t.formCode })));
+      this.ops = await this.$http.post("/api/tmgc2-query/dataQuery/execute", o).then((e) => e.data.object.list || []).then(
+        (e) => e.map((t) => ({ formCode: t.formCode, formId: t.formId }))
+      );
     }
   }
 };
-function u(o, e, t, g, r, a) {
-  const d = n("a-select"), i = n("a-form-item");
+function u(o, e, t, g, r, d) {
+  const a = n("a-select"), i = n("a-form-item");
   return p(), l(i, {
     label: o.i18nt("designer.setting.formCode")
   }, {
     default: f(() => [
-      c(d, {
+      c(a, {
         value: t.optionModel.formCode,
         "onUpdate:value": e[0] || (e[0] = (s) => t.optionModel.formCode = s),
         allowClear: "",
         options: r.ops,
         fieldNames: { label: "formCode", value: "formCode" },
-        onChange: a.handleChangeFormCode
+        onChange: d.handleChangeFormCode
       }, null, 8, ["value", "options", "onChange"])
     ]),
     _: 1

package/src/mixins/useDataTableMixin.js

@@ -1,9 +1,9 @@
 import { createVNode as w } from "vue";
-import { omit as c, 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 f } from "../hooks/TpfConfirm.js";
 import m from "../components/CustomRender/RenderBodyCell.js";
-import { executeFunction as l } from "../utils/executeFunction.js";
+import { executeFunction as r } from "../utils/executeFunction.js";
 import R from "../components/public/ActionButtonListRender.vue.js";
 const I = {
   data() {
@@ -22,8 +22,8 @@ const I = {
   inject: ["refList"],
   computed: {
     columns() {
-      var r;
-      const t = [], e = ((r = this.widget) == null ? void 0 : r.options) ?? {};
+      var c;
+      const t = [], e = ((c = this.widget) == null ? void 0 : c.options) ?? {};
       e.showIndex && t.push({
         title: "序号",
         align: "left",
@@ -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,14 +50,17 @@ 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
       };
     },
@@ -130,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;
@@ -228,10 +231,10 @@ const I = {
     },
     // 处理列配置
     handleColumnItem(t) {
-      const e = c(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,
@@ -252,7 +255,7 @@ const I = {
       this.skipSelectionChangeEvent = !0;
       try {
         if (n.onClick) {
-          await l({
+          await r({
             functionBody: n.onClick,
             params: {
               record: o,
@@ -265,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,
@@ -320,7 +323,7 @@ const I = {
       const t = this.widget.options.rowSelection;
       if (t.hasRowSelection)
         return {
-          ...c(t, ["onChange"]),
+          ...u(t, ["onChange"]),
           onChange: (e, o) => {
             this.selectedRowInfo = {
               selectedRowKeys: e,