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

package/es/ele-pro-table/components/tool-column.js

@@ -4,7 +4,7 @@ import { SettingOutlined } from "../../icons";
 import { eachTree } from "../../utils/core";
 import EleTooltip from "../../ele-tooltip/index";
 import EleTool from "../../ele-tool/index";
-import { getColItems, columnsSettingFilter, getCacheCols, getCheckedColumns, getColsCacheKey } from "../util";
+import { getColItems, columnsSettingFilter, getCacheCols, getColsCacheKey, getCacheColsWidth, getCheckedColumns } from "../util";
 import ToolColumnList from "./tool-column-list";
 const _sfc_main = defineComponent({
   name: "ToolColumn",
@@ -34,7 +34,7 @@ const _sfc_main = defineComponent({
     cacheKey: String
   },
   emits: {
-    "update:columns": (_columns, _tableColumns) => true
+    "update:columns": (_columns, _tableColumns, _isReset) => true
   },
   setup(props, { emit }) {
     const toolRef = ref(null);
@@ -46,18 +46,22 @@ const _sfc_main = defineComponent({
         props.columns,
         props.locale,
         columnsSettingFilter,
-        getCacheCols(props.cacheKey)
+        getCacheCols(getColsCacheKey(props.cacheKey))
       );
       colItems.value = cols;
       isCheckAll.value = checkAll;
       isIndeterminate.value = indeterminate;
     };
-    const updateColumns = () => {
+    const updateColumns = (isReset) => {
+      const colsWidth = getCacheColsWidth(props.cacheKey);
       const columns = getCheckedColumns(
         props.columns,
         colItems.value,
         props.sortable,
-        (item) => item.hideInSetting
+        (item) => item.hideInSetting,
+        void 0,
+        false,
+        colsWidth
       );
       const tableColumns = getCheckedColumns(
         props.columns,
@@ -65,9 +69,10 @@ const _sfc_main = defineComponent({
         props.sortable,
         (item) => item.hideInSetting,
         void 0,
-        true
+        true,
+        colsWidth
       );
-      emit("update:columns", columns, tableColumns);
+      emit("update:columns", columns, tableColumns, !!isReset);
     };
     const cacheSettingCols = () => {
       if (props.cacheKey) {
@@ -158,7 +163,7 @@ const _sfc_main = defineComponent({
     const handleReset = () => {
       cleanSettingCols();
       initColItems();
-      updateColumns();
+      updateColumns(true);
     };
     watch(
       [() => props.columns, () => props.locale],
@@ -202,7 +207,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_EleTool, {
     ref: "toolRef",
     title: _ctx.locale.columns,
-    placement: _ctx.placement
+    placement: _ctx.placement,
+    clickHideTooltip: true
   }, {
     default: withCtx(() => [
       createVNode(_component_EleTooltip, {

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

@@ -1,17 +1,17 @@
 import { PropType } from 'vue';
 import { ElFormInstance } from '../../ele-app/el';
 import { EleModalProps } from '../../ele-app/plus';
-import { Columns, DataItem, TreeProps } from '../../ele-data-table/types';
-import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem } from '../types';
+import { Columns, DataItem, SpanMethod, SummaryMethod, TreeProps } from '../../ele-data-table/types';
+import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TableExportParams } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
-    /** 提示位置 */
-    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 表格国际化 */
     locale: {
         type: PropType<TableLocale>;
         required: true;
     };
+    /** 缓存本地的名称 */
+    cacheKey: StringConstructor;
     /** 弹窗参数 */
     modalProps: PropType<EleModalProps>;
     /** 列数据 */
@@ -23,15 +23,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 表格全部数据 */
     datasource: PropType<Datasource>;
     /** 单元格合并行列方法 */
-    spanMethod: PropType<((data: {
-        row: DataItem;
-        rowIndex: number;
-        column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
-    }) => number[] | {
-        rowspan: number;
-        colspan: number;
-    } | undefined) | undefined>;
+    spanMethod: PropType<SpanMethod>;
     /** 表格是否有表头 */
     tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
@@ -39,7 +31,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<SummaryMethod>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
     /** 树表字段名 */
@@ -56,6 +48,13 @@ declare const _default: import('vue').DefineComponent<{
         type: PropType<ExportDataType>;
         default: string;
     };
+    /** 默认是否勾选表尾 */
+    defaultShowFooter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 默认是否勾选层级序号 */
+    defaultShowTreeIndex: BooleanConstructor;
     /** 导出前的钩子函数 */
     beforeExport: PropType<BeforeExport>;
 }, {
@@ -71,9 +70,10 @@ declare const _default: import('vue').DefineComponent<{
         uid: string;
         label?: string | undefined;
         checked?: boolean | undefined;
-        fixed?: string | boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
         type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;
@@ -86,17 +86,19 @@ declare const _default: import('vue').DefineComponent<{
     handleExport: () => void;
     handleCheckedChange: (item?: ColItem, checked?: boolean, type?: string) => void;
     handleSortChange: (items: ColItem[], parent?: ColItem) => void;
+    handleColWidthChange: (item: ColItem, width?: string) => void;
     handleCheckAllChange: (checked: boolean) => void;
     handleReset: () => void;
     handleTreeIndexChange: (checked?: boolean | string | number) => void;
+    exportData: (params?: TableExportParams) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    /** 提示位置 */
-    placement: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, import('element-plus').Placement, unknown> | undefined>;
     /** 表格国际化 */
     locale: {
         type: PropType<TableLocale>;
         required: true;
     };
+    /** 缓存本地的名称 */
+    cacheKey: StringConstructor;
     /** 弹窗参数 */
     modalProps: PropType<EleModalProps>;
     /** 列数据 */
@@ -108,15 +110,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 表格全部数据 */
     datasource: PropType<Datasource>;
     /** 单元格合并行列方法 */
-    spanMethod: PropType<((data: {
-        row: DataItem;
-        rowIndex: number;
-        column: import('element-plus').TableColumnCtx<DataItem>;
-        columnIndex: number;
-    }) => number[] | {
-        rowspan: number;
-        colspan: number;
-    } | undefined) | undefined>;
+    spanMethod: PropType<SpanMethod>;
     /** 表格是否有表头 */
     tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
@@ -124,7 +118,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 合计行文本 */
     sumText: StringConstructor;
     /** 合计行自定义方法 */
-    summaryMethod: PropType<import('element-plus').SummaryMethod<DataItem> | undefined>;
+    summaryMethod: PropType<SummaryMethod>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
     /** 树表字段名 */
@@ -141,12 +135,21 @@ declare const _default: import('vue').DefineComponent<{
         type: PropType<ExportDataType>;
         default: string;
     };
+    /** 默认是否勾选表尾 */
+    defaultShowFooter: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 默认是否勾选层级序号 */
+    defaultShowTreeIndex: BooleanConstructor;
     /** 导出前的钩子函数 */
     beforeExport: PropType<BeforeExport>;
 }>>, {
     showSummary: boolean;
     tableHeader: boolean;
     defaultDataType: ExportDataType;
+    defaultShowFooter: boolean;
+    defaultShowTreeIndex: boolean;
     defaultFileName: string;
 }, {}>;
 export default _default;