@zat-design/sisyphus-react 3.10.3-beta.3 → 3.10.3-beta.4

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/es/ProEditTable/index.js

@@ -169,28 +169,33 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
-            _context.next = 3;
+            if (!pagination) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
             return form.validateFields([name], {
               recursive: true
             });
-          case 3:
+          case 4:
             setState({
               page: {
                 pageNum: current,
                 pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
               }
             });
-            _context.next = 9;
+          case 5:
+            _context.next = 10;
             break;
-          case 6:
-            _context.prev = 6;
+          case 7:
+            _context.prev = 7;
             _context.t0 = _context["catch"](0);
             handleScrollToError();
-          case 9:
+          case 10:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 6]]);
+      }, _callee, null, [[0, 7]]);
     }));
     return function (_x, _x2) {
       return _ref4.apply(this, arguments);

package/es/ProSelect/index.js

@@ -12,7 +12,7 @@ import _Select from "antd/es/select";
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef, isValidElement } from 'react';
+import React, { useImperativeHandle, useState, forwardRef, isValidElement, useCallback } from 'react';
 import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -23,7 +23,7 @@ import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
-  var _selectProps$showCode, _locale$ProSelect;
+  var _selectProps$showCode, _useRequest$options, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -87,6 +87,21 @@ export var ProSelect = function ProSelect(props, ref) {
     }
     setSelectList(data || []);
   };
+  var successTransformDataHandle = 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) {
+      _message.error(msg);
+      return;
+    }
+    return data;
+  }, []);
   var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
     onSuccess: function onSuccess(data) {
@@ -100,6 +115,7 @@ export var 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 = [];
@@ -124,15 +140,24 @@ export var ProSelect = function ProSelect(props, ref) {
   useDeepCompareEffect(function () {
     setSelectList(dataSource);
   }, [dataSource]);
+  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]);
   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/ProEditTable/index.js

@@ -172,28 +172,33 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
-            _context.next = 3;
+            if (!pagination) {
+              _context.next = 5;
+              break;
+            }
+            _context.next = 4;
             return form.validateFields([name], {
               recursive: true
             });
-          case 3:
+          case 4:
             setState({
               page: {
                 pageNum: current,
                 pageSize: pageSize !== null && pageSize !== void 0 ? pageSize : page.pageSize
               }
             });
-            _context.next = 9;
+          case 5:
+            _context.next = 10;
             break;
-          case 6:
-            _context.prev = 6;
+          case 7:
+            _context.prev = 7;
             _context.t0 = _context["catch"](0);
             (0, _tools.handleScrollToError)();
-          case 9:
+          case 10:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 6]]);
+      }, _callee, null, [[0, 7]]);
     }));
     return function (_x, _x2) {
       return _ref4.apply(this, arguments);

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/package.json

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