@zat-design/sisyphus-react 3.7.1-beta.2 → 3.7.1-beta.3

package/es/ProForm/components/render/Render.js

@@ -441,36 +441,25 @@ var Render = function Render(props) {
         children: child
       });
     }
-    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+    return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
-    var formItem = orgFormItem;
-    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      formItem =
-      // 空标签防止气泡不显示
-      _jsx(_Fragment, {
-        children: _jsx(_Form.Item, {
-          shouldUpdate: _otherFormItemProps.shouldUpdate,
-          noStyle: true,
-          children: function children() {
-            return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
-              // @ts-ignore
-              _internalItemRender: internalItemRender,
-              className: _className,
-              children: child
-            }));
-          }
-        })
-      });
-    }
-    return formItem;
   };
   var FormItem = _jsxs(_Fragment, {
-    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+    children: [_otherFormItemProps.shouldUpdate ?
+    // 空标签防止气泡不显示
+    _jsx(_Fragment, {
+      children: _jsx(_Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return renderItem();
+        }
+      })
+    }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
       return _jsx(_Form.Item, {
         hidden: true,
         name: name,

package/es/ProForm/components/render/RenderFields.js

@@ -5,6 +5,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
 import Render from './Render';
+import { getDefaultProps } from '../../utils/getDefaultProps';
 import * as componentMap from '../index';
 import { isSelect } from '../../utils';
 import { FieldProvider } from '../../utils/useFieldProps';
@@ -76,8 +77,9 @@ var RenderFields = function RenderFields(props) {
       otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    var defaultProps = getDefaultProps(column);
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, formItemProps), otherFormItemProps), {}, {
+    var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow: clearNotShow
     });

package/es/ProForm/utils/getDefaultProps.d.ts

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/es/ProForm/utils/getDefaultProps.js

@@ -0,0 +1,31 @@
+import { get, isEqual } from 'lodash';
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _listName = namePath.slice(0, -1);
+      var _namePath = name.slice(1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var preListValue = get(preValues, _listName).map(function (item) {
+          return get(item, _namePath);
+        });
+        var curListValue = get(curValues, _listName).map(function (item) {
+          return get(item, _namePath);
+        });
+        return !isEqual(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+export var getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/lib/ProForm/components/render/Render.js

@@ -441,36 +441,25 @@ var Render = function Render(props) {
         children: child
       });
     }
-    var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
-    var formItem = orgFormItem;
-    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      formItem =
-      // 空标签防止气泡不显示
-      (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-          shouldUpdate: _otherFormItemProps.shouldUpdate,
-          noStyle: true,
-          children: function children() {
-            return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
-              // @ts-ignore
-              _internalItemRender: internalItemRender,
-              className: _className,
-              children: child
-            }));
-          }
-        })
-      });
-    }
-    return formItem;
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+    children: [_otherFormItemProps.shouldUpdate ?
+    // 空标签防止气泡不显示
+    (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return renderItem();
+        }
+      })
+    }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
       return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
         hidden: true,
         name: name,

package/lib/ProForm/components/render/RenderFields.js

@@ -12,6 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _Render = _interopRequireDefault(require("./Render"));
+var _getDefaultProps = require("../../utils/getDefaultProps");
 var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
@@ -84,8 +85,9 @@ var RenderFields = function RenderFields(props) {
       otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    var defaultProps = (0, _getDefaultProps.getDefaultProps)(column);
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemProps), otherFormItemProps), {}, {
+    var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow: clearNotShow
     });

package/lib/ProForm/utils/getDefaultProps.d.ts

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/lib/ProForm/utils/getDefaultProps.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultProps = void 0;
+var _lodash = require("lodash");
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _listName = namePath.slice(0, -1);
+      var _namePath = name.slice(1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var preListValue = (0, _lodash.get)(preValues, _listName).map(function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        var curListValue = (0, _lodash.get)(curValues, _listName).map(function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        return !(0, _lodash.isEqual)(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+var getDefaultProps = exports.getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/package.json

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