@kdcloudjs/kdesign 1.6.12 → 1.6.14

package/es/select/style/token.less

@@ -30,20 +30,25 @@
 @select-middle-font-size: var(~'@{select-custom-prefix}-font-size-middle', 14px); // 中号高度
 @select-small-font-size: var(~'@{select-custom-prefix}-font-size-small', 12px); // 小号高度
 
+// line-height
+@select-dropdown-line-height: var(~'@{select-custom-prefix}-dropdown-line-height', 22px);
+@select-large-line-height: var(~'@{select-custom-prefix}-line-height-large', 28px);
+@select-middle-line-height: var(~'@{select-custom-prefix}-line-height-middle', 22px);
+@select-small-line-height: var(~'@{select-custom-prefix}-line-height-small', 14px);
+
 // sizing
 @select-dropdown-height: var(~'@{select-custom-prefix}-item-sizing-height', 22px);
 @select-large-height: var(~'@{select-custom-prefix}-sizing-height-large', 36px); // 大号高度 lh:28px
 @select-middle-height: var(~'@{select-custom-prefix}-sizing-height-middle', 30px); // 中号高度lh:22px
 @select-small-height: var(~'@{select-custom-prefix}-sizing-height-small', 24px); // 小号高度lh:12px
 
-// line-height
-@select-dropdown-line-height: var(~'@{select-custom-prefix}-dropdown-line-height', 22px);
-@select-large-line-height: var(~'@{select-custom-prefix}-line-height-large', 28px);
-@select-middle-line-height: var(~'@{select-custom-prefix}-line-height-middle', 22px);
-@select-small-line-height: var(~'@{select-custom-prefix}-line-height-small', 14px);
+// spacing
+@select-bordered: var(~'@{select-custom-prefix}-bordered-spacing-padding-left', 8px);
+@select-wrapper-padding: var(~'@{select-custom-prefix}-wrapper-spacing-padding', 1px 28px 1px 0);
 
 // radius
 @select-g-radius-border: var(~'@{select-custom-prefix}-radius-border', @radius-border);
+@select-border-radius-border: var(~'@{select-custom-prefix}-bordered-radius-border', 2px);
 
 // z-index
 @select-z-index: var(~'@{select-custom-prefix}-z-index', @z-index-popper);

package/es/tooltip/tooltip.js

@@ -21,8 +21,7 @@ var Tooltip = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
 
   var popperProps = _extends(_extends({}, allProps), {
-    prefixCls: prefixCls,
-    arrow: true
+    prefixCls: prefixCls
   });
 
   var tipPopper = typeof tip === 'function' ? tip() : tip;

package/lib/button/group.d.ts

@@ -1,5 +1,5 @@
 import React, { CSSProperties, ReactNode } from 'react';
-import { ButtonType } from './button';
+import { ButtonType, ButtonSize } from './button';
 export declare const ButtonGroupTypes: ["basic", "similar"];
 export declare type ButtonGroupType = typeof ButtonGroupTypes[number];
 export interface OverlayType {
@@ -7,15 +7,17 @@ export interface OverlayType {
     label?: React.ReactNode;
 }
 export interface ButtonGroupProps {
-    style?: CSSProperties;
-    className?: string;
+    buttonType?: ButtonType;
     children?: ReactNode;
-    onClick?: () => void;
-    overlay?: Array<OverlayType>;
+    className?: string;
+    disabled?: boolean;
     icon?: [ReactNode, ReactNode];
+    overlay?: Array<OverlayType>;
+    size?: ButtonSize;
+    style?: CSSProperties;
     type?: ButtonGroupType;
-    buttonType?: ButtonType;
-    disabled?: boolean;
+    onClick?: () => void;
+    onItemClick?: (data: OverlayType) => void;
 }
 declare const ButtonGroup: React.ForwardRefExoticComponent<ButtonGroupProps & React.RefAttributes<HTMLDivElement>>;
 export default ButtonGroup;

package/lib/button/group.js

@@ -64,6 +64,7 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
       overlay = buttonGoupProps.overlay,
       icon = buttonGoupProps.icon,
       type = buttonGoupProps.type,
+      size = buttonGoupProps.size,
       buttonType = buttonGoupProps.buttonType,
       disabled = buttonGoupProps.disabled,
       onVisibleChange = buttonGoupProps.onVisibleChange;
@@ -99,11 +100,13 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
       ref: refBtnGroup
     }, isBsicType && /*#__PURE__*/_react.default.createElement(_index.Button, {
       type: buttonType,
+      size: size,
       disabled: disabled
     }, children, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(btnGroupPrefixCls, "-basic-icon")
     }, optionShow ? iconUp : iconDown)), !isBsicType && /*#__PURE__*/_react.default.createElement(_index.Button, {
       type: buttonType,
+      size: size,
       disabled: disabled,
       onClick: onClick
     }, children), !isBsicType && /*#__PURE__*/_react.default.createElement("span", {
@@ -112,13 +115,15 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
     }, optionShow ? /*#__PURE__*/_react.default.createElement(_index.Button, {
       icon: iconUp,
       type: buttonType,
+      size: size,
       disabled: disabled
     }) : /*#__PURE__*/_react.default.createElement(_index.Button, {
       icon: iconDown,
       type: buttonType,
+      size: size,
       disabled: disabled
     })));
-  }, [icon, btnGroupPrefixCls, style, btnGroupClasses, refBtnGroup, isBsicType, buttonType, disabled, children, optionShow, onClick]);
+  }, [icon, btnGroupPrefixCls, style, btnGroupClasses, refBtnGroup, isBsicType, buttonType, disabled, children, optionShow, onClick, size]);
   var handleItemClick = (0, _react.useCallback)(function (data) {
     onItemClick === null || onItemClick === void 0 ? void 0 : onItemClick(data);
     setOptionShow(false);

package/lib/config-provider/compDefaultProps.d.ts

@@ -23,6 +23,7 @@ declare const compDefaultProps: {
     ButtonGroup: {
         buttonType: string;
         type: string;
+        size: string;
     };
     Card: {
         hoverable: boolean;
@@ -317,6 +318,7 @@ declare const compDefaultProps: {
     ToolTip: {
         placement: string;
         trigger: string;
+        arrow: boolean;
     };
     Tabs: {
         type: string;

package/lib/config-provider/compDefaultProps.js

@@ -42,7 +42,8 @@ var compDefaultProps = {
   },
   ButtonGroup: {
     buttonType: 'primary',
-    type: 'basic'
+    type: 'basic',
+    size: 'middle'
   },
   Card: {
     hoverable: false,
@@ -349,7 +350,8 @@ var compDefaultProps = {
   TreeNode: {},
   ToolTip: {
     placement: 'top',
-    trigger: 'hover'
+    trigger: 'hover',
+    arrow: true
   },
   Tabs: {
     type: 'line',

package/lib/date-picker/range-picker.js

@@ -458,33 +458,27 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   var triggerChange = function triggerChange(newValue, sourceIndex) {
     var values = newValue;
     var startValue = (0, _utils2.getValue)(values, 0);
-    var endValue = (0, _utils2.getValue)(values, 1); // >>>>> Format start & end values
+    var endValue = (0, _utils2.getValue)(values, 1);
 
     if (startValue && endValue && (0, _dateFns.isAfter)(startValue, endValue)) {
-      if ( // WeekPicker only compare week
-      picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || // QuotaPicker only compare week
-      picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || // Other non-TimePicker compare date
-      picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
-        // Clean up end date when start date is after end date
+      if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
         if (sourceIndex === 0) {
           values = [startValue, null];
           endValue = null;
         } else {
           startValue = null;
           values = [null, endValue];
-        } // Clean up cache since invalidate
-
+        }
 
         openRecordsRef.current = (0, _defineProperty2.default)({}, sourceIndex, true);
       } else if (picker === 'time' && order === true) {
-        // Reorder when in same date
         values = reorderValues(values);
       }
     }
 
     setSelectedValue(values);
     var startStr = values && values[0] ? (0, _dateFns.formatDate)(values[0], _format) : '';
-    var endStr = values && values[1] ? (0, _dateFns.formatDate)(values[1], _format) : ''; // 外部回调
+    var endStr = values && values[1] ? (0, _dateFns.formatDate)(values[1], _format) : '';
 
     if (onCalendarChange) {
       var info = {
@@ -498,15 +492,12 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
 
     if (canTrigger) {
-      // Trigger onChange only when value is validate
       setInnerValue(values);
 
-      if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(selectedValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(selectedValue, 1), endValue))) {
+      if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), endValue))) {
         onChange(values, [startStr, endStr]);
       }
-    } // >>>>> Open picker when
-    // Always open another picker if possible
-
+    }
 
     var nextOpenIndex = null;
 
@@ -517,7 +508,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     }
 
     if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !(0, _utils2.getValue)(values, nextOpenIndex)) && (0, _utils2.getValue)(values, sourceIndex)) {
-      // Delay to focus to avoid input blur trigger expired selectedValues
       triggerOpenAndFocus(nextOpenIndex);
     } else {
       triggerOpen(false, sourceIndex);
@@ -818,7 +808,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     trigger: 'click',
     prefixCls: "".concat(datePickerPrefixCls, "-panel"),
     arrow: false,
-    popperClassName: className,
     popperStyle: style,
     visible: mergedOpen,
     placement: 'bottomLeft',

package/lib/date-picker/style/index.css

@@ -218,13 +218,13 @@
   white-space: nowrap;
 }
 .kd-date-picker-input input::-webkit-input-placeholder {
-  color: var(--kd-c-date-picker-input-color-placeholder, var(--kd-g-color-text-secondary, #666));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input input::-moz-input-placeholder {
-  color: var(--kd-c-date-picker-input-color-placeholder, var(--kd-g-color-text-secondary, #666));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input input::-ms-input-placeholder {
-  color: var(--kd-c-date-picker-input-color-placeholder, var(--kd-g-color-text-secondary, #666));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input input:focus {
   -webkit-box-shadow: none;
@@ -236,22 +236,22 @@
   background: transparent;
 }
 .kd-date-picker-input input::-webkit-input-placeholder {
-  color: var(--kd-c-date-picker-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input input::-moz-placeholder {
-  color: var(--kd-c-date-picker-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input input:-ms-input-placeholder {
-  color: var(--kd-c-date-picker-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input input::-ms-input-placeholder {
-  color: var(--kd-c-date-picker-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input input::placeholder {
-  color: var(--kd-c-date-picker-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-input-placeholder > input {
-  color: var(--kd-c-date-picker-input-color-placeholder, var(--kd-g-color-text-secondary, #666));
+  color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
 }
 .kd-date-picker-range {
   display: -webkit-inline-box;

package/lib/date-picker/style/index.less

@@ -63,7 +63,7 @@
       }
 
       &::placeholder {
-        color: @date-input-color-disabled;
+        color: @date-input-color-placeholder;
       }
     }
 

package/lib/date-picker/style/token.less

@@ -6,7 +6,7 @@
 @date-color-background-checked: var(~'@{date-picker-custom-prefix}-color-background-checked', @color-theme);
 @date-wrapper-color-background: var(~'@{date-picker-custom-prefix}-wrapper-color-background', @color-background);
 @date-input-color: var(~'@{date-picker-custom-prefix}-input-color', @color-text-primary);
-@date-input-color-placeholder: var(~'@{date-picker-custom-prefix}-input-color-placeholder', @color-text-secondary);
+@date-input-color-placeholder: var(~'@{date-picker-custom-prefix}-input-color-placeholder', #f2f2f2);
 @date-input-underline-color: var(~'@{date-picker-custom-prefix}-input-underline-color', #999);
 @date-input-color-border: var(~'@{date-picker-custom-prefix}-input-color-border', @color-border-strong);
 @date-input-color-disabled: var(~'@{date-picker-custom-prefix}-input-color-disabled', @color-disabled);

package/lib/form/Field.js

@@ -17,6 +17,8 @@ var _extends5 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
+
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
@@ -138,7 +140,6 @@ var Field = function Field(props) {
       vertical = fieldContext.vertical,
       getDefaultValue = fieldContext.getDefaultValue,
       local = fieldContext.local,
-      setRules = fieldContext.setRules,
       formDisabled = fieldContext.disabled;
 
   var _getInternalHooks = getInternalHooks(_useForm.INTERNAL_HOOK_KEY),
@@ -157,8 +158,7 @@ var Field = function Field(props) {
       labelWidth = props.labelWidth,
       labelAlign = props.labelAlign,
       required = props.required,
-      _props$rules = props.rules,
-      rules = _props$rules === void 0 ? [] : _props$rules,
+      rules = props.rules,
       wrapperWidth = props.wrapperWidth,
       validateTrigger = props.validateTrigger,
       defaultValue = props.defaultValue,
@@ -202,7 +202,7 @@ var Field = function Field(props) {
     }
   };
 
-  var rulesRequired = rules.some(function (rule) {
+  var mergedRequired = required || (rules === null || rules === void 0 ? void 0 : rules.some(function (rule) {
     if (rule && (0, _typeof2.default)(rule) === 'object' && rule.required) {
       return true;
     }
@@ -213,51 +213,54 @@ var Field = function Field(props) {
     }
 
     return false;
-  });
-  var mergedRequired = required || rulesRequired;
+  }));
 
-  if (Array.isArray(rules) && !rules.some(function (rule) {
-    return Object.prototype.hasOwnProperty.call(rule, 'required');
-  }) && required) {
-    var _context2;
+  var mergeRule = function mergeRule() {
+    var mergeRules = Array.isArray(rules) ? (0, _toConsumableArray2.default)(rules) : [];
 
-    rules.push({
-      required: true,
-      message: (0, _concat.default)(_context2 = "".concat(local && local.requiredMessage)).call(_context2, label)
-    });
-  }
+    if (!mergeRules.some(function (rule) {
+      return Object.prototype.hasOwnProperty.call(rule, 'required');
+    }) && required) {
+      var _context2;
 
-  var mergeRules = rules;
+      mergeRules.push({
+        required: true,
+        message: (0, _concat.default)(_context2 = "".concat(local && local.requiredMessage)).call(_context2, label)
+      });
+    }
 
-  if (mergeRules.length) {
-    mergeRules = (0, _map.default)(rules).call(rules, function (r) {
-      if (typeof r === 'function') {
-        return r(fieldContext);
-      }
+    if (mergeRules.length) {
+      mergeRules = (0, _map.default)(mergeRules).call(mergeRules, function (r) {
+        if (typeof r === 'function') {
+          return r(fieldContext);
+        }
 
-      return r;
-    });
-  }
+        return r;
+      });
+    }
+
+    return mergeRules;
+  };
 
-  var itemRef = _react.default.useRef({
+  var item = {
     onStoreChange: onStoreChange,
     meta: {
-      rules: mergeRules,
+      rules: mergeRule(),
       name: name,
       trigger: validateTrigger
     }
-  });
+  };
+
+  var itemRef = _react.default.useRef(item);
 
+  itemRef.current = item;
   (0, _react.useEffect)(function () {
-    registerField(name, itemRef.current);
+    registerField(name, itemRef);
 
     if (defaultValue !== undefined) {
       setDefaultValues((0, _defineProperty2.default)({}, name, defaultValue));
     }
   }, [name, registerField]);
-  (0, _react.useEffect)(function () {
-    setRules(name, mergeRules);
-  }, [mergedRequired, name, mergeRules]);
   var formPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, 'form', customizePrefixcls);
   var formItemClassName = (0, _classnames2.default)((_classnames = {}, (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls), true), (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls, "-field"), true), (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls, "-field-hidden"), hidden), (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls, "-field-vertical"), vertical), _classnames), className);
   var value = getFieldValue(name);
@@ -304,7 +307,7 @@ var Field = function Field(props) {
 
     var faChange = fa.onChange,
         faDisabled = fa.disabled,
-        rest = __rest(fa, ["onChange", "disabled"]);
+        faRest = __rest(fa, ["onChange", "disabled"]);
 
     var _ch$props = ch.props,
         chChange = _ch$props.onChange,
@@ -337,10 +340,36 @@ var Field = function Field(props) {
       forceUpdate();
     }
 
-    return (0, _extends5.default)((0, _extends5.default)({}, rest), (_extends3 = {
+    var mergeResult = (0, _extends5.default)((0, _extends5.default)({}, faRest), (_extends3 = {
       onChange: onChange,
       defaultValue: defaultValue
     }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _extends3));
+    var mergeEventArray = [];
+
+    if (validateTrigger) {
+      if (Array.isArray(validateTrigger)) {
+        mergeEventArray.push.apply(mergeEventArray, (0, _toConsumableArray2.default)((0, _filter.default)(validateTrigger).call(validateTrigger, function (v) {
+          return v !== DEFAULT_TRIGGER;
+        })));
+      } else if (validateTrigger !== DEFAULT_TRIGGER) {
+        mergeEventArray.push(validateTrigger);
+      }
+    }
+
+    mergeEventArray.forEach(function (eventName) {
+      mergeResult[eventName] = function () {
+        var _a;
+
+        if ((fa === null || fa === void 0 ? void 0 : fa[eventName]) && typeof fa[eventName] === 'function') {
+          fa[eventName]();
+        }
+
+        if (((_a = ch.props) === null || _a === void 0 ? void 0 : _a[eventName]) && typeof ch.props[eventName] === 'function') {
+          ch.props[eventName]();
+        }
+      };
+    });
+    return mergeResult;
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {

package/lib/form/FieldContext.js

@@ -24,7 +24,6 @@ var context = /*#__PURE__*/_react.default.createContext({
   resetFields: warningFunc,
   setFieldsValue: warningFunc,
   setFieldValue: warningFunc,
-  setRules: warningFunc,
   submit: warningFunc,
   validateFields: warningFunc,
   getInternalHooks: function getInternalHooks() {

package/lib/form/hooks/useForm.js

@@ -49,7 +49,6 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
   this.defaultValues = {};
   this.store = {};
   this.fields = {};
-  this.rules = {};
   this.errorMessages = {};
   this.callbacks = {}; // constructor (forceRootUpdate: () => void) {
   //   this.forceRootUpdate = forceRootUpdate
@@ -65,7 +64,6 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
       resetFields: _this.resetFields,
       setFieldValue: _this.setFieldValue,
       setFieldsValue: _this.setFieldsValue,
-      setRules: _this.setRules,
       validateFields: _this.validateFields,
       submit: _this.submit,
       getInternalHooks: _this.getInternalHooks
@@ -192,25 +190,25 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
   this.getRules = function (namePathList) {
     _this.warningUnhooked();
 
-    if (!namePathList) {
-      return _this.rules;
+    var list = (0, _cloneDeep.default)(namePathList);
+
+    if (!list) {
+      list = (0, _keys.default)(_this.fields);
     }
 
     var rules = {};
-    namePathList.forEach(function (name) {
-      if (_this.rules[name]) {
-        rules[name] = (0, _cloneDeep.default)(_this.rules[name]);
+    list.forEach(function (name) {
+      var _a, _b;
+
+      var current = _this.fields[name].current;
+
+      if ((_a = current === null || current === void 0 ? void 0 : current.meta) === null || _a === void 0 ? void 0 : _a.rules) {
+        rules[name] = (0, _cloneDeep.default)((_b = current === null || current === void 0 ? void 0 : current.meta) === null || _b === void 0 ? void 0 : _b.rules);
       }
     });
     return (0, _keys.default)(rules).length === 0 ? null : rules;
   };
 
-  this.setRules = function (name, rules) {
-    _this.warningUnhooked();
-
-    (0, _set.default)(_this.rules, name, rules);
-  };
-
   this.setCallbacks = function (callbacks) {
     _this.warningUnhooked();
 
@@ -266,15 +264,6 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
     _this.warningUnhooked();
 
     _this.fields[name] = field;
-    var meta = field.meta;
-
-    if (meta.rules !== undefined) {
-      _this.setRules(name, meta.rules); // TODO: 初始化的时候是否需要校验？？
-      // this.validateFields([name]).catch(({ errorInfos }) => {
-      //   this.validateFieldFaild(errorInfos, 'internal')
-      // })
-
-    }
   };
 
   this.validateFields = function (namePathList) {
@@ -319,7 +308,11 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
       _this.notifyObservers(_this.store, namePathList || [], 'validateFinish');
     }).catch(function (_ref2) {
       var errorInfos = _ref2.errorInfos;
-      _this.errorMessages = {};
+
+      if (!namePathList) {
+        _this.errorMessages = {};
+      }
+
       var _errorInfos$fields = errorInfos.fields,
           fields = _errorInfos$fields === void 0 ? {} : _errorInfos$fields;
       (0, _keys.default)(fields).forEach(function (name) {
@@ -358,7 +351,7 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
     _this.warningUnhooked();
 
     (0, _values.default)(_this.fields).forEach(function (_ref4) {
-      var onStoreChange = _ref4.onStoreChange;
+      var onStoreChange = _ref4.current.onStoreChange;
       var stores = {
         prev: prevStore,
         curr: _this.store

package/lib/form/interface.d.ts

@@ -10,7 +10,9 @@ export interface FieldError {
     [name: string]: string;
 }
 export interface Fields {
-    [name: string]: FieldInstance;
+    [name: string]: {
+        current: FieldInstance;
+    };
 }
 export interface FormInstance<Values = any> {
     getFieldError: (name: NamePath) => string | undefined;
@@ -21,7 +23,6 @@ export interface FormInstance<Values = any> {
     resetFields: (fields?: NamePath[]) => void;
     setFieldsValue: (value: Values) => void;
     setFieldValue: (name: NamePath, value: Values) => void;
-    setRules: (name: NamePath, rules: any) => void;
     validateFields: (namePathList?: NamePath[]) => Promise<Values>;
     submit: () => void;
     getInternalHooks: (secret: string) => InternalHooks | null;
@@ -71,7 +72,9 @@ export interface InternalHooks {
     dispatch: (action: ReducerAction) => void;
     setDefaultValues: (values: Store) => void;
     setCallbacks: (callbacks: Callbacks) => void;
-    registerField: (name: NamePath, field: FieldInstance) => void;
+    registerField: (name: NamePath, field: {
+        current: FieldInstance;
+    }) => void;
 }
 export declare type NotifySource = 'externalUpdateValue' | 'updateValue' | 'reset' | 'validateField' | 'validateFinish';
 export interface ValidateErrorEntity<Values = any> {

package/lib/icon/icon.js

@@ -17,6 +17,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
+var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
+
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -31,6 +33,19 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof _getOwnPropertySymbols.default === "function") for (var i = 0, p = (0, _getOwnPropertySymbols.default)(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
 var InternalIcon = function InternalIcon(props, ref) {
   var _context, _classNames;
 
@@ -38,6 +53,7 @@ var InternalIcon = function InternalIcon(props, ref) {
       userDefaultProps = _useContext.compDefaultProps;
 
   var iconProps = (0, _utils.getCompProps)('Icon', userDefaultProps, props);
+
   var type = iconProps.type,
       spin = iconProps.spin,
       style = iconProps.style,
@@ -46,7 +62,8 @@ var InternalIcon = function InternalIcon(props, ref) {
       rotate = iconProps.rotate,
       onClick = iconProps.onClick,
       onMouseEnter = iconProps.onMouseEnter,
-      onMouseLeave = iconProps.onMouseLeave;
+      onMouseLeave = iconProps.onMouseLeave,
+      others = __rest(iconProps, ["type", "spin", "style", "prefix", "className", "rotate", "onClick", "onMouseEnter", "onMouseLeave"]);
 
   var innerRef = _react.default.useRef();
 
@@ -72,14 +89,15 @@ var InternalIcon = function InternalIcon(props, ref) {
     iconStyle.transform = "rotate(".concat(rotate, "deg)");
   }
 
-  return /*#__PURE__*/_react.default.createElement("i", {
+  return /*#__PURE__*/_react.default.createElement("i", (0, _extends2.default)({
     className: iconClass,
     onClick: handleClick,
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave,
-    style: iconStyle,
+    style: iconStyle
+  }, others, {
     ref: iconRef
-  });
+  }));
 };
 
 var Icon = /*#__PURE__*/_react.default.forwardRef(InternalIcon);