@zat-design/sisyphus-react 3.3.3 → 3.4.0

package/lib/ProForm/components/base/TextArea/index.js

@@ -46,9 +46,7 @@ var TextAreaDef = function TextAreaDef(props) {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || ''),
-    autoSize: {
-      minRows: 4
-    }
+    autoSize: true
   }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
     className: _className
   }));

package/lib/ProForm/components/base/TextArea/index.less

@@ -10,3 +10,10 @@ div.pro-textarea-view {
     padding-bottom: 12px;
   }
 }
+
+// input-textarea级联选择
+.pro-textarea {
+  .@{ant-prefix}-input {
+    resize: auto !important;
+  }
+}

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

@@ -226,13 +226,13 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index)) : ( /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.actionType).concat(index),
         onClick: function onClick(e) {
           e.stopPropagation();
           handleClick(_onClick, index);
         }
-      }), label);
+      }), label));
     })
   });
 };

package/lib/ProForm/components/combination/Group/index.js

@@ -55,6 +55,9 @@ var Group = function Group(props) {
     'pro-group-diy-width': columns.some(function (item) {
       var _item$fieldProps, _item$fieldProps$styl;
       return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+    }),
+    'pro-group-width-auto': columns.some(function (item) {
+      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
   return (0, _jsxRuntime.jsx)("div", {
@@ -64,7 +67,9 @@ var Group = function Group(props) {
         columns: data.columns,
         form: form
       }, (0, _lodash.omit)(otherProps, ['colProps'])))
-    }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
+    }) : (0, _jsxRuntime.jsx)(_antd.Space, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      align: "start"
+    }, (0, _lodash.omit)(space, ['separator', 'compact'])), {}, {
       children: data.columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
           columns: [column],

package/lib/ProForm/components/combination/Group/style/index.less

@@ -20,8 +20,9 @@
 
 .pro-group {
   width: unset !important;
+  
 
-  &.pro-group-diy-width {
+  &.pro-group-diy-width, &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 

package/lib/ProForm/components/combination/ProCombination/index.js

@@ -87,7 +87,6 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     _handleChange(_values, rest === null || rest === void 0 ? void 0 : rest[0], form);
     (_childProps$index = childProps[index]) === null || _childProps$index === void 0 ? void 0 : (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 ? void 0 : _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
   };
-
   var className = (0, _classnames.default)({
     'pro-combination': true,
     'pro-combination-view': isView

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -549,8 +549,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         _value: value
       });
     } else if (Object.prototype.toString.call(value) === '[object Object]') {
-      var _initialValue;
-      var initialValue = (_initialValue = {}, (0, _defineProperty2.default)(_initialValue, valueKey, value[valueKey]), (0, _defineProperty2.default)(_initialValue, labelKey, value[labelKey]), _initialValue);
+      var initialValue = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, valueKey, value[valueKey]), labelKey, value[labelKey]);
       setState({
         selectedRowKeys: [value],
         selectedRows: [initialValue],
@@ -741,6 +740,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       visible: visible
     }, restModalProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_index.ProForm, {
+        submitOnEnter: true,
         form: form,
         columns: formColumns,
         onFinish: handleSearch,

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,6 +13,7 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
+
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

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

@@ -31,7 +31,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _classNames, _otherProps$names2;
+  var _ref2, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -169,7 +169,7 @@ var Render = function Render(props) {
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), (0, _defineProperty2.default)(_classNames, 'pro-form-item-width-auto', ['Switch'].includes(type)), _classNames));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
@@ -342,7 +342,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
       otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -388,7 +388,6 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-
     var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,

package/lib/ProForm/index.js

@@ -7,9 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -25,9 +25,9 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey"];
 var ProForm = function ProForm(props, ref) {
-  var _localStorage;
+  var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -66,8 +66,14 @@ var ProForm = function ProForm(props, ref) {
     required = props.required,
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    formKey = props.formKey,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _useForm = (0, _useForm3.useForm)(originForm),
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
+    state = _useProConfig.state,
+    dispatch = _useProConfig.dispatch;
+  var config = state.ProForm,
+    forms = state.forms;
+  var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
   var _useControlled = (0, _index.useControlled)({
@@ -77,7 +83,30 @@ var ProForm = function ProForm(props, ref) {
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
-  var config = (0, _ProConfigProvider.useProConfig)('ProForm');
+  // 把表单实例存入表单组
+  (0, _react.useMemo)(function () {
+    if (formKey && forms[formKey] !== form) {
+      forms[formKey] = form;
+      dispatch({
+        type: 'set',
+        payload: {
+          forms: (0, _objectSpread2.default)({}, forms)
+        }
+      });
+    }
+    // 销毁
+    return function () {
+      if (formKey && forms[formKey]) {
+        delete forms[formKey];
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: (0, _objectSpread2.default)({}, forms)
+          }
+        });
+      }
+    };
+  }, [formKey, form]);
   var _getLayout = (0, _index.getLayout)({
       span: span,
       form: form
@@ -282,6 +311,7 @@ var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
+ProFormForward.useContextForms = _ProConfigProvider.useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProAddressBar = _components.ProAddressBar;
 ProFormForward.ProCombination = _components.ProCombination;

package/lib/ProForm/propsType.d.ts

@@ -43,6 +43,7 @@ export interface ProFormOtherProps {
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     mode?: ModeEnum;
+    formKey?: string;
     /** 是否查看 */
     isView?: boolean;
     span?: number;

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

@@ -84,4 +84,8 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @returns {}
  */
 export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
 export {};

package/lib/ProForm/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
+exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
@@ -150,18 +150,22 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
 // 过滤掉字段名中包含 '-' 的字段
 var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values) {
   var nextValues = values;
+  // fix: braft-editor对象不可遍历
+  if (values === null || values === void 0 ? void 0 : values._immutable) {
+    return nextValues;
+  }
   if (Array.isArray(nextValues)) {
-    nextValues.forEach(function (item) {
-      filterInternalFields(item);
+    return nextValues.map(function (item) {
+      return filterInternalFields(item);
     });
   }
   if ((0, _lodash.isObject)(nextValues)) {
+    var result = {};
     Object.keys(nextValues).forEach(function (key) {
-      if (key.includes('-')) {
-        delete nextValues[key];
-      }
-      filterInternalFields(nextValues[key]);
+      if (key.includes('-')) return;
+      result[key] = filterInternalFields(nextValues[key]);
     });
+    return result;
   }
   return nextValues;
 };
@@ -419,4 +423,17 @@ var findOptionByValue = exports.findOptionByValue = function findOptionByValue(t
       }
     }
   }
+};
+/**
+ * 对比依赖列表中的 值是否变更
+ */
+var equalDependencies = exports.equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
+  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+    return dependencies.some(function (namePath) {
+      var prevValue = (0, _lodash.get)(prevValues, namePath);
+      var currentValue = (0, _lodash.get)(currentValues, namePath);
+      return prevValue !== currentValue;
+    });
+  }
+  return false;
 };

package/lib/ProForm/utils/useForm.js

@@ -9,86 +9,59 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
-var _react = require("react");
-var _lodash = require("lodash");
-var _FieldContext = require("rc-field-form/es/FieldContext");
-var _ = require(".");
+var _index = require("./index");
 var useForm = exports.useForm = function useForm(originForm) {
   var _Form$useForm = _antd.Form.useForm(originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
-    validateFields = form.validateFields,
-    getFieldValue = form.getFieldValue;
-  (0, _react.useMemo)(function () {
-    var _getFieldsValue = function _getFieldsValue() {
-      var firstProps = !(arguments.length <= 0 ? undefined : arguments[0]) ? true : arguments.length <= 0 ? undefined : arguments[0];
-      var values = getFieldsValue(firstProps, arguments.length <= 1 ? undefined : arguments[1]);
-      if ((arguments.length <= 0 ? undefined : arguments[0]) === undefined) {
-        var result = (0, _lodash.merge)({}, values);
-        // @ts-ignore
-        var internalHooks = form.getInternalHooks(_FieldContext.HOOK_MARK);
-        var fields = internalHooks.getFields();
-        var deletePath = [];
-        // 找到带'-'的name
-        fields.forEach(function (field) {
-          var name = field.name;
-          if (Array.isArray(name)) {
-            var index = name.findIndex(function (item) {
-              return typeof item === 'string' && item.includes('-');
-            });
-            if (index !== -1) deletePath.push(name);
-          }
-          if (typeof name === 'string' && name.includes('-')) {
-            deletePath.push(name);
-          }
-        });
-        // 执行删除操作
-        deletePath.forEach(function (item) {
-          (0, _.deleteForPath)(result, item);
-        });
-        return result;
-      }
-      return values;
+    validateFields = form.validateFields;
+  // @ts-ignore
+  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
+    // 全部查询
+    if (nameList !== true) {
+      var values = getFieldsValue(true, filterFunc);
+      return (0, _index.filterInternalFields)(values);
+    }
+    return getFieldsValue(nameList, filterFunc);
+  };
+  var _validateFields = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+      var _len,
+        rest,
+        _key,
+        values,
+        _values,
+        _args = arguments;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+              rest[_key - 1] = _args[_key];
+            }
+            _context.next = 3;
+            return validateFields.apply(void 0, [nameList].concat(rest));
+          case 3:
+            values = _context.sent;
+            if (!nameList) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return", values);
+          case 6:
+            _values = _getFieldsValue();
+            return _context.abrupt("return", _values);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function _validateFields(_x) {
+      return _ref.apply(this, arguments);
     };
-    var _validateFields = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
-        var _len,
-          rest,
-          _key,
-          values,
-          _values,
-          _args = arguments;
-        return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                rest[_key - 1] = _args[_key];
-              }
-              _context.next = 3;
-              return validateFields.apply(void 0, [nameList].concat(rest));
-            case 3:
-              values = _context.sent;
-              if (!nameList) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return", values);
-            case 6:
-              _values = _getFieldsValue();
-              return _context.abrupt("return", _values);
-            case 8:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function _validateFields(_x) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    form.getFieldsValue = _getFieldsValue;
-    form.validateFields = _validateFields;
-  }, [form]);
+  }();
+  form.getFieldsValue = _getFieldsValue;
+  form.validateFields = _validateFields;
   return [form];
 };

package/lib/ProForm/utils/useRules.js

@@ -53,7 +53,7 @@ var useRules = function useRules(props) {
   internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)(internalRule.rules, _label, isSelect);
   (0, _react.useEffect)(function () {
     // 添加完整性校验
-    if (names && !(0, _lodash.isBoolean)(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
+    if (names && !(0, _lodash.isBoolean)(labelRequired)) {
       var customRequired = {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
@@ -63,7 +63,9 @@ var useRules = function useRules(props) {
           return Promise.resolve();
         }
       };
-      internalRule.rules.push(customRequired);
+      if (!(type === 'Group' && Array.isArray(names) && !required)) {
+        internalRule.rules.push(customRequired);
+      }
     }
   }, [internalRule]);
   return internalRule;

package/lib/ProForm/utils/useShouldUpdate.js

@@ -27,7 +27,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
     clearNotShow = formItemProps.clearNotShow,
     index = formItemProps.index,
     namePath = formItemProps.namePath,
-    names = formItemProps.names;
+    names = formItemProps.names,
+    dependencies = formItemProps.dependencies;
   var timerRef = (0, _react.useRef)();
   var showRef = (0, _react.useRef)();
   var disabledRef = (0, _react.useRef)();
@@ -174,11 +175,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearInterval(timerRef.current);
         }
       }
-      // 当校验规则改变的时候  重新执行校验
-      if (_required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun)) {
-        form.validateFields([name]);
-      }
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(originComponentRef.current, _component, _index.customEqualForFun)) {
+      // // 当校验规则改变的时候  重新执行校验 导致: 第一次进页面直接触发校验
+      // if (
+      //   _required !== requiredRef.current ||
+      //   !isEqualWith(rulesRef.current, _rules, customEqualForFun)
+      // ) {
+      //   form.validateFields([name]);
+      // }
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !(0, _lodash.isEqualWith)(rulesRef.current, _rules, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(fieldPropsRef.current, _fieldProps, _index.customEqualForFun) || !(0, _lodash.isEqualWith)(originComponentRef.current, _component, _index.customEqualForFun) || (0, _index.equalDependencies)(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;

package/lib/ProStep/index.js

@@ -167,7 +167,6 @@ var ProStep = function ProStep(_ref) {
       subtree: true,
       childList: true // 是否观察子元素的添加或删除
     };
-
     observer.observe(targetElement, config);
   };
   (0, _ahooks.useDeepCompareEffect)(function () {

package/lib/ProThemeTools/index.d.ts

@@ -1,6 +1,6 @@
 import type { ProThemeToolsProps } from './propsType';
 declare const ProThemeTools: {
-    ({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, ...props }: ProThemeToolsProps): JSX.Element;
+    ({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): JSX.Element;
     defaultProps: {
         size: number;
         mode: string;

package/lib/ProThemeTools/index.js

@@ -13,11 +13,13 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
 var _react = require("react");
+var _ahooks = require("ahooks");
+var _lodash = require("lodash");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _index = require("./utils/index");
 var _component = require("./component");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
+var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme", "onChange"];
 /* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
@@ -50,6 +52,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
     tableStripe = _ref$tableStripe === void 0 ? false : _ref$tableStripe,
     _ref$theme = _ref.theme,
     theme = _ref$theme === void 0 ? {} : _ref$theme,
+    onChange = _ref.onChange,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -59,6 +62,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     state = _useState4[0],
     setState = _useState4[1];
+  var previousState = (0, _ahooks.usePrevious)(state);
   var zauiBrand = state.zauiBrand,
     zauiStripe = state.zauiStripe,
     zauiTableBorder = state.zauiTableBorder;
@@ -119,7 +123,6 @@ var ProThemeTools = function ProThemeTools(_ref) {
         return ["".concat((0, _index.getKebabCase)(item === null || item === void 0 ? void 0 : item[0])), ['zauiSize'].includes(item === null || item === void 0 ? void 0 : item[0]) || typeof (item === null || item === void 0 ? void 0 : item[1]) !== 'number' ? item === null || item === void 0 ? void 0 : item[1] : "".concat(item === null || item === void 0 ? void 0 : item[1], "px") // zauiSize取数字
         ];
       }));
-
       setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), localThemeConfig));
       (0, _index.setThemes)(cssVariables);
       _antd.ConfigProvider.config({
@@ -170,6 +173,11 @@ var ProThemeTools = function ProThemeTools(_ref) {
       localStorage.setItem('themeConfig', JSON.stringify(newThemeConfig));
     }
   }, [state, cacheTime]);
+  (0, _ahooks.useUpdateEffect)(function () {
+    if (!(0, _lodash.isEqual)(state, previousState) && visible) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(state);
+    }
+  }, [state]);
   var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-theme-tools': true,
     'pro-theme-tools-follow': iconFollowTheme

package/lib/ProThemeTools/propsType.d.ts

@@ -27,6 +27,7 @@ export interface ProThemeToolsProps {
     tableStripe?: boolean;
     /** 统一样式前缀, 默认ant */
     prefixCls?: string;
+    onChange?: (record: any) => void;
     [key: string]: any;
 }
 export interface LocalThemeConfigPropsType {

package/lib/ProThemeTools/utils/index.js

@@ -55,7 +55,6 @@ var getKebabCase = exports.getKebabCase = function getKebabCase(str) {
   if (temp.slice(0, 1) === '-') {
     temp = temp.slice(1); // 如果首字母是大写，执行replace时会多一个-，需要去掉
   }
-
   return temp;
 };
 /** JS实现对象驼峰命名与横线命名的转换  */

package/lib/ProTree/components/Tree.js

@@ -308,7 +308,6 @@ function List(props) {
       });
       return treeRow; // .filter((item) => item);
     };
-
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
     }

package/lib/ProTree/index.js

@@ -16,6 +16,7 @@ var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
  *@Author: liudongliang
  *@Description: ProTree组件，集成了tree和treeSelect
 */
+
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/lib/ProTreeSelect/index.js

@@ -21,7 +21,6 @@ var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onCha
   _excluded2 = ["children"];
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
-  var _classnames2;
   // 全局属性配置在ConfigProvider
   var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -365,7 +364,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
         //   currentAllNodeChild.push(item);
         // }
       }
-
       return currentAllNodeChild;
     };
     sourceList = filterData(sourceList);
@@ -471,9 +469,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     'pro-tree-select': true
   }, "".concat(className), className));
   var innerClass = treeCheckable ? 'checkable-tree pro' : "".concat(tenCountClass, " signal-tree");
-  var dropDownClassName = (0, _classnames3.default)((_classnames2 = {
+  var dropDownClassName = (0, _classnames3.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
     'pro-tree-select-drop-down-container': true
-  }, (0, _defineProperty2.default)(_classnames2, "".concat(innerClass), true), (0, _defineProperty2.default)(_classnames2, "".concat(popupClassName), popupClassName), _classnames2));
+  }, "".concat(innerClass), true), "".concat(popupClassName), popupClassName));
   var treeProps = (0, _objectSpread2.default)({
     disabled: disabled,
     showSearch: showSearch,

package/lib/ProUpload/index.js

@@ -98,7 +98,6 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
           response: file === null || file === void 0 ? void 0 : file.response
           // url: file?.response?.data?.url,
         };
-
         if (transformResponse) {
           var data = transformResponse(file.response) || {};
           return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, nfile), data);