ele-admin-plus 1.3.1-beta.1 → 1.4.0-beta.1

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

@@ -1,9 +1,22 @@
 import { PropType } from 'vue';
+import { StyleValue } from '../../ele-app/types';
 import { EleModalProps, ElePrinterProps, EleTableProps } from '../../ele-app/plus';
 import { Columns, DataItem, SpanMethod, SummaryMethod, CellStyle, CellClass, HeaderCellStyle, HeaderCellClass, TreeProps } from '../../ele-data-table/types';
-import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, ColItem, TablePrintOptions, TableExportParams } from '../types';
+import { TableLocale, ExportDataType, BeforeExport, Datasource, FetchFunction, TableExportParams } from '../types';
 
-declare const _default: import('vue').DefineComponent<{
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: {
+    row: DataItem | undefined;
+    column: import('../types').Column;
+    $index: number;
+}) => any>> & Partial<Record<string, (_: any) => any>> & {
+    printTop?(_: {
+        data: DataItem[];
+    }): any;
+    printBottom?(_: {
+        data: DataItem[];
+    }): any;
+};
+declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 表格国际化 */
     locale: {
         type: PropType<TableLocale>;
@@ -35,6 +48,8 @@ declare const _default: import('vue').DefineComponent<{
     sumText: StringConstructor;
     /** 合计行自定义方法 */
     summaryMethod: PropType<SummaryMethod>;
+    /** 自定义表格样式 */
+    tableStyle: PropType<StyleValue>;
     /** 单元格样式 */
     cellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */
@@ -63,39 +78,11 @@ declare const _default: import('vue').DefineComponent<{
     defaultShowTreeIndex: BooleanConstructor;
     /** 打印前的钩子函数 */
     beforePrint: PropType<BeforeExport>;
-}, {
-    ownSlots: string[];
-    visible: import('vue').Ref<boolean>;
-    loading: import('vue').Ref<boolean>;
-    dataType: import('vue').Ref<ExportDataType>;
-    colItems: import('vue').Ref<{
-        uid: string;
-        label?: string | undefined;
-        checked?: 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>;
-    showHeader: import('vue').Ref<boolean>;
-    showFooter: import('vue').Ref<boolean>;
-    showTreeIndex: import('vue').Ref<boolean>;
-    treeIndexDisabled: import('vue').Ref<boolean>;
-    printOptions: TablePrintOptions;
+}>, {
     openModal: () => void;
     closeModal: () => void;
-    handlePrintDone: () => void;
-    handlePrint: () => 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;
     printData: (params?: TableExportParams) => void;
-}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 表格国际化 */
     locale: {
         type: PropType<TableLocale>;
@@ -127,6 +114,8 @@ declare const _default: import('vue').DefineComponent<{
     sumText: StringConstructor;
     /** 合计行自定义方法 */
     summaryMethod: PropType<SummaryMethod>;
+    /** 自定义表格样式 */
+    tableStyle: PropType<StyleValue>;
     /** 单元格样式 */
     cellStyle: PropType<CellStyle>;
     /** 单元格类名自定义 */
@@ -155,11 +144,17 @@ declare const _default: import('vue').DefineComponent<{
     defaultShowTreeIndex: BooleanConstructor;
     /** 打印前的钩子函数 */
     beforePrint: PropType<BeforeExport>;
-}>>, {
+}>> & Readonly<{}>, {
     showSummary: boolean;
     tableHeader: boolean;
     defaultDataType: ExportDataType;
     defaultShowFooter: boolean;
     defaultShowTreeIndex: boolean;
-}, {}>;
+}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

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

@@ -1,6 +1,6 @@
 "use strict";
 const vue = require("vue");
-const core = require("../utils/core");
+const common = require("../utils/common");
 const receiver = require("../ele-config-provider/receiver");
 const EleLoading = require("../ele-loading/index");
 const ElePagination = require("../ele-pagination/index");
@@ -12,23 +12,25 @@ 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: {
-    EleLoading,
-    ElePagination,
-    EleDataTable,
-    EleVirtualTable,
-    EleToolbar,
-    TableTools
-  },
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...{ name: "EleProTable" },
+  __name: "index",
   props: props.proTableProps,
   emits: props.proTableEmits,
-  setup(props2, { emit }) {
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const ownSlots = [
+      "default",
+      "toolbar",
+      "tools",
+      "footer",
+      "topExtra",
+      "bottomExtra"
+    ];
+    const toolsSlotExcludes = [...ownSlots, "empty", "append"];
+    const tableSlotExcludes = [...ownSlots, "printTop", "printBottom"];
+    const pageSlotExcludes = [...toolsSlotExcludes, "printTop", "printBottom"];
+    const props2 = __props;
+    const emit = __emit;
     const events = util.useEmits(emit);
     const methods = util.useMethods(() => getTableRef());
     const globalProps = receiver.useGlobalProps("table");
@@ -70,6 +72,7 @@ const _sfc_main = vue.defineComponent({
     const tableIndex = vue.computed(() => {
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
+    const tableCurrentIndex = vue.ref(tableIndex.value);
     const paginationProps = vue.computed(() => {
       return util$1.getPaginationProps(
         tableSize.value,
@@ -95,7 +98,7 @@ const _sfc_main = vue.defineComponent({
     const tableProps = vue.computed(() => {
       const isMaximized = tableMaximized.value && props2.maximizedHeight;
       const options = {
-        ...core.pick(props2, props$1.dataTablePropKeys),
+        ...common.pick(props2, props$1.dataTablePropKeys),
         height: isMaximized ? props2.maximizedHeight : props2.height,
         border: props2.border ?? globalProps.value.border ?? false,
         stripe: props2.stripe ?? globalProps.value.stripe ?? false,
@@ -105,7 +108,7 @@ const _sfc_main = vue.defineComponent({
         columns: tableCols.value,
         cacheData: cacheData.value,
         errorText: errorText.value,
-        pageIndex: tableIndex.value,
+        pageIndex: tableCurrentIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props2.virtual ? props2.rowHeight : void 0,
         rowKey: tableRowKey.value,
@@ -321,11 +324,10 @@ const _sfc_main = vue.defineComponent({
       reload(void 0, row, resolve);
     };
     const handleDone = (result, parent) => {
+      checkTableCurrentIndex();
       vue.nextTick(() => {
         if (props2.current != null) {
-          methods.setCurrentRowKey(
-            core.getValue(props2.current, tableRowKey.value)
-          );
+          methods.setCurrentRowKey(common.getValue(props2.current, tableRowKey.value));
         }
         if (props2.selections != null && props2.selections.length) {
           methods.setSelectedRowKeys(
@@ -408,6 +410,11 @@ const _sfc_main = vue.defineComponent({
         emit("update:selections", selection);
       }
     };
+    const checkTableCurrentIndex = () => {
+      if (tableCurrentIndex.value !== tableIndex.value) {
+        tableCurrentIndex.value = tableIndex.value;
+      }
+    };
     const reloadTable = () => {
       methods.doLayout();
     };
@@ -419,6 +426,7 @@ const _sfc_main = vue.defineComponent({
     };
     const setData = (data) => {
       tableData.value = data;
+      checkTableCurrentIndex();
     };
     const goPageByRowKey = (key) => {
       if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
@@ -426,8 +434,8 @@ const _sfc_main = vue.defineComponent({
       }
       const rowKey = tableRowKey.value;
       const data = util$1.sortData(props2.datasource, tableState.sorter);
-      const index2 = data.findIndex((d) => core.getValue(d, rowKey) === key);
-      const page = Math.floor(index2 / tableLimit.value) + 1;
+      const index = data.findIndex((d) => common.getValue(d, rowKey) === key);
+      const page = Math.floor(index / tableLimit.value) + 1;
       if (tablePage.value !== page) {
         reload({ page });
       }
@@ -512,7 +520,7 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       () => props2.current,
       (current) => {
-        methods.setCurrentRowKey(core.getValue(current, tableRowKey.value));
+        methods.setCurrentRowKey(common.getValue(current, tableRowKey.value));
       }
     );
     vue.watch(
@@ -530,11 +538,7 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       globalProps,
       (config) => {
-        tableSize.value = util$1.getTableSize(
-          props2.cacheKey,
-          props2.size,
-          config.size
-        );
+        tableSize.value = util$1.getTableSize(props2.cacheKey, props2.size, config.size);
       },
       { deep: true }
     );
@@ -543,30 +547,13 @@ const _sfc_main = vue.defineComponent({
         reload();
       }
     });
-    return {
-      toolsSlotExcludes,
-      tableSlotExcludes,
-      pageSlotExcludes,
+    __expose({
       ...methods,
       tableToolsRef,
       tableViewRef,
       tableData,
-      tableSize,
-      tableMaximized,
-      tableIndex,
-      paginationProps,
+      tableLoading,
       tableProps,
-      toolNames,
-      tableToolbarProps,
-      toolExportConfig,
-      toolPrintConfig,
-      loadingProps,
-      handleRefresh,
-      handleSizeChange,
-      handleColumnsChange,
-      handleMaximizedChange,
-      handlePageSizeChange,
-      handlePageCurrentChange,
       reload,
       reloadTable,
       getTableRef,
@@ -578,62 +565,72 @@ const _sfc_main = vue.defineComponent({
       printData,
       openExportModal,
       exportData
-    };
-  }
-});
-const _export_sfc = (sfc, props2) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props2) {
-    target[key] = val;
-  }
-  return target;
-};
-function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_TableTools = vue.resolveComponent("TableTools");
-  const _component_EleToolbar = vue.resolveComponent("EleToolbar");
-  const _component_EleVirtualTable = vue.resolveComponent("EleVirtualTable");
-  const _component_EleDataTable = vue.resolveComponent("EleDataTable");
-  const _component_ElePagination = vue.resolveComponent("ElePagination");
-  const _component_EleLoading = vue.resolveComponent("EleLoading");
-  return vue.openBlock(), vue.createBlock(_component_EleLoading, vue.normalizeProps(vue.guardReactiveProps(_ctx.loadingProps)), {
-    default: vue.withCtx(() => [
-      _ctx.tableToolbarProps ? (vue.openBlock(), vue.createBlock(_component_EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.tableToolbarProps === true ? {} : _ctx.tableToolbarProps)), {
-        tools: vue.withCtx(() => [
-          vue.renderSlot(_ctx.$slots, "tools"),
-          _ctx.toolNames && _ctx.toolNames.length ? (vue.openBlock(), vue.createBlock(_component_TableTools, {
-            key: 0,
-            ref: "tableToolsRef",
-            tools: _ctx.toolNames,
-            size: _ctx.tableSize,
-            columns: _ctx.columns,
-            columnSortable: _ctx.columnSortable,
-            columnFixed: _ctx.columnFixed,
-            maximized: _ctx.tableMaximized,
-            cacheKey: _ctx.cacheKey,
-            locale: _ctx.locale,
-            selections: _ctx.selections,
-            pageData: _ctx.tableData,
-            spanMethod: _ctx.spanMethod,
-            tableHeader: _ctx.showHeader,
-            showSummary: _ctx.showSummary,
-            sumText: _ctx.sumText,
-            summaryMethod: _ctx.summaryMethod,
-            cellStyle: _ctx.cellStyle,
-            cellClassName: _ctx.cellClassName,
-            headerCellStyle: _ctx.headerCellStyle,
-            headerCellClassName: _ctx.headerCellClassName,
-            pageIndex: _ctx.tableIndex,
-            treeProps: _ctx.treeProps,
-            fetch: _ctx.fetch,
-            exportConfig: _ctx.toolExportConfig,
-            printConfig: _ctx.toolPrintConfig,
-            onReload: _ctx.handleRefresh,
-            "onUpdate:size": _ctx.handleSizeChange,
-            "onUpdate:columns": _ctx.handleColumnsChange,
-            "onUpdate:maximized": _ctx.handleMaximizedChange
-          }, vue.createSlots({ _: 2 }, [
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createBlock(EleLoading, vue.normalizeProps(vue.guardReactiveProps(loadingProps.value)), {
+        default: vue.withCtx(() => [
+          vue.renderSlot(_ctx.$slots, "topExtra"),
+          tableToolbarProps.value ? (vue.openBlock(), vue.createBlock(EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, tableToolbarProps.value === true ? {} : tableToolbarProps.value)), {
+            tools: vue.withCtx(() => [
+              vue.renderSlot(_ctx.$slots, "tools"),
+              toolNames.value && toolNames.value.length ? (vue.openBlock(), vue.createBlock(TableTools, {
+                key: 0,
+                ref_key: "tableToolsRef",
+                ref: tableToolsRef,
+                tools: toolNames.value,
+                size: tableSize.value,
+                columns: _ctx.columns,
+                columnSortable: _ctx.columnSortable,
+                columnFixed: _ctx.columnFixed,
+                maximized: tableMaximized.value,
+                cacheKey: _ctx.cacheKey,
+                locale: _ctx.locale,
+                selections: _ctx.selections,
+                pageData: tableData.value,
+                spanMethod: _ctx.spanMethod,
+                tableHeader: _ctx.showHeader,
+                showSummary: _ctx.showSummary,
+                sumText: _ctx.sumText,
+                summaryMethod: _ctx.summaryMethod,
+                tableStyle: _ctx.tableStyle,
+                cellStyle: _ctx.cellStyle,
+                cellClassName: _ctx.cellClassName,
+                headerCellStyle: _ctx.headerCellStyle,
+                headerCellClassName: _ctx.headerCellClassName,
+                pageIndex: tableIndex.value,
+                treeProps: _ctx.treeProps,
+                fetch,
+                exportConfig: toolExportConfig.value,
+                printConfig: toolPrintConfig.value,
+                onReload: handleRefresh,
+                "onUpdate:size": handleSizeChange,
+                "onUpdate:columns": handleColumnsChange,
+                "onUpdate:maximized": handleMaximizedChange
+              }, vue.createSlots({ _: 2 }, [
+                vue.renderList(Object.keys(_ctx.$slots).filter(
+                  (k) => !toolsSlotExcludes.includes(k)
+                ), (name) => {
+                  return {
+                    name,
+                    fn: vue.withCtx((slotProps) => [
+                      vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                    ])
+                  };
+                })
+              ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "tableStyle", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "exportConfig", "printConfig"])) : vue.createCommentVNode("", true)
+            ]),
+            default: vue.withCtx(() => [
+              vue.renderSlot(_ctx.$slots, "toolbar")
+            ]),
+            _: 3
+          }, 16)) : vue.createCommentVNode("", true),
+          vue.renderSlot(_ctx.$slots, "default"),
+          _ctx.virtual ? (vue.openBlock(), vue.createBlock(EleVirtualTable, vue.mergeProps({ key: 1 }, tableProps.value, {
+            ref_key: "tableViewRef",
+            ref: tableViewRef
+          }), vue.createSlots({ _: 2 }, [
             vue.renderList(Object.keys(_ctx.$slots).filter(
-              (k) => !_ctx.toolsSlotExcludes.includes(k)
+              (k) => !tableSlotExcludes.includes(k)
             ), (name) => {
               return {
                 name,
@@ -642,62 +639,48 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ])
               };
             })
-          ]), 1032, ["tools", "size", "columns", "columnSortable", "columnFixed", "maximized", "cacheKey", "locale", "selections", "pageData", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "fetch", "exportConfig", "printConfig", "onReload", "onUpdate:size", "onUpdate:columns", "onUpdate:maximized"])) : vue.createCommentVNode("", true)
-        ]),
-        default: vue.withCtx(() => [
-          vue.renderSlot(_ctx.$slots, "toolbar")
+          ]), 1040)) : (vue.openBlock(), vue.createBlock(vue.unref(EleDataTable), vue.mergeProps({ key: 2 }, tableProps.value, {
+            ref_key: "tableViewRef",
+            ref: tableViewRef
+          }), vue.createSlots({ _: 2 }, [
+            vue.renderList(Object.keys(_ctx.$slots).filter(
+              (k) => !tableSlotExcludes.includes(k)
+            ), (name) => {
+              return {
+                name,
+                fn: vue.withCtx((slotProps) => [
+                  vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1040)),
+          paginationProps.value || _ctx.$slots.footer ? (vue.openBlock(), vue.createElementBlock("div", {
+            key: 3,
+            class: "ele-pro-table-footer",
+            style: vue.normalizeStyle(_ctx.footerStyle)
+          }, [
+            vue.renderSlot(_ctx.$slots, "footer"),
+            paginationProps.value && paginationProps.value.total ? (vue.openBlock(), vue.createBlock(ElePagination, vue.mergeProps({ key: 0 }, paginationProps.value, {
+              "onUpdate:currentPage": handlePageCurrentChange,
+              "onUpdate:pageSize": handlePageSizeChange
+            }), vue.createSlots({ _: 2 }, [
+              vue.renderList(Object.keys(_ctx.$slots).filter(
+                (k) => !pageSlotExcludes.includes(k)
+              ), (name) => {
+                return {
+                  name,
+                  fn: vue.withCtx((slotProps) => [
+                    vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                  ])
+                };
+              })
+            ]), 1040)) : vue.createCommentVNode("", true)
+          ], 4)) : vue.createCommentVNode("", true),
+          vue.renderSlot(_ctx.$slots, "bottomExtra")
         ]),
         _: 3
-      }, 16)) : vue.createCommentVNode("", true),
-      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) => !_ctx.tableSlotExcludes.includes(k)
-        ), (name) => {
-          return {
-            name,
-            fn: vue.withCtx((slotProps) => [
-              vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 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) => !_ctx.tableSlotExcludes.includes(k)
-        ), (name) => {
-          return {
-            name,
-            fn: vue.withCtx((slotProps) => [
-              vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-            ])
-          };
-        })
-      ]), 1040)),
-      _ctx.paginationProps || _ctx.$slots.footer ? (vue.openBlock(), vue.createElementBlock("div", {
-        key: 3,
-        class: "ele-pro-table-footer",
-        style: vue.normalizeStyle(_ctx.footerStyle)
-      }, [
-        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.handlePageCurrentChange,
-          "onUpdate:pageSize": _ctx.handlePageSizeChange
-        }), vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(_ctx.$slots).filter(
-            (k) => !_ctx.pageSlotExcludes.includes(k)
-          ), (name) => {
-            return {
-              name,
-              fn: vue.withCtx((slotProps) => [
-                vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-              ])
-            };
-          })
-        ]), 1040, ["onUpdate:currentPage", "onUpdate:pageSize"])) : vue.createCommentVNode("", true)
-      ], 4)) : vue.createCommentVNode("", true)
-    ]),
-    _: 3
-  }, 16);
-}
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
-module.exports = index;
+      }, 16);
+    };
+  }
+});
+module.exports = _sfc_main;