uiw 4.11.4 → 4.11.5

package/dist/uiw.js

@@ -6934,6 +6934,7 @@ FormItem.defaultProps = {
 
 
 
+
 var Form_excluded = ["prefixCls", "className", "fields", "children", "resetOnSubmit", "onSubmitError", "onChange", "onSubmit", "afterSubmit"],
     Form_excluded2 = ["children", "validator", "name", "help", "label", "labelFor", "labelClassName", "labelStyle", "inline", "initialValue"];
 
@@ -6959,7 +6960,7 @@ function newFormState(fields, cb) {
         initialValue = _cb.initialValue,
         _currentValue = _cb.currentValue;
 
-    state.initial[name] = initialValue;
+    state.initial[name] = Array.isArray(initialValue) ? _toConsumableArray(initialValue) : initialValue;
     state.current[name] = _currentValue;
   }
 
@@ -6999,15 +7000,10 @@ function Form(_ref, ref //| React.RefObject<FormRefType>,
     });
   }, []);
 
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(JSON.parse(JSON.stringify(initData))),
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(initData),
       _useState2 = _slicedToArray(_useState, 2),
       data = _useState2[0],
-      setDatas = _useState2[1];
-
-  var setData = function setData(values) {
-    // 解决value为数组时不进行深拷贝,initvalue无法重置问题
-    setDatas(JSON.parse(JSON.stringify(values)));
-  };
+      setData = _useState2[1];
 
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useImperativeHandle)(ref, function () {
     return {
@@ -7162,17 +7158,30 @@ function Form(_ref, ref //| React.RefObject<FormRefType>,
 
   function handleReset() {
     var initial = data.initial;
+
+    var initials = _extends({}, initial);
+
+    Object.entries(initials).map(function (_ref3) {
+      var _ref5 = _slicedToArray(_ref3, 2),
+          key = _ref5[0],
+          value = _ref5[1];
+
+      if (Array.isArray(value)) {
+        initials[key] = _toConsumableArray(value);
+      }
+    });
     setData(_extends({}, data, {
-      current: initial,
+      initial: initial,
+      current: initials,
       errors: {}
     }));
   }
 
-  function controlField(_ref3) {
-    var children = _ref3.children,
-        validator = _ref3.validator,
-        name = _ref3.name,
-        other = _objectWithoutPropertiesLoose(_ref3, Form_excluded2);
+  function controlField(_ref4) {
+    var children = _ref4.children,
+        validator = _ref4.validator,
+        name = _ref4.name,
+        other = _objectWithoutPropertiesLoose(_ref4, Form_excluded2);
 
     var element = typeof children !== 'function' ? children : children({
       onChange: handleChange(name, validator),
@@ -9525,31 +9534,22 @@ function SearchSelect(props) {
     var values = [item];
     setSelectedLabel(item.label);
     var resultValue = item.value;
-    onSelect && onSelect(resultValue);
-    handleSelectChange(resultValue, values); // 支持form组件
-
-    value === undefined && setSelectedValue(values); // 如果存在props.value,内部不维护value状态
+    handleChange(resultValue, values);
   }
 
-  function handleItemsClick(item) {
-    var values = [];
-    var index = selectedValue.findIndex(function (finds) {
-      return finds.value === item.value;
-    });
-
-    if (index !== -1) {
-      values = removeSelectItem(index);
-    } else {
-      values = [].concat(_toConsumableArray(selectedValue), [item]);
-    }
-
+  function handleItemsClick(index, item) {
+    var values = index !== -1 ? removeSelectItem(index) : [].concat(_toConsumableArray(selectedValue), [item]);
     var resultValue = values.map(function (item) {
       return item.value;
     });
+    handleChange(resultValue, values);
+  }
+
+  function handleChange(resultValue, values) {
     onSelect && onSelect(resultValue);
     handleSelectChange(resultValue, values); // 支持form组件
 
-    value === undefined && setSelectedValue(values);
+    value === undefined && setSelectedValue(values); // 如果受控于父组件则不需要内部维护状态
   } // 渲染icon
 
 
@@ -9590,8 +9590,7 @@ function SearchSelect(props) {
 
   function inputKeyDown(e) {
     if (isMultiple && selectedValue.length > 0 && !selectedLabel && e.keyCode === 8) {
-      var values = removeSelectItem(selectedValue.length - 1);
-      setSelectedValue(values);
+      handleItemsClick(selectedValue.length - 1);
     }
   }
 
@@ -9623,15 +9622,17 @@ function SearchSelect(props) {
           fontSize: 12
         },
         children: loading ? '正在加载数据...' : '没有数据'
-      }) : option.map(function (opt, idx) {
-        var active = !!getSelectOption(selectedValue, opt.value);
+      }) : option.map(function (item) {
+        var index = selectedValue.findIndex(function (finds) {
+          return finds.value === item.value;
+        });
         return /*#__PURE__*/(0,jsx_runtime.jsx)(react_menu_esm.Item, {
-          active: active,
-          text: opt.label,
+          active: index !== -1,
+          text: item.label,
           onClick: function onClick() {
-            return isMultiple ? handleItemsClick(opt) : handleItemClick(opt);
+            return isMultiple ? handleItemsClick(index, item) : handleItemClick(item);
           }
-        }, idx);
+        }, index);
       })
     }),
     children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -9664,7 +9665,7 @@ function SearchSelect(props) {
               className: prefixCls + "-tag",
               closable: true,
               onClose: function onClose() {
-                return setSelectedValue(removeSelectItem(index));
+                return handleItemsClick(index, item);
               },
               color: "#ccc",
               children: item.label