@zat-design/sisyphus-react 4.0.0-beta.4 → 4.0.0-beta.6

package/es/ProTable/hooks/useAntdTable.js

@@ -1,25 +1,27 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
 import { useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
-import { Form, message } from 'antd';
 import { defaultPage } from "../index";
 import { isListResult, removeEmptyKeys, isNonEmptyObject } from "../utils";
 import locale, { formatMessage } from "../../locale";
-var useDefaultOptions = function useDefaultOptions(options) {
+var useDefaultOptions = options => {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
     _useState2 = _slicedToArray(_useState, 2),
     page = _useState2[0],
     onPageChange = _useState2[1];
   return _objectSpread(_objectSpread({}, options), {}, {
     rowSelectType: (options === null || options === void 0 ? void 0 : options.rowSelectType) || 'checkbox',
-    page: page,
+    page,
     onPageChange: (options === null || options === void 0 ? void 0 : options.onPageChange) || onPageChange
   });
 };
@@ -68,7 +70,7 @@ function useAntdTable(service, options, useRequestOptions) {
     transformParams = _useDefaultOptions.transformParams,
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
-  var _Form$useForm = Form.useForm(_form),
+  var _Form$useForm = _Form.useForm(_form),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _ref = useRequestOptions || {},
@@ -76,7 +78,7 @@ function useAntdTable(service, options, useRequestOptions) {
   var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
   var initPage = (options === null || options === void 0 ? void 0 : options.page) || defaultPage;
   var previousPage = usePrevious(page || defaultPage);
-  var getTransformParams = function getTransformParams(params) {
+  var getTransformParams = params => {
     var _pickBy;
     var realParams = _objectSpread(_objectSpread(_objectSpread({}, defaultParam), extraParams), params);
     var _realParams$page = realParams.page,
@@ -89,18 +91,17 @@ function useAntdTable(service, options, useRequestOptions) {
       sorter: JSON.stringify(sorter) === '{}' ? undefined : sorter
     }, otherParams);
     var requestParams = _objectSpread(_objectSpread({}, page), {}, {
-      queryBean: (_pickBy = pickBy(queryBean, function (item) {
-        return item !== undefined;
-      })) !== null && _pickBy !== void 0 ? _pickBy : {}
+      queryBean: (_pickBy = pickBy(queryBean, item => item !== undefined)) !== null && _pickBy !== void 0 ? _pickBy : {}
     });
     if (transformParams) {
-      return transformParams(realParams, requestParams);
+      var mergedParams = _objectSpread(_objectSpread({}, realParams), requestParams);
+      return transformParams(mergedParams);
     }
     return requestParams;
   };
 
   // 仅清数据源相关，查询相关
-  var handleSetStateCallback = function handleSetStateCallback(values) {
+  var handleSetStateCallback = values => {
     setState(_objectSpread({
       data: [],
       total: 0,
@@ -109,10 +110,8 @@ function useAntdTable(service, options, useRequestOptions) {
       allSelected: false
     }, values));
   };
-  var curService = useMemo(function () {
-    return service.toString();
-  }, [service]);
-  var curExtraParams = useMemo(function () {
+  var curService = useMemo(() => service.toString(), [service]);
+  var curExtraParams = useMemo(() => {
     return extraParams ? JSON.stringify(extraParams) : extraParams;
   }, [extraParams]);
 
@@ -121,7 +120,7 @@ function useAntdTable(service, options, useRequestOptions) {
     debounceWait: 300
   }, useRequestOptions), {}, {
     defaultParams: [getTransformParams()],
-    onSuccess: function onSuccess(res, params) {
+    onSuccess: (res, params) => {
       var transformResult = transformResponse ? transformResponse(res) : res || {};
       var _ref2 = isListResult(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
         _ref2$list = _ref2.list,
@@ -130,10 +129,10 @@ function useAntdTable(service, options, useRequestOptions) {
         total = _ref2$total === void 0 ? 0 : _ref2$total;
       if (list !== null && !Array.isArray(list)) {
         var _locale$ProTable;
-        return message.error(locale === null || locale === void 0 || (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
+        return _message.error(locale === null || locale === void 0 || (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.transformResponseMsg);
       }
       setState({
-        total: total,
+        total,
         data: list || []
       });
       if (useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.onSuccess) {
@@ -146,7 +145,7 @@ function useAntdTable(service, options, useRequestOptions) {
 
   // service变化时触发 (禁止掉防止service变更时导致的死循环)
 
-  var clearSelected = function clearSelected() {
+  var clearSelected = () => {
     setState({
       allSelected: false,
       selectedRecords: [],
@@ -157,31 +156,27 @@ function useAntdTable(service, options, useRequestOptions) {
   /**
    * 手动触发时，手动调用run
    */
-  useEffect(function () {
+  useEffect(() => {
     if (!(useRequestOptions !== null && useRequestOptions !== void 0 && useRequestOptions.manual)) {
       run(getTransformParams());
     }
   }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
-  useDeepCompareEffect(function () {
+  useDeepCompareEffect(() => {
     if (allSelected) {
-      var filterList = data.filter(function (item) {
-        return !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]);
-      });
+      var filterList = data.filter(item => !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]));
       var nextObject = {
-        selectedRecords: [].concat(_toConsumableArray(selectedRecords), _toConsumableArray(filterList)),
-        selectedRowKeys: [].concat(_toConsumableArray(selectedRowKeys), _toConsumableArray(filterList === null || filterList === void 0 ? void 0 : filterList.map(function (item) {
-          return item === null || item === void 0 ? void 0 : item[rowKey];
-        })))
+        selectedRecords: [...selectedRecords, ...filterList],
+        selectedRowKeys: [...selectedRowKeys, ...(filterList === null || filterList === void 0 ? void 0 : filterList.map(item => item === null || item === void 0 ? void 0 : item[rowKey]))]
       };
       if (typeof disabled === 'function') {
         var _selectedRecords$filt, _nextSelectRecords$ma;
         var _nextObject = nextObject,
           _selectedRecords = _nextObject.selectedRecords;
-        var nextSelectRecords = (_selectedRecords$filt = _selectedRecords.filter(function (item) {
+        var nextSelectRecords = (_selectedRecords$filt = _selectedRecords.filter(item => {
           // 去掉禁用的
           return !disabled(item);
         })) !== null && _selectedRecords$filt !== void 0 ? _selectedRecords$filt : [];
-        var nextSelectedRowKeys = (_nextSelectRecords$ma = nextSelectRecords.map(function (item) {
+        var nextSelectedRowKeys = (_nextSelectRecords$ma = nextSelectRecords.map(item => {
           return item === null || item === void 0 ? void 0 : item[rowKey];
         })) !== null && _nextSelectRecords$ma !== void 0 ? _nextSelectRecords$ma : [];
         nextObject = {
@@ -194,18 +189,18 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [allSelected, data]);
 
   // 释放
-  useEffect(function () {
-    return function () {
+  useEffect(() => {
+    return () => {
       previousSearchValues = null;
     };
   }, []);
 
   // 分页变更
-  var handlePageChange = function handlePageChange(current, pageSize) {
+  var handlePageChange = (current, pageSize) => {
     var _form$getFieldsValue;
     var page = {
       pageNum: current,
-      pageSize: pageSize
+      pageSize
     };
     onPageChange(page);
     if (!rowSelections && !crossPageSelect) {
@@ -217,10 +212,10 @@ function useAntdTable(service, options, useRequestOptions) {
     var newValues = (_form$getFieldsValue = form.getFieldsValue()) !== null && _form$getFieldsValue !== void 0 ? _form$getFieldsValue : {};
     var nextValues = removeEmptyKeys(newValues);
     run(getTransformParams(_objectSpread(_objectSpread({
-      page: page
+      page
     }, nextValues), extraFilter)));
   };
-  var handleTableChange = function handleTableChange(pagination, filters, sorter, extra) {
+  var handleTableChange = (pagination, filters, sorter, extra) => {
     var _form$getFieldsValue2;
     // 跳过分页改变，使用pagination的onChange
     if (extra.action === 'paginate') {
@@ -235,19 +230,19 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRecords: [],
       selectedRowKeys: [],
       extraFilter: {
-        filters: filters,
-        sorter: sorter
+        filters,
+        sorter
       }
     });
     var _values = (_form$getFieldsValue2 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue2 !== void 0 ? _form$getFieldsValue2 : {};
     run(getTransformParams(_objectSpread(_objectSpread({
-      page: page
+      page
     }, _values), {}, {
-      filters: filters,
-      sorter: sorter
+      filters,
+      sorter
     })));
   };
-  var onSearch = function onSearch(values) {
+  var onSearch = values => {
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
@@ -273,7 +268,7 @@ function useAntdTable(service, options, useRequestOptions) {
       page: newPage
     }, extraFilter), _values)));
   };
-  var resetParams = function resetParams(page) {
+  var resetParams = page => {
     setState({
       searchValues: {},
       allSelected: false,
@@ -287,7 +282,7 @@ function useAntdTable(service, options, useRequestOptions) {
   };
 
   // 重置查询条件: 页码还原、勾选清空
-  var onReset = function onReset() {
+  var onReset = () => {
     form === null || form === void 0 || form.resetFields();
     var newPage = {
       pageNum: 1,
@@ -301,7 +296,7 @@ function useAntdTable(service, options, useRequestOptions) {
       }));
     }
   };
-  var refreshPage = function refreshPage(res) {
+  var refreshPage = res => {
     var transformResult = transformResponse ? transformResponse(res) : res || {};
     var _ref3 = isListResult(transformResult) ? transformResult : (transformResult === null || transformResult === void 0 ? void 0 : transformResult.data) || {},
       _ref3$total = _ref3.total,
@@ -351,17 +346,17 @@ function useAntdTable(service, options, useRequestOptions) {
     text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable2 = locale.ProTable) === null || _locale$ProTable2 === void 0 ? void 0 : _locale$ProTable2.selectCurPage, {
       total: (data === null || data === void 0 ? void 0 : data.length) || 0
     }),
-    onSelect: function onSelect(changeableRowKeys) {
+    onSelect: changeableRowKeys => {
       setState({
         allSelected: false,
-        selectedRecords: _toConsumableArray(data),
+        selectedRecords: [...data],
         selectedRowKeys: changeableRowKeys
       });
     }
   }, {
     key: 'all',
     text: formatMessage(locale === null || locale === void 0 || (_locale$ProTable3 = locale.ProTable) === null || _locale$ProTable3 === void 0 ? void 0 : _locale$ProTable3.selectAll, {
-      total: total
+      total
     }),
     onSelect: function () {
       var _onSelect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(changeableRowKeys) {
@@ -370,7 +365,7 @@ function useAntdTable(service, options, useRequestOptions) {
             case 0:
               setState({
                 allSelected: true,
-                selectedRecords: _toConsumableArray(data),
+                selectedRecords: [...data],
                 selectedRowKeys: changeableRowKeys
               });
             case 1:
@@ -409,12 +404,12 @@ function useAntdTable(service, options, useRequestOptions) {
       return onSelect;
     }()
   }];
-  var selections = useMemo(function () {
+  var selections = useMemo(() => {
     if (rowSelections === true) {
       return defaultSelections;
     }
     if (Array.isArray(rowSelections)) {
-      return rowSelections.map(function (item) {
+      return rowSelections.map(item => {
         if (typeof item === 'string') {
           if (item === CURRENT_PAGE) {
             return defaultSelections[0];
@@ -435,26 +430,18 @@ function useAntdTable(service, options, useRequestOptions) {
     fixed: true,
     type: rowSelectType,
     columnWidth: rowSelections ? 64 : undefined,
-    selectedRowKeys: selectedRowKeys,
-    onChange: function onChange(rowKeys, rows) {
+    selectedRowKeys,
+    onChange(rowKeys, rows) {
       if (crossPageSelect) {
         var _data$map, _Array$from, _ref5;
-        var removeKeys = data === null || data === void 0 || (_data$map = data.map(function (item) {
-          return item === null || item === void 0 ? void 0 : item[rowKey];
-        })) === null || _data$map === void 0 ? void 0 : _data$map.filter(function (key) {
-          return !rowKeys.includes(key);
-        });
-        var newSelectedKeys = (_Array$from = Array.from(new Set([].concat(_toConsumableArray(selectedRowKeys), _toConsumableArray(rowKeys))))) === null || _Array$from === void 0 ? void 0 : _Array$from.filter(function (item) {
-          return !removeKeys.includes(item);
-        });
-        var selectedRecordObj = (_ref5 = [].concat(_toConsumableArray(selectedRecords), _toConsumableArray(rows))) === null || _ref5 === void 0 ? void 0 : _ref5.reduce(function (acc, cur) {
+        var removeKeys = data === null || data === void 0 || (_data$map = data.map(item => item === null || item === void 0 ? void 0 : item[rowKey])) === null || _data$map === void 0 ? void 0 : _data$map.filter(key => !rowKeys.includes(key));
+        var newSelectedKeys = (_Array$from = Array.from(new Set([...selectedRowKeys, ...rowKeys]))) === null || _Array$from === void 0 ? void 0 : _Array$from.filter(item => !removeKeys.includes(item));
+        var selectedRecordObj = (_ref5 = [...selectedRecords, ...rows]) === null || _ref5 === void 0 ? void 0 : _ref5.reduce((acc, cur) => {
           acc[cur === null || cur === void 0 ? void 0 : cur[rowKey]] = cur;
           return acc;
         }, {});
         setState({
-          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(function (item) {
-            return selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[String(item)];
-          }),
+          selectedRecords: newSelectedKeys === null || newSelectedKeys === void 0 ? void 0 : newSelectedKeys.map(item => selectedRecordObj === null || selectedRecordObj === void 0 ? void 0 : selectedRecordObj[String(item)]),
           selectedRowKeys: newSelectedKeys
         });
       } else {
@@ -464,7 +451,7 @@ function useAntdTable(service, options, useRequestOptions) {
         });
       }
     },
-    onSelectAll: function onSelectAll(selected) {
+    onSelectAll: selected => {
       if (rowSelections && allSelected && !selected) {
         setState({
           allSelected: false,
@@ -473,19 +460,17 @@ function useAntdTable(service, options, useRequestOptions) {
         });
       }
     },
-    getCheckboxProps: function getCheckboxProps(record) {
-      return {
-        className: allSelected && rowSelections ? 'checkbox-disabled' : ''
-      };
-    },
-    selections: selections
+    getCheckboxProps: record => ({
+      className: allSelected && rowSelections ? 'checkbox-disabled' : ''
+    }),
+    selections
   };
   var rowSelection = isObject(returnRowSelection) ? merge(_rowSelection, returnRowSelection) : _rowSelection;
   if (isObject(returnRowSelection) && !isEqual(rowSelection, _rowSelection)) {
     // getCheckboxProps需要特殊兼容原有的逻辑，特殊处理
     var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
     if (isHasGetCheckboxProps) {
-      set(rowSelection, 'getCheckboxProps', function (record) {
+      set(rowSelection, 'getCheckboxProps', record => {
         var _rowSelection$getChec;
         var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
         return _objectSpread({
@@ -503,54 +488,54 @@ function useAntdTable(service, options, useRequestOptions) {
     showSizeChanger: true,
     showQuickJumper: true,
     onPaginationChange: true,
-    total: total,
-    showTotal: function showTotal(total) {
+    total,
+    showTotal: total => {
       var _locale$ProTable6;
       if (!total) return;
       return formatMessage(locale === null || locale === void 0 || (_locale$ProTable6 = locale.ProTable) === null || _locale$ProTable6 === void 0 ? void 0 : _locale$ProTable6.total, {
-        total: total
+        total
       });
     },
     onShowSizeChange: handlePageChange,
     onChange: handlePageChange
   };
   var useAntdTableProps = _objectSpread(_objectSpread({}, result), {}, {
-    form: form,
-    data: data,
+    form,
+    data,
     params: (result === null || result === void 0 || (_result$params = result.params) === null || _result$params === void 0 ? void 0 : _result$params[0]) || {},
-    rowSelection: rowSelection,
+    rowSelection,
     searchValues: (_form$getFieldsValue3 = form === null || form === void 0 ? void 0 : form.getFieldsValue()) !== null && _form$getFieldsValue3 !== void 0 ? _form$getFieldsValue3 : {},
-    allSelected: allSelected,
-    selectedTip: selectedTip,
-    selectedRowKeys: selectedRowKeys,
-    selectedRecords: selectedRecords,
-    clearSelected: clearSelected,
-    setSelectedRowKeys: function setSelectedRowKeys(selectedRowKeys) {
+    allSelected,
+    selectedTip,
+    selectedRowKeys,
+    selectedRecords,
+    clearSelected,
+    setSelectedRowKeys: selectedRowKeys => {
       setState({
-        selectedRowKeys: selectedRowKeys
+        selectedRowKeys
       });
     },
-    setSelectedRecords: function setSelectedRecords(selectedRecords) {
+    setSelectedRecords: selectedRecords => {
       setState({
-        selectedRecords: selectedRecords
+        selectedRecords
       });
     },
-    pagination: pagination,
-    onReset: onReset,
-    onSearch: onSearch,
+    pagination,
+    onReset,
+    onSearch,
     refresh: handleRefresh,
     tableProps: {
-      rowKey: rowKey,
+      rowKey,
       loading: result.loading,
       dataSource: data,
       rowSelection: returnRowSelection || rowSelections ? rowSelection : undefined,
-      pagination: pagination,
+      pagination,
       onChange: handleTableChange
     },
-    handleSetStateCallback: handleSetStateCallback
+    handleSetStateCallback
   });
   useAntdTableProps.tableProps.formTableProps = _objectSpread(_objectSpread({}, omit(useAntdTableProps, 'tableProps')), {}, {
-    form: form
+    form
   });
   return useAntdTableProps;
 }