ele-admin-plus 1.0.2 → 1.1.0

package/lib/ele-pro-table/index.d.ts

@@ -1,10 +1,11 @@
-import type { Ref, CSSProperties } from 'vue';
+import type { Ref } from 'vue';
+import type { StyleValue, ElEmptyProps } from '../ele-app/types';
 import type { PaginationProps } from '../ele-pagination/props';
 import type { DataItem, Column, Columns, Sorter, Filter, ReloadFunction, DoneParams, TableTool, TableSize, FetchCallback } from './types';
 import type { TableViewProps } from './props';
 import type TableViewType from './components/table-view';
 export type TableViewInstance = InstanceType<typeof TableViewType> | null;
-declare const _sfc_main: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<{
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -49,17 +50,17 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     maximizedIndex: NumberConstructor;
     maximizedHeight: (StringConstructor | NumberConstructor)[];
-    headerEllipsis: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     rowClickChecked: import("vue").PropType<import("./types").RowClickChecked>;
-    tableStyle: import("vue").PropType<CSSProperties>;
-    footerStyle: import("vue").PropType<CSSProperties>;
+    tableStyle: import("vue").PropType<StyleValue>;
+    footerStyle: import("vue").PropType<StyleValue>;
     pagination: {
         type: import("vue").PropType<boolean | import("./types").TablePagination>;
         default: () => null;
     };
+    emptyProps: {
+        type: import("vue").PropType<boolean | ElEmptyProps>;
+        default: () => null;
+    };
     sticky: BooleanConstructor;
     cacheKey: StringConstructor;
     locale: import("vue").PropType<import("./types").TableLocale>;
@@ -69,9 +70,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     loading: BooleanConstructor;
     pageIndex: NumberConstructor;
-    data: {
-        type: import("vue").PropType<any[]>;
-        default: () => never[];
+    headerEllipsis: {
+        type: BooleanConstructor;
+        default: boolean;
     };
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
@@ -79,13 +80,23 @@ declare const _sfc_main: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
     maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
+    className: {
+        type: StringConstructor;
+        default: string;
+    };
+    lazy: BooleanConstructor;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    data: {
+        type: import("vue").PropType<any[]>;
+        default: () => never[];
+    };
+    height: (StringConstructor | NumberConstructor)[];
     rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     showHeader: {
         type: BooleanConstructor;
@@ -109,7 +120,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "showArrow" | "effect" | "enterable" | "popperClass" | "offset" | "placement" | "popperOptions" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;
@@ -137,14 +148,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
             children: string;
         };
     };
-    lazy: BooleanConstructor;
     load: import("vue").PropType<((row: any, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
     tableLayout: {
-        type: import("vue").PropType<"fixed" | "auto">;
+        type: import("vue").PropType<"auto" | "fixed">;
         default: string;
     };
     scrollbarAlwaysOn: {
@@ -183,16 +189,22 @@ declare const _sfc_main: import("vue").DefineComponent<{
         hideInTable?: boolean | undefined;
         hideInSetting?: boolean | undefined;
         children?: any[] | undefined;
-        width?: string | number | undefined;
         type?: string | undefined;
+        width?: string | number | undefined;
         minWidth?: string | number | undefined;
         sortable?: string | boolean | undefined;
         resizable?: boolean | undefined;
         reserveSelection?: boolean | undefined;
         filterMultiple?: boolean | undefined;
         sortOrders?: ("ascending" | "descending" | null)[] | undefined;
-        className?: string | undefined;
+        align?: string | undefined;
+        formatter?: ((row: any, column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<any>, cellValue: any, index: number) => string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+            [key: string]: any;
+        }>) | undefined;
         label?: string | undefined;
+        className?: string | undefined;
+        fixed?: string | boolean | undefined;
+        index?: number | ((index: number) => number) | undefined;
         labelClassName?: string | undefined;
         property?: string | undefined;
         prop?: string | undefined;
@@ -205,12 +217,27 @@ declare const _sfc_main: import("vue").DefineComponent<{
         sortMethod?: ((a: any, b: any) => number) | undefined;
         sortBy?: string | string[] | ((row: any, index: number) => string) | undefined;
         columnKey?: string | undefined;
-        align?: string | undefined;
         headerAlign?: string | undefined;
         showOverflowTooltip?: boolean | {
-            showArrow?: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
+            offset?: number | undefined;
             effect?: string | undefined;
-            enterable?: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
+            placement?: import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
+            popperOptions?: {
+                placement?: import("element-plus").Placement | undefined;
+                modifiers?: {
+                    name?: any;
+                    enabled?: boolean | undefined;
+                    phase?: import("@popperjs/core").ModifierPhases | undefined;
+                    requires?: string[] | undefined;
+                    requiresIfExists?: string[] | undefined;
+                    fn?: ((arg0: import("@popperjs/core").ModifierArguments<any>) => void | import("@popperjs/core").State) | undefined;
+                    effect?: ((arg0: import("@popperjs/core").ModifierArguments<any>) => void | (() => void)) | undefined;
+                    options?: Partial<any> | undefined;
+                    data?: import("@popperjs/core").Obj | undefined;
+                }[] | undefined;
+                strategy?: import("@popperjs/core").PositioningStrategy | undefined;
+                onFirstUpdate?: ((arg0: Partial<import("@popperjs/core").State>) => void) | undefined;
+            } | undefined;
             popperClass?: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | {
                 [x: string]: boolean;
             } | (string | {
@@ -300,31 +327,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
             } | (string | any[] | {
                 [x: string]: boolean;
             })[])[])[])[])[])[])[])[])[])[]))[], unknown, unknown> | undefined;
-            offset?: number | undefined;
-            placement?: import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
-            popperOptions?: {
-                placement?: import("element-plus").Placement | undefined;
-                modifiers?: {
-                    name?: any;
-                    enabled?: boolean | undefined;
-                    phase?: import("@popperjs/core").ModifierPhases | undefined;
-                    requires?: string[] | undefined;
-                    requiresIfExists?: string[] | undefined;
-                    fn?: ((arg0: import("@popperjs/core").ModifierArguments<any>) => void | import("@popperjs/core").State) | undefined;
-                    effect?: ((arg0: import("@popperjs/core").ModifierArguments<any>) => void | (() => void)) | undefined;
-                    options?: Partial<any> | undefined;
-                    data?: import("@popperjs/core").Obj | undefined;
-                }[] | undefined;
-                strategy?: import("@popperjs/core").PositioningStrategy | undefined;
-                onFirstUpdate?: ((arg0: Partial<import("@popperjs/core").State>) => void) | undefined;
-            } | undefined;
+            enterable?: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
             showAfter?: number | undefined;
             hideAfter?: number | undefined;
+            showArrow?: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
         } | undefined;
-        fixed?: string | boolean | undefined;
-        formatter?: ((row: any, column: import("element-plus/es/components/table/src/table-column/defaults").TableColumnCtx<any>, cellValue: any, index: number) => string | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-            [key: string]: any;
-        }>) | undefined;
         selectable?: ((row: any, index: number) => boolean) | undefined;
         filterMethod?: import("element-plus/es/components/table/src/table-column/defaults").FilterMethods<any> | undefined;
         filteredValue?: string[] | undefined;
@@ -333,7 +340,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
             value: string;
         }[] | undefined;
         filterPlacement?: string | undefined;
-        index?: number | ((index: number) => number) | undefined;
     }[]>;
     tableSize: Ref<"" | "default" | "small" | "large" | undefined>;
     tableMaximized: Ref<boolean>;
@@ -342,8 +348,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
     tableIndex: import("vue").ComputedRef<number>;
     paginationProps: import("vue").ComputedRef<Partial<PaginationProps> | null>;
     tableProps: import("vue").ComputedRef<Partial<TableViewProps>>;
-    proTableStyle: import("vue").ComputedRef<CSSProperties>;
+    proTableStyle: import("vue").ComputedRef<StyleValue>;
     tableTools: import("vue").ComputedRef<TableTool[]>;
+    tableEmptyProps: import("vue").ComputedRef<boolean | ElEmptyProps>;
     tableLoad: (row: DataItem, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: DataItem[]) => void) => void;
     onRefresh: () => void;
     onSizeChange: (size: TableSize) => void;
@@ -449,17 +456,17 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     maximizedIndex: NumberConstructor;
     maximizedHeight: (StringConstructor | NumberConstructor)[];
-    headerEllipsis: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     rowClickChecked: import("vue").PropType<import("./types").RowClickChecked>;
-    tableStyle: import("vue").PropType<CSSProperties>;
-    footerStyle: import("vue").PropType<CSSProperties>;
+    tableStyle: import("vue").PropType<StyleValue>;
+    footerStyle: import("vue").PropType<StyleValue>;
     pagination: {
         type: import("vue").PropType<boolean | import("./types").TablePagination>;
         default: () => null;
     };
+    emptyProps: {
+        type: import("vue").PropType<boolean | ElEmptyProps>;
+        default: () => null;
+    };
     sticky: BooleanConstructor;
     cacheKey: StringConstructor;
     locale: import("vue").PropType<import("./types").TableLocale>;
@@ -469,9 +476,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     loading: BooleanConstructor;
     pageIndex: NumberConstructor;
-    data: {
-        type: import("vue").PropType<any[]>;
-        default: () => never[];
+    headerEllipsis: {
+        type: BooleanConstructor;
+        default: boolean;
     };
     size: {
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
@@ -479,13 +486,23 @@ declare const _sfc_main: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
     maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
     };
+    className: {
+        type: StringConstructor;
+        default: string;
+    };
+    lazy: BooleanConstructor;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    data: {
+        type: import("vue").PropType<any[]>;
+        default: () => never[];
+    };
+    height: (StringConstructor | NumberConstructor)[];
     rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     showHeader: {
         type: BooleanConstructor;
@@ -509,7 +526,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "showArrow" | "effect" | "enterable" | "popperClass" | "offset" | "placement" | "popperOptions" | "showAfter" | "hideAfter">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;
@@ -537,14 +554,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
             children: string;
         };
     };
-    lazy: BooleanConstructor;
     load: import("vue").PropType<((row: any, treeNode: import("element-plus/es/components/table/src/table/defaults").TreeNode, resolve: (data: any[]) => void) => void) | undefined>;
-    className: {
-        type: StringConstructor;
-        default: string;
-    };
     tableLayout: {
-        type: import("vue").PropType<"fixed" | "auto">;
+        type: import("vue").PropType<"auto" | "fixed">;
         default: string;
     };
     scrollbarAlwaysOn: {
@@ -554,6 +566,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     flexible: BooleanConstructor;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
+    onSortChange?: ((_sorter: Sorter) => any) | undefined;
     onSelectAll?: ((_selection: DataItem[]) => any) | undefined;
     onSelectionChange?: ((_selection: DataItem[]) => any) | undefined;
     onCellMouseEnter?: ((_row: DataItem, _column: Column, _cell: HTMLTableCellElement, _e: MouseEvent) => any) | undefined;
@@ -566,21 +579,23 @@ declare const _sfc_main: import("vue").DefineComponent<{
     onRowDblclick?: ((_row: DataItem, _column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderClick?: ((_column: Column, _e: MouseEvent) => any) | undefined;
     onHeaderContextmenu?: ((_column: Column, _e: MouseEvent) => any) | undefined;
-    onSortChange?: ((_sorter: Sorter) => any) | undefined;
     onFilterChange?: ((_filter: Filter) => any) | undefined;
     onCurrentChange?: ((_current?: DataItem | undefined, _old?: DataItem | undefined) => any) | undefined;
     onHeaderDragend?: ((_width: number, _old: number, _column: Column, _e: MouseEvent) => any) | undefined;
     onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;
     onDone?: ((_result: DoneParams<DataItem>, _parent?: DataItem | undefined) => any) | undefined;
+    onRefresh?: (() => any) | undefined;
     "onUpdate:selections"?: ((_selections: DataItem[]) => any) | undefined;
     "onUpdate:current"?: ((_current?: DataItem | null | undefined) => any) | undefined;
     onColumnsChange?: ((_columns: Columns) => any) | undefined;
     onSizeChange?: ((_size: "" | "default" | "small" | "large" | undefined) => any) | undefined;
     onMaximizedChange?: ((_maximized: boolean) => any) | undefined;
-    onRefresh?: (() => any) | undefined;
 }, {
-    data: any[];
+    loading: boolean;
     fit: boolean;
+    className: string;
+    lazy: boolean;
+    data: any[];
     stripe: boolean;
     border: boolean;
     showHeader: boolean;
@@ -593,20 +608,18 @@ declare const _sfc_main: import("vue").DefineComponent<{
         hasChildren?: string | undefined;
         children?: string | undefined;
     } | undefined;
-    lazy: boolean;
-    className: string;
-    tableLayout: "fixed" | "auto";
+    tableLayout: "auto" | "fixed";
     scrollbarAlwaysOn: boolean;
     flexible: boolean;
-    loading: boolean;
     loadOnCreated: boolean;
     loadOnChanged: boolean;
     toolbar: boolean | import("./types").TableToolbar;
     tools: boolean | TableTool[];
     columnSortable: boolean;
     columnFixed: boolean;
-    headerEllipsis: boolean;
     pagination: boolean | import("./types").TablePagination;
+    emptyProps: boolean | ElEmptyProps;
     sticky: boolean;
+    headerEllipsis: boolean;
 }, {}>;
-export default _sfc_main;
+export default _default;

package/lib/ele-pro-table/index.js

@@ -67,7 +67,9 @@ const _sfc_main = vue.defineComponent({
         load: tableLoad,
         columns: tableCols.value,
         pageIndex: tableIndex.value,
-        loading: tableLoading.value
+        loading: tableLoading.value,
+        headerEllipsis: props$1.headerEllipsis,
+        emptyText: errorText.value || props$1.emptyText
       };
       return Object.assign(core.pick(props$1, props.tablePropKeys), opt);
     });
@@ -85,6 +87,12 @@ const _sfc_main = vue.defineComponent({
       }
       return tools || [];
     });
+    const tableEmptyProps = vue.computed(() => {
+      return util.mergeProps(
+        props$1.emptyProps,
+        globalProps.value.emptyProps
+      );
+    });
     const reload = (option, parent, resolve) => {
       if (!authenticated.value) {
         return;
@@ -138,7 +146,7 @@ const _sfc_main = vue.defineComponent({
         const { data, page, total } = util.reloadData(
           props$1.datasource,
           sorter,
-          !props$1.pagination ? void 0 : tablePage.value,
+          paginationProps.value ? tablePage.value : void 0,
           tableLimit.value
         );
         tableData.value = data;
@@ -168,7 +176,7 @@ const _sfc_main = vue.defineComponent({
       if (resolve) {
         resolve(data);
       } else {
-        if (props$1.pagination && (props$1.pagination === true || props$1.pagination.autoAmend) && !data.length && total && tablePage.value && tableLimit.value) {
+        if (util.isAutoAmend(props$1.pagination, globalProps.value.pagination) && !data.length && total && tablePage.value && tableLimit.value) {
           const maxPage = Math.ceil(total / tableLimit.value);
           if (maxPage && tablePage.value > maxPage) {
             tablePage.value = maxPage;
@@ -384,7 +392,7 @@ const _sfc_main = vue.defineComponent({
       );
     };
     const goPageByRowKey = (key) => {
-      if (!props$1.rowKey || !props$1.pagination || tableLimit.value == null || !Array.isArray(props$1.datasource)) {
+      if (!props$1.rowKey || !paginationProps.value || tableLimit.value == null || !Array.isArray(props$1.datasource)) {
         return;
       }
       const sorter = current.sorter ?? getDefaultSorter();
@@ -477,6 +485,7 @@ const _sfc_main = vue.defineComponent({
       tableProps,
       proTableStyle,
       tableTools,
+      tableEmptyProps,
       tableLoad,
       onRefresh,
       onSizeChange,
@@ -518,7 +527,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     class: vue.normalizeClass([
       "ele-pro-table",
       { "is-sticky": _ctx.sticky },
-      { "is-header-ellipsis": _ctx.headerEllipsis },
       { "is-maximized": _ctx.tableMaximized }
     ]),
     style: vue.normalizeStyle(_ctx.proTableStyle)
@@ -569,20 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       onSortChange: _ctx.onSortChange,
       onFilterChange: _ctx.onFilterChange,
       onCurrentChange: _ctx.onCurrentChange
-    }), vue.createSlots({
-      empty: vue.withCtx(() => [
-        vue.renderSlot(_ctx.$slots, "empty", {
-          text: _ctx.emptyText,
-          error: _ctx.errorText
-        }, () => [
-          vue.createVNode(_component_ElEmpty, {
-            description: _ctx.errorText || _ctx.emptyText,
-            imageSize: 68
-          }, null, 8, ["description"])
-        ])
-      ]),
-      _: 2
-    }, [
+    }), vue.createSlots({ _: 2 }, [
       vue.renderList(Object.keys(_ctx.$slots).filter(
         (k) => "default" !== k && "empty" !== k
       ), (name) => {
@@ -592,7 +587,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
           ])
         };
-      })
+      }),
+      _ctx.tableEmptyProps || _ctx.$slots.empty ? {
+        name: "empty",
+        fn: vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "empty", {
+            text: _ctx.emptyText,
+            error: _ctx.errorText
+          }, () => [
+            _ctx.tableEmptyProps ? (vue.openBlock(), vue.createBlock(_component_ElEmpty, vue.mergeProps({
+              key: 0,
+              imageSize: 68
+            }, _ctx.tableEmptyProps === true ? {} : _ctx.emptyProps, {
+              class: "ele-table-empty",
+              description: _ctx.errorText || _ctx.emptyText
+            }), null, 16, ["description"])) : vue.createCommentVNode("", true)
+          ])
+        ]),
+        key: "0"
+      } : void 0
     ]), 1040, ["style", "onSelect", "onSelectAll", "onCellMouseEnter", "onCellMouseLeave", "onCellClick", "onCellDblclick", "onCellContextmenu", "onRowContextmenu", "onRowDblclick", "onHeaderClick", "onHeaderContextmenu", "onHeaderDragend", "onExpandChange", "onRowClick", "onSelectionChange", "onSortChange", "onFilterChange", "onCurrentChange"])) : vue.createCommentVNode("", true),
     _ctx.paginationProps || _ctx.$slots.footer ? (vue.openBlock(), vue.createElementBlock("div", {
       key: 2,