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

package/es/ProEditTable/components/RenderField/index.js

@@ -588,7 +588,7 @@ var RenderField = function RenderField(_ref) {
     }
     FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
@@ -598,7 +598,7 @@ var RenderField = function RenderField(_ref) {
     if (type === 'FormList') {
       FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, omit(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: function children(fields, operation, meta) {
           return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
             otherProps: otherProps,

package/es/ProEditTable/index.js

@@ -112,7 +112,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     selectedRows = state.selectedRows,
     page = state.page;
   var virtualRowName = getNamePath(isArray(name) ? name : [name], virtualKey);
-  var cacheMap = useRef({});
   // 样式处理
   var _className = classnames({
     'pro-edit-table': true,
@@ -207,7 +206,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     isView: isView,
     viewEmpty: viewEmpty,
     disabled: disabled,
-    cacheMap: cacheMap,
     cellNamePath: cellNamePath,
     forceUpdate: forceUpdate,
     insertType: insertType,

package/es/ProEditTable/propsType.d.ts

@@ -98,7 +98,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     labelRequired?: boolean;
     name?: NamePath;
     names?: NamePath[];
-    cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
     valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({

package/es/ProEditTable/utils/index.js

@@ -1,4 +1,3 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
@@ -201,13 +200,10 @@ export var transformColumns = function transformColumns() {
     virtualKey = config.virtualKey,
     requiredAlign = config.requiredAlign,
     isView = config.isView,
-    cacheMap = config.cacheMap,
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
   var _columns = cloneDeepFilterNode(columns);
-  // 你的函数代码
-  var _cacheMap = _objectSpread({}, cacheMap.current);
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);
   _columns.forEach(function (item, index) {
@@ -280,26 +276,6 @@ export var transformColumns = function transformColumns() {
     if (item.className) {
       item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
     }
-    // 当列表配置cache，接口请求静态数据会做数据缓存
-    if (item.cache) {
-      var _item$fieldProps3;
-      // 初始化加载ProSelect，缓存当前useRequest
-      if (item.type === 'ProSelect') {
-        var _cacheMap$item$dataIn, _cacheMap$item$dataIn2;
-        if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
-          var _item$fieldProps, _item$fieldProps2;
-          _cacheMap[item.dataIndex] = {
-            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
-            dataSource: [],
-            transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
-          };
-        } else {
-          var _cacheMap$item$dataIn3;
-          item.fieldProps.dataSource = (_cacheMap$item$dataIn3 = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn3 === void 0 ? void 0 : _cacheMap$item$dataIn3.dataSource;
-        }
-      }
-      (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
-    }
     var _render = function _render(text, record, index) {
       var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = isArray(name) ? name : [name];
@@ -390,53 +366,6 @@ export var transformColumns = function transformColumns() {
     }));
     actionColumn && _columns.push(actionColumn);
   }
-  // cacheMap 用来存储缓存值，若有值后不再请求
-  if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _item = _slicedToArray(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
-              if (!service) {
-                _context2.next = 8;
-                break;
-              }
-              _context2.t0 = key;
-              _context2.next = 6;
-              return service(_objectSpread({}, option === null || option === void 0 ? void 0 : option.defaultParams));
-            case 6:
-              _context2.t1 = _context2.sent;
-              return _context2.abrupt("return", [_context2.t0, _context2.t1]);
-            case 8:
-              return _context2.abrupt("return", [key, {}]);
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x3) {
-        return _ref4.apply(this, arguments);
-      };
-    }())).then(function (res) {
-      res.forEach(function (item) {
-        var _item2 = _slicedToArray(item, 2),
-          key = _item2[0],
-          value = _item2[1];
-        var transformResponse = _cacheMap[key].transformResponse;
-        _cacheMap[key].dataSource = (transformResponse ? transformResponse(value) : value === null || value === void 0 ? void 0 : value.data) || [];
-      });
-      cacheMap.current = _cacheMap;
-      if (JSON.stringify(cacheMap.current) !== '{}') {
-        setState({
-          forceUpdate: {}
-        });
-      }
-    });
-  }
   // 渲染操作列
   return _columns;
 };

package/lib/ProEditTable/components/RenderField/index.js

@@ -595,7 +595,7 @@ var RenderField = function RenderField(_ref) {
     }
     FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       validateFirst: true
-    }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
@@ -605,7 +605,7 @@ var RenderField = function RenderField(_ref) {
     if (type === 'FormList') {
       FormItem = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, (0, _lodash.omit)(_formItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: function children(fields, operation, meta) {
           return (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
             otherProps: otherProps,

package/lib/ProEditTable/index.js

@@ -115,7 +115,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     selectedRows = state.selectedRows,
     page = state.page;
   var virtualRowName = (0, _tools.getNamePath)((0, _lodash.isArray)(name) ? name : [name], virtualKey);
-  var cacheMap = (0, _react.useRef)({});
   // 样式处理
   var _className = (0, _classnames.default)({
     'pro-edit-table': true,
@@ -210,7 +209,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     isView: isView,
     viewEmpty: viewEmpty,
     disabled: disabled,
-    cacheMap: cacheMap,
     cellNamePath: cellNamePath,
     forceUpdate: forceUpdate,
     insertType: insertType,

package/lib/ProEditTable/propsType.d.ts

@@ -98,7 +98,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     labelRequired?: boolean;
     name?: NamePath;
     names?: NamePath[];
-    cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
     valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({

package/lib/ProEditTable/utils/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformColumns = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -205,13 +204,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     virtualKey = config.virtualKey,
     requiredAlign = config.requiredAlign,
     isView = config.isView,
-    cacheMap = config.cacheMap,
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
   var _columns = (0, _tools.cloneDeepFilterNode)(columns);
-  // 你的函数代码
-  var _cacheMap = (0, _objectSpread2.default)({}, cacheMap.current);
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
   _columns.forEach(function (item, index) {
@@ -284,26 +280,6 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (item.className) {
       item.className = (0, _toConsumableArray2.default)(new Set(item.className.split(' '))).join(' ');
     }
-    // 当列表配置cache，接口请求静态数据会做数据缓存
-    if (item.cache) {
-      var _item$fieldProps3;
-      // 初始化加载ProSelect，缓存当前useRequest
-      if (item.type === 'ProSelect') {
-        var _cacheMap$item$dataIn, _cacheMap$item$dataIn2;
-        if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
-          var _item$fieldProps, _item$fieldProps2;
-          _cacheMap[item.dataIndex] = {
-            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
-            dataSource: [],
-            transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
-          };
-        } else {
-          var _cacheMap$item$dataIn3;
-          item.fieldProps.dataSource = (_cacheMap$item$dataIn3 = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn3 === void 0 ? void 0 : _cacheMap$item$dataIn3.dataSource;
-        }
-      }
-      (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
-    }
     var _render = function _render(text, record, index) {
       var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
@@ -394,53 +370,6 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     }));
     actionColumn && _columns.push(actionColumn);
   }
-  // cacheMap 用来存储缓存值，若有值后不再请求
-  if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
-              if (!service) {
-                _context2.next = 8;
-                break;
-              }
-              _context2.t0 = key;
-              _context2.next = 6;
-              return service((0, _objectSpread2.default)({}, option === null || option === void 0 ? void 0 : option.defaultParams));
-            case 6:
-              _context2.t1 = _context2.sent;
-              return _context2.abrupt("return", [_context2.t0, _context2.t1]);
-            case 8:
-              return _context2.abrupt("return", [key, {}]);
-            case 9:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2);
-      }));
-      return function (_x3) {
-        return _ref4.apply(this, arguments);
-      };
-    }())).then(function (res) {
-      res.forEach(function (item) {
-        var _item2 = (0, _slicedToArray2.default)(item, 2),
-          key = _item2[0],
-          value = _item2[1];
-        var transformResponse = _cacheMap[key].transformResponse;
-        _cacheMap[key].dataSource = (transformResponse ? transformResponse(value) : value === null || value === void 0 ? void 0 : value.data) || [];
-      });
-      cacheMap.current = _cacheMap;
-      if (JSON.stringify(cacheMap.current) !== '{}') {
-        setState({
-          forceUpdate: {}
-        });
-      }
-    });
-  }
   // 渲染操作列
   return _columns;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.10.3-beta.4",
+  "version": "3.10.4-beta.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -61,8 +61,8 @@
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
     "@zat-design/utils": "1.1.37",
-    "ahooks": "3.7.4",
-    "antd": "4.24.8",
+    "ahooks": "3.8.4",
+    "antd": "4.24.12",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "lodash": "^4.17.21",