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

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,46 @@ 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(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 columns = util.getCheckedColumns(
         props.columns,
-        data.value,
-        props.sortable
+        colItems.value,
+        props.sortable,
+        (item) => item.hideInSetting
       );
-      emit("update:columns", columns);
+      const tableColumns = util.getCheckedColumns(
+        props.columns,
+        colItems.value,
+        props.sortable,
+        (item) => item.hideInSetting,
+        void 0,
+        true
+      );
+      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 +83,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 +100,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 +116,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 +130,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 +140,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 +150,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,7 +201,8 @@ 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,
+    ref: "toolRef",
+    title: _ctx.locale.columns,
     placement: _ctx.placement
   }, {
     default: vue.withCtx(() => [
@@ -243,39 +230,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 } 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;
+    /** 表格国际化 */
+    locale: {
+        type: PropType<TableLocale>;
+        required: true;
+    };
     /** 列数据 */
     columns: PropType<Columns>;
     /** 是否开启列拖拽排序 */
@@ -26,7 +20,8 @@ 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;
@@ -36,33 +31,24 @@ declare const _default: import('vue').DefineComponent<{
     }[]>;
     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;
+    /** 表格国际化 */
+    locale: {
+        type: PropType<TableLocale>;
+        required: true;
+    };
     /** 列数据 */
     columns: PropType<Columns>;
     /** 是否开启列拖拽排序 */
@@ -72,7 +58,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;

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

@@ -111,6 +111,7 @@ const _sfc_main = vue.defineComponent({
         props.columns,
         colItems.value,
         true,
+        (item) => item.hideInExport,
         util.columnsExportFilter
       );
       const { headerData, bodyData, footerData, bodyCols } = util.getExportData(
@@ -178,32 +179,19 @@ const _sfc_main = vue.defineComponent({
       });
     };
     const initColItems = () => {
-      colItems.value = util.getColItems(
+      const { cols, checkAll, indeterminate } = util.getColItems(
         props.columns,
-        props.locale.columnUntitled,
-        props.locale.columnIndex,
-        props.locale.columnExpand,
+        props.locale,
         util.columnsExportFilter,
+        void 0,
         true,
         true
       );
-      let checkAll = true;
-      let indeterminate = false;
-      core.eachTree(colItems.value, (d) => {
-        if (!d.checked && checkAll) {
-          checkAll = false;
-        }
-        if (d.checked && !indeterminate) {
-          indeterminate = true;
-        }
-        if (!checkAll && indeterminate) {
-          return false;
-        }
-      });
-      isCheckAll.value = colItems.value.length > 0 && checkAll;
-      isIndeterminate.value = !checkAll && indeterminate;
+      colItems.value = cols;
+      isCheckAll.value = checkAll;
+      isIndeterminate.value = indeterminate;
     };
-    const onCheckedChange = (item, checked, type) => {
+    const handleCheckedChange = (item, checked, type) => {
       let checkAll = true;
       let indeterminate = false;
       core.eachTree(colItems.value, (d) => {
@@ -224,7 +212,16 @@ const _sfc_main = vue.defineComponent({
       isCheckAll.value = colItems.value.length > 0 && checkAll;
       isIndeterminate.value = !checkAll && indeterminate;
     };
-    const onSortChange = (items, parent) => {
+    const handleCheckAllChange = (checked) => {
+      isCheckAll.value = checked;
+      isIndeterminate.value = false;
+      core.eachTree(colItems.value, (d) => {
+        if (d.checked !== checked) {
+          d.checked = checked;
+        }
+      });
+    };
+    const handleSortChange = (items, parent) => {
       if (!parent) {
         colItems.value = items;
       } else {
@@ -236,21 +233,12 @@ const _sfc_main = vue.defineComponent({
         });
       }
     };
-    const onCheckAllChange = (checked) => {
-      isCheckAll.value = checked;
-      isIndeterminate.value = false;
-      core.eachTree(colItems.value, (d) => {
-        if (d.checked !== checked) {
-          d.checked = checked;
-        }
-      });
-    };
-    const onReset = () => {
+    const handleReset = () => {
       initColItems();
     };
     const handleTreeIndexChange = (checked) => {
       if (checked) {
-        onCheckedChange(void 0, false, "index");
+        handleCheckedChange(void 0, false, "index");
       }
     };
     vue.watch(visible, (visible2) => {
@@ -299,10 +287,10 @@ const _sfc_main = vue.defineComponent({
       openModal,
       closeModal,
       handleExport,
-      onCheckedChange,
-      onSortChange,
-      onCheckAllChange,
-      onReset,
+      handleCheckedChange,
+      handleSortChange,
+      handleCheckAllChange,
+      handleReset,
       handleTreeIndexChange
     };
   }
@@ -438,19 +426,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           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[2] || (_cache[2] = (...args) => _ctx.onReset && _ctx.onReset(...args))
+                        onClick: _cache[2] || (_cache[2] = (...args) => _ctx.handleReset && _ctx.handleReset(...args))
                       }, vue.toDisplayString(_ctx.locale.columnReset), 1)
                     ]),
                     vue.createVNode(_component_ToolColumnList, {
                       data: _ctx.colItems,
                       sortable: true,
-                      onSortChange: _ctx.onSortChange,
-                      onCheckedChange: _ctx.onCheckedChange
+                      onSortChange: _ctx.handleSortChange,
+                      onCheckedChange: _ctx.handleCheckedChange
                     }, null, 8, ["data", "onSortChange", "onCheckedChange"])
                   ])
                 ]),

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

@@ -84,10 +84,10 @@ declare const _default: import('vue').DefineComponent<{
     openModal: () => void;
     closeModal: () => void;
     handleExport: () => void;
-    onCheckedChange: (item?: ColItem, checked?: boolean, type?: string) => void;
-    onSortChange: (items: ColItem[], parent?: ColItem) => void;
-    onCheckAllChange: (checked: boolean) => void;
-    onReset: () => void;
+    handleCheckedChange: (item?: ColItem, checked?: boolean, type?: string) => void;
+    handleSortChange: (items: ColItem[], parent?: ColItem) => void;
+    handleCheckAllChange: (checked: boolean) => void;
+    handleReset: () => void;
     handleTreeIndexChange: (checked?: boolean | string | number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 提示位置 */