@tmagic/table 1.6.1 → 1.7.0-beta.1

package/dist/tmagic-table.umd.cjs

@@ -2038,7 +2038,9 @@
       columns: { default: () => [] },
       config: { default: () => ({}) },
       rowkeyName: { default: "c_id" },
-      editState: { default: () => [] }
+      editState: { default: () => [] },
+      row: {},
+      index: {}
     },
     emits: ["after-action"],
     setup(__props, { emit: __emit }) {
@@ -2048,8 +2050,20 @@
         if (typeof fuc === "function") {
           return fuc(row);
         }
+        if (typeof fuc === "boolean") {
+          return fuc;
+        }
         return true;
       };
+      const disabled = (fuc, row) => {
+        if (typeof fuc === "function") {
+          return fuc(row);
+        }
+        if (typeof fuc === "boolean") {
+          return fuc;
+        }
+        return false;
+      };
       const formatter = (fuc, row) => {
         if (typeof fuc === "function") {
           return fuc(row);
@@ -2071,7 +2085,9 @@
         const data = {};
         const row = props.editState[index];
         props.columns.filter((item) => item.type).forEach((column) => {
-          data[column.prop] = row[column.prop];
+          if (column.prop) {
+            data[column.prop] = row[column.prop];
+          }
         });
         const res = await action({
           data
@@ -2090,12 +2106,10 @@
         }
       };
       return (_ctx, _cache) => {
-        return vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTableColumn), {
-          label: __props.config.label,
-          width: __props.config.width,
-          fixed: __props.config.fixed
-        }, {
-          default: vue.withCtx((scope) => [
+        return vue.openBlock(), vue.createElementBlock(
+          vue.Fragment,
+          null,
+          [
             (vue.openBlock(true), vue.createElementBlock(
               vue.Fragment,
               null,
@@ -2113,17 +2127,18 @@
                       size: "small",
                       type: action.buttonType || "primary",
                       icon: action.icon,
-                      onClick: ($event) => actionHandler(action, scope.row, scope.$index)
+                      disabled: disabled(action.disabled, __props.row),
+                      onClick: ($event) => actionHandler(action, __props.row, __props.index)
                     }, {
                       default: vue.withCtx(() => [
                         vue.createElementVNode("span", {
-                          innerHTML: formatter(action.text, scope.row)
+                          innerHTML: formatter(action.text, __props.row)
                         }, null, 8, _hoisted_1$2)
                       ]),
                       _: 2
                       /* DYNAMIC */
-                    }, 1032, ["type", "icon", "onClick"]), [
-                      [vue.vShow, display(action.display, scope.row) && !__props.editState[scope.$index]]
+                    }, 1032, ["type", "icon", "disabled", "onClick"]), [
+                      [vue.vShow, display(action.display, __props.row) && !__props.editState[__props.index]]
                     ])
                   ]),
                   _: 2
@@ -2133,48 +2148,60 @@
               128
               /* KEYED_FRAGMENT */
             )),
-            vue.withDirectives(vue.createVNode(vue.unref(design.TMagicButton), {
-              class: "action-btn",
-              link: "",
-              type: "primary",
-              size: "small",
-              onClick: ($event) => save(scope.$index, __props.config)
-            }, {
-              default: vue.withCtx(() => [..._cache[0] || (_cache[0] = [
-                vue.createTextVNode(
-                  "保存",
-                  -1
-                  /* CACHED */
-                )
-              ])]),
-              _: 1
-              /* STABLE */
-            }, 8, ["onClick"]), [
-              [vue.vShow, __props.editState[scope.$index]]
+            vue.withDirectives(vue.createVNode(
+              vue.unref(design.TMagicButton),
+              {
+                class: "action-btn",
+                link: "",
+                type: "primary",
+                size: "small",
+                onClick: _cache[0] || (_cache[0] = ($event) => save(__props.index, __props.config))
+              },
+              {
+                default: vue.withCtx(() => [..._cache[2] || (_cache[2] = [
+                  vue.createTextVNode(
+                    "保存",
+                    -1
+                    /* CACHED */
+                  )
+                ])]),
+                _: 1
+                /* STABLE */
+              },
+              512
+              /* NEED_PATCH */
+            ), [
+              [vue.vShow, __props.editState[__props.index]]
             ]),
-            vue.withDirectives(vue.createVNode(vue.unref(design.TMagicButton), {
-              class: "action-btn",
-              link: "",
-              type: "primary",
-              size: "small",
-              onClick: ($event) => __props.editState[scope.$index] = void 0
-            }, {
-              default: vue.withCtx(() => [..._cache[1] || (_cache[1] = [
-                vue.createTextVNode(
-                  "取消",
-                  -1
-                  /* CACHED */
-                )
-              ])]),
-              _: 1
-              /* STABLE */
-            }, 8, ["onClick"]), [
-              [vue.vShow, __props.editState[scope.$index]]
+            vue.withDirectives(vue.createVNode(
+              vue.unref(design.TMagicButton),
+              {
+                class: "action-btn",
+                link: "",
+                type: "primary",
+                size: "small",
+                onClick: _cache[1] || (_cache[1] = ($event) => __props.editState[__props.index] = void 0)
+              },
+              {
+                default: vue.withCtx(() => [..._cache[3] || (_cache[3] = [
+                  vue.createTextVNode(
+                    "取消",
+                    -1
+                    /* CACHED */
+                  )
+                ])]),
+                _: 1
+                /* STABLE */
+              },
+              512
+              /* NEED_PATCH */
+            ), [
+              [vue.vShow, __props.editState[__props.index]]
             ])
-          ]),
-          _: 1
-          /* STABLE */
-        }, 8, ["label", "width", "fixed"]);
+          ],
+          64
+          /* STABLE_FRAGMENT */
+        );
       };
     }
   });
@@ -2185,7 +2212,9 @@
     },
     __name: "ComponentColumn",
     props: {
-      config: { default: () => ({}) }
+      config: { default: () => ({}) },
+      row: {},
+      index: {}
     },
     setup(__props) {
       const props = __props;
@@ -2202,26 +2231,13 @@
         return props.config.listeners || {};
       };
       return (_ctx, _cache) => {
-        return vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTableColumn), {
-          "show-overflow-tooltip": "",
-          label: __props.config.label,
-          width: __props.config.width,
-          fixed: __props.config.fixed,
-          sortable: __props.config.sortable,
-          prop: __props.config.prop
-        }, {
-          default: vue.withCtx((scope) => [
-            (vue.openBlock(), vue.createBlock(
-              vue.resolveDynamicComponent(__props.config.component),
-              vue.mergeProps(componentProps(scope.row, scope.$index), vue.toHandlers(componentListeners(scope.row, scope.$index))),
-              null,
-              16
-              /* FULL_PROPS */
-            ))
-          ]),
-          _: 1
-          /* STABLE */
-        }, 8, ["label", "width", "fixed", "sortable", "prop"]);
+        return vue.openBlock(), vue.createBlock(
+          vue.resolveDynamicComponent(__props.config.component),
+          vue.mergeProps(componentProps(__props.row, __props.index), vue.toHandlers(componentListeners(__props.row, __props.index))),
+          null,
+          16
+          /* FULL_PROPS */
+        );
       };
     }
   });
@@ -2233,7 +2249,8 @@
     },
     __name: "ExpandColumn",
     props: {
-      config: { default: () => ({}) }
+      config: { default: () => ({}) },
+      row: {}
     },
     setup(__props) {
       const props = __props;
@@ -2248,42 +2265,31 @@
           vue.Fragment,
           null,
           [
-            vue.createCommentVNode(" @ts-nocheck "),
-            vue.createVNode(vue.unref(design.TMagicTableColumn), {
-              type: "expand",
-              width: __props.config.width,
-              fixed: __props.config.fixed
-            }, {
-              default: vue.withCtx((scope) => [
-                __props.config.table ? (vue.openBlock(), vue.createBlock(_sfc_main, {
-                  key: 0,
-                  "show-header": false,
-                  columns: __props.config.table,
-                  data: __props.config.prop && scope.row[__props.config.prop] || []
-                }, null, 8, ["columns", "data"])) : vue.createCommentVNode("v-if", true),
-                __props.config.form ? (vue.openBlock(), vue.createBlock(vue.unref(form.MForm), {
-                  key: 1,
-                  config: __props.config.form,
-                  "init-values": __props.config.values || __props.config.prop && scope.row[__props.config.prop] || {}
-                }, null, 8, ["config", "init-values"])) : vue.createCommentVNode("v-if", true),
-                __props.config.expandContent ? (vue.openBlock(), vue.createElementBlock("div", {
-                  key: 2,
-                  innerHTML: __props.config.expandContent(scope.row, __props.config.prop)
-                }, null, 8, _hoisted_1$1)) : vue.createCommentVNode("v-if", true),
-                __props.config.component ? (vue.openBlock(), vue.createBlock(
-                  vue.resolveDynamicComponent(__props.config.component),
-                  vue.normalizeProps(vue.mergeProps({ key: 3 }, componentProps(scope.row))),
-                  null,
-                  16
-                  /* FULL_PROPS */
-                )) : vue.createCommentVNode("v-if", true)
-              ]),
-              _: 1
-              /* STABLE */
-            }, 8, ["width", "fixed"])
+            __props.config.table ? (vue.openBlock(), vue.createBlock(_sfc_main, {
+              key: 0,
+              "show-header": false,
+              columns: __props.config.table,
+              data: __props.config.prop && __props.row[__props.config.prop] || []
+            }, null, 8, ["columns", "data"])) : vue.createCommentVNode("v-if", true),
+            __props.config.form ? (vue.openBlock(), vue.createBlock(vue.unref(form.MForm), {
+              key: 1,
+              config: __props.config.form,
+              "init-values": __props.config.values || __props.config.prop && __props.row[__props.config.prop] || {}
+            }, null, 8, ["config", "init-values"])) : vue.createCommentVNode("v-if", true),
+            __props.config.expandContent ? (vue.openBlock(), vue.createElementBlock("div", {
+              key: 2,
+              innerHTML: __props.config.expandContent(__props.row, __props.config.prop)
+            }, null, 8, _hoisted_1$1)) : vue.createCommentVNode("v-if", true),
+            __props.config.component ? (vue.openBlock(), vue.createBlock(
+              vue.resolveDynamicComponent(__props.config.component),
+              vue.normalizeProps(vue.mergeProps({ key: 3 }, componentProps(__props.row))),
+              null,
+              16
+              /* FULL_PROPS */
+            )) : vue.createCommentVNode("v-if", true)
           ],
-          2112
-          /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+          64
+          /* STABLE_FRAGMENT */
         );
       };
     }
@@ -2313,69 +2319,46 @@
     },
     __name: "PopoverColumn",
     props: {
-      config: { default: () => ({}) }
+      config: { default: () => ({}) },
+      row: {},
+      index: {}
     },
     setup(__props) {
       return (_ctx, _cache) => {
-        return vue.openBlock(), vue.createElementBlock(
-          vue.Fragment,
-          null,
-          [
-            vue.createCommentVNode(" @ts-nocheck "),
-            vue.createVNode(vue.unref(design.TMagicTableColumn), {
-              label: __props.config.label,
-              width: __props.config.width,
-              fixed: __props.config.fixed
+        return __props.config.popover ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicPopover), {
+          key: 0,
+          placement: __props.config.popover.placement,
+          width: __props.config.popover.width,
+          trigger: __props.config.popover.trigger,
+          "destroy-on-close": __props.config.popover.destroyOnClose ?? true
+        }, {
+          reference: vue.withCtx(() => [
+            vue.createVNode(vue.unref(design.TMagicButton), {
+              link: "",
+              type: "primary"
             }, {
-              default: vue.withCtx((scope) => [
-                __props.config.popover ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicPopover), {
-                  key: 0,
-                  placement: __props.config.popover.placement,
-                  width: __props.config.popover.width,
-                  trigger: __props.config.popover.trigger,
-                  "destroy-on-close": __props.config.popover.destroyOnClose ?? true
-                }, {
-                  reference: vue.withCtx(() => [
-                    vue.createVNode(
-                      vue.unref(design.TMagicButton),
-                      {
-                        link: "",
-                        type: "primary"
-                      },
-                      {
-                        default: vue.withCtx(() => [
-                          vue.createTextVNode(
-                            vue.toDisplayString(__props.config.text || vue.unref(formatter)(__props.config, scope.row, { index: scope.$index })),
-                            1
-                            /* TEXT */
-                          )
-                        ]),
-                        _: 2
-                        /* DYNAMIC */
-                      },
-                      1024
-                      /* DYNAMIC_SLOTS */
-                    )
-                  ]),
-                  default: vue.withCtx(() => [
-                    __props.config.popover.tableEmbed ? (vue.openBlock(), vue.createBlock(_sfc_main, {
-                      key: 0,
-                      "show-header": __props.config.showHeader,
-                      columns: __props.config.table,
-                      data: __props.config.prop && scope.row[__props.config.prop] || []
-                    }, null, 8, ["show-header", "columns", "data"])) : vue.createCommentVNode("v-if", true)
-                  ]),
-                  _: 2
-                  /* DYNAMIC */
-                }, 1032, ["placement", "width", "trigger", "destroy-on-close"])) : vue.createCommentVNode("v-if", true)
+              default: vue.withCtx(() => [
+                vue.createTextVNode(
+                  vue.toDisplayString(__props.config.text || vue.unref(formatter)(__props.config, __props.row, { index: __props.index })),
+                  1
+                  /* TEXT */
+                )
               ]),
               _: 1
               /* STABLE */
-            }, 8, ["label", "width", "fixed"])
-          ],
-          2112
-          /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-        );
+            })
+          ]),
+          default: vue.withCtx(() => [
+            __props.config.popover.tableEmbed ? (vue.openBlock(), vue.createBlock(_sfc_main, {
+              key: 0,
+              "show-header": __props.config.showHeader,
+              columns: __props.config.table,
+              data: __props.config.prop && __props.row[__props.config.prop] || []
+            }, null, 8, ["show-header", "columns", "data"])) : vue.createCommentVNode("v-if", true)
+          ]),
+          _: 1
+          /* STABLE */
+        }, 8, ["placement", "width", "trigger", "destroy-on-close"])) : vue.createCommentVNode("v-if", true);
       };
     }
   });
@@ -2393,129 +2376,112 @@
     __name: "TextColumn",
     props: {
       config: { default: () => ({}) },
-      editState: { default: () => ({}) }
+      editState: { default: () => ({}) },
+      row: {},
+      index: {}
     },
     setup(__props) {
       return (_ctx, _cache) => {
         const _component_m_form_container = vue.resolveComponent("m-form-container");
         const _component_el_tooltip = vue.resolveComponent("el-tooltip");
-        return vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTableColumn), {
-          "show-overflow-tooltip": "",
-          label: __props.config.label,
-          width: __props.config.width,
-          fixed: __props.config.fixed,
-          sortable: __props.config.sortable,
-          prop: __props.config.prop
+        return __props.config.type === "index" ? (vue.openBlock(), vue.createElementBlock(
+          "div",
+          _hoisted_1,
+          vue.toDisplayString(__props.config.pageIndex && __props.config.pageSize ? __props.config.pageIndex * __props.config.pageSize + __props.index + 1 : __props.index + 1),
+          1
+          /* TEXT */
+        )) : __props.config.type && __props.editState[__props.index] ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicForm), {
+          key: 1,
+          "label-width": "0",
+          model: __props.editState[__props.index]
         }, {
-          default: vue.withCtx((scope) => [
-            __props.config.type === "index" ? (vue.openBlock(), vue.createElementBlock(
+          default: vue.withCtx(() => [
+            vue.createVNode(_component_m_form_container, {
+              prop: __props.config.prop,
+              rules: __props.config.rules,
+              config: __props.config,
+              name: __props.config.prop,
+              model: __props.editState[__props.index]
+            }, null, 8, ["prop", "rules", "config", "name", "model"])
+          ]),
+          _: 1
+          /* STABLE */
+        }, 8, ["model"])) : __props.config.action === "actionLink" && __props.config.prop ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
+          key: 2,
+          link: "",
+          type: "primary",
+          onClick: _cache[0] || (_cache[0] = ($event) => __props.config.handler?.(__props.row))
+        }, {
+          default: vue.withCtx(() => [
+            vue.createElementVNode("span", {
+              innerHTML: vue.unref(formatter)(__props.config, __props.row, { index: __props.index })
+            }, null, 8, _hoisted_2)
+          ]),
+          _: 1
+          /* STABLE */
+        })) : __props.config.action === "img" && __props.config.prop ? (vue.openBlock(), vue.createElementBlock("a", {
+          key: 3,
+          target: "_blank",
+          href: __props.row[__props.config.prop]
+        }, [
+          vue.createElementVNode("img", {
+            src: __props.row[__props.config.prop],
+            height: "50"
+          }, null, 8, _hoisted_4)
+        ], 8, _hoisted_3)) : __props.config.action === "link" && __props.config.prop ? (vue.openBlock(), vue.createElementBlock("a", {
+          key: 4,
+          target: "_blank",
+          href: __props.row[__props.config.prop],
+          class: "keep-all"
+        }, vue.toDisplayString(__props.row[__props.config.prop]), 9, _hoisted_5)) : __props.config.action === "tip" ? (vue.openBlock(), vue.createBlock(_component_el_tooltip, {
+          key: 5,
+          placement: "left"
+        }, {
+          content: vue.withCtx(() => [
+            vue.createElementVNode(
               "div",
-              _hoisted_1,
-              vue.toDisplayString(__props.config.pageIndex && __props.config.pageSize ? __props.config.pageIndex * __props.config.pageSize + scope.$index + 1 : scope.$index + 1),
+              null,
+              vue.toDisplayString(vue.unref(formatter)(__props.config, __props.row, { index: __props.index })),
               1
               /* TEXT */
-            )) : __props.config.type && __props.editState[scope.$index] ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicForm), {
-              key: 1,
-              "label-width": "0",
-              model: __props.editState[scope.$index]
-            }, {
-              default: vue.withCtx(() => [
-                vue.createVNode(_component_m_form_container, {
-                  prop: __props.config.prop,
-                  rules: __props.config.rules,
-                  config: __props.config,
-                  name: __props.config.prop,
-                  model: __props.editState[scope.$index]
-                }, null, 8, ["prop", "rules", "config", "name", "model"])
-              ]),
-              _: 2
-              /* DYNAMIC */
-            }, 1032, ["model"])) : __props.config.action === "actionLink" && __props.config.prop ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicButton), {
-              key: 2,
+            )
+          ]),
+          default: vue.withCtx(() => [
+            vue.createVNode(vue.unref(design.TMagicButton), {
               link: "",
-              type: "primary",
-              onClick: ($event) => __props.config.handler?.(scope.row)
-            }, {
-              default: vue.withCtx(() => [
-                vue.createElementVNode("span", {
-                  innerHTML: vue.unref(formatter)(__props.config, scope.row, { index: scope.$index })
-                }, null, 8, _hoisted_2)
-              ]),
-              _: 2
-              /* DYNAMIC */
-            }, 1032, ["onClick"])) : __props.config.action === "img" && __props.config.prop ? (vue.openBlock(), vue.createElementBlock("a", {
-              key: 3,
-              target: "_blank",
-              href: scope.row[__props.config.prop]
-            }, [
-              vue.createElementVNode("img", {
-                src: scope.row[__props.config.prop],
-                height: "50"
-              }, null, 8, _hoisted_4)
-            ], 8, _hoisted_3)) : __props.config.action === "link" && __props.config.prop ? (vue.openBlock(), vue.createElementBlock("a", {
-              key: 4,
-              target: "_blank",
-              href: scope.row[__props.config.prop],
-              class: "keep-all"
-            }, vue.toDisplayString(scope.row[__props.config.prop]), 9, _hoisted_5)) : __props.config.action === "tip" ? (vue.openBlock(), vue.createBlock(
-              _component_el_tooltip,
-              {
-                key: 5,
-                placement: "left"
-              },
-              {
-                content: vue.withCtx(() => [
-                  vue.createElementVNode(
-                    "div",
-                    null,
-                    vue.toDisplayString(vue.unref(formatter)(__props.config, scope.row, { index: scope.$index })),
-                    1
-                    /* TEXT */
-                  )
-                ]),
-                default: vue.withCtx(() => [
-                  vue.createVNode(vue.unref(design.TMagicButton), {
-                    link: "",
-                    type: "primary"
-                  }, {
-                    default: vue.withCtx(() => [
-                      vue.createTextVNode(
-                        vue.toDisplayString(__props.config.buttonText || "扩展配置"),
-                        1
-                        /* TEXT */
-                      )
-                    ]),
-                    _: 1
-                    /* STABLE */
-                  })
-                ]),
-                _: 2
-                /* DYNAMIC */
-              },
-              1024
-              /* DYNAMIC_SLOTS */
-            )) : __props.config.action === "tag" && __props.config.prop ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTag), {
-              key: 6,
-              type: typeof __props.config.type === "function" ? __props.config.type(scope.row[__props.config.prop], scope.row) : __props.config.type,
-              "close-transition": ""
+              type: "primary"
             }, {
               default: vue.withCtx(() => [
                 vue.createTextVNode(
-                  vue.toDisplayString(vue.unref(formatter)(__props.config, scope.row, { index: scope.$index })),
+                  vue.toDisplayString(__props.config.buttonText || "扩展配置"),
                   1
                   /* TEXT */
                 )
               ]),
-              _: 2
-              /* DYNAMIC */
-            }, 1032, ["type"])) : (vue.openBlock(), vue.createElementBlock("div", {
-              key: 7,
-              innerHTML: vue.unref(formatter)(__props.config, scope.row, { index: scope.$index })
-            }, null, 8, _hoisted_6))
+              _: 1
+              /* STABLE */
+            })
           ]),
           _: 1
           /* STABLE */
-        }, 8, ["label", "width", "fixed", "sortable", "prop"]);
+        })) : __props.config.action === "tag" && __props.config.prop ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTag), {
+          key: 6,
+          type: typeof __props.config.type === "function" ? __props.config.type(__props.row[__props.config.prop], __props.row) : __props.config.type,
+          "close-transition": ""
+        }, {
+          default: vue.withCtx(() => [
+            vue.createTextVNode(
+              vue.toDisplayString(vue.unref(formatter)(__props.config, __props.row, { index: __props.index })),
+              1
+              /* TEXT */
+            )
+          ]),
+          _: 1
+          /* STABLE */
+        }, 8, ["type"])) : (vue.openBlock(), vue.createElementBlock("div", {
+          key: 7,
+          innerHTML: vue.unref(formatter)(__props.config, __props.row, { index: __props.index })
+        }, null, 8, _hoisted_6));
       };
     }
   });
@@ -2549,9 +2515,67 @@
     setup(__props, { expose: __expose, emit: __emit }) {
       const props = __props;
       const emit = __emit;
-      const tMagicTable = vue.ref();
+      const cellRender = (config, { row = {}, $index }) => {
+        if (config.type === "expand") {
+          return vue.h(_sfc_main$3, {
+            config,
+            row
+          });
+        }
+        if (config.type === "component") {
+          return vue.h(_sfc_main$4, {
+            config,
+            row,
+            index: $index
+          });
+        }
+        if (config.actions) {
+          return vue.h(_sfc_main$5, {
+            config,
+            row,
+            index: $index,
+            rowkeyName: props.rowkeyName,
+            editState: editState.value,
+            columns: props.columns
+          });
+        }
+        if (config.type === "popover") {
+          return vue.h(_sfc_main$2, {
+            config,
+            row,
+            index: $index
+          });
+        }
+        return vue.h(_sfc_main$1, {
+          config,
+          row,
+          index: $index,
+          editState: editState.value
+        });
+      };
+      const tableColumns = vue.computed(
+        () => props.columns.map((item) => {
+          let type = "default";
+          if (item.type === "expand") {
+            type = "expand";
+          } else if (item.selection) {
+            type = "selection";
+          }
+          return {
+            props: {
+              label: item.label,
+              fixed: item.fixed,
+              width: item.width ?? (item.selection ? 40 : void 0),
+              prop: item.prop,
+              type,
+              selectable: item.selectable
+            },
+            cell: type === "selection" ? void 0 : ({ row, $index }) => cellRender(item, { row, $index })
+          };
+        })
+      );
+      const tMagicTableRef = vue.useTemplateRef("tMagicTable");
       const editState = vue.ref([]);
-      const tableColumnComponent = design.getDesignConfig("components")?.tableColumn;
       const selectionColumn = vue.computed(() => {
         const column = props.columns.filter((item) => item.selection);
         return column.length ? column[0] : null;
@@ -2587,13 +2611,13 @@
         emit("expand-change", ...args);
       };
       const toggleRowSelection = (row, selected) => {
-        tMagicTable.value?.toggleRowSelection(row, selected);
+        tMagicTableRef.value?.toggleRowSelection(row, selected);
       };
       const toggleRowExpansion = (row, expanded) => {
-        tMagicTable.value?.toggleRowExpansion(row, expanded);
+        tMagicTableRef.value?.toggleRowExpansion(row, expanded);
       };
       const clearSelection = () => {
-        tMagicTable.value?.clearSelection();
+        tMagicTableRef.value?.clearSelection();
       };
       const objectSpanMethod = (data) => {
         if (typeof props.spanMethod === "function") {
@@ -2612,11 +2636,11 @@
       return (_ctx, _cache) => {
         const _directive_loading = vue.resolveDirective("loading");
         return vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTable), {
+          class: "m-table",
+          ref: "tMagicTable",
+          "show-overflow-tooltip": true,
           "tooltip-effect": "dark",
           "tooltip-options": { popperOptions: { strategy: "absolute" } },
-          class: "m-table",
-          ref_key: "tMagicTable",
-          ref: tMagicTable,
           data: tableData.value,
           "show-header": __props.showHeader,
           "max-height": __props.bodyHeight,
@@ -2626,60 +2650,14 @@
           "tree-props": { children: "children" },
           "empty-text": __props.emptyText || "暂无数据",
           "span-method": objectSpanMethod,
+          columns: tableColumns.value,
           onSortChange: sortChange,
           onSelect: selectHandler,
           onSelectAll: selectAllHandler,
           onSelectionChange: selectionChangeHandler,
           onCellClick: cellClickHandler,
           onExpandChange: expandChange
-        }, {
-          default: vue.withCtx(() => [
-            (vue.openBlock(true), vue.createElementBlock(
-              vue.Fragment,
-              null,
-              vue.renderList(__props.columns, (item, columnIndex) => {
-                return vue.openBlock(), vue.createElementBlock(
-                  vue.Fragment,
-                  null,
-                  [
-                    item.type === "expand" ? (vue.openBlock(), vue.createBlock(_sfc_main$3, {
-                      config: item,
-                      key: columnIndex
-                    }, null, 8, ["config"])) : item.type === "component" ? (vue.openBlock(), vue.createBlock(_sfc_main$4, {
-                      config: item,
-                      key: columnIndex
-                    }, null, 8, ["config"])) : item.selection ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(vue.unref(tableColumnComponent)?.component || "el-table-column"), {
-                      width: "40",
-                      type: "selection",
-                      key: columnIndex,
-                      selectable: item.selectable
-                    }, null, 8, ["selectable"])) : item.actions ? (vue.openBlock(), vue.createBlock(_sfc_main$5, {
-                      columns: __props.columns,
-                      config: item,
-                      "rowkey-name": __props.rowkeyName,
-                      "edit-state": editState.value,
-                      key: columnIndex,
-                      onAfterAction: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("after-action"))
-                    }, null, 8, ["columns", "config", "rowkey-name", "edit-state"])) : item.type === "popover" ? (vue.openBlock(), vue.createBlock(_sfc_main$2, {
-                      key: columnIndex,
-                      config: item
-                    }, null, 8, ["config"])) : (vue.openBlock(), vue.createBlock(_sfc_main$1, {
-                      key: columnIndex,
-                      config: item,
-                      "edit-state": editState.value
-                    }, null, 8, ["config", "edit-state"]))
-                  ],
-                  64
-                  /* STABLE_FRAGMENT */
-                );
-              }),
-              256
-              /* UNKEYED_FRAGMENT */
-            ))
-          ]),
-          _: 1
-          /* STABLE */
-        }, 8, ["data", "show-header", "max-height", "default-expand-all", "border", "row-key", "empty-text"])), [
+        }, null, 8, ["data", "show-header", "max-height", "default-expand-all", "border", "row-key", "empty-text", "columns"])), [
           [_directive_loading, __props.loading]
         ]);
       };