@zat-design/sisyphus-react 3.6.11 → 3.7.0-beta.1

package/es/ProEnum/hooks/useEnumRequest.js

@@ -91,6 +91,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 // 忽略清洗的 codes
                 ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
                 Object.keys(response).forEach(function (key) {
+                  if (!response[key] || !Array.isArray(response[key])) {
+                    return;
+                  }
                   var options = _toConsumableArray(response[key]) || [];
                   if (ignoreCodes.includes(key)) {
                     response[key] = options;

package/es/ProEnum/utils/index.js

@@ -74,7 +74,7 @@ export function cacheFieldNames(fieldNames, dataSource) {
   });
   // 递归去对数据进行清洗
   if (children && Array.isArray(dataSource[children])) {
-    result[children] = dataSource[children].map(function (item) {
+    result.children = dataSource[children].map(function (item) {
       return cacheFieldNames(fieldNames, item);
     });
   }

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -4,12 +4,14 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useMemo } from 'react';
+import React, { useMemo } from 'react';
 import { isFunction } from 'lodash';
 import classNames from 'classnames';
 import ActionButton from './ActionButton';
 import RenderFields from '../../../render/RenderFields';
 import ProCollapse from '../../../../../ProLayout/components/ProCollapse';
+import { memoWith } from '../utils';
+var MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
 var BlockFields = function BlockFields(props) {
   var title = props.title,
     mode = props.mode,
@@ -66,7 +68,7 @@ var BlockFields = function BlockFields(props) {
       }),
       children: _jsx(_Row, {
         gutter: 24,
-        children: _jsx(RenderFields, {
+        children: _jsx(MemoRenderFields, {
           columns: columns,
           form: form,
           colProps: colProps,

package/es/ProForm/components/combination/FormList/components/LineFields.js

@@ -3,12 +3,15 @@ import _Row from "antd/es/row";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import React from 'react';
 import classNames from 'classnames';
 import { useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../../../../ProIcon';
 import ActionButton from './ActionButton';
 import RenderFields from '../../../render/RenderFields';
+import { memoWith } from '../utils';
+var MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
 var LineFields = function LineFields(props) {
   var mode = props.mode,
     index = props.index,
@@ -62,7 +65,7 @@ var LineFields = function LineFields(props) {
       })
     })), _jsx(_Row, {
       gutter: isLess ? 0 : 24,
-      children: _jsx(RenderFields, {
+      children: _jsx(MemoRenderFields, {
         columns: columns,
         form: form,
         colProps: colProps,

package/es/ProForm/components/combination/FormList/utils.d.ts

@@ -9,3 +9,4 @@ export declare const namesPathTransform: ({ names, prefixNamePath, type, }: {
     prefixNamePath: any[];
     type: string;
 }) => string;
+export declare const memoWith: (pre: any, next: any) => boolean;

package/es/ProForm/components/combination/FormList/utils.js

@@ -1,3 +1,5 @@
+import { isEqualWith, isFunction } from 'lodash';
+import React from 'react';
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
  * @param names  name的集合
@@ -17,4 +19,15 @@ export var namesPathTransform = function namesPathTransform(_ref) {
   return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
     return Array.isArray(name) ? name.join('_') : name;
   }).join('-');
+};
+// 比较memo
+export var memoWith = function memoWith(pre, next) {
+  return isEqualWith(pre, next, function (objValue, othValue) {
+    if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
+      return true;
+    }
+    if (isFunction(objValue) && isFunction(othValue)) {
+      return true;
+    }
+  });
 };

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -98,6 +98,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 // 忽略清洗的 codes
                 ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
                 Object.keys(response).forEach(function (key) {
+                  if (!response[key] || !Array.isArray(response[key])) {
+                    return;
+                  }
                   var options = (0, _toConsumableArray2.default)(response[key]) || [];
                   if (ignoreCodes.includes(key)) {
                     response[key] = options;

package/lib/ProEnum/utils/index.js

@@ -87,7 +87,7 @@ function cacheFieldNames(fieldNames, dataSource) {
   });
   // 递归去对数据进行清洗
   if (children && Array.isArray(dataSource[children])) {
-    result[children] = dataSource[children].map(function (item) {
+    result.children = dataSource[children].map(function (item) {
       return cacheFieldNames(fieldNames, item);
     });
   }

package/lib/ProForm/components/combination/FormList/components/BlockFields.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -8,12 +9,14 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ActionButton = _interopRequireDefault(require("./ActionButton"));
 var _RenderFields = _interopRequireDefault(require("../../../render/RenderFields"));
 var _ProCollapse = _interopRequireDefault(require("../../../../../ProLayout/components/ProCollapse"));
+var _utils = require("../utils");
+var MemoRenderFields = /*#__PURE__*/_react.default.memo(_RenderFields.default, _utils.memoWith);
 var BlockFields = function BlockFields(props) {
   var title = props.title,
     mode = props.mode,
@@ -70,7 +73,7 @@ var BlockFields = function BlockFields(props) {
       }),
       children: (0, _jsxRuntime.jsx)(_antd.Row, {
         gutter: 24,
-        children: (0, _jsxRuntime.jsx)(_RenderFields.default, {
+        children: (0, _jsxRuntime.jsx)(MemoRenderFields, {
           columns: columns,
           form: form,
           colProps: colProps,

package/lib/ProForm/components/combination/FormList/components/LineFields.js

@@ -9,12 +9,15 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
+var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
 var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
 var _ActionButton = _interopRequireDefault(require("./ActionButton"));
 var _RenderFields = _interopRequireDefault(require("../../../render/RenderFields"));
+var _utils = require("../utils");
+var MemoRenderFields = /*#__PURE__*/_react.default.memo(_RenderFields.default, _utils.memoWith);
 var LineFields = function LineFields(props) {
   var mode = props.mode,
     index = props.index,
@@ -68,7 +71,7 @@ var LineFields = function LineFields(props) {
       })
     })), (0, _jsxRuntime.jsx)(_antd.Row, {
       gutter: isLess ? 0 : 24,
-      children: (0, _jsxRuntime.jsx)(_RenderFields.default, {
+      children: (0, _jsxRuntime.jsx)(MemoRenderFields, {
         columns: columns,
         form: form,
         colProps: colProps,

package/lib/ProForm/components/combination/FormList/utils.d.ts

@@ -9,3 +9,4 @@ export declare const namesPathTransform: ({ names, prefixNamePath, type, }: {
     prefixNamePath: any[];
     type: string;
 }) => string;
+export declare const memoWith: (pre: any, next: any) => boolean;

package/lib/ProForm/components/combination/FormList/utils.js

@@ -1,9 +1,12 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.namesPathTransform = void 0;
+exports.namesPathTransform = exports.memoWith = void 0;
+var _lodash = require("lodash");
+var _react = _interopRequireDefault(require("react"));
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
  * @param names  name的集合
@@ -23,4 +26,15 @@ var namesPathTransform = exports.namesPathTransform = function namesPathTransfor
   return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
     return Array.isArray(name) ? name.join('_') : name;
   }).join('-');
+};
+// 比较memo
+var memoWith = exports.memoWith = function memoWith(pre, next) {
+  return (0, _lodash.isEqualWith)(pre, next, function (objValue, othValue) {
+    if ( /*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
+      return true;
+    }
+    if ((0, _lodash.isFunction)(objValue) && (0, _lodash.isFunction)(othValue)) {
+      return true;
+    }
+  });
 };

package/package.json

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