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

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<{
     /** 提示位置 */

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

@@ -12,6 +12,7 @@ const util$1 = require("../util");
 const ToolColumnList = require("./tool-column-list");
 const ToolPrintBodyCell = require("./tool-print-body-cell");
 const ToolPrintHeaderCell = require("./tool-print-header-cell");
+const ownSlots = ["printTop", "printBottom"];
 const _sfc_main = vue.defineComponent({
   name: "ToolPrint",
   components: {
@@ -119,7 +120,7 @@ const _sfc_main = vue.defineComponent({
     const hideLoading = () => {
       loading.value = false;
     };
-    const onPrintDone = () => {
+    const handlePrintDone = () => {
       hideLoading();
     };
     const printData = (data) => {
@@ -129,6 +130,7 @@ const _sfc_main = vue.defineComponent({
         props.columns,
         colItems.value,
         true,
+        (item) => item.hideInPrint,
         util$1.columnsPrintFilter
       );
       const { headerData, bodyData, footerData, bodyCols } = util$1.getExportData(
@@ -196,32 +198,19 @@ const _sfc_main = vue.defineComponent({
       });
     };
     const initColItems = () => {
-      colItems.value = util$1.getColItems(
+      const { cols, checkAll, indeterminate } = util$1.getColItems(
         props.columns,
-        props.locale.columnUntitled,
-        props.locale.columnIndex,
-        props.locale.columnExpand,
+        props.locale,
         util$1.columnsPrintFilter,
+        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) => {
@@ -242,7 +231,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 {
@@ -254,21 +252,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) => {
@@ -300,6 +289,7 @@ const _sfc_main = vue.defineComponent({
       loading.value = false;
     });
     return {
+      ownSlots,
       visible,
       loading,
       dataType,
@@ -313,12 +303,12 @@ const _sfc_main = vue.defineComponent({
       printOptions,
       openModal,
       closeModal,
-      onPrintDone,
+      handlePrintDone,
       handlePrint,
-      onCheckedChange,
-      onSortChange,
-      onCheckAllChange,
-      onReset,
+      handleCheckedChange,
+      handleSortChange,
+      handleCheckAllChange,
+      handleReset,
       handleTreeIndexChange
     };
   }
@@ -447,19 +437,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[1] || (_cache[1] = (...args) => _ctx.onReset && _ctx.onReset(...args))
+                        onClick: _cache[1] || (_cache[1] = (...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"])
                   ])
                 ]),
@@ -501,7 +491,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       vue.createVNode(_component_ElePrinter, vue.mergeProps({ target: "_iframe" }, _ctx.printerProps || {}, {
         modelValue: _ctx.printOptions.printing,
         "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => _ctx.printOptions.printing = $event),
-        onDone: _ctx.onPrintDone
+        onDone: _ctx.handlePrintDone
       }), {
         default: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "printTop", {
@@ -544,7 +534,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           headerCellClass: _ctx.headerCellClassName
                         }, vue.createSlots({ _: 2 }, [
                           vue.renderList(Object.keys(_ctx.$slots).filter(
-                            (k) => !["printTop", "printBottom"].includes(k)
+                            (k) => !_ctx.ownSlots.includes(k)
                           ), (name) => {
                             return {
                               name,
@@ -574,7 +564,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                             style: { "padding-left": "0", "padding-right": "0" },
                             class: "ele-print-expand-td"
                           }, [
-                            col.column && (col.column.printSlot || col.column.slot) && !["printTop", "printBottom"].includes(
+                            col.column && (col.column.printSlot || col.column.slot) && !_ctx.ownSlots.includes(
                               col.column.printSlot || col.column.slot
                             ) ? vue.renderSlot(_ctx.$slots, col.column.printSlot || col.column.slot, vue.mergeProps({
                               key: 0,
@@ -610,7 +600,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                           bodyCellClass: _ctx.cellClassName
                         }, vue.createSlots({ _: 2 }, [
                           vue.renderList(Object.keys(_ctx.$slots).filter(
-                            (k) => !["printTop", "printBottom"].includes(k)
+                            (k) => !_ctx.ownSlots.includes(k)
                           ), (name) => {
                             return {
                               name,

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

@@ -27,12 +27,13 @@ declare const _default: import('vue').DefineComponent<{
     datasource: PropType<Datasource>;
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
-        row: DataItem;
+        row: DataItem; /** 单元格类名自定义 */
         rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
+        /** 树表字段名 */
         colspan: number;
     } | undefined) | undefined>;
     /** 表格是否有表头 */
@@ -65,6 +66,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 打印前的钩子函数 */
     beforePrint: PropType<BeforeExport>;
 }, {
+    ownSlots: string[];
     visible: import('vue').Ref<boolean>;
     loading: import('vue').Ref<boolean>;
     dataType: import('vue').Ref<ExportDataType>;
@@ -85,12 +87,12 @@ declare const _default: import('vue').DefineComponent<{
     printOptions: TablePrintOptions;
     openModal: () => void;
     closeModal: () => void;
-    onPrintDone: () => void;
+    handlePrintDone: () => void;
     handlePrint: () => 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<{
     /** 提示位置 */
@@ -116,12 +118,13 @@ declare const _default: import('vue').DefineComponent<{
     datasource: PropType<Datasource>;
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
-        row: DataItem;
+        row: DataItem; /** 单元格类名自定义 */
         rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
     }) => number[] | {
         rowspan: number;
+        /** 树表字段名 */
         colspan: number;
     } | undefined) | undefined>;
     /** 表格是否有表头 */

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

@@ -12,6 +12,10 @@ const EleToolbar = require("../ele-toolbar/index");
 const TableTools = require("./components/table-tools");
 const util$1 = require("./util");
 const props = require("./props");
+const ownSlots = ["default", "toolbar", "tools", "footer"];
+const toolsSlotExcludes = [...ownSlots, "empty", "append"];
+const tableSlotExcludes = [...ownSlots, "printTop", "printBottom"];
+const pageSlotExcludes = [...toolsSlotExcludes, "printTop", "printBottom"];
 const _sfc_main = vue.defineComponent({
   name: "EleProTable",
   components: {
@@ -96,10 +100,10 @@ const _sfc_main = vue.defineComponent({
         style: props2.tableStyle,
         class: "ele-pro-table-view",
         ...events,
-        onSelectionChange,
-        onSortChange,
-        onFilterChange,
-        onCurrentChange
+        onSelectionChange: handleSelectionChange,
+        onSortChange: handleSortChange,
+        onFilterChange: handleFilterChange,
+        onCurrentChange: handleCurrentChange
       };
     });
     const toolNames = vue.computed(() => {
@@ -185,7 +189,7 @@ const _sfc_main = vue.defineComponent({
         tableData.value = data;
         tablePage.value = page;
         tableTotal.value = total;
-        onDone({ data, page, total, response: props2.datasource });
+        handleDone({ data, page, total, response: props2.datasource });
         return;
       }
       if (!parent) {
@@ -270,7 +274,7 @@ const _sfc_main = vue.defineComponent({
         total: tableTotal.value,
         response
       };
-      onDone(result, parent);
+      handleDone(result, parent);
     };
     const tableLoad = (row, treeNode, resolve) => {
       if (props2.load) {
@@ -279,7 +283,7 @@ const _sfc_main = vue.defineComponent({
       }
       reload(void 0, row, resolve);
     };
-    const onDone = (result, parent) => {
+    const handleDone = (result, parent) => {
       vue.nextTick(() => {
         if (props2.current != null) {
           methods.setCurrentRowKey(
@@ -294,52 +298,52 @@ const _sfc_main = vue.defineComponent({
       });
       emit("done", result, parent);
     };
-    const onRefresh = () => {
+    const handleRefresh = () => {
       if (isFunctionSource.value) {
         reload();
         return;
       }
       emit("refresh");
     };
-    const onSizeChange = (size) => {
+    const handleSizeChange = (size) => {
       tableSize.value = size;
       emit("sizeChange", size);
     };
-    const onColumnsChange = (columns) => {
+    const handleColumnsChange = (columns, tableColumns) => {
       tableCols.value = columns;
-      emit("columnsChange", columns);
+      emit("columnsChange", columns, tableColumns);
     };
-    const onMaximizedChange = (maximized) => {
+    const handleMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
       emit("maximizedChange", maximized);
     };
-    const onPageSizeChange = (limit) => {
+    const handlePageSizeChange = (limit) => {
       tableLimit.value = limit;
       reload();
     };
-    const onPageCurrentChange = (page) => {
+    const handlePageCurrentChange = (page) => {
       tablePage.value = page;
       reload();
     };
-    const onSortChange = (sorter) => {
+    const handleSortChange = (sorter) => {
       if (props2.loadOnChanged) {
         tableState.sorter = sorter;
         reload();
       }
       events.onSortChange(sorter);
     };
-    const onFilterChange = (filter) => {
+    const handleFilterChange = (filter) => {
       if (props2.loadOnChanged) {
         tableState.filter = filter;
         reload();
       }
       events.onFilterChange(filter);
     };
-    const onCurrentChange = (currentRow, oldCurrentRow) => {
+    const handleCurrentChange = (currentRow, oldCurrentRow) => {
       updateCurrent(currentRow);
       events.onCurrentChange(currentRow, oldCurrentRow);
     };
-    const onSelectionChange = (selection) => {
+    const handleSelectionChange = (selection) => {
       updateSelections(selection);
       events.onSelectionChange(selection);
     };
@@ -472,6 +476,9 @@ const _sfc_main = vue.defineComponent({
       }
     });
     return {
+      toolsSlotExcludes,
+      tableSlotExcludes,
+      pageSlotExcludes,
       ...methods,
       tableViewRef,
       tableData,
@@ -484,12 +491,12 @@ const _sfc_main = vue.defineComponent({
       toolExportConfig,
       toolPrintConfig,
       loadingProps,
-      onRefresh,
-      onSizeChange,
-      onColumnsChange,
-      onMaximizedChange,
-      onPageSizeChange,
-      onPageCurrentChange,
+      handleRefresh,
+      handleSizeChange,
+      handleColumnsChange,
+      handleMaximizedChange,
+      handlePageSizeChange,
+      handlePageCurrentChange,
       reload,
       reloadTable,
       getTableRef,
@@ -545,20 +552,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             fetch: _ctx.fetch,
             exportConfig: _ctx.toolExportConfig,
             printConfig: _ctx.toolPrintConfig,
-            onReload: _ctx.onRefresh,
-            "onUpdate:size": _ctx.onSizeChange,
-            "onUpdate:columns": _ctx.onColumnsChange,
-            "onUpdate:maximized": _ctx.onMaximizedChange
+            onReload: _ctx.handleRefresh,
+            "onUpdate:size": _ctx.handleSizeChange,
+            "onUpdate:columns": _ctx.handleColumnsChange,
+            "onUpdate:maximized": _ctx.handleMaximizedChange
           }, vue.createSlots({ _: 2 }, [
             vue.renderList(Object.keys(_ctx.$slots).filter(
-              (k) => ![
-                "default",
-                "toolbar",
-                "tools",
-                "footer",
-                "empty",
-                "append"
-              ].includes(k)
+              (k) => !_ctx.toolsSlotExcludes.includes(k)
             ), (name) => {
               return {
                 name,
@@ -577,14 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       vue.renderSlot(_ctx.$slots, "default"),
       _ctx.virtual ? (vue.openBlock(), vue.createBlock(_component_EleVirtualTable, vue.mergeProps({ key: 1 }, _ctx.tableProps, { ref: "tableViewRef" }), vue.createSlots({ _: 2 }, [
         vue.renderList(Object.keys(_ctx.$slots).filter(
-          (k) => ![
-            "default",
-            "toolbar",
-            "tools",
-            "footer",
-            "printTop",
-            "printBottom"
-          ].includes(k)
+          (k) => !_ctx.tableSlotExcludes.includes(k)
         ), (name) => {
           return {
             name,
@@ -595,14 +588,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         })
       ]), 1040)) : (vue.openBlock(), vue.createBlock(_component_EleDataTable, vue.mergeProps({ key: 2 }, _ctx.tableProps, { ref: "tableViewRef" }), vue.createSlots({ _: 2 }, [
         vue.renderList(Object.keys(_ctx.$slots).filter(
-          (k) => ![
-            "default",
-            "toolbar",
-            "tools",
-            "footer",
-            "printTop",
-            "printBottom"
-          ].includes(k)
+          (k) => !_ctx.tableSlotExcludes.includes(k)
         ), (name) => {
           return {
             name,
@@ -619,20 +605,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, [
         vue.renderSlot(_ctx.$slots, "footer"),
         _ctx.paginationProps && _ctx.paginationProps.total ? (vue.openBlock(), vue.createBlock(_component_ElePagination, vue.mergeProps({ key: 0 }, _ctx.paginationProps, {
-          "onUpdate:currentPage": _ctx.onPageCurrentChange,
-          "onUpdate:pageSize": _ctx.onPageSizeChange
+          "onUpdate:currentPage": _ctx.handlePageCurrentChange,
+          "onUpdate:pageSize": _ctx.handlePageSizeChange
         }), vue.createSlots({ _: 2 }, [
           vue.renderList(Object.keys(_ctx.$slots).filter(
-            (k) => ![
-              "default",
-              "toolbar",
-              "tools",
-              "footer",
-              "empty",
-              "append",
-              "printTop",
-              "printBottom"
-            ].includes(k)
+            (k) => !_ctx.pageSlotExcludes.includes(k)
           ), (name) => {
             return {
               name,