@zat-design/sisyphus-react 3.10.3 → 3.10.4

package/lib/ProSelect/index.js

@@ -24,7 +24,7 @@ require("./index.less");
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
-  var _selectProps$showCode, _locale$ProSelect;
+  var _selectProps$showCode, _useRequest$options, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -88,6 +88,21 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     }
     setSelectList(data || []);
   };
+  var successTransformDataHandle = (0, _react.useCallback)(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref3 = res || {},
+      _ref3$status = _ref3.status,
+      status = _ref3$status === void 0 ? 200 : _ref3$status,
+      msg = _ref3.message,
+      data = _ref3.data;
+    if (status !== 200) {
+      _antd.message.error(msg);
+      return;
+    }
+    return data;
+  }, []);
   var fetchFunction = (0, _ahooks.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread2.default)({
     manual: true,
     onSuccess: function onSuccess(data) {
@@ -101,6 +116,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     },
     debounceWait: 300
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
+  var cacheList = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.cacheKey) ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   var getValueObject = function getValueObject(input) {
     if (Array.isArray(input) && input.length) {
       var resArr = [];
@@ -125,15 +141,24 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   (0, _ahooks.useDeepCompareEffect)(function () {
     setSelectList(dataSource);
   }, [dataSource]);
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    var _useRequest$options2;
+    // 设置cacheKey后使用缓存的数据
+    if (!(selectList === null || selectList === void 0 ? void 0 : selectList.length) && (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.cacheKey)) {
+      if (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length) {
+        setSelectList(cacheList);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     // 默认disable值时，不查询接口
     if (defaultDisableValue || !useRequest) {
       return;
     }
-    var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-      defaultParams = _ref3.defaultParams,
-      manual = _ref3.manual;
-    if (manual) {
+    var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      defaultParams = _ref4.defaultParams,
+      manual = _ref4.manual;
+    if (manual || (cacheList === null || cacheList === void 0 ? void 0 : cacheList.length)) {
       return;
     }
     fetchFunction.run(defaultParams);

package/lib/ProTable/hooks/useAntdTable.js

@@ -31,6 +31,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
     onPageChange: (options === null || options === void 0 ? void 0 : options.onPageChange) || onPageChange
   });
 };
+var previousSearchValues = null;
 function useAntdTable(service, options, useRequestOptions) {
   var _locale$ProTable2, _locale$ProTable3, _locale$ProTable4, _locale$ProTable5;
   var _useSetState = (0, _ahooks.useSetState)({
@@ -39,7 +40,10 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRecords: [],
       selectedRowKeys: [],
       searchValues: undefined,
-      extraFilter: undefined,
+      extraFilter: {
+        filters: undefined,
+        sorter: undefined
+      },
       allSelected: false
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
@@ -70,10 +74,10 @@ function useAntdTable(service, options, useRequestOptions) {
     transformResponse = _useDefaultOptions.transformResponse,
     disabled = _useDefaultOptions.disabled;
   var _ref = useRequestOptions || {},
-    defaultParams = _ref.defaultParams,
-    manual = _ref.manual;
+    defaultParams = _ref.defaultParams;
   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) || _index.defaultPage;
+  var previousPage = (0, _ahooks.usePrevious)(page || _index.defaultPage);
   var getTransformParams = (0, _react.useCallback)(function (params) {
     var _pickBy;
     var realParams = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultParam), extraParams), params);
@@ -112,9 +116,17 @@ function useAntdTable(service, options, useRequestOptions) {
       page: page
     }, newQueryBean));
   }, [page, searchValues, extraFilter]);
+  var curService = (0, _react.useMemo)(function () {
+    return service.toString();
+  }, [service]);
+  var curExtraParams = (0, _react.useMemo)(function () {
+    return extraParams ? JSON.stringify(extraParams) : extraParams;
+  }, [extraParams]);
   // 调接口
-  var result = (0, _ahooks.useRequest)(service, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequestOptions), {}, {
-    debounceWait: 50,
+  var result = (0, _ahooks.useRequest)(service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    debounceWait: 300,
+    refreshDeps: [curService, curExtraParams]
+  }, useRequestOptions), {}, {
     defaultParams: [getTransformParams()],
     onSuccess: function onSuccess(res, params) {
       var transformResult = transformResponse ? transformResponse(res) : res || {};
@@ -138,9 +150,6 @@ function useAntdTable(service, options, useRequestOptions) {
   }));
   var run = result.run,
     refreshAsync = result.refreshAsync;
-  var curService = (0, _react.useMemo)(function () {
-    return service.toString();
-  }, [service]);
   // service变化时触发 (禁止掉防止service变更时导致的死循环)
   var clearSelected = (0, _react.useCallback)(function () {
     setState({
@@ -179,6 +188,12 @@ function useAntdTable(service, options, useRequestOptions) {
       setState(nextObject);
     }
   }, [allSelected, data]);
+  // 释放
+  (0, _react.useEffect)(function () {
+    return function () {
+      previousSearchValues = null;
+    };
+  }, []);
   // 分页变更
   var handlePageChange = (0, _react.useCallback)(function (current, pageSize) {
     var page = {
@@ -220,26 +235,32 @@ function useAntdTable(service, options, useRequestOptions) {
       filters: filters,
       sorter: sorter
     })));
-  }, [allSelected, searchValues, run, getTransformParams]);
+  }, [allSelected, searchValues, getTransformParams]);
   var onSearch = (0, _react.useCallback)(function (values) {
     var newPage = {
       pageNum: 1,
       pageSize: page.pageSize
     };
     var _values = (0, _utils.removeEmptyKeys)(values);
-    onPageChange(newPage);
-    setState({
-      searchValues: _values,
-      allSelected: false,
-      selectedRecords: [],
-      selectedRowKeys: []
-    });
+    // 如果 previousPage 存在且与 page 不相等，则触发页面变化
+    if (previousPage && !(0, _lodash.isEqual)(previousPage, page)) {
+      onPageChange(newPage);
+    }
+    // 减少查询按钮的渲染，只有需要重置值时才需要调用
+    if ((selectedRecords === null || selectedRecords === void 0 ? void 0 : selectedRecords.length) || (0, _utils.isNonEmptyObject)(_values) && !(0, _lodash.isEqual)(previousSearchValues, _values)) {
+      previousSearchValues = _values;
+      setState({
+        searchValues: _values,
+        allSelected: false,
+        selectedRecords: [],
+        selectedRowKeys: []
+      });
+    }
     run(getTransformParams((0, _objectSpread2.default)((0, _objectSpread2.default)({
       page: newPage
     }, extraFilter), _values)));
-  }, [extraFilter, page.pageSize, run, getTransformParams]);
-  var resetParams = (0, _react.useCallback)(function () {
-    var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;
+  }, [extraFilter, page.pageSize, previousPage, getTransformParams]);
+  var resetParams = (0, _react.useCallback)(function (page) {
     setState({
       searchValues: undefined,
       allSelected: false,
@@ -309,28 +330,6 @@ function useAntdTable(service, options, useRequestOptions) {
       return _ref4.apply(this, arguments);
     };
   }();
-  (0, _ahooks.useDeepCompareEffect)(function () {
-    if (!manual && curService) {
-      // service改变时重新请求
-      resetParams();
-      onPageChange(initPage);
-      run(getTransformParams());
-    }
-  }, [curService]);
-  (0, _ahooks.useDeepCompareEffect)(function () {
-    // extraParams改变时重新请求
-    if (!manual && extraParams) {
-      var newPage = {
-        pageNum: 1,
-        pageSize: page.pageSize
-      };
-      onPageChange(newPage);
-      resetParams(newPage);
-      run(getTransformParams({
-        page: newPage
-      }));
-    }
-  }, [extraParams]);
   var _rowSelection = {
     fixed: true,
     type: rowSelectType,
@@ -456,8 +455,8 @@ function useAntdTable(service, options, useRequestOptions) {
       });
     }
   }
-  var selectedTip = allSelected || selectedRowKeys.length ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable5 = _locale.default.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
-    selectedNum: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
+  var selectedTip = allSelected && selectedRowKeys.length ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable5 = _locale.default.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
+    total: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
   }) : null;
   var pagination = {
     current: page.pageNum,

package/lib/ProTable/style/index.less

@@ -585,7 +585,9 @@
 
   .@{ant-prefix}-table-summary {
     background-color: var(--zaui-table-header-bg, #f2f3f5);
-
+    td{
+      padding:calc(4px + var(--zaui-size)* 8px);
+    }
     .@{ant-prefix}-table-cell {
       font-weight: 500;
       background-color: var(--zaui-table-header-bg, #f2f3f5);

package/lib/ProTable/utils/index.d.ts

@@ -39,3 +39,5 @@ export declare const getPadding: (el: HTMLElement) => {
     pTop: number;
     pBottom: number;
 };
+/** 判断是有值的对象 */
+export declare const isNonEmptyObject: (obj: any) => obj is Record<string, any>;

package/lib/ProTable/utils/index.js

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeEmptyKeys = exports.isListResult = exports.getRowKey = exports.getPadding = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+exports.removeEmptyKeys = exports.isNonEmptyObject = exports.isListResult = exports.getRowKey = exports.getPadding = exports.getOriginalValue = exports.getDecimalDigits = exports.getColumnDataIndex = void 0;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
@@ -106,4 +107,8 @@ var getPadding = exports.getPadding = function getPadding(el) {
     pTop: paddingTop,
     pBottom: paddingBottom
   };
+};
+/** 判断是有值的对象 */
+var isNonEmptyObject = exports.isNonEmptyObject = function isNonEmptyObject(obj) {
+  return obj !== null && (0, _typeof2.default)(obj) === 'object' && !Array.isArray(obj) && Object.keys(obj).length > 0;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.10.3",
+  "version": "3.10.4",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",