@jetlinks-web/components 3.0.1-rc → 3.1.0

package/lib/ProTable/Header.js

@@ -1,24 +1,30 @@
 /* Analyzed bindings: {
   "initMode": "props",
+  "computed": "setup-const",
   "RadioGroup": "setup-maybe-ref",
   "RadioButton": "setup-maybe-ref",
   "AIcon": "setup-maybe-ref",
   "_headerProps": "setup-maybe-ref",
+  "useProTableStyle": "setup-maybe-ref",
   "props": "setup-reactive-const",
-  "emits": "setup-const"
+  "emits": "setup-const",
+  "prefixCls": "setup-ref",
+  "wrapSSR": "setup-maybe-ref",
+  "hashId": "setup-maybe-ref"
 } */
 import { defineComponent as _defineComponent } from 'vue';
-import { renderSlot as _renderSlot, createElementVNode as _createElementVNode, unref as _unref, createVNode as _createVNode, withCtx as _withCtx, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode } from "vue";
-const _hoisted_1 = { class: "jtable-body-header" };
-const _hoisted_2 = { class: "jtable-body-header-left" };
-const _hoisted_3 = { class: "jtable-body-header-right" };
-const _hoisted_4 = {
+import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, createVNode as _createVNode, withCtx as _withCtx, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, normalizeClass as _normalizeClass } from "vue";
+const _hoisted_1 = { class: "jtable-body-header-left" };
+const _hoisted_2 = { class: "jtable-body-header-right" };
+const _hoisted_3 = {
     key: 0,
     class: "table-body-header-right-button"
 };
+import { computed } from 'vue';
 import { RadioGroup, RadioButton } from 'ant-design-vue';
 import AIcon from '../Icon';
 import { _headerProps } from './setting';
+import useProTableStyle from './style';
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'Header'
@@ -34,15 +40,19 @@ const __sfc_main__ = _defineComponent({
     setup(__props, { emit: __emit }) {
         const props = __props;
         const emits = __emit;
+        const prefixCls = computed(() => 'pro-table');
+        const [wrapSSR, hashId] = useProTableStyle(prefixCls);
         return (_ctx, _cache) => {
-            return (_openBlock(), _createElementBlock("div", _hoisted_1, [
-                _createElementVNode("div", _hoisted_2, [
+            return (_openBlock(), _createElementBlock("div", {
+                class: _normalizeClass(['jtable-body-header', _unref(hashId)])
+            }, [
+                _createElementVNode("div", _hoisted_1, [
                     _renderSlot(_ctx.$slots, "headerLeftRender")
                 ]),
-                _createElementVNode("div", _hoisted_3, [
+                _createElementVNode("div", _hoisted_2, [
                     _renderSlot(_ctx.$slots, "headerRightRender"),
                     (!__props.initMode)
-                        ? (_openBlock(), _createElementBlock("div", _hoisted_4, [
+                        ? (_openBlock(), _createElementBlock("div", _hoisted_3, [
                             _createVNode(_unref(RadioGroup), {
                                 value: _ctx.mode,
                                 onChange: _cache[0] || (_cache[0] = (e) => emits('change', e))
@@ -66,7 +76,7 @@ const __sfc_main__ = _defineComponent({
                         ]))
                         : _createCommentVNode("v-if", true)
                 ])
-            ]));
+            ], 2 /* CLASS */));
         };
     }
 });

package/lib/ProTable/Pagination.js

@@ -16,23 +16,29 @@ 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",
   "emits": "setup-const",
   "contextLocale": "setup-maybe-ref",
+  "prefixCls": "setup-ref",
+  "wrapSSR": "setup-maybe-ref",
+  "hashId": "setup-maybe-ref",
   "className": "setup-ref",
   "_showTotal": "setup-const",
   "onChange": "setup-const"
 } */
 import { defineComponent as _defineComponent } from 'vue';
-import { renderSlot as _renderSlot, unref as _unref, mergeProps as _mergeProps, createVNode as _createVNode, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
-const _hoisted_1 = { class: "jtable-pagination" };
-import { Pagination } from 'ant-design-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, 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({
     ...{
         name: 'JPagination'
@@ -43,6 +49,8 @@ const __sfc_main__ = _defineComponent({
         const props = __props;
         const emits = __emit;
         const [contextLocale] = useLocaleReceiver('ProTable');
+        const prefixCls = computed(() => 'pro-table');
+        const [wrapSSR, hashId] = useProTableStyle(prefixCls);
         const className = computed(() => {
             return {
                 'hide-content': !props.isShowContent,
@@ -51,18 +59,27 @@ 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);
         };
         return (_ctx, _cache) => {
-            return (_openBlock(), _createElementBlock("div", _hoisted_1, [
+            return (_openBlock(), _createElementBlock("div", {
+                class: _normalizeClass(['jtable-pagination', _unref(hashId)])
+            }, [
                 _renderSlot(_ctx.$slots, "default", {}, () => [
                     _createVNode(_unref(Pagination), _mergeProps(props, {
                         total: _ctx.total,
@@ -73,7 +90,7 @@ const __sfc_main__ = _defineComponent({
                         onChange: onChange
                     }), null, 16 /* FULL_PROPS */, ["total", "pageSize", "current", "show-total", "class"])
                 ])
-            ]));
+            ], 2 /* CLASS */));
         };
     }
 });

package/lib/ProTable/ProTable.js

@@ -22,6 +22,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } return value; }
 /* Analyzed bindings: {
   "proTableProps": "setup-maybe-ref",
+  "Spin": "setup-maybe-ref",
   "Header": "setup-const",
   "Alert": "setup-const",
   "Content": "setup-const",
@@ -36,7 +37,10 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "inject": "setup-const",
   "debounce": "setup-maybe-ref",
   "TableConfig": "setup-maybe-ref",
-  "JSkeletonList": "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",
@@ -46,7 +50,13 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "_mode": "setup-ref",
   "column": "setup-ref",
   "page": "setup-reactive-const",
+  "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",
   "showPagination": "setup-ref",
   "onCheck": "setup-const",
@@ -60,9 +70,10 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "windowChange": "setup-const"
 } */
 import { defineComponent as _defineComponent } from 'vue';
-import { renderSlot as _renderSlot, withCtx as _withCtx, createVNode as _createVNode, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, unref as _unref, normalizeProps as _normalizeProps, mergeProps as _mergeProps, renderList as _renderList, createSlots as _createSlots, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, createElementBlock as _createElementBlock } from "vue";
+import { unref as _unref, renderSlot as _renderSlot, withCtx as _withCtx, createVNode as _createVNode, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, normalizeProps as _normalizeProps, mergeProps as _mergeProps, renderList as _renderList, createSlots as _createSlots, createElementVNode as _createElementVNode, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle, createElementBlock as _createElementBlock } from "vue";
 const _hoisted_1 = { class: "jtable-body" };
 import { proTableProps } from "./setting";
+import { Spin } from 'ant-design-vue';
 import Header from './Header.js';
 import Alert from './Alert.js';
 import Content from './Content.js';
@@ -70,7 +81,10 @@ import Pagination from './Pagination.js';
 import { useSlots, watch, onMounted, onUnmounted, computed, ref, reactive, inject } from "vue";
 import { debounce } from 'lodash-es';
 import { TableConfig } from "../utils/constants";
-import { JSkeletonList } from "../Skeleton";
+import { useTableInject } from "./hooks";
+import useProTableStyle from "./style";
+import { onlyMessage } from "@jetlinks-web/utils";
+import { useLocaleReceiver } from "../LocaleReciver";
 const __sfc_main__ = _defineComponent({
     ...{
         name: 'JProTable'
@@ -98,16 +112,22 @@ const __sfc_main__ = _defineComponent({
         });
         const loading = ref(false);
         const _dataSource = ref([]);
-        const _mode = ref(!props.mode ? (props.modeValue || 'CARD') : props.mode);
+        const _mode = ref(props.mode || props.modeValue || 'CARD');
         const column = ref(4);
         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(() => {
-            return props.alertShow && _optionalChain([props, 'optionalAccess', _2 => _2.rowSelection, 'optionalAccess', _3 => _3.selectedRowKeys, 'optionalAccess', _4 => _4.length]);
+            return props.alertShow && (_optionalChain([props, 'access', _2 => _2.rowSelection, 'optionalAccess', _3 => _3.selectedRowKeys, 'optionalAccess', _4 => _4.length]) || _optionalChain([_rowSelection, 'optionalAccess', _5 => _5.value, 'optionalAccess', _6 => _6.selectedRowKeys, 'optionalAccess', _7 => _7.length]));
         });
         const showPagination = computed(() => {
             return !!_dataSource.value.length && !props.noPagination && props.type === 'PAGE';
@@ -115,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', _5 => _5.total]) &&
-                    _optionalChain([result, 'optionalAccess', _6 => _6.pageSize]) &&
-                    _optionalChain([result, 'optionalAccess', _7 => _7.pageIndex]) &&
-                    _optionalChain([result, 'optionalAccess', _8 => _8.data, 'optionalAccess', _9 => _9.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', _10 => _10.data]) || [];
-                    page.pageIndex = _optionalChain([result, 'optionalAccess', _11 => _11.pageIndex]) || 0;
-                    page.pageSize = _optionalChain([result, 'optionalAccess', _12 => _12.pageSize]) || 12;
-                    page.total = _optionalChain([result, 'optionalAccess', _13 => _13.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 {
@@ -147,8 +181,8 @@ const __sfc_main__ = _defineComponent({
                     ...props.defaultParams,
                     ..._params,
                     terms: [
-                        ...(_optionalChain([props, 'access', _14 => _14.defaultParams, 'optionalAccess', _15 => _15.terms]) || []),
-                        ...(_optionalChain([_params, 'optionalAccess', _16 => _16.terms]) || []),
+                        ...(_optionalChain([props, 'access', _19 => _19.defaultParams, 'optionalAccess', _20 => _20.terms]) || []),
+                        ...(_optionalChain([_params, 'optionalAccess', _21 => _21.terms]) || []),
                     ],
                 };
                 loading.value = true;
@@ -156,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 = [];
@@ -183,8 +238,13 @@ const __sfc_main__ = _defineComponent({
             });
         };
         const onClose = () => {
-            _optionalChain([props, 'access', _17 => _17.rowSelection, 'optionalAccess', _18 => _18.onChange, 'optionalCall', _19 => _19([], [])]);
-            _optionalChain([props, 'access', _20 => _20.rowSelection, 'optionalAccess', _21 => _21.onSelectNone, 'optionalCall', _22 => _22()]);
+            if (props.rowSelection) {
+                _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', _31 => _31.value])) {
+                _optionalChain([_rowSelection, 'access', _32 => _32.value, 'optionalAccess', _33 => _33.onSelectNone, 'optionalCall', _34 => _34()]);
+            }
         };
         /**
          * 刷新数据
@@ -199,10 +259,10 @@ const __sfc_main__ = _defineComponent({
             });
         };
         const _gridColumns = computed(() => {
-            if (_optionalChain([props, 'access', _23 => _23.gridColumns, 'optionalAccess', _24 => _24.length])) {
+            if (_optionalChain([props, 'access', _35 => _35.gridColumns, 'optionalAccess', _36 => _36.length])) {
                 const arr = props.gridColumns;
-                const lastValue = _optionalChain([arr, 'access', _25 => _25.slice, 'call', _26 => _26(-1), 'optionalAccess', _27 => _27[0]]);
-                if (_optionalChain([arr, 'optionalAccess', _28 => _28.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);
                     }
@@ -223,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', _29 => _29.value, 'optionalAccess', _30 => _30[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', _31 => _31.value, 'optionalAccess', _32 => _32[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', _33 => _33.value, 'optionalAccess', _34 => _34[2]]) || 3;
+                    column.value = _optionalChain([_gridColumns, 'access', _45 => _45.value, 'optionalAccess', _46 => _46[2]]) || 3;
                 }
                 else if (width > 1600) {
-                    column.value = _optionalChain([_gridColumns, 'access', _35 => _35.value, 'optionalAccess', _36 => _36[3]]) || 4;
+                    column.value = _optionalChain([_gridColumns, 'access', _47 => _47.value, 'optionalAccess', _48 => _48[3]]) || 4;
                 }
             }
         };
@@ -256,15 +316,11 @@ const __sfc_main__ = _defineComponent({
         __expose({ reload, dataSource: _dataSource });
         return (_ctx, _cache) => {
             return (_openBlock(), _createElementBlock("div", {
-                class: "jtable-body-spin",
+                class: _normalizeClass(['jtable-body-spin', _unref(hashId)]),
                 style: _normalizeStyle(_ctx.bodyStyle),
                 id: "jtable-body-spin"
             }, [
-                _createVNode(_unref(JSkeletonList), {
-                    loading: loading.value,
-                    active: true,
-                    mode: _mode.value
-                }, {
+                _createVNode(_unref(Spin), { spinning: loading.value }, {
                     default: _withCtx(() => [
                         _createElementVNode("div", _hoisted_1, [
                             _createVNode(Header, {
@@ -284,12 +340,12 @@ const __sfc_main__ = _defineComponent({
                             (showAlert.value)
                                 ? (_openBlock(), _createBlock(Alert, {
                                     key: 0,
-                                    rowSelection: _ctx.rowSelection,
+                                    rowSelection: _ctx.rowSelection || _unref(_rowSelection),
                                     onClose: onClose
                                 }, {
                                     default: _withCtx(() => [
                                         _renderSlot(_ctx.$slots, "alertRender", {
-                                            rowSelection: _ctx.rowSelection,
+                                            rowSelection: _ctx.rowSelection || _unref(_rowSelection),
                                             onClose: onClose
                                         })
                                     ]),
@@ -319,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", {
@@ -330,13 +388,13 @@ const __sfc_main__ = _defineComponent({
                                         })
                                     ]),
                                     _: 3 /* FORWARDED */
-                                }, 16 /* FULL_PROPS */, ["total", "pageIndex", "pageSize"]))
+                                }, 16 /* FULL_PROPS */, ["total", "pageIndex", "pageSize", "totalLoading", "totalRequest"]))
                                 : _createCommentVNode("v-if", true)
                         ])
                     ]),
                     _: 3 /* FORWARDED */
-                }, 8 /* PROPS */, ["loading", "mode"])
-            ], 4 /* STYLE */));
+                }, 8 /* PROPS */, ["spinning"])
+            ], 6 /* CLASS, STYLE */));
         };
     }
 });

package/lib/ProTable/hooks/index.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _useTableSelection = require("./useTableSelection");
+Object.keys(_useTableSelection).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useTableSelection[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _useTableSelection[key];
+    }
+  });
+});
+var _useTableInject = require("./useTableInject");
+Object.keys(_useTableInject).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useTableInject[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _useTableInject[key];
+    }
+  });
+});

package/lib/ProTable/hooks/useTableInject.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useTableInject = void 0;
+var _useTableSelection = require("./useTableSelection");
+var _vue = require("vue");
+var useTableInject = exports.useTableInject = function useTableInject() {
+  return (0, _vue.inject)(_useTableSelection.PROTABLE_ROW_SELECTION_KEY, null);
+};

package/lib/ProTable/hooks/useTableSelection.js

@@ -0,0 +1,102 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useTableSelection = exports.PROTABLE_ROW_SELECTION_KEY = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _vue = require("vue");
+var _lodashEs = require("lodash");
+var PROTABLE_ROW_SELECTION_KEY = exports.PROTABLE_ROW_SELECTION_KEY = Symbol('protable-row-selection-key');
+var useTableSelection = exports.useTableSelection = function useTableSelection() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+    type: 'checkbox',
+    rowKey: "id",
+    isCheck: true
+  };
+  var _options$type = options.type,
+    type = _options$type === void 0 ? 'checkbox' : _options$type,
+    _options$rowKey = options.rowKey,
+    rowKey = _options$rowKey === void 0 ? 'id' : _options$rowKey;
+  var selectedRowKeys = (0, _vue.ref)([]);
+  var selectedRows = (0, _vue.ref)([]);
+  var selectionObj = (0, _vue.ref)(null);
+  var isCheckRef = (0, _vue.computed)(function () {
+    return (0, _vue.unref)(options.isCheck);
+  });
+  var onSelect = function onSelect(record, selected) {
+    if (type === 'checkbox') {
+      if (selected) {
+        selectedRows.value.push(record);
+      } else {
+        selectedRows.value = selectedRows.value.filter(function (i) {
+          return i[rowKey] !== record[rowKey];
+        });
+      }
+      selectedRowKeys.value = selectedRows.value.map(function (i) {
+        return i[rowKey];
+      });
+    }
+  };
+  // 单选
+  var onChange = function onChange(_selectedRowKeys, _selectedRows) {
+    if (type === 'radio') {
+      selectedRowKeys.value = _selectedRowKeys;
+      selectedRows.value = _selectedRows;
+    }
+  };
+  var onSelectAll = function onSelectAll(selected, _selectedRows, changeRows) {
+    if (selected) {
+      var _selectedRows$value;
+      (_selectedRows$value = selectedRows.value).push.apply(_selectedRows$value, (0, _toConsumableArray2.default)(changeRows));
+    } else {
+      var arr = changeRows.map(function (item) {
+        return item[rowKey];
+      });
+      selectedRows.value = selectedRows.value.filter(function (i) {
+        return !arr.includes(i[rowKey]);
+      });
+    }
+    selectedRowKeys.value = selectedRows.value.map(function (i) {
+      return i[rowKey];
+    });
+  };
+  var onSelectNone = function onSelectNone() {
+    selectedRowKeys.value = [];
+    selectedRows.value = [];
+  };
+  var updateSelection = function updateSelection() {
+    if (isCheckRef.value) {
+      // 提供选择上下文
+      selectionObj.value = type === 'checkbox' ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodashEs.omit)(options, ['isCheck'])), {}, {
+        selectedRowKeys: selectedRowKeys,
+        onSelect: onSelect,
+        onSelectAll: onSelectAll,
+        onSelectNone: onSelectNone
+      }) : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodashEs.omit)(options, ['isCheck'])), {}, {
+        selectedRowKeys: selectedRowKeys,
+        onChange: onChange,
+        onSelectNone: onSelectNone
+      });
+    } else {
+      // 清空选择状态
+      onSelectNone();
+      selectionObj.value = null;
+    }
+  };
+  (0, _vue.watch)(isCheckRef, function () {
+    updateSelection();
+  }, {
+    immediate: true,
+    deep: false
+  } // 注意：deep 设为 false
+  );
+  (0, _vue.provide)(PROTABLE_ROW_SELECTION_KEY, selectionObj);
+  return {
+    selectedRowKeys: selectedRowKeys,
+    selectedRows: selectedRows,
+    onSelectNone: onSelectNone
+  };
+};

package/lib/ProTable/setting.js

@@ -55,7 +55,7 @@ var _contentProps = exports._contentProps = (0, _objectSpread2.default)((0, _obj
     }
   },
   scroll: {
-    type: Object,
+    type: [Object, Boolean],
     default: function _default() {
       return {};
     } //  x: 1366
@@ -63,6 +63,14 @@ var _contentProps = exports._contentProps = (0, _objectSpread2.default)((0, _obj
   rowKey: {
     type: [String, Function],
     default: 'id'
+  },
+  type: {
+    type: String,
+    default: 'PAGE'
+  },
+  height: {
+    type: Number,
+    default: 500
   }
 });
 var _paginationProps = exports._paginationProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodashEs.omit)((0, _Pagination.paginationProps)(), ['onChange'])), {}, {
@@ -83,6 +91,17 @@ var _paginationProps = exports._paginationProps = (0, _objectSpread2.default)((0
    */
   isShowContent: {
     type: Boolean
+  },
+  /**
+   * 总数loading状态
+   */
+  totalLoading: {
+    type: Boolean,
+    default: false
+  },
+  totalRequest: {
+    type: Function,
+    default: undefined
   }
 });
 var proTableProps = exports.proTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _contentProps), _alertProps), {}, {
@@ -98,6 +117,10 @@ var proTableProps = exports.proTableProps = (0, _objectSpread2.default)((0, _obj
     type: Function,
     default: undefined
   },
+  totalRequest: {
+    type: Function,
+    default: undefined
+  },
   params: {
     type: Object,
     default: function _default() {