@tmagic/table 1.6.0 → 1.7.0-beta.0

package/dist/tmagic-table.js

@@ -1,6 +1,6 @@
-import { defineComponent, createBlock, openBlock, unref, withCtx, createElementBlock, withDirectives, Fragment, renderList, createVNode, createElementVNode, vShow, createTextVNode, resolveDynamicComponent, mergeProps, toHandlers, createCommentVNode, normalizeProps, toDisplayString, resolveComponent, ref, computed, resolveDirective } from 'vue';
+import { defineComponent, createElementBlock, openBlock, Fragment, withDirectives, renderList, createBlock, unref, withCtx, createVNode, createElementVNode, vShow, createTextVNode, resolveDynamicComponent, mergeProps, toHandlers, createCommentVNode, normalizeProps, toDisplayString, resolveComponent, computed, useTemplateRef, ref, resolveDirective, h } from 'vue';
 import { cloneDeep } from 'lodash-es';
-import { TMagicTableColumn, TMagicTooltip, TMagicButton, tMagicMessage, TMagicPopover, TMagicForm, TMagicTag, getDesignConfig, TMagicTable } from '@tmagic/design';
+import { TMagicTooltip, TMagicButton, tMagicMessage, TMagicPopover, TMagicForm, TMagicTag, TMagicTable } from '@tmagic/design';
 import { MForm, datetimeFormatter } from '@tmagic/form';
 
 const _hoisted_1$2 = ["innerHTML"];
@@ -13,7 +13,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     columns: { default: () => [] },
     config: { default: () => ({}) },
     rowkeyName: { default: "c_id" },
-    editState: { default: () => [] }
+    editState: { default: () => [] },
+    row: {},
+    index: {}
   },
   emits: ["after-action"],
   setup(__props, { emit: __emit }) {
@@ -23,8 +25,20 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       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);
@@ -46,7 +60,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       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
@@ -65,16 +81,14 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       }
     };
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(TMagicTableColumn), {
-        label: _ctx.config.label,
-        width: _ctx.config.width,
-        fixed: _ctx.config.fixed
-      }, {
-        default: withCtx((scope) => [
+      return openBlock(), createElementBlock(
+        Fragment,
+        null,
+        [
           (openBlock(true), createElementBlock(
             Fragment,
             null,
-            renderList(_ctx.config.actions, (action, actionIndex) => {
+            renderList(__props.config.actions, (action, actionIndex) => {
               return openBlock(), createBlock(unref(TMagicTooltip), {
                 placement: action.tooltipPlacement || "top",
                 key: actionIndex,
@@ -88,17 +102,18 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                     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: withCtx(() => [
                       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"]), [
-                    [vShow, display(action.display, scope.row) && !_ctx.editState[scope.$index]]
+                  }, 1032, ["type", "icon", "disabled", "onClick"]), [
+                    [vShow, display(action.display, __props.row) && !__props.editState[__props.index]]
                   ])
                 ]),
                 _: 2
@@ -108,48 +123,60 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
             128
             /* KEYED_FRAGMENT */
           )),
-          withDirectives(createVNode(unref(TMagicButton), {
-            class: "action-btn",
-            link: "",
-            type: "primary",
-            size: "small",
-            onClick: ($event) => save(scope.$index, _ctx.config)
-          }, {
-            default: withCtx(() => [..._cache[0] || (_cache[0] = [
-              createTextVNode(
-                "保存",
-                -1
-                /* CACHED */
-              )
-            ])]),
-            _: 2
-            /* DYNAMIC */
-          }, 1032, ["onClick"]), [
-            [vShow, _ctx.editState[scope.$index]]
+          withDirectives(createVNode(
+            unref(TMagicButton),
+            {
+              class: "action-btn",
+              link: "",
+              type: "primary",
+              size: "small",
+              onClick: _cache[0] || (_cache[0] = ($event) => save(__props.index, __props.config))
+            },
+            {
+              default: withCtx(() => [..._cache[2] || (_cache[2] = [
+                createTextVNode(
+                  "保存",
+                  -1
+                  /* CACHED */
+                )
+              ])]),
+              _: 1
+              /* STABLE */
+            },
+            512
+            /* NEED_PATCH */
+          ), [
+            [vShow, __props.editState[__props.index]]
           ]),
-          withDirectives(createVNode(unref(TMagicButton), {
-            class: "action-btn",
-            link: "",
-            type: "primary",
-            size: "small",
-            onClick: ($event) => _ctx.editState[scope.$index] = void 0
-          }, {
-            default: withCtx(() => [..._cache[1] || (_cache[1] = [
-              createTextVNode(
-                "取消",
-                -1
-                /* CACHED */
-              )
-            ])]),
-            _: 2
-            /* DYNAMIC */
-          }, 1032, ["onClick"]), [
-            [vShow, _ctx.editState[scope.$index]]
+          withDirectives(createVNode(
+            unref(TMagicButton),
+            {
+              class: "action-btn",
+              link: "",
+              type: "primary",
+              size: "small",
+              onClick: _cache[1] || (_cache[1] = ($event) => __props.editState[__props.index] = void 0)
+            },
+            {
+              default: withCtx(() => [..._cache[3] || (_cache[3] = [
+                createTextVNode(
+                  "取消",
+                  -1
+                  /* CACHED */
+                )
+              ])]),
+              _: 1
+              /* STABLE */
+            },
+            512
+            /* NEED_PATCH */
+          ), [
+            [vShow, __props.editState[__props.index]]
           ])
-        ]),
-        _: 1
-        /* STABLE */
-      }, 8, ["label", "width", "fixed"]);
+        ],
+        64
+        /* STABLE_FRAGMENT */
+      );
     };
   }
 });
@@ -160,7 +187,9 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   },
   __name: "ComponentColumn",
   props: {
-    config: { default: () => ({}) }
+    config: { default: () => ({}) },
+    row: {},
+    index: {}
   },
   setup(__props) {
     const props = __props;
@@ -177,26 +206,13 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       return props.config.listeners || {};
     };
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(TMagicTableColumn), {
-        "show-overflow-tooltip": "",
-        label: _ctx.config.label,
-        width: _ctx.config.width,
-        fixed: _ctx.config.fixed,
-        sortable: _ctx.config.sortable,
-        prop: _ctx.config.prop
-      }, {
-        default: withCtx((scope) => [
-          (openBlock(), createBlock(
-            resolveDynamicComponent(_ctx.config.component),
-            mergeProps(componentProps(scope.row, scope.$index), toHandlers(componentListeners(scope.row, scope.$index))),
-            null,
-            16
-            /* FULL_PROPS */
-          ))
-        ]),
-        _: 1
-        /* STABLE */
-      }, 8, ["label", "width", "fixed", "sortable", "prop"]);
+      return openBlock(), createBlock(
+        resolveDynamicComponent(__props.config.component),
+        mergeProps(componentProps(__props.row, __props.index), toHandlers(componentListeners(__props.row, __props.index))),
+        null,
+        16
+        /* FULL_PROPS */
+      );
     };
   }
 });
@@ -208,7 +224,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   },
   __name: "ExpandColumn",
   props: {
-    config: { default: () => ({}) }
+    config: { default: () => ({}) },
+    row: {}
   },
   setup(__props) {
     const props = __props;
@@ -223,42 +240,31 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         Fragment,
         null,
         [
-          createCommentVNode(" @ts-nocheck "),
-          createVNode(unref(TMagicTableColumn), {
-            type: "expand",
-            width: _ctx.config.width,
-            fixed: _ctx.config.fixed
-          }, {
-            default: withCtx((scope) => [
-              _ctx.config.table ? (openBlock(), createBlock(_sfc_main, {
-                key: 0,
-                "show-header": false,
-                columns: _ctx.config.table,
-                data: _ctx.config.prop && scope.row[_ctx.config.prop] || []
-              }, null, 8, ["columns", "data"])) : createCommentVNode("v-if", true),
-              _ctx.config.form ? (openBlock(), createBlock(unref(MForm), {
-                key: 1,
-                config: _ctx.config.form,
-                "init-values": _ctx.config.values || _ctx.config.prop && scope.row[_ctx.config.prop] || {}
-              }, null, 8, ["config", "init-values"])) : createCommentVNode("v-if", true),
-              _ctx.config.expandContent ? (openBlock(), createElementBlock("div", {
-                key: 2,
-                innerHTML: _ctx.config.expandContent(scope.row, _ctx.config.prop)
-              }, null, 8, _hoisted_1$1)) : createCommentVNode("v-if", true),
-              _ctx.config.component ? (openBlock(), createBlock(
-                resolveDynamicComponent(_ctx.config.component),
-                normalizeProps(mergeProps({ key: 3 }, componentProps(scope.row))),
-                null,
-                16
-                /* FULL_PROPS */
-              )) : createCommentVNode("v-if", true)
-            ]),
-            _: 1
-            /* STABLE */
-          }, 8, ["width", "fixed"])
+          __props.config.table ? (openBlock(), 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"])) : createCommentVNode("v-if", true),
+          __props.config.form ? (openBlock(), createBlock(unref(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"])) : createCommentVNode("v-if", true),
+          __props.config.expandContent ? (openBlock(), createElementBlock("div", {
+            key: 2,
+            innerHTML: __props.config.expandContent(__props.row, __props.config.prop)
+          }, null, 8, _hoisted_1$1)) : createCommentVNode("v-if", true),
+          __props.config.component ? (openBlock(), createBlock(
+            resolveDynamicComponent(__props.config.component),
+            normalizeProps(mergeProps({ key: 3 }, componentProps(__props.row))),
+            null,
+            16
+            /* FULL_PROPS */
+          )) : createCommentVNode("v-if", true)
         ],
-        2112
-        /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+        64
+        /* STABLE_FRAGMENT */
       );
     };
   }
@@ -288,69 +294,46 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   },
   __name: "PopoverColumn",
   props: {
-    config: { default: () => ({}) }
+    config: { default: () => ({}) },
+    row: {},
+    index: {}
   },
   setup(__props) {
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(
-        Fragment,
-        null,
-        [
-          createCommentVNode(" @ts-nocheck "),
-          createVNode(unref(TMagicTableColumn), {
-            label: _ctx.config.label,
-            width: _ctx.config.width,
-            fixed: _ctx.config.fixed
+      return __props.config.popover ? (openBlock(), createBlock(unref(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: withCtx(() => [
+          createVNode(unref(TMagicButton), {
+            link: "",
+            type: "primary"
           }, {
-            default: withCtx((scope) => [
-              _ctx.config.popover ? (openBlock(), createBlock(unref(TMagicPopover), {
-                key: 0,
-                placement: _ctx.config.popover.placement,
-                width: _ctx.config.popover.width,
-                trigger: _ctx.config.popover.trigger,
-                "destroy-on-close": _ctx.config.popover.destroyOnClose ?? true
-              }, {
-                reference: withCtx(() => [
-                  createVNode(
-                    unref(TMagicButton),
-                    {
-                      link: "",
-                      type: "primary"
-                    },
-                    {
-                      default: withCtx(() => [
-                        createTextVNode(
-                          toDisplayString(_ctx.config.text || unref(formatter)(_ctx.config, scope.row, { index: scope.$index })),
-                          1
-                          /* TEXT */
-                        )
-                      ]),
-                      _: 2
-                      /* DYNAMIC */
-                    },
-                    1024
-                    /* DYNAMIC_SLOTS */
-                  )
-                ]),
-                default: withCtx(() => [
-                  _ctx.config.popover.tableEmbed ? (openBlock(), createBlock(_sfc_main, {
-                    key: 0,
-                    "show-header": _ctx.config.showHeader,
-                    columns: _ctx.config.table,
-                    data: _ctx.config.prop && scope.row[_ctx.config.prop] || []
-                  }, null, 8, ["show-header", "columns", "data"])) : createCommentVNode("v-if", true)
-                ]),
-                _: 2
-                /* DYNAMIC */
-              }, 1032, ["placement", "width", "trigger", "destroy-on-close"])) : createCommentVNode("v-if", true)
+            default: withCtx(() => [
+              createTextVNode(
+                toDisplayString(__props.config.text || unref(formatter)(__props.config, __props.row, { index: __props.index })),
+                1
+                /* TEXT */
+              )
             ]),
             _: 1
             /* STABLE */
-          }, 8, ["label", "width", "fixed"])
-        ],
-        2112
-        /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-      );
+          })
+        ]),
+        default: withCtx(() => [
+          __props.config.popover.tableEmbed ? (openBlock(), 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"])) : createCommentVNode("v-if", true)
+        ]),
+        _: 1
+        /* STABLE */
+      }, 8, ["placement", "width", "trigger", "destroy-on-close"])) : createCommentVNode("v-if", true);
     };
   }
 });
@@ -368,129 +351,112 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "TextColumn",
   props: {
     config: { default: () => ({}) },
-    editState: { default: () => ({}) }
+    editState: { default: () => ({}) },
+    row: {},
+    index: {}
   },
   setup(__props) {
     return (_ctx, _cache) => {
       const _component_m_form_container = resolveComponent("m-form-container");
       const _component_el_tooltip = resolveComponent("el-tooltip");
-      return openBlock(), createBlock(unref(TMagicTableColumn), {
-        "show-overflow-tooltip": "",
-        label: _ctx.config.label,
-        width: _ctx.config.width,
-        fixed: _ctx.config.fixed,
-        sortable: _ctx.config.sortable,
-        prop: _ctx.config.prop
+      return __props.config.type === "index" ? (openBlock(), createElementBlock(
+        "div",
+        _hoisted_1,
+        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] ? (openBlock(), createBlock(unref(TMagicForm), {
+        key: 1,
+        "label-width": "0",
+        model: __props.editState[__props.index]
       }, {
-        default: withCtx((scope) => [
-          _ctx.config.type === "index" ? (openBlock(), createElementBlock(
+        default: withCtx(() => [
+          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 ? (openBlock(), createBlock(unref(TMagicButton), {
+        key: 2,
+        link: "",
+        type: "primary",
+        onClick: _cache[0] || (_cache[0] = ($event) => __props.config.handler?.(__props.row))
+      }, {
+        default: withCtx(() => [
+          createElementVNode("span", {
+            innerHTML: unref(formatter)(__props.config, __props.row, { index: __props.index })
+          }, null, 8, _hoisted_2)
+        ]),
+        _: 1
+        /* STABLE */
+      })) : __props.config.action === "img" && __props.config.prop ? (openBlock(), createElementBlock("a", {
+        key: 3,
+        target: "_blank",
+        href: __props.row[__props.config.prop]
+      }, [
+        createElementVNode("img", {
+          src: __props.row[__props.config.prop],
+          height: "50"
+        }, null, 8, _hoisted_4)
+      ], 8, _hoisted_3)) : __props.config.action === "link" && __props.config.prop ? (openBlock(), createElementBlock("a", {
+        key: 4,
+        target: "_blank",
+        href: __props.row[__props.config.prop],
+        class: "keep-all"
+      }, toDisplayString(__props.row[__props.config.prop]), 9, _hoisted_5)) : __props.config.action === "tip" ? (openBlock(), createBlock(_component_el_tooltip, {
+        key: 5,
+        placement: "left"
+      }, {
+        content: withCtx(() => [
+          createElementVNode(
             "div",
-            _hoisted_1,
-            toDisplayString(_ctx.config.pageIndex && _ctx.config.pageSize ? _ctx.config.pageIndex * _ctx.config.pageSize + scope.$index + 1 : scope.$index + 1),
+            null,
+            toDisplayString(unref(formatter)(__props.config, __props.row, { index: __props.index })),
             1
             /* TEXT */
-          )) : _ctx.config.type && _ctx.editState[scope.$index] ? (openBlock(), createBlock(unref(TMagicForm), {
-            key: 1,
-            "label-width": "0",
-            model: _ctx.editState[scope.$index]
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_m_form_container, {
-                prop: _ctx.config.prop,
-                rules: _ctx.config.rules,
-                config: _ctx.config,
-                name: _ctx.config.prop,
-                model: _ctx.editState[scope.$index]
-              }, null, 8, ["prop", "rules", "config", "name", "model"])
-            ]),
-            _: 2
-            /* DYNAMIC */
-          }, 1032, ["model"])) : _ctx.config.action === "actionLink" && _ctx.config.prop ? (openBlock(), createBlock(unref(TMagicButton), {
-            key: 2,
+          )
+        ]),
+        default: withCtx(() => [
+          createVNode(unref(TMagicButton), {
             link: "",
-            type: "primary",
-            onClick: ($event) => _ctx.config.handler?.(scope.row)
-          }, {
-            default: withCtx(() => [
-              createElementVNode("span", {
-                innerHTML: unref(formatter)(_ctx.config, scope.row, { index: scope.$index })
-              }, null, 8, _hoisted_2)
-            ]),
-            _: 2
-            /* DYNAMIC */
-          }, 1032, ["onClick"])) : _ctx.config.action === "img" && _ctx.config.prop ? (openBlock(), createElementBlock("a", {
-            key: 3,
-            target: "_blank",
-            href: scope.row[_ctx.config.prop]
-          }, [
-            createElementVNode("img", {
-              src: scope.row[_ctx.config.prop],
-              height: "50"
-            }, null, 8, _hoisted_4)
-          ], 8, _hoisted_3)) : _ctx.config.action === "link" && _ctx.config.prop ? (openBlock(), createElementBlock("a", {
-            key: 4,
-            target: "_blank",
-            href: scope.row[_ctx.config.prop],
-            class: "keep-all"
-          }, toDisplayString(scope.row[_ctx.config.prop]), 9, _hoisted_5)) : _ctx.config.action === "tip" ? (openBlock(), createBlock(
-            _component_el_tooltip,
-            {
-              key: 5,
-              placement: "left"
-            },
-            {
-              content: withCtx(() => [
-                createElementVNode(
-                  "div",
-                  null,
-                  toDisplayString(unref(formatter)(_ctx.config, scope.row, { index: scope.$index })),
-                  1
-                  /* TEXT */
-                )
-              ]),
-              default: withCtx(() => [
-                createVNode(unref(TMagicButton), {
-                  link: "",
-                  type: "primary"
-                }, {
-                  default: withCtx(() => [
-                    createTextVNode(
-                      toDisplayString(_ctx.config.buttonText || "扩展配置"),
-                      1
-                      /* TEXT */
-                    )
-                  ]),
-                  _: 1
-                  /* STABLE */
-                })
-              ]),
-              _: 2
-              /* DYNAMIC */
-            },
-            1024
-            /* DYNAMIC_SLOTS */
-          )) : _ctx.config.action === "tag" && _ctx.config.prop ? (openBlock(), createBlock(unref(TMagicTag), {
-            key: 6,
-            type: typeof _ctx.config.type === "function" ? _ctx.config.type(scope.row[_ctx.config.prop], scope.row) : _ctx.config.type,
-            "close-transition": ""
+            type: "primary"
           }, {
             default: withCtx(() => [
               createTextVNode(
-                toDisplayString(unref(formatter)(_ctx.config, scope.row, { index: scope.$index })),
+                toDisplayString(__props.config.buttonText || "扩展配置"),
                 1
                 /* TEXT */
               )
             ]),
-            _: 2
-            /* DYNAMIC */
-          }, 1032, ["type"])) : (openBlock(), createElementBlock("div", {
-            key: 7,
-            innerHTML: unref(formatter)(_ctx.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 ? (openBlock(), createBlock(unref(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: withCtx(() => [
+          createTextVNode(
+            toDisplayString(unref(formatter)(__props.config, __props.row, { index: __props.index })),
+            1
+            /* TEXT */
+          )
+        ]),
+        _: 1
+        /* STABLE */
+      }, 8, ["type"])) : (openBlock(), createElementBlock("div", {
+        key: 7,
+        innerHTML: unref(formatter)(__props.config, __props.row, { index: __props.index })
+      }, null, 8, _hoisted_6));
     };
   }
 });
@@ -524,9 +490,67 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose: __expose, emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const tMagicTable = ref();
+    const cellRender = (config, { row = {}, $index }) => {
+      if (config.type === "expand") {
+        return h(_sfc_main$3, {
+          config,
+          row
+        });
+      }
+      if (config.type === "component") {
+        return h(_sfc_main$4, {
+          config,
+          row,
+          index: $index
+        });
+      }
+      if (config.actions) {
+        return h(_sfc_main$5, {
+          config,
+          row,
+          index: $index,
+          rowkeyName: props.rowkeyName,
+          editState: editState.value,
+          columns: props.columns
+        });
+      }
+      if (config.type === "popover") {
+        return h(_sfc_main$2, {
+          config,
+          row,
+          index: $index
+        });
+      }
+      return h(_sfc_main$1, {
+        config,
+        row,
+        index: $index,
+        editState: editState.value
+      });
+    };
+    const tableColumns = 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 = useTemplateRef("tMagicTable");
     const editState = ref([]);
-    const tableColumnComponent = getDesignConfig("components")?.tableColumn;
     const selectionColumn = computed(() => {
       const column = props.columns.filter((item) => item.selection);
       return column.length ? column[0] : null;
@@ -562,13 +586,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       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") {
@@ -587,75 +611,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");
       return withDirectives((openBlock(), createBlock(unref(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": _ctx.showHeader,
-        "max-height": _ctx.bodyHeight,
-        "default-expand-all": _ctx.defaultExpandAll,
+        "show-header": __props.showHeader,
+        "max-height": __props.bodyHeight,
+        "default-expand-all": __props.defaultExpandAll,
         border: hasBorder.value,
-        "row-key": _ctx.rowkeyName || "id",
+        "row-key": __props.rowkeyName || "id",
         "tree-props": { children: "children" },
-        "empty-text": _ctx.emptyText || "暂无数据",
+        "empty-text": __props.emptyText || "暂无数据",
         "span-method": objectSpanMethod,
+        columns: tableColumns.value,
         onSortChange: sortChange,
         onSelect: selectHandler,
         onSelectAll: selectAllHandler,
         onSelectionChange: selectionChangeHandler,
         onCellClick: cellClickHandler,
         onExpandChange: expandChange
-      }, {
-        default: withCtx(() => [
-          (openBlock(true), createElementBlock(
-            Fragment,
-            null,
-            renderList(_ctx.columns, (item, columnIndex) => {
-              return openBlock(), createElementBlock(
-                Fragment,
-                null,
-                [
-                  item.type === "expand" ? (openBlock(), createBlock(_sfc_main$3, {
-                    config: item,
-                    key: columnIndex
-                  }, null, 8, ["config"])) : item.type === "component" ? (openBlock(), createBlock(_sfc_main$4, {
-                    config: item,
-                    key: columnIndex
-                  }, null, 8, ["config"])) : item.selection ? (openBlock(), createBlock(resolveDynamicComponent(unref(tableColumnComponent)?.component || "el-table-column"), {
-                    width: "40",
-                    type: "selection",
-                    key: columnIndex,
-                    selectable: item.selectable
-                  }, null, 8, ["selectable"])) : item.actions ? (openBlock(), createBlock(_sfc_main$5, {
-                    columns: _ctx.columns,
-                    config: item,
-                    "rowkey-name": _ctx.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" ? (openBlock(), createBlock(_sfc_main$2, {
-                    key: columnIndex,
-                    config: item
-                  }, null, 8, ["config"])) : (openBlock(), 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"])), [
-        [_directive_loading, _ctx.loading]
+      }, null, 8, ["data", "show-header", "max-height", "default-expand-all", "border", "row-key", "empty-text", "columns"])), [
+        [_directive_loading, __props.loading]
       ]);
     };
   }