ele-admin-plus 1.2.1-beta.1 → 1.2.1-beta.3

package/lib/ele-pro-table/components/tool-column-list.cjs

@@ -9,6 +9,7 @@ const _sfc_main = vue.defineComponent({
     VueDraggable,
     ElCheckbox: elementPlus.ElCheckbox,
     ElIcon: elementPlus.ElIcon,
+    ElInput: elementPlus.ElInput,
     HolderOutlined: icons.HolderOutlined,
     VerticalRightOutlined: icons.VerticalRightOutlined,
     VerticalLeftOutlined: icons.VerticalLeftOutlined
@@ -21,7 +22,11 @@ const _sfc_main = vue.defineComponent({
     /** 是否开启列拖拽排序 */
     sortable: Boolean,
     /** 是否开启开关固定列 */
-    allowFixed: Boolean
+    allowFixed: Boolean,
+    /** 是否开启列宽设置 */
+    allowWidth: Boolean,
+    /** 列宽输入框提示文本 */
+    columnWidthPlaceholder: String
   },
   emits: {
     sortChange: (_colItems, _parent) => true,
@@ -29,46 +34,51 @@ const _sfc_main = vue.defineComponent({
     fixedLeft: (_item) => true,
     fixedRight: (_item) => true,
     fixedLeftTooltip: (_el) => true,
-    fixedRightTooltip: (_el) => true
+    fixedRightTooltip: (_el) => true,
+    colWidthChange: (_item, _width) => true
   },
   setup(props, { emit }) {
-    const onSortChange = (colItems) => {
-      onChildSortChange(colItems, props.parent);
+    const handleSortChange = (colItems) => {
+      handleChildSortChange(colItems, props.parent);
     };
-    const onCheckedChange = (colItem, checked) => {
+    const handleCheckedChange = (colItem, checked) => {
       emit("checkedChange", colItem, checked);
     };
-    const onFixedLeft = (colItem) => {
+    const handleFixedLeft = (colItem) => {
       emit("fixedLeft", colItem);
     };
-    const onFixedRight = (colItem) => {
+    const handleFixedRight = (colItem) => {
       emit("fixedRight", colItem);
     };
-    const onFixedLeftTooltip = (e) => {
-      onChildFixedLeftTooltip(e.currentTarget);
+    const handleFixedLeftTooltip = (e) => {
+      handleChildFixedLeftTooltip(e.currentTarget);
     };
-    const onFixedRightTooltip = (e) => {
-      onChildFixedRightTooltip(e.currentTarget);
+    const handleFixedRightTooltip = (e) => {
+      handleChildFixedRightTooltip(e.currentTarget);
     };
-    const onChildSortChange = (colItems, parent) => {
+    const handleChildSortChange = (colItems, parent) => {
       emit("sortChange", colItems, parent);
     };
-    const onChildFixedLeftTooltip = (el) => {
+    const handleChildFixedLeftTooltip = (el) => {
       emit("fixedLeftTooltip", el);
     };
-    const onChildFixedRightTooltip = (el) => {
+    const handleChildFixedRightTooltip = (el) => {
       emit("fixedRightTooltip", el);
     };
+    const handleColWidthChange = (item, width) => {
+      emit("colWidthChange", item, width);
+    };
     return {
-      onSortChange,
-      onCheckedChange,
-      onFixedLeft,
-      onFixedRight,
-      onFixedLeftTooltip,
-      onFixedRightTooltip,
-      onChildSortChange,
-      onChildFixedLeftTooltip,
-      onChildFixedRightTooltip
+      handleSortChange,
+      handleCheckedChange,
+      handleFixedLeft,
+      handleFixedRight,
+      handleFixedLeftTooltip,
+      handleFixedRightTooltip,
+      handleChildSortChange,
+      handleChildFixedLeftTooltip,
+      handleChildFixedRightTooltip,
+      handleColWidthChange
     };
   }
 });
@@ -92,12 +102,17 @@ const _hoisted_5 = {
 };
 const _hoisted_6 = ["onClick"];
 const _hoisted_7 = ["onClick"];
+const _hoisted_8 = {
+  key: 2,
+  class: "ele-tool-column-input"
+};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_HolderOutlined = vue.resolveComponent("HolderOutlined");
   const _component_ElIcon = vue.resolveComponent("ElIcon");
   const _component_ElCheckbox = vue.resolveComponent("ElCheckbox");
   const _component_VerticalRightOutlined = vue.resolveComponent("VerticalRightOutlined");
   const _component_VerticalLeftOutlined = vue.resolveComponent("VerticalLeftOutlined");
+  const _component_ElInput = vue.resolveComponent("ElInput");
   const _component_ToolColumnList = vue.resolveComponent("ToolColumnList", true);
   const _component_VueDraggable = vue.resolveComponent("VueDraggable");
   return vue.openBlock(), vue.createBlock(_component_VueDraggable, {
@@ -108,7 +123,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     handle: ".ele-tool-column-handle",
     componentData: { class: "ele-tool-column-list" },
     forceFallback: true,
-    "onUpdate:modelValue": _ctx.onSortChange
+    "onUpdate:modelValue": _ctx.handleSortChange
   }, {
     item: vue.withCtx(({ element: d }) => [
       vue.createElementVNode("div", _hoisted_1, [
@@ -125,7 +140,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             vue.createVNode(_component_ElCheckbox, {
               label: d.label,
               modelValue: d.checked,
-              "onUpdate:modelValue": (v) => _ctx.onCheckedChange(d, v)
+              "onUpdate:modelValue": (v) => _ctx.handleCheckedChange(d, v)
             }, null, 8, ["label", "modelValue", "onUpdate:modelValue"])
           ]),
           _ctx.allowFixed ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
@@ -134,8 +149,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 "ele-tool-column-fixed-item",
                 { "is-active": d.fixed === true || d.fixed === "left" }
               ]),
-              onClick: ($event) => _ctx.onFixedLeft(d),
-              onMouseover: _cache[0] || (_cache[0] = (...args) => _ctx.onFixedLeftTooltip && _ctx.onFixedLeftTooltip(...args))
+              onClick: ($event) => _ctx.handleFixedLeft(d),
+              onMouseover: _cache[0] || (_cache[0] = (...args) => _ctx.handleFixedLeftTooltip && _ctx.handleFixedLeftTooltip(...args))
             }, [
               vue.createVNode(_component_ElIcon, null, {
                 default: vue.withCtx(() => [
@@ -149,8 +164,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 "ele-tool-column-fixed-item",
                 { "is-active": d.fixed === "right" }
               ]),
-              onClick: ($event) => _ctx.onFixedRight(d),
-              onMouseover: _cache[1] || (_cache[1] = (...args) => _ctx.onFixedRightTooltip && _ctx.onFixedRightTooltip(...args))
+              onClick: ($event) => _ctx.handleFixedRight(d),
+              onMouseover: _cache[1] || (_cache[1] = (...args) => _ctx.handleFixedRightTooltip && _ctx.handleFixedRightTooltip(...args))
             }, [
               vue.createVNode(_component_ElIcon, null, {
                 default: vue.withCtx(() => [
@@ -159,6 +174,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 _: 1
               })
             ], 42, _hoisted_7)
+          ])) : vue.createCommentVNode("", true),
+          _ctx.allowWidth ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_8, [
+            vue.createVNode(_component_ElInput, {
+              size: "small",
+              maxlength: 12,
+              modelValue: d.width,
+              placeholder: _ctx.columnWidthPlaceholder,
+              "onUpdate:modelValue": (v) => _ctx.handleColWidthChange(d, v)
+            }, null, 8, ["modelValue", "placeholder", "onUpdate:modelValue"])
           ])) : vue.createCommentVNode("", true)
         ]),
         d.children && d.children.length ? (vue.openBlock(), vue.createBlock(_component_ToolColumnList, {
@@ -166,13 +190,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           data: d.children,
           parent: d,
           sortable: _ctx.sortable,
-          onSortChange: _ctx.onChildSortChange,
-          onCheckedChange: _ctx.onCheckedChange,
-          onFixedLeft: _ctx.onFixedLeft,
-          onFixedRight: _ctx.onFixedRight,
-          onFixedLeftTooltip: _ctx.onChildFixedLeftTooltip,
-          onFixedRightTooltip: _ctx.onChildFixedRightTooltip
-        }, null, 8, ["data", "parent", "sortable", "onSortChange", "onCheckedChange", "onFixedLeft", "onFixedRight", "onFixedLeftTooltip", "onFixedRightTooltip"])) : vue.createCommentVNode("", true)
+          allowWidth: _ctx.allowWidth,
+          columnWidthPlaceholder: _ctx.columnWidthPlaceholder,
+          onSortChange: _ctx.handleChildSortChange,
+          onCheckedChange: _ctx.handleCheckedChange,
+          onFixedLeft: _ctx.handleFixedLeft,
+          onFixedRight: _ctx.handleFixedRight,
+          onFixedLeftTooltip: _ctx.handleChildFixedLeftTooltip,
+          onFixedRightTooltip: _ctx.handleChildFixedRightTooltip,
+          onColWidthChange: _ctx.handleColWidthChange
+        }, null, 8, ["data", "parent", "sortable", "allowWidth", "columnWidthPlaceholder", "onSortChange", "onCheckedChange", "onFixedLeft", "onFixedRight", "onFixedLeftTooltip", "onFixedRightTooltip", "onColWidthChange"])) : vue.createCommentVNode("", true)
       ])
     ]),
     _: 1

package/lib/ele-pro-table/components/tool-column-list.d.ts

@@ -10,16 +10,21 @@ declare const _default: import('vue').DefineComponent<{
     sortable: BooleanConstructor;
     /** 是否开启开关固定列 */
     allowFixed: BooleanConstructor;
+    /** 是否开启列宽设置 */
+    allowWidth: BooleanConstructor;
+    /** 列宽输入框提示文本 */
+    columnWidthPlaceholder: StringConstructor;
 }, {
-    onSortChange: (colItems: ColItem[]) => void;
-    onCheckedChange: (colItem: ColItem, checked: boolean) => void;
-    onFixedLeft: (colItem: ColItem) => void;
-    onFixedRight: (colItem: ColItem) => void;
-    onFixedLeftTooltip: (e: MouseEvent) => void;
-    onFixedRightTooltip: (e: MouseEvent) => void;
-    onChildSortChange: (colItems: ColItem[], parent?: ColItem) => void;
-    onChildFixedLeftTooltip: (el: HTMLElement) => void;
-    onChildFixedRightTooltip: (el: HTMLElement) => void;
+    handleSortChange: (colItems: ColItem[]) => void;
+    handleCheckedChange: (colItem: ColItem, checked: boolean) => void;
+    handleFixedLeft: (colItem: ColItem) => void;
+    handleFixedRight: (colItem: ColItem) => void;
+    handleFixedLeftTooltip: (e: MouseEvent) => void;
+    handleFixedRightTooltip: (e: MouseEvent) => void;
+    handleChildSortChange: (colItems: ColItem[], parent?: ColItem) => void;
+    handleChildFixedLeftTooltip: (el: HTMLElement) => void;
+    handleChildFixedRightTooltip: (el: HTMLElement) => void;
+    handleColWidthChange: (item: ColItem, width?: string) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     sortChange: (_colItems: ColItem[], _parent?: ColItem) => true;
     checkedChange: (_item: ColItem, _checked: boolean) => true;
@@ -27,6 +32,7 @@ declare const _default: import('vue').DefineComponent<{
     fixedRight: (_item: ColItem) => true;
     fixedLeftTooltip: (_el: HTMLElement) => true;
     fixedRightTooltip: (_el: HTMLElement) => true;
+    colWidthChange: (_item: ColItem, _width?: string | number) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 列配置数据 */
     data: PropType<ColItem[]>;
@@ -36,6 +42,10 @@ declare const _default: import('vue').DefineComponent<{
     sortable: BooleanConstructor;
     /** 是否开启开关固定列 */
     allowFixed: BooleanConstructor;
+    /** 是否开启列宽设置 */
+    allowWidth: BooleanConstructor;
+    /** 列宽输入框提示文本 */
+    columnWidthPlaceholder: StringConstructor;
 }>> & {
     onSortChange?: ((_colItems: ColItem[], _parent?: ColItem | undefined) => any) | undefined;
     onCheckedChange?: ((_item: ColItem, _checked: boolean) => any) | undefined;
@@ -43,8 +53,10 @@ declare const _default: import('vue').DefineComponent<{
     onFixedRight?: ((_item: ColItem) => any) | undefined;
     onFixedLeftTooltip?: ((_el: HTMLElement) => any) | undefined;
     onFixedRightTooltip?: ((_el: HTMLElement) => any) | undefined;
+    onColWidthChange?: ((_item: ColItem, _width?: string | number | undefined) => any) | undefined;
 }, {
     sortable: boolean;
     allowFixed: boolean;
+    allowWidth: boolean;
 }, {}>;
 export default _default;

package/lib/ele-pro-table/components/tool-column.cjs

@@ -12,26 +12,19 @@ const _sfc_main = vue.defineComponent({
   components: {
     ElCheckbox: elementPlus.ElCheckbox,
     ElIcon: elementPlus.ElIcon,
-    EleTooltip,
     SettingOutlined: icons.SettingOutlined,
+    EleTooltip,
     EleTool,
     ToolColumnList
   },
   props: {
-    /** 提示文字 */
-    title: String,
     /** 提示位置 */
     placement: String,
-    /** 全选文字 */
-    checkAllText: String,
-    /** 重置文字 */
-    resetText: String,
-    /** 无标题列文字 */
-    untitledText: String,
-    /** 固定在左侧文字 */
-    fixedLeftText: String,
-    /** 固定在右侧文字 */
-    fixedRightText: String,
+    /** 表格国际化 */
+    locale: {
+      type: Object,
+      required: true
+    },
     /** 列数据 */
     columns: Array,
     /** 是否开启列拖拽排序 */
@@ -42,50 +35,51 @@ const _sfc_main = vue.defineComponent({
     cacheKey: String
   },
   emits: {
-    "update:columns": (_columns) => true
+    "update:columns": (_columns, _tableColumns) => true
   },
   setup(props, { emit }) {
-    const data = vue.ref([]);
+    const toolRef = vue.ref(null);
+    const colItems = vue.ref([]);
     const isCheckAll = vue.ref(false);
     const isIndeterminate = vue.ref(false);
-    const tooltipContent = vue.ref("");
-    const virtualRef = vue.ref();
-    const initData = () => {
-      const cols = util.getSettingCols(
+    const initColItems = () => {
+      const { cols, checkAll, indeterminate } = util.getColItems(
         props.columns,
-        props.untitledText,
-        props.cacheKey
+        props.locale,
+        util.columnsSettingFilter,
+        util.getCacheCols(util.getColsCacheKey(props.cacheKey))
       );
-      data.value = cols;
-      let checkAll = true;
-      let indeterminate = false;
-      core.eachTree(data.value, (d) => {
-        if (!d.checked && checkAll) {
-          checkAll = false;
-        }
-        if (d.checked && !indeterminate) {
-          indeterminate = true;
-        }
-        if (!checkAll && indeterminate) {
-          return false;
-        }
-      });
-      isCheckAll.value = data.value.length > 0 && checkAll;
-      isIndeterminate.value = !checkAll && indeterminate;
+      colItems.value = cols;
+      isCheckAll.value = checkAll;
+      isIndeterminate.value = indeterminate;
     };
     const updateColumns = () => {
+      const colsWidth = util.getCacheColsWidth(props.cacheKey);
       const columns = util.getCheckedColumns(
         props.columns,
-        data.value,
-        props.sortable
+        colItems.value,
+        props.sortable,
+        (item) => item.hideInSetting,
+        void 0,
+        false,
+        colsWidth
       );
-      emit("update:columns", columns);
+      const tableColumns = util.getCheckedColumns(
+        props.columns,
+        colItems.value,
+        props.sortable,
+        (item) => item.hideInSetting,
+        void 0,
+        true,
+        colsWidth
+      );
+      emit("update:columns", columns, tableColumns);
     };
     const cacheSettingCols = () => {
       if (props.cacheKey) {
         localStorage.setItem(
           util.getColsCacheKey(props.cacheKey),
-          JSON.stringify(data.value)
+          JSON.stringify(colItems.value)
         );
       }
     };
@@ -94,10 +88,10 @@ const _sfc_main = vue.defineComponent({
         localStorage.removeItem(util.getColsCacheKey(props.cacheKey));
       }
     };
-    const onCheckedChange = (item, checked) => {
+    const handleCheckedChange = (item, checked) => {
       let checkAll = true;
       let indeterminate = false;
-      core.eachTree(data.value, (d) => {
+      core.eachTree(colItems.value, (d) => {
         if (d.uid === item.uid) {
           d.checked = checked;
         }
@@ -111,15 +105,15 @@ const _sfc_main = vue.defineComponent({
           return false;
         }
       });
-      isCheckAll.value = data.value.length > 0 && checkAll;
+      isCheckAll.value = colItems.value.length > 0 && checkAll;
       isIndeterminate.value = !checkAll && indeterminate;
       cacheSettingCols();
       updateColumns();
     };
-    const onCheckAllChange = (checked) => {
+    const handleCheckAllChange = (checked) => {
       isCheckAll.value = checked;
       isIndeterminate.value = false;
-      core.eachTree(data.value, (d) => {
+      core.eachTree(colItems.value, (d) => {
         if (d.checked !== checked) {
           d.checked = checked;
         }
@@ -127,18 +121,13 @@ const _sfc_main = vue.defineComponent({
       cacheSettingCols();
       updateColumns();
     };
-    const onReset = () => {
-      cleanSettingCols();
-      initData();
-      updateColumns();
-    };
-    const onSortChange = (colItems, parent) => {
+    const handleSortChange = (items, parent) => {
       if (!parent) {
-        data.value = colItems;
+        colItems.value = items;
       } else {
-        core.eachTree(data.value, (d) => {
+        core.eachTree(colItems.value, (d) => {
           if (d.uid === parent.uid) {
-            d.children = colItems;
+            d.children = items;
             return false;
           }
         });
@@ -146,8 +135,8 @@ const _sfc_main = vue.defineComponent({
       cacheSettingCols();
       updateColumns();
     };
-    const onFixedLeft = (colItem) => {
-      core.eachTree(data.value, (d) => {
+    const handleFixedLeft = (colItem) => {
+      core.eachTree(colItems.value, (d) => {
         if (d.uid === colItem.uid) {
           d.fixed = d.fixed === true || d.fixed === "left" ? false : "left";
           return false;
@@ -156,8 +145,8 @@ const _sfc_main = vue.defineComponent({
       cacheSettingCols();
       updateColumns();
     };
-    const onFixedRight = (colItem) => {
-      core.eachTree(data.value, (d) => {
+    const handleFixedRight = (colItem) => {
+      core.eachTree(colItems.value, (d) => {
         if (d.uid === colItem.uid) {
           d.fixed = d.fixed === "right" ? false : "right";
           return false;
@@ -166,35 +155,37 @@ const _sfc_main = vue.defineComponent({
       cacheSettingCols();
       updateColumns();
     };
-    const onFixedLeftTooltip = (el) => {
-      virtualRef.value = el;
-      tooltipContent.value = props.fixedLeftText ?? "";
+    const handleFixedLeftTooltip = (el) => {
+      toolRef.value && toolRef.value.showTooltip(props.locale.columnFixedLeft ?? "", el);
+    };
+    const handleFixedRightTooltip = (el) => {
+      toolRef.value && toolRef.value.showTooltip(props.locale.columnFixedRight ?? "", el);
     };
-    const onFixedRightTooltip = (el) => {
-      virtualRef.value = el;
-      tooltipContent.value = props.fixedRightText ?? "";
+    const handleReset = () => {
+      cleanSettingCols();
+      initColItems();
+      updateColumns();
     };
     vue.watch(
-      [() => props.columns, () => props.untitledText],
+      [() => props.columns, () => props.locale],
       () => {
-        initData();
+        initColItems();
       },
       { immediate: true, deep: true }
     );
     return {
-      data,
+      toolRef,
+      colItems,
       isCheckAll,
       isIndeterminate,
-      tooltipContent,
-      virtualRef,
-      onCheckedChange,
-      onCheckAllChange,
-      onReset,
-      onSortChange,
-      onFixedLeft,
-      onFixedRight,
-      onFixedLeftTooltip,
-      onFixedRightTooltip
+      handleCheckedChange,
+      handleCheckAllChange,
+      handleReset,
+      handleSortChange,
+      handleFixedLeft,
+      handleFixedRight,
+      handleFixedLeftTooltip,
+      handleFixedRightTooltip
     };
   }
 });
@@ -215,8 +206,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleTooltip = vue.resolveComponent("EleTooltip");
   const _component_EleTool = vue.resolveComponent("EleTool");
   return vue.openBlock(), vue.createBlock(_component_EleTool, {
-    title: _ctx.title,
-    placement: _ctx.placement
+    ref: "toolRef",
+    title: _ctx.locale.columns,
+    placement: _ctx.placement,
+    clickHideTooltip: true
   }, {
     default: vue.withCtx(() => [
       vue.createVNode(_component_EleTooltip, {
@@ -243,39 +236,30 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             vue.createElementVNode("div", _hoisted_1, [
               vue.createElementVNode("div", _hoisted_2, [
                 vue.createVNode(_component_ElCheckbox, {
-                  label: _ctx.checkAllText,
+                  label: _ctx.locale.columnTitle,
                   modelValue: _ctx.isCheckAll,
                   indeterminate: _ctx.isIndeterminate,
-                  "onUpdate:modelValue": _ctx.onCheckAllChange
+                  "onUpdate:modelValue": _ctx.handleCheckAllChange
                 }, null, 8, ["label", "modelValue", "indeterminate", "onUpdate:modelValue"])
               ]),
               vue.createElementVNode("div", {
                 class: "ele-tool-column-link",
-                onClick: _cache[0] || (_cache[0] = (...args) => _ctx.onReset && _ctx.onReset(...args))
-              }, vue.toDisplayString(_ctx.resetText), 1)
+                onClick: _cache[0] || (_cache[0] = (...args) => _ctx.handleReset && _ctx.handleReset(...args))
+              }, vue.toDisplayString(_ctx.locale.columnReset), 1)
             ]),
-            _ctx.data.length ? (vue.openBlock(), vue.createBlock(_component_ToolColumnList, {
+            _ctx.colItems.length ? (vue.openBlock(), vue.createBlock(_component_ToolColumnList, {
               key: 0,
-              data: _ctx.data,
+              data: _ctx.colItems,
               sortable: _ctx.sortable,
               allowFixed: _ctx.allowFixed,
-              onSortChange: _ctx.onSortChange,
-              onCheckedChange: _ctx.onCheckedChange,
-              onFixedLeft: _ctx.onFixedLeft,
-              onFixedRight: _ctx.onFixedRight,
-              onFixedLeftTooltip: _ctx.onFixedLeftTooltip,
-              onFixedRightTooltip: _ctx.onFixedRightTooltip
+              onSortChange: _ctx.handleSortChange,
+              onCheckedChange: _ctx.handleCheckedChange,
+              onFixedLeft: _ctx.handleFixedLeft,
+              onFixedRight: _ctx.handleFixedRight,
+              onFixedLeftTooltip: _ctx.handleFixedLeftTooltip,
+              onFixedRightTooltip: _ctx.handleFixedRightTooltip
             }, null, 8, ["data", "sortable", "allowFixed", "onSortChange", "onCheckedChange", "onFixedLeft", "onFixedRight", "onFixedLeftTooltip", "onFixedRightTooltip"])) : vue.createCommentVNode("", true)
-          ], 2),
-          vue.createVNode(_component_EleTooltip, {
-            trigger: "hover",
-            placement: "top",
-            teleported: false,
-            persistent: false,
-            virtualTriggering: true,
-            virtualRef: _ctx.virtualRef,
-            content: _ctx.tooltipContent
-          }, null, 8, ["virtualRef", "content"])
+          ], 2)
         ]),
         default: vue.withCtx(() => [
           vue.createVNode(_component_ElIcon, null, {

package/lib/ele-pro-table/components/tool-column.d.ts

@@ -1,22 +1,16 @@
 import { PropType } from 'vue';
+import { EleToolInstance, EleTooltipProps } from '../../ele-app/plus';
 import { Columns } from '../../ele-data-table/types';
-import { ColItem } from '../types';
+import { ColItem, TableLocale } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
-    /** 提示文字 */
-    title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
-    /** 全选文字 */
-    checkAllText: StringConstructor;
-    /** 重置文字 */
-    resetText: StringConstructor;
-    /** 无标题列文字 */
-    untitledText: StringConstructor;
-    /** 固定在左侧文字 */
-    fixedLeftText: StringConstructor;
-    /** 固定在右侧文字 */
-    fixedRightText: StringConstructor;
+    placement: PropType<EleTooltipProps["placement"]>;
+    /** 表格国际化 */
+    locale: {
+        type: PropType<TableLocale>;
+        required: true;
+    };
     /** 列数据 */
     columns: PropType<Columns>;
     /** 是否开启列拖拽排序 */
@@ -26,43 +20,36 @@ declare const _default: import('vue').DefineComponent<{
     /** 列配置缓存本地的名称 */
     cacheKey: StringConstructor;
 }, {
-    data: import('vue').Ref<{
+    toolRef: import('vue').Ref<EleToolInstance>;
+    colItems: import('vue').Ref<{
         uid: string;
-        label?: string | undefined;
-        checked?: boolean | undefined;
-        fixed?: string | boolean | undefined;
+        label?: string;
+        checked?: boolean;
+        fixed?: boolean | string;
         children?: any[] | undefined;
-        type?: string | undefined;
+        type?: string;
+        width?: number | string;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;
-    tooltipContent: import('vue').Ref<string>;
-    virtualRef: import('vue').Ref<any>;
-    onCheckedChange: (item: ColItem, checked: boolean) => void;
-    onCheckAllChange: (checked: boolean) => void;
-    onReset: () => void;
-    onSortChange: (colItems: ColItem[], parent?: ColItem) => void;
-    onFixedLeft: (colItem: ColItem) => void;
-    onFixedRight: (colItem: ColItem) => void;
-    onFixedLeftTooltip: (el: HTMLElement) => void;
-    onFixedRightTooltip: (el: HTMLElement) => void;
+    handleCheckedChange: (item: ColItem, checked: boolean) => void;
+    handleCheckAllChange: (checked: boolean) => void;
+    handleReset: () => void;
+    handleSortChange: (items: ColItem[], parent?: ColItem) => void;
+    handleFixedLeft: (colItem: ColItem) => void;
+    handleFixedRight: (colItem: ColItem) => void;
+    handleFixedLeftTooltip: (el: HTMLElement) => void;
+    handleFixedRightTooltip: (el: HTMLElement) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:columns': (_columns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    /** 提示文字 */
-    title: StringConstructor;
     /** 提示位置 */
-    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
-    /** 全选文字 */
-    checkAllText: StringConstructor;
-    /** 重置文字 */
-    resetText: StringConstructor;
-    /** 无标题列文字 */
-    untitledText: StringConstructor;
-    /** 固定在左侧文字 */
-    fixedLeftText: StringConstructor;
-    /** 固定在右侧文字 */
-    fixedRightText: StringConstructor;
+    placement: PropType<EleTooltipProps["placement"]>;
+    /** 表格国际化 */
+    locale: {
+        type: PropType<TableLocale>;
+        required: true;
+    };
     /** 列数据 */
     columns: PropType<Columns>;
     /** 是否开启列拖拽排序 */
@@ -72,7 +59,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 列配置缓存本地的名称 */
     cacheKey: StringConstructor;
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
 }, {
     sortable: boolean;
     allowFixed: boolean;