ele-admin-plus 1.1.9-beta.9 → 1.1.9

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

@@ -50,6 +50,7 @@ const _sfc_main = vue.defineComponent({
     const tableMaximized = vue.ref(false);
     const errorText = vue.ref("");
     const cacheData = vue.ref();
+    const tableRowKey = vue.shallowRef(util$1.getRowKey(props2.rowKey));
     const tableIndex = vue.computed(() => {
       return ((tablePage.value ?? 1) - 1) * (tableLimit.value ?? 0) + 1;
     });
@@ -61,7 +62,8 @@ const _sfc_main = vue.defineComponent({
         {
           total: tableTotal.value,
           pageSize: tableLimit.value,
-          currentPage: tablePage.value
+          currentPage: tablePage.value,
+          hasNext: tableData.value.length >= tableLimit.value
         }
       );
     });
@@ -90,7 +92,7 @@ const _sfc_main = vue.defineComponent({
         pageIndex: tableIndex.value,
         emptyProps: tableEmptyProps.value,
         rowHeight: props2.virtual ? props2.rowHeight : void 0,
-        rowKey: util$1.getRowKey(props2.rowKey),
+        rowKey: tableRowKey.value,
         style: props2.tableStyle,
         class: "ele-pro-table-view",
         ...events,
@@ -180,11 +182,7 @@ const _sfc_main = vue.defineComponent({
           tableLimit.value
         );
         cacheData.value = props2.datasource;
-        tableData.value = util$1.addDefaultRowKey(
-          data,
-          util$1.getDefaultRowKey(props2.rowKey),
-          tablePage.value
-        );
+        tableData.value = data;
         tablePage.value = page;
         tableTotal.value = total;
         onDone({ data, page, total, response: props2.datasource });
@@ -202,6 +200,12 @@ const _sfc_main = vue.defineComponent({
       props2.datasource({
         page: tablePage.value,
         limit: tableLimit.value,
+        pages: util$1.getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props2.request,
+          globalProps.value.request
+        ),
         where: Object.assign({}, tableState.where),
         orders,
         filters: util$1.getRequestFilters(filter),
@@ -252,11 +256,7 @@ const _sfc_main = vue.defineComponent({
             return;
           }
         }
-        tableData.value = util$1.addDefaultRowKey(
-          data,
-          util$1.getDefaultRowKey(props2.rowKey),
-          tablePage.value
-        );
+        tableData.value = data;
         tableTotal.value = total || data.length;
       }
       tableLoading.value = false;
@@ -279,12 +279,12 @@ const _sfc_main = vue.defineComponent({
       vue.nextTick(() => {
         if (props2.current != null) {
           methods.setCurrentRowKey(
-            util.getValue(props2.current, util$1.getRowKey(props2.rowKey))
+            util.getValue(props2.current, tableRowKey.value)
           );
         }
         if (props2.selections != null && props2.selections.length) {
           methods.setSelectedRowKeys(
-            util.getRowKeys(props2.selections, util$1.getRowKey(props2.rowKey))
+            util.getRowKeys(props2.selections, tableRowKey.value)
           );
         }
       });
@@ -359,17 +359,13 @@ const _sfc_main = vue.defineComponent({
       return tableData.value;
     };
     const setData = (data) => {
-      tableData.value = util$1.addDefaultRowKey(
-        data,
-        util$1.getDefaultRowKey(props2.rowKey),
-        tablePage.value
-      );
+      tableData.value = data;
     };
     const goPageByRowKey = (key) => {
       if (!paginationProps.value || tableLimit.value == null || isFunctionSource.value) {
         return;
       }
-      const rowKey = util$1.getRowKey(props2.rowKey);
+      const rowKey = tableRowKey.value;
       const data = util$1.sortData(props2.datasource, tableState.sorter);
       const index2 = data.findIndex((d) => util.getValue(d, rowKey) === key);
       const page = Math.floor(index2 / tableLimit.value) + 1;
@@ -387,6 +383,12 @@ const _sfc_main = vue.defineComponent({
       callback({
         page: tablePage.value,
         limit: tableLimit.value,
+        pages: util$1.getRequestPages(
+          tablePage.value,
+          tableLimit.value,
+          props2.request,
+          globalProps.value.request
+        ),
         where: Object.assign({}, tableState.where),
         orders,
         filters: util$1.getRequestFilters(filter),
@@ -434,15 +436,19 @@ const _sfc_main = vue.defineComponent({
     vue.watch(
       () => props2.current,
       (current) => {
-        methods.setCurrentRowKey(util.getValue(current, util$1.getRowKey(props2.rowKey)));
+        methods.setCurrentRowKey(util.getValue(current, tableRowKey.value));
       }
     );
     vue.watch(
       () => props2.selections,
       (selections) => {
-        methods.setSelectedRowKeys(
-          util.getRowKeys(selections, util$1.getRowKey(props2.rowKey))
-        );
+        methods.setSelectedRowKeys(util.getRowKeys(selections, tableRowKey.value));
+      }
+    );
+    vue.watch(
+      () => props2.rowKey,
+      () => {
+        tableRowKey.value = util$1.getRowKey(props2.rowKey);
       }
     );
     vue.watch(
@@ -565,7 +571,14 @@ 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"].includes(k)
+          (k) => ![
+            "default",
+            "toolbar",
+            "tools",
+            "footer",
+            "printTop",
+            "printBottom"
+          ].includes(k)
         ), (name) => {
           return {
             name,
@@ -576,7 +589,14 @@ 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"].includes(k)
+          (k) => ![
+            "default",
+            "toolbar",
+            "tools",
+            "footer",
+            "printTop",
+            "printBottom"
+          ].includes(k)
         ), (name) => {
           return {
             name,
@@ -603,7 +623,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               "tools",
               "footer",
               "empty",
-              "append"
+              "append",
+              "printTop",
+              "printBottom"
             ].includes(k)
           ), (name) => {
             return {