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

package/lib/ele-pro-table/components/table-tools.d.ts

@@ -63,7 +63,7 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     ownSlots: string[];
     SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-    MenuOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+    SizeMiddleOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
     SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
     lang: import('vue').ComputedRef<TableLocale>;
     toolExportRef: import('vue').Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
@@ -110,12 +110,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -224,12 +224,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -297,12 +297,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -412,12 +412,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -447,7 +447,7 @@ declare const _default: import('vue').DefineComponent<{
     placement: import('vue').ComputedRef<"top" | "bottom">;
     reload: () => void;
     updateSize: (size: string) => void;
-    updateColumns: (columns: Columns, tableColumns: Columns) => void;
+    updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
     toggleMaximized: () => void;
     openExportModal: () => void;
     openPrintModal: () => void;
@@ -456,7 +456,7 @@ declare const _default: import('vue').DefineComponent<{
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     reload: () => true;
     'update:size': (_size: TableSize) => true;
-    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => true;
     'update:maximized': (_maximized: boolean) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 工具按钮布局 */
@@ -517,7 +517,7 @@ declare const _default: import('vue').DefineComponent<{
         required: true;
     };
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
     onReload?: (() => any) | undefined;
     "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;

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

@@ -35,7 +35,7 @@ const _sfc_main = vue.defineComponent({
     cacheKey: String
   },
   emits: {
-    "update:columns": (_columns, _tableColumns) => true
+    "update:columns": (_columns, _tableColumns, _isReset) => true
   },
   setup(props, { emit }) {
     const toolRef = vue.ref(null);
@@ -53,7 +53,7 @@ const _sfc_main = vue.defineComponent({
       isCheckAll.value = checkAll;
       isIndeterminate.value = indeterminate;
     };
-    const updateColumns = () => {
+    const updateColumns = (isReset) => {
       const colsWidth = util.getCacheColsWidth(props.cacheKey);
       const columns = util.getCheckedColumns(
         props.columns,
@@ -73,7 +73,7 @@ const _sfc_main = vue.defineComponent({
         true,
         colsWidth
       );
-      emit("update:columns", columns, tableColumns);
+      emit("update:columns", columns, tableColumns, !!isReset);
     };
     const cacheSettingCols = () => {
       if (props.cacheKey) {
@@ -164,7 +164,7 @@ const _sfc_main = vue.defineComponent({
     const handleReset = () => {
       cleanSettingCols();
       initColItems();
-      updateColumns();
+      updateColumns(true);
     };
     vue.watch(
       [() => props.columns, () => props.locale],

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

@@ -23,12 +23,12 @@ declare const _default: import('vue').DefineComponent<{
     toolRef: import('vue').Ref<EleToolInstance>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;
@@ -41,7 +41,7 @@ declare const _default: import('vue').DefineComponent<{
     handleFixedLeftTooltip: (el: HTMLElement) => void;
     handleFixedRightTooltip: (el: HTMLElement) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 提示位置 */
     placement: PropType<EleTooltipProps["placement"]>;
@@ -59,7 +59,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 列配置缓存本地的名称 */
     cacheKey: StringConstructor;
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
 }, {
     sortable: boolean;
     allowFixed: boolean;

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

@@ -68,12 +68,12 @@ declare const _default: import('vue').DefineComponent<{
     dataType: import('vue').Ref<ExportDataType>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;

package/lib/ele-pro-table/components/tool-print-body-cell.cjs

@@ -24,7 +24,7 @@ const _sfc_main = vue.defineComponent({
       const { text, row, column, index: $index } = props.col;
       const params = [{ row, column, $index }];
       const slotName = column ? column.printSlot || column.slot : void 0;
-      if (column && !["expand", "selection", "index"].includes(column.type || "") && slotName && typeof slots[slotName] === "function") {
+      if (column && "expand" !== column.type && slotName && typeof slots[slotName] === "function") {
         return { render: slots[slotName], params };
       }
       return { render: () => text, params };

package/lib/ele-pro-table/components/tool-print-header-cell.cjs

@@ -21,8 +21,9 @@ const _sfc_main = vue.defineComponent({
     const renderOpt = vue.computed(() => {
       const { text, column } = props.col;
       const params = [{ column, $index: props.columnIndex }];
-      if (column && "index" !== column.type && column.headerSlot && typeof slots[column.headerSlot] === "function") {
-        return { render: slots[column.headerSlot], params };
+      const slotName = column ? column.printHeaderSlot || column.headerSlot : void 0;
+      if (column && slotName && typeof slots[slotName] === "function") {
+        return { render: slots[slotName], params };
       }
       return { render: () => text, params };
     });

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

@@ -70,12 +70,12 @@ declare const _default: import('vue').DefineComponent<{
     dataType: import('vue').Ref<ExportDataType>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;

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

@@ -32,16 +32,9 @@ const _sfc_main = vue.defineComponent({
     const events = util.useEmits(emit);
     const methods = util.useMethods(() => getTableRef());
     const globalProps = receiver.useGlobalProps("table");
-    const userColumns = vue.computed(() => {
-      return core.mapTree(props2.columns, (item) => {
-        if (item.vIf == null || (typeof item.vIf === "function" ? item.vIf() : item.vIf)) {
-          return item;
-        }
-      });
-    });
     const tableState = {
       sorter: props2.defaultSort ?? {},
-      filter: util$1.getDefaultFilter(userColumns.value),
+      filter: util$1.getDefaultFilter(props2.columns),
       where: props2.where ?? {}
     };
     const tableToolsRef = vue.ref(null);
@@ -324,27 +317,31 @@ const _sfc_main = vue.defineComponent({
       tableSize.value = size;
       emit("sizeChange", size);
     };
-    const handleColumnsChange = (columns, tableColumns) => {
+    const handleColumnsChange = (columns, tableColumns, isReset) => {
       tableCols.value = columns;
-      emit("columnsChange", columns, tableColumns);
+      emit("columnsChange", columns, tableColumns, isReset);
     };
     const handleMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
       emit("maximizedChange", maximized);
     };
     const handlePageSizeChange = (limit) => {
-      if (tableTotal.value !== "*") {
-        const maxPage = Math.ceil(tableTotal.value / limit);
-        if (maxPage && tablePage.value > maxPage) {
-          tablePage.value = maxPage;
+      if (tableLimit.value !== limit) {
+        tableLimit.value = limit;
+        if (tableTotal.value !== "*") {
+          const maxPage = Math.ceil(tableTotal.value / limit);
+          if (maxPage && tablePage.value > maxPage) {
+            tablePage.value = maxPage;
+          }
         }
+        reload();
       }
-      tableLimit.value = limit;
-      reload();
     };
     const handlePageCurrentChange = (page) => {
-      tablePage.value = page;
-      reload();
+      if (tablePage.value !== page) {
+        tablePage.value = page;
+        reload();
+      }
     };
     const handleSortChange = (sorter) => {
       if (props2.loadOnChanged) {
@@ -450,7 +447,7 @@ const _sfc_main = vue.defineComponent({
       }
     };
     vue.watch(
-      userColumns,
+      () => props2.columns,
       (columns) => {
         if (columns) {
           tableCols.value = util$1.getInitCacheColumns(
@@ -522,7 +519,6 @@ const _sfc_main = vue.defineComponent({
       tableSlotExcludes,
       pageSlotExcludes,
       ...methods,
-      userColumns,
       tableToolsRef,
       tableViewRef,
       tableData,
@@ -580,7 +576,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ref: "tableToolsRef",
             tools: _ctx.toolNames,
             size: _ctx.tableSize,
-            columns: _ctx.userColumns,
+            columns: _ctx.columns,
             columnSortable: _ctx.columnSortable,
             columnFixed: _ctx.columnFixed,
             maximized: _ctx.tableMaximized,