@jetlinks-web/components 3.0.1 → 3.1.0

package/es/ProTable/Content.js

@@ -26,6 +26,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "useTableInject": "setup-maybe-ref",
   "useProTableStyle": "setup-maybe-ref",
   "useLocaleReceiver": "setup-maybe-ref",
+  "JVirtualTable": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "slots": "setup-maybe-ref",
   "contextLocale": "setup-maybe-ref",
@@ -66,6 +67,7 @@ import Empty from '../Empty';
 import { useTableInject } from './hooks';
 import useProTableStyle from './style';
 import { useLocaleReceiver } from "../LocaleReciver";
+import JVirtualTable from '../VirtualTable';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'Content'
@@ -165,42 +167,81 @@ const __sfc_main__ = _defineComponent({
                                 ])
                             ]))
                     ]))
-                    : (_openBlock(), _createBlock(_unref(Table), _mergeProps({ key: 1 }, props, {
-                        "row-selection": __rowSelection.value,
-                        dataSource: _ctx.dataSource,
-                        columns: _columns.value,
-                        pagination: false,
-                        scroll: _scroll.value,
-                        class: { 'j-table-scroll': !_optionalChain([props, 'access', _26 => _26.scroll, 'optionalAccess', _27 => _27.y]) }
-                    }), _createSlots({
-                        bodyCell: _withCtx(({ column, record, index }) => [
-                            ((_optionalChain([column, 'optionalAccess', _28 => _28.key]) || _optionalChain([column, 'optionalAccess', _29 => _29.dataIndex])) && _optionalChain([column, 'optionalAccess', _30 => _30.scopedSlots]) && (_optionalChain([_slots, 'access', _31 => _31.value, 'optionalAccess', _32 => _32[_optionalChain([column, 'optionalAccess', _33 => _33.dataIndex])]]) || _optionalChain([_slots, 'access', _34 => _34.value, 'optionalAccess', _35 => _35[_optionalChain([column, 'optionalAccess', _36 => _36.key])]])))
-                                ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _37 => _37.key]) || _optionalChain([column, 'optionalAccess', _38 => _38.dataIndex]), _mergeProps({ key: 0 }, record, {
-                                    index: index,
-                                    column: column
-                                }))
-                                : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
-                                    _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _39 => _39.dataIndex]) || _optionalChain([column, 'optionalAccess', _40 => _40.key])) || '--'), 1 /* TEXT */)
-                                ], 64 /* STABLE_FRAGMENT */))
-                        ]),
-                        emptyText: _withCtx(() => [
-                            _renderSlot(_ctx.$slots, "emptyText", {}, () => [
-                                _createVNode(_unref(Empty))
-                            ])
-                        ]),
-                        _: 2 /* DYNAMIC */
-                    }, [
-                        _renderList(_slots.value, (_, slotKey) => {
-                            return {
-                                name: slotKey,
-                                fn: _withCtx((slotProps) => [
-                                    (!((_optionalChain([__props, 'access', _41 => _41.column, 'optionalAccess', _42 => _42.key]) || _optionalChain([__props, 'access', _43 => _43.column, 'optionalAccess', _44 => _44.dataIndex])) && _optionalChain([__props, 'access', _45 => _45.column, 'optionalAccess', _46 => _46.scopedSlots]) && (_optionalChain([_slots, 'access', _47 => _47.value, 'optionalAccess', _48 => _48[_optionalChain([__props, 'access', _49 => _49.column, 'optionalAccess', _50 => _50.dataIndex])]]) || _optionalChain([_slots, 'access', _51 => _51.value, 'optionalAccess', _52 => _52[_optionalChain([__props, 'access', _53 => _53.column, 'optionalAccess', _54 => _54.key])]]))))
-                                        ? _renderSlot(_ctx.$slots, slotKey, _normalizeProps(_mergeProps({ key: 0 }, slotProps)))
-                                        : _createCommentVNode("v-if", true)
-                                ])
-                            };
-                        })
-                    ]), 1040 /* FULL_PROPS, DYNAMIC_SLOTS */, ["row-selection", "dataSource", "columns", "scroll", "class"]))
+                    : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
+                        (props.type === 'TREE')
+                            ? (_openBlock(), _createBlock(_unref(JVirtualTable), {
+                                key: 0,
+                                rowKey: _ctx.rowKey,
+                                "row-selection": __rowSelection.value,
+                                dataSource: _ctx.dataSource,
+                                columns: _columns.value,
+                                height: _ctx.height
+                            }, _createSlots({
+                                bodyCell: _withCtx(({ column, record, index }) => [
+                                    ((_optionalChain([column, 'optionalAccess', _26 => _26.key]) || _optionalChain([column, 'optionalAccess', _27 => _27.dataIndex])) && _optionalChain([column, 'optionalAccess', _28 => _28.scopedSlots]) && (_optionalChain([_slots, 'access', _29 => _29.value, 'optionalAccess', _30 => _30[_optionalChain([column, 'optionalAccess', _31 => _31.dataIndex])]]) || _optionalChain([_slots, 'access', _32 => _32.value, 'optionalAccess', _33 => _33[_optionalChain([column, 'optionalAccess', _34 => _34.key])]])))
+                                        ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _35 => _35.key]) || _optionalChain([column, 'optionalAccess', _36 => _36.dataIndex]), _mergeProps({ key: 0 }, record, {
+                                            index: index,
+                                            column: column
+                                        }))
+                                        : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
+                                            _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _37 => _37.dataIndex]) || _optionalChain([column, 'optionalAccess', _38 => _38.key])) || '--'), 1 /* TEXT */)
+                                        ], 64 /* STABLE_FRAGMENT */))
+                                ]),
+                                emptyText: _withCtx(() => [
+                                    _renderSlot(_ctx.$slots, "emptyText", {}, () => [
+                                        _createVNode(_unref(Empty))
+                                    ])
+                                ]),
+                                _: 2 /* DYNAMIC */
+                            }, [
+                                _renderList(_slots.value, (_, slotKey) => {
+                                    return {
+                                        name: slotKey,
+                                        fn: _withCtx((slotProps) => [
+                                            (!((_optionalChain([__props, 'access', _39 => _39.column, 'optionalAccess', _40 => _40.key]) || _optionalChain([__props, 'access', _41 => _41.column, 'optionalAccess', _42 => _42.dataIndex])) && _optionalChain([__props, 'access', _43 => _43.column, 'optionalAccess', _44 => _44.scopedSlots]) && (_optionalChain([_slots, 'access', _45 => _45.value, 'optionalAccess', _46 => _46[_optionalChain([__props, 'access', _47 => _47.column, 'optionalAccess', _48 => _48.dataIndex])]]) || _optionalChain([_slots, 'access', _49 => _49.value, 'optionalAccess', _50 => _50[_optionalChain([__props, 'access', _51 => _51.column, 'optionalAccess', _52 => _52.key])]]))))
+                                                ? _renderSlot(_ctx.$slots, slotKey, _normalizeProps(_mergeProps({ key: 0 }, slotProps)))
+                                                : _createCommentVNode("v-if", true)
+                                        ])
+                                    };
+                                })
+                            ]), 1032 /* PROPS, DYNAMIC_SLOTS */, ["rowKey", "row-selection", "dataSource", "columns", "height"]))
+                            : (_openBlock(), _createBlock(_unref(Table), _mergeProps({ key: 1 }, props, {
+                                "row-selection": __rowSelection.value,
+                                dataSource: _ctx.dataSource,
+                                columns: _columns.value,
+                                pagination: false,
+                                scroll: _scroll.value,
+                                class: { 'j-table-scroll': !_optionalChain([props, 'access', _53 => _53.scroll, 'optionalAccess', _54 => _54.y]) }
+                            }), _createSlots({
+                                bodyCell: _withCtx(({ column, record, index }) => [
+                                    ((_optionalChain([column, 'optionalAccess', _55 => _55.key]) || _optionalChain([column, 'optionalAccess', _56 => _56.dataIndex])) && _optionalChain([column, 'optionalAccess', _57 => _57.scopedSlots]) && (_optionalChain([_slots, 'access', _58 => _58.value, 'optionalAccess', _59 => _59[_optionalChain([column, 'optionalAccess', _60 => _60.dataIndex])]]) || _optionalChain([_slots, 'access', _61 => _61.value, 'optionalAccess', _62 => _62[_optionalChain([column, 'optionalAccess', _63 => _63.key])]])))
+                                        ? _renderSlot(_ctx.$slots, _optionalChain([column, 'optionalAccess', _64 => _64.key]) || _optionalChain([column, 'optionalAccess', _65 => _65.dataIndex]), _mergeProps({ key: 0 }, record, {
+                                            index: index,
+                                            column: column
+                                        }))
+                                        : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
+                                            _createTextVNode(_toDisplayString(_unref(get)(record, _optionalChain([column, 'optionalAccess', _66 => _66.dataIndex]) || _optionalChain([column, 'optionalAccess', _67 => _67.key])) || '--'), 1 /* TEXT */)
+                                        ], 64 /* STABLE_FRAGMENT */))
+                                ]),
+                                emptyText: _withCtx(() => [
+                                    _renderSlot(_ctx.$slots, "emptyText", {}, () => [
+                                        _createVNode(_unref(Empty))
+                                    ])
+                                ]),
+                                _: 2 /* DYNAMIC */
+                            }, [
+                                _renderList(_slots.value, (_, slotKey) => {
+                                    return {
+                                        name: slotKey,
+                                        fn: _withCtx((slotProps) => [
+                                            (!((_optionalChain([__props, 'access', _68 => _68.column, 'optionalAccess', _69 => _69.key]) || _optionalChain([__props, 'access', _70 => _70.column, 'optionalAccess', _71 => _71.dataIndex])) && _optionalChain([__props, 'access', _72 => _72.column, 'optionalAccess', _73 => _73.scopedSlots]) && (_optionalChain([_slots, 'access', _74 => _74.value, 'optionalAccess', _75 => _75[_optionalChain([__props, 'access', _76 => _76.column, 'optionalAccess', _77 => _77.dataIndex])]]) || _optionalChain([_slots, 'access', _78 => _78.value, 'optionalAccess', _79 => _79[_optionalChain([__props, 'access', _80 => _80.column, 'optionalAccess', _81 => _81.key])]]))))
+                                                ? _renderSlot(_ctx.$slots, slotKey, _normalizeProps(_mergeProps({ key: 0 }, slotProps)))
+                                                : _createCommentVNode("v-if", true)
+                                        ])
+                                    };
+                                })
+                            ]), 1040 /* FULL_PROPS, DYNAMIC_SLOTS */, ["row-selection", "dataSource", "columns", "scroll", "class"]))
+                    ], 64 /* STABLE_FRAGMENT */))
             ], 2 /* CLASS */));
         };
     }

package/es/ProTable/Pagination.js

@@ -16,8 +16,10 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } return value; }
 /* Analyzed bindings: {
   "Pagination": "setup-maybe-ref",
+  "Spin": "setup-maybe-ref",
   "_paginationProps": "setup-maybe-ref",
   "computed": "setup-const",
+  "h": "setup-const",
   "useLocaleReceiver": "setup-maybe-ref",
   "useProTableStyle": "setup-maybe-ref",
   "props": "setup-reactive-const",
@@ -32,9 +34,9 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, mergeProps as _mergeProps, createVNode as _createVNode, normalizeClass as _normalizeClass, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-import { Pagination } from 'ant-design-vue';
+import { Pagination, Spin } from 'ant-design-vue';
 import { _paginationProps } from "./setting";
-import { computed } from 'vue';
+import { computed, h } from 'vue';
 import { useLocaleReceiver } from "../LocaleReciver";
 import useProTableStyle from './style';
 const __sfc_main__ = _defineComponent({
@@ -57,12 +59,19 @@ const __sfc_main__ = _defineComponent({
         const _showTotal = (num) => {
             const minSize = props.pageIndex * props.pageSize + 1;
             const MaxSize = (props.pageIndex + 1) * props.pageSize;
-            // return `第 ${minSize} - ${ MaxSize > num ? num : MaxSize } 条/总共 ${num} 条`
-            let locale = _optionalChain([contextLocale, 'access', _ => _.value, 'access', _2 => _2.pagination, 'optionalAccess', _3 => _3.total]) || '';
-            [minSize, MaxSize > num ? num : MaxSize, num].forEach((item, index) => {
-                locale = locale.replace(`{${index}}`, item);
+            let localePage = _optionalChain([contextLocale, 'access', _ => _.value, 'access', _2 => _2.pagination, 'optionalAccess', _3 => _3.page]) || '';
+            let localeTotal = _optionalChain([contextLocale, 'access', _4 => _4.value, 'access', _5 => _5.pagination, 'optionalAccess', _6 => _6.total]) || '';
+            const _maxSize = props.totalLoading ? MaxSize : (MaxSize > num ? num : MaxSize);
+            [minSize, _maxSize].forEach((item, index) => {
+                localePage = localePage.replace(`{${index}}`, item);
             });
-            return locale;
+            return h('span', {}, [
+                localePage,
+                props.totalLoading
+                    ? h(Spin, { size: 'small', style: { margin: '0 4px' } })
+                    : h('span', { style: { margin: '0 4px' } }, num),
+                localeTotal
+            ]);
         };
         const onChange = (page, size) => {
             emits('change', page, size);

package/es/ProTable/ProTable.js

@@ -39,6 +39,8 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "TableConfig": "setup-maybe-ref",
   "useTableInject": "setup-maybe-ref",
   "useProTableStyle": "setup-maybe-ref",
+  "onlyMessage": "setup-maybe-ref",
+  "useLocaleReceiver": "setup-maybe-ref",
   "tableConfig": "setup-maybe-ref",
   "props": "setup-reactive-const",
   "slots": "setup-maybe-ref",
@@ -51,6 +53,8 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "prefixCls": "setup-ref",
   "wrapSSR": "setup-maybe-ref",
   "hashId": "setup-maybe-ref",
+  "contextLocale": "setup-maybe-ref",
+  "currentRequestId": "setup-let",
   "extraSlots": "setup-const",
   "_rowSelection": "setup-maybe-ref",
   "showAlert": "setup-ref",
@@ -79,6 +83,8 @@ import { debounce } from 'lodash-es';
 import { TableConfig } from "../utils/constants";
 import { useTableInject } from "./hooks";
 import useProTableStyle from "./style";
+import { onlyMessage } from "@jetlinks-web/utils";
+import { useLocaleReceiver } from "../LocaleReciver";
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JProTable'
@@ -111,10 +117,13 @@ const __sfc_main__ = _defineComponent({
         const page = reactive({
             pageIndex: 0,
             pageSize: 12,
-            total: 0
+            total: 0,
+            loading: false
         });
         const prefixCls = computed(() => 'pro-table');
         const [wrapSSR, hashId] = useProTableStyle(prefixCls);
+        const [contextLocale] = useLocaleReceiver('ProTable');
+        let currentRequestId = 0;
         const extraSlots = ['headerRightRender', 'headerLeftRender', 'paginationRender', 'alertRender'];
         const _rowSelection = useTableInject();
         const showAlert = computed(() => {
@@ -126,20 +135,34 @@ const __sfc_main__ = _defineComponent({
         const onCheck = (e) => {
             _mode.value = e.target.value;
         };
-        const handleData = (result) => {
+        const handleData = (result, _params) => {
             if (props.type === 'PAGE') {
                 // 判断如果是最后一页且最后一页为空，就跳转到前一页
-                if (_optionalChain([result, 'optionalAccess', _8 => _8.total]) &&
-                    _optionalChain([result, 'optionalAccess', _9 => _9.pageSize]) &&
-                    _optionalChain([result, 'optionalAccess', _10 => _10.pageIndex]) &&
-                    _optionalChain([result, 'optionalAccess', _11 => _11.data, 'optionalAccess', _12 => _12.length]) === 0) {
-                    return true;
+                // 判断条件：如果是total分开查询，判断result的长度；如果不分开查询就判断result.data的长度
+                if (props.totalRequest) {
+                    if (result.length === 0) {
+                        return true;
+                    }
+                    else {
+                        _dataSource.value = result || [];
+                        page.pageIndex = _optionalChain([_params, 'optionalAccess', _8 => _8.pageIndex]) || 0;
+                        page.pageSize = _optionalChain([_params, 'optionalAccess', _9 => _9.pageSize]) || 12;
+                        page.total = page.pageSize * (page.pageIndex + 1) + 1;
+                    }
                 }
                 else {
-                    _dataSource.value = _optionalChain([result, 'optionalAccess', _13 => _13.data]) || [];
-                    page.pageIndex = _optionalChain([result, 'optionalAccess', _14 => _14.pageIndex]) || 0;
-                    page.pageSize = _optionalChain([result, 'optionalAccess', _15 => _15.pageSize]) || 12;
-                    page.total = _optionalChain([result, 'optionalAccess', _16 => _16.total]) || 0;
+                    if (_optionalChain([result, 'optionalAccess', _10 => _10.total]) &&
+                        _optionalChain([result, 'optionalAccess', _11 => _11.pageSize]) &&
+                        _optionalChain([result, 'optionalAccess', _12 => _12.pageIndex]) &&
+                        _optionalChain([result, 'optionalAccess', _13 => _13.data, 'optionalAccess', _14 => _14.length]) === 0) {
+                        return true;
+                    }
+                    else {
+                        _dataSource.value = _optionalChain([result, 'optionalAccess', _15 => _15.data]) || [];
+                        page.pageIndex = _optionalChain([result, 'optionalAccess', _16 => _16.pageIndex]) || 0;
+                        page.pageSize = _optionalChain([result, 'optionalAccess', _17 => _17.pageSize]) || 12;
+                        page.total = _optionalChain([result, 'optionalAccess', _18 => _18.total]) || 0;
+                    }
                 }
             }
             else {
@@ -158,8 +181,8 @@ const __sfc_main__ = _defineComponent({
                     ...props.defaultParams,
                     ..._params,
                     terms: [
-                        ...(_optionalChain([props, 'access', _17 => _17.defaultParams, 'optionalAccess', _18 => _18.terms]) || []),
-                        ...(_optionalChain([_params, 'optionalAccess', _19 => _19.terms]) || []),
+                        ...(_optionalChain([props, 'access', _19 => _19.defaultParams, 'optionalAccess', _20 => _20.terms]) || []),
+                        ...(_optionalChain([_params, 'optionalAccess', _21 => _21.terms]) || []),
                     ],
                 };
                 loading.value = true;
@@ -167,19 +190,40 @@ const __sfc_main__ = _defineComponent({
                     loading.value = false;
                 });
                 if (resp.success) {
-                    const flag = handleData(resp.result || {});
+                    const flag = handleData(resp.result || {}, _params);
                     if (flag) { // 判断如果是最后一页且最后一页为空，就跳转到前一页
-                        page.pageIndex = page.pageIndex > 0 ? page.pageIndex - 1 : 0;
-                        handleSearch({
-                            ..._params,
-                            pageSize: page.pageSize,
-                            pageIndex: page.pageIndex,
-                        });
+                        if (props.totalRequest) {
+                            onlyMessage(_optionalChain([contextLocale, 'access', _22 => _22.value, 'access', _23 => _23.pagination, 'optionalAccess', _24 => _24.lastPage]) || '', 'error');
+                            // 置灰下一页
+                            page.total = page.pageSize * (page.pageIndex > 0 ? page.pageIndex : 1);
+                        }
+                        else {
+                            page.pageIndex = page.pageIndex > 0 ? page.pageIndex - 1 : 0;
+                            handleSearch({
+                                ..._params,
+                                pageSize: page.pageSize,
+                                pageIndex: page.pageIndex,
+                            });
+                        }
                     }
                 }
                 else {
                     _dataSource.value = [];
                 }
+                if (props.totalRequest) {
+                    currentRequestId++;
+                    const requestId = currentRequestId;
+                    page.loading = true;
+                    props.totalRequest(__params).then((res) => {
+                        if (res.success) {
+                            page.total = res.result || 0;
+                        }
+                    }).finally(() => {
+                        if (requestId === currentRequestId) {
+                            page.loading = false;
+                        }
+                    });
+                }
             }
             else {
                 _dataSource.value = [];
@@ -195,11 +239,11 @@ const __sfc_main__ = _defineComponent({
         };
         const onClose = () => {
             if (props.rowSelection) {
-                _optionalChain([props, 'access', _20 => _20.rowSelection, 'access', _21 => _21.onChange, 'optionalCall', _22 => _22([], [])]);
-                _optionalChain([props, 'access', _23 => _23.rowSelection, 'access', _24 => _24.onSelectNone, 'optionalCall', _25 => _25()]);
+                _optionalChain([props, 'access', _25 => _25.rowSelection, 'access', _26 => _26.onChange, 'optionalCall', _27 => _27([], [])]);
+                _optionalChain([props, 'access', _28 => _28.rowSelection, 'access', _29 => _29.onSelectNone, 'optionalCall', _30 => _30()]);
             }
-            else if (_optionalChain([_rowSelection, 'optionalAccess', _26 => _26.value])) {
-                _optionalChain([_rowSelection, 'access', _27 => _27.value, 'optionalAccess', _28 => _28.onSelectNone, 'optionalCall', _29 => _29()]);
+            else if (_optionalChain([_rowSelection, 'optionalAccess', _31 => _31.value])) {
+                _optionalChain([_rowSelection, 'access', _32 => _32.value, 'optionalAccess', _33 => _33.onSelectNone, 'optionalCall', _34 => _34()]);
             }
         };
         /**
@@ -215,10 +259,10 @@ const __sfc_main__ = _defineComponent({
             });
         };
         const _gridColumns = computed(() => {
-            if (_optionalChain([props, 'access', _30 => _30.gridColumns, 'optionalAccess', _31 => _31.length])) {
+            if (_optionalChain([props, 'access', _35 => _35.gridColumns, 'optionalAccess', _36 => _36.length])) {
                 const arr = props.gridColumns;
-                const lastValue = _optionalChain([arr, 'access', _32 => _32.slice, 'call', _33 => _33(-1), 'optionalAccess', _34 => _34[0]]);
-                if (_optionalChain([arr, 'optionalAccess', _35 => _35.length]) < 4) {
+                const lastValue = _optionalChain([arr, 'access', _37 => _37.slice, 'call', _38 => _38(-1), 'optionalAccess', _39 => _39[0]]);
+                if (_optionalChain([arr, 'optionalAccess', _40 => _40.length]) < 4) {
                     while (arr.length < 4) {
                         arr.push(lastValue);
                     }
@@ -239,16 +283,16 @@ const __sfc_main__ = _defineComponent({
                 const styles = window.getComputedStyle(ele);
                 const width = parseFloat(styles.width);
                 if (width <= 992) {
-                    column.value = _optionalChain([_gridColumns, 'access', _36 => _36.value, 'optionalAccess', _37 => _37[0]]) || 1;
+                    column.value = _optionalChain([_gridColumns, 'access', _41 => _41.value, 'optionalAccess', _42 => _42[0]]) || 1;
                 }
                 else if (width > 992 && width <= 1440) {
-                    column.value = _optionalChain([_gridColumns, 'access', _38 => _38.value, 'optionalAccess', _39 => _39[1]]) || 2;
+                    column.value = _optionalChain([_gridColumns, 'access', _43 => _43.value, 'optionalAccess', _44 => _44[1]]) || 2;
                 }
                 else if (width > 1440 && width <= 1600) {
-                    column.value = _optionalChain([_gridColumns, 'access', _40 => _40.value, 'optionalAccess', _41 => _41[2]]) || 3;
+                    column.value = _optionalChain([_gridColumns, 'access', _45 => _45.value, 'optionalAccess', _46 => _46[2]]) || 3;
                 }
                 else if (width > 1600) {
-                    column.value = _optionalChain([_gridColumns, 'access', _42 => _42.value, 'optionalAccess', _43 => _43[3]]) || 4;
+                    column.value = _optionalChain([_gridColumns, 'access', _47 => _47.value, 'optionalAccess', _48 => _48[3]]) || 4;
                 }
             }
         };
@@ -331,7 +375,9 @@ const __sfc_main__ = _defineComponent({
                                 }, myPagination.value, {
                                     total: page.total,
                                     pageIndex: page.pageIndex,
-                                    pageSize: page.pageSize
+                                    pageSize: page.pageSize,
+                                    totalLoading: page.loading,
+                                    totalRequest: _ctx.totalRequest
                                 }), {
                                     default: _withCtx(() => [
                                         _renderSlot(_ctx.$slots, "paginationRender", {
@@ -342,7 +388,7 @@ const __sfc_main__ = _defineComponent({
                                         })
                                     ]),
                                     _: 3 /* FORWARDED */
-                                }, 16 /* FULL_PROPS */, ["total", "pageIndex", "pageSize"]))
+                                }, 16 /* FULL_PROPS */, ["total", "pageIndex", "pageSize", "totalLoading", "totalRequest"]))
                                 : _createCommentVNode("v-if", true)
                         ])
                     ]),

package/es/ProTable/setting.js

@@ -56,6 +56,14 @@ export var _contentProps = _objectSpread(_objectSpread(_objectSpread({}, tablePr
   rowKey: {
     type: [String, Function],
     default: 'id'
+  },
+  type: {
+    type: String,
+    default: 'PAGE'
+  },
+  height: {
+    type: Number,
+    default: 500
   }
 });
 export var _paginationProps = _objectSpread(_objectSpread({}, omit(paginationProps(), ['onChange'])), {}, {
@@ -76,6 +84,17 @@ export var _paginationProps = _objectSpread(_objectSpread({}, omit(paginationPro
    */
   isShowContent: {
     type: Boolean
+  },
+  /**
+   * 总数loading状态
+   */
+  totalLoading: {
+    type: Boolean,
+    default: false
+  },
+  totalRequest: {
+    type: Function,
+    default: undefined
   }
 });
 export var proTableProps = _objectSpread(_objectSpread(_objectSpread({}, _contentProps), _alertProps), {}, {
@@ -91,6 +110,10 @@ export var proTableProps = _objectSpread(_objectSpread(_objectSpread({}, _conten
     type: Function,
     default: undefined
   },
+  totalRequest: {
+    type: Function,
+    default: undefined
+  },
   params: {
     type: Object,
     default: function _default() {