@arco-design/mobile-react 2.36.0 → 2.36.2

package/umd/form/useForm.js

@@ -1,16 +1,16 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports", "@babel/runtime/helpers/extends", "react", "es6-promise"], factory);
+    define(["exports", "@babel/runtime/helpers/extends", "react", "es6-promise", "./type", "./utils"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports, require("@babel/runtime/helpers/extends"), require("react"), require("es6-promise"));
+    factory(exports, require("@babel/runtime/helpers/extends"), require("react"), require("es6-promise"), require("./type"), require("./utils"));
   } else {
     var mod = {
       exports: {}
     };
-    factory(mod.exports, global._extends, global.react, global.es6Promise);
+    factory(mod.exports, global._extends, global.react, global.es6Promise, global.type, global.utils);
     global.useForm = mod.exports;
   }
-})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _extends6, _react, _es6Promise) {
+})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _extends6, _react, _es6Promise, _type, _utils) {
   "use strict";
 
   var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
@@ -49,7 +49,11 @@
       return {
         registerField: defaultFunc,
         setInitialValues: defaultFunc,
-        setCallbacks: defaultFunc
+        setCallbacks: defaultFunc,
+        getInitialValue: defaultFunc,
+        setInitialValue: defaultFunc,
+        innerSetFieldsValue: defaultFunc,
+        innerSetFieldValue: defaultFunc
       };
     }
   }; // 在field的静态的状态下设置
@@ -64,42 +68,82 @@
     this._initialValues = {};
     this._callbacks = {};
 
-    this.setFieldsValue = function (values) {
+    this.commonSetFieldsValue = function (values, changeType) {
       var oldValues = Object.keys(values).reduce(function (acc, key) {
         var _extends2;
 
         return (0, _extends6.default)({}, acc, (_extends2 = {}, _extends2[key] = _this.getFieldValue(key), _extends2));
       }, {});
       _this._formData = (0, _extends6.default)({}, _this._formData, values);
+
+      _this.notifyField(values, oldValues, changeType);
+    };
+
+    this.setFieldsValue = function (values) {
+      _this.commonSetFieldsValue(values);
+
       var onValuesChange = _this._callbacks.onValuesChange;
-      onValuesChange && onValuesChange(values, _this._formData);
+      onValuesChange == null ? void 0 : onValuesChange(values, _this._formData);
+      return true;
+    };
 
-      _this.notifyField(values, oldValues);
+    this.innerSetFieldsValue = function (values, changeType) {
+      _this.commonSetFieldsValue(values, changeType);
 
+      var _this$_callbacks = _this._callbacks,
+          onValuesChange = _this$_callbacks.onValuesChange,
+          onChange = _this$_callbacks.onChange;
+      onValuesChange == null ? void 0 : onValuesChange(values, _this._formData);
+      onChange == null ? void 0 : onChange(values, _this._formData);
       return true;
     };
 
-    this.setFieldValue = function (name, value) {
-      var _oldValues, _extends3, _onValuesChange, _this$notifyField;
+    this.commonSetFieldValue = function (name, value, changeType) {
+      var _oldValues, _extends3, _this$notifyField;
 
       var oldValues = (_oldValues = {}, _oldValues[name] = _this.getFieldValue(name), _oldValues);
       _this._formData = (0, _extends6.default)({}, _this._formData, (_extends3 = {}, _extends3[name] = value, _extends3));
+
+      _this.notifyField((_this$notifyField = {}, _this$notifyField[name] = value, _this$notifyField), oldValues, changeType);
+    };
+
+    this.setFieldValue = function (name, value) {
+      var _onValuesChange;
+
+      _this.commonSetFieldValue(name, value);
+
       var onValuesChange = _this._callbacks.onValuesChange;
-      onValuesChange && onValuesChange((_onValuesChange = {}, _onValuesChange[name] = value, _onValuesChange), _this._formData);
+      onValuesChange && onValuesChange((_onValuesChange = {}, _onValuesChange[name] = value, _onValuesChange), _this.getFieldsValue());
+      return true;
+    };
+
+    this.innerSetFieldValue = function (name, value, changeType) {
+      var _onValuesChange2, _onChange;
 
-      _this.notifyField((_this$notifyField = {}, _this$notifyField[name] = value, _this$notifyField), oldValues);
+      _this.commonSetFieldValue(name, value, changeType);
 
+      var _this$_callbacks2 = _this._callbacks,
+          onValuesChange = _this$_callbacks2.onValuesChange,
+          onChange = _this$_callbacks2.onChange;
+      onValuesChange && onValuesChange((_onValuesChange2 = {}, _onValuesChange2[name] = value, _onValuesChange2), _this._formData);
+      onChange && onChange((_onChange = {}, _onChange[name] = value, _onChange), _this._formData);
       return true;
     };
 
-    this.notifyField = function (values, oldValues) {
+    this.notifyField = function (values, oldValues, changeType) {
+      if (changeType === void 0) {
+        changeType = _type.ValueChangeType.Update;
+      }
+
       Object.keys(values).map(function (fieldName) {
         var _this$_fieldsList;
 
         var fieldObj = ((_this$_fieldsList = _this._fieldsList) == null ? void 0 : _this$_fieldsList[fieldName]) || null;
 
         if (fieldObj) {
-          fieldObj.onValueChange(values[fieldName], oldValues[fieldName]);
+          fieldObj.onValueChange(values[fieldName], oldValues[fieldName], {
+            changeType: changeType
+          });
         }
       });
     };
@@ -111,13 +155,13 @@
         });
       }
 
-      return _this._formData;
+      return (0, _utils.deepClone)(_this._formData);
     };
 
     this.getFieldValue = function (name) {
       var _this$_formData;
 
-      return (_this$_formData = _this._formData) == null ? void 0 : _this$_formData[name];
+      return (0, _utils.deepClone)((_this$_formData = _this._formData) == null ? void 0 : _this$_formData[name]);
     };
 
     this.getFieldError = function (name) {
@@ -180,13 +224,42 @@
     };
 
     this.setInitialValues = function (initVal) {
-      _this._initialValues = (0, _extends6.default)({}, initVal || {});
+      _this._initialValues = (0, _utils.deepClone)(initVal || {});
 
       _this.setFieldsValue(initVal);
     };
 
+    this.setInitialValue = function (fieldName, value) {
+      if (!fieldName) {
+        return;
+      }
+
+      _this._initialValues[fieldName] = value;
+
+      _this.setFieldValue(fieldName, value);
+    };
+
+    this.getInitialValue = function (fieldName) {
+      return _this._initialValues[fieldName];
+    };
+
     this.resetFields = function () {
-      _this.setFieldsValue(_this._initialValues);
+      var oldValues = (0, _extends6.default)({}, _this._formData);
+      var initialValues = {};
+      Object.keys(_this._formData).forEach(function (fieldName) {
+        var _this$_fieldsList5;
+
+        var fieldObj = ((_this$_fieldsList5 = _this._fieldsList) == null ? void 0 : _this$_fieldsList5[fieldName]) || null;
+
+        if (fieldObj) {
+          initialValues[fieldName] = fieldObj.getInitialValue();
+        }
+      });
+      var onValuesChange = _this._callbacks.onValuesChange;
+      onValuesChange && onValuesChange(initialValues, _this._formData);
+      _this._formData = initialValues;
+
+      _this.notifyField(initialValues, oldValues, _type.ValueChangeType.Reset);
     };
 
     this.validateFields = function () {
@@ -218,7 +291,7 @@
     this.submit = function () {
       _this.validateFields().then(function (result) {
         var onSubmit = _this._callbacks.onSubmit;
-        onSubmit == null ? void 0 : onSubmit(_this._formData, result);
+        onSubmit == null ? void 0 : onSubmit(_this.getFieldsValue(), result);
       }).catch(function (e) {
         var onSubmitFailed = _this._callbacks.onSubmitFailed;
 
@@ -226,7 +299,7 @@
           return;
         }
 
-        onSubmitFailed(_this._formData, e);
+        onSubmitFailed(_this.getFieldsValue(), e);
       });
     };
 
@@ -255,7 +328,11 @@
       return {
         registerField: _this.registerField,
         setInitialValues: _this.setInitialValues,
-        setCallbacks: _this.setCallbacks
+        setCallbacks: _this.setCallbacks,
+        getInitialValue: _this.getInitialValue,
+        setInitialValue: _this.setInitialValue,
+        innerSetFieldsValue: _this.innerSetFieldsValue,
+        innerSetFieldValue: _this.innerSetFieldValue
       };
     };
   };

package/umd/form/utils.d.ts

@@ -5,3 +5,5 @@ export declare const getErrorAndWarnings: (result: ValidatorError[]) => {
     errors: string[];
     errorTypes: string[];
 };
+export declare const getDefaultValueForInterComponent: (componentType: string) => 0 | never[] | null | undefined;
+export declare function deepClone(value: any): any;

package/umd/form/utils.js

@@ -1,20 +1,24 @@
 (function (global, factory) {
   if (typeof define === "function" && define.amd) {
-    define(["exports"], factory);
+    define(["exports", "@arco-design/mobile-utils", "lodash/cloneDeepWith", "./type"], factory);
   } else if (typeof exports !== "undefined") {
-    factory(exports);
+    factory(exports, require("@arco-design/mobile-utils"), require("lodash/cloneDeepWith"), require("./type"));
   } else {
     var mod = {
       exports: {}
     };
-    factory(mod.exports);
+    factory(mod.exports, global.mobileUtils, global.cloneDeepWith, global.type);
     global.utils = mod.exports;
   }
-})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports) {
+})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_exports, _mobileUtils, _cloneDeepWith, _type) {
   "use strict";
 
+  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
   _exports.__esModule = true;
-  _exports.isFieldRequired = _exports.getErrorAndWarnings = void 0;
+  _exports.deepClone = deepClone;
+  _exports.isFieldRequired = _exports.getErrorAndWarnings = _exports.getDefaultValueForInterComponent = void 0;
+  _cloneDeepWith = _interopRequireDefault(_cloneDeepWith);
 
   var isFieldRequired = function isFieldRequired(rules) {
     if (rules === void 0) {
@@ -58,4 +62,35 @@
   };
 
   _exports.getErrorAndWarnings = getErrorAndWarnings;
+
+  var getDefaultValueForInterComponent = function getDefaultValueForInterComponent(componentType) {
+    switch (componentType) {
+      case _type.FormInternalComponentType.Input:
+      case _type.FormInternalComponentType.Textarea:
+        return undefined;
+
+      case _type.FormInternalComponentType.CheckboxGroup:
+        return [];
+
+      case _type.FormInternalComponentType.RadioGroup:
+        return null;
+
+      case _type.FormInternalComponentType.Slider:
+      case _type.FormInternalComponentType.Rate:
+        return 0;
+
+      default:
+        return undefined;
+    }
+  };
+
+  _exports.getDefaultValueForInterComponent = getDefaultValueForInterComponent;
+
+  function deepClone(value) {
+    return (0, _cloneDeepWith.default)(value, function (val) {
+      if (!(0, _mobileUtils.isObject)(val) && !(0, _mobileUtils.isArray)(val)) {
+        return val;
+      }
+    });
+  }
 });

package/umd/input/index.js

@@ -65,7 +65,7 @@
     function renderInput(_ref) {
       var prefixCls = _ref.prefixCls;
       var prefix = prefixCls + "-input";
-      return renderWrapper(prefix, type, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, nativeProps, {
+      return renderWrapper(prefix, type + " single-line", /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, nativeProps, {
         id: id,
         name: name,
         maxLength: maxLength,

package/umd/popover/hooks/usePosition.js

@@ -239,20 +239,38 @@
 
 
       if (verticalAuto) {
-        var popoverTop = childRect.bottom - (newConfig.bottom && newConfig.height ? newConfig.bottom + newConfig.height : 0);
-        var popoverBottom = childRect.top + (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0); // 顶部安全距离不够，调整到底部
-        // @en The top safety distance is not enough, adjust to the bottom
-
-        if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+        var setToBottom = function setToBottom() {
           newConfig.top = verticalOffset + childRect.height;
           newConfig.bottom = null;
           onAdjustDirection('bottom');
-        } else if (directionState.indexOf('bottom') !== -1 && popoverBottom + bottomOffset > window.innerHeight) {
-          // 底部安全距离不够，调整到顶部
-          // @en The bottom safety distance is not enough, adjust to the top
+        };
+
+        var setToTop = function setToTop() {
           newConfig.top = null;
           newConfig.bottom = verticalOffset + childRect.height;
           onAdjustDirection('top');
+        }; // 判断上下空间是否都不足以展示气泡内容
+        // @en Determine whether there is insufficient space both above and below to display content
+
+
+        var isPopoverTooTall = window.innerHeight - topOffset - bottomOffset < 2 * (newConfig.height || 0) + 2 * verticalOffset + childRect.height;
+
+        if (isPopoverTooTall) {
+          var spaceAbove = childRect.top;
+          var spaceBelow = window.innerHeight - childRect.bottom;
+          spaceAbove > spaceBelow ? setToTop() : setToBottom();
+        } else {
+          var popoverTop = childRect.bottom - (newConfig.bottom && newConfig.height ? newConfig.bottom + newConfig.height : 0);
+          var popoverBottom = childRect.top + (newConfig.top && newConfig.height ? newConfig.top + newConfig.height : 0); // 顶部安全距离不够，调整到底部
+          // @en The top safety distance is not enough, adjust to the bottom
+
+          if (directionState.indexOf('top') !== -1 && popoverTop < topOffset) {
+            setToBottom();
+          } else if ( // 底部安全距离不够，调整到顶部
+          // @en The bottom safety distance is not enough, adjust to the top
+          directionState.indexOf('bottom') !== -1 && popoverBottom + bottomOffset > window.innerHeight) {
+            setToTop();
+          }
         }
       } // 挂载在全局的气泡需要计算相对屏幕的位置
       // @en Bubble mounted in the global needs to calculate the position relative to the screen

package/umd/radio/group.js

@@ -97,7 +97,7 @@
             layout: layout,
             disabled: disabled,
             icons: icons,
-            value: groupValue === void 0 ? [] : [groupValue],
+            value: groupValue === void 0 || groupValue === null ? [] : [groupValue],
             onChange: handleChange
           }
         }, children, !children && options && options.map(function (option) {

package/umd/radio/type.d.ts

@@ -8,10 +8,10 @@ export interface RadioGroupProps<T extends ValueType = ValueType, P extends Radi
      */
     options?: P[];
     /**
-     * 受控模式，选中的选项
+     * 受控模式，选中的选项，传null表示取消选中
      * @en Checked option, controlled mode
      */
-    value?: T;
+    value?: T | null;
     /**
      * 默认选中项
      * @en Default checked value