iglooform 2.5.1 → 2.5.2

package/es/input/amount.js

@@ -47,8 +47,15 @@ var Amount = function Amount(_ref) {
   var handleOnBlur = function handleOnBlur(e) {
     var onChange = rest.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -75,7 +82,11 @@ Amount.formItemPropsHandler = function (_ref2) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(seperator, '').replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return str;
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     },
     rules: [{

package/es/input/input-number.js

@@ -17,8 +17,15 @@ var IglooInputNumber = function IglooInputNumber(props) {
     var value = props.value,
         onChange = props.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -36,7 +43,11 @@ IglooInputNumber.formItemPropsHandler = function (config) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return parseInt(str);
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     }
   };

package/es/select/attached-select.js

@@ -1,7 +1,7 @@
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options"],
-    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children", "clearWhenOptionsUpdated"];
+var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options", "clearWhenOptionsUpdated"],
+    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -56,6 +56,25 @@ var Option = _Select.Option,
     OptGroup = _Select.OptGroup;
 export { Option, OptGroup };
 
+var compareOptions = function compareOptions(newOptions, oldOptions) {
+  if ((oldOptions === null || oldOptions === void 0 ? void 0 : oldOptions.length) !== newOptions.length) {
+    return true;
+  }
+
+  if (Array.isArray(oldOptions)) {
+    for (var i = 0; i < oldOptions.length; i++) {
+      var newOption = oldOptions[i];
+      var originOption = newOptions[i];
+
+      if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+};
+
 var IglooSelect = function IglooSelect(_ref) {
   var valueProp = _ref.value,
       className = _ref.className,
@@ -68,6 +87,8 @@ var IglooSelect = function IglooSelect(_ref) {
       multiple = _ref.multiple,
       _ref$options = _ref.options,
       options = _ref$options === void 0 ? [] : _ref$options,
+      _ref$clearWhenOptions = _ref.clearWhenOptionsUpdated,
+      clearWhenOptionsUpdated = _ref$clearWhenOptions === void 0 ? false : _ref$clearWhenOptions,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var _useContext = useContext(LocaleContext),
@@ -88,6 +109,11 @@ var IglooSelect = function IglooSelect(_ref) {
       displayOptions = _useState6[0],
       setDisplay = _useState6[1];
 
+  var _useState7 = useState(options),
+      _useState8 = _slicedToArray(_useState7, 2),
+      originOptions = _useState8[0],
+      setOrigin = _useState8[1];
+
   useEffect(function () {
     typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
   }, [selected]);
@@ -96,22 +122,30 @@ var IglooSelect = function IglooSelect(_ref) {
   }, [valueProp]);
   useEffect(function () {
     setDisplay(options);
+    setOrigin(options);
   }, [options]);
+  useEffect(function () {
+    var setFieldValue = rest.setFieldValue;
+
+    if (clearWhenOptionsUpdated && compareOptions(options, originOptions)) {
+      typeof setFieldValue === 'function' && setFieldValue();
+    }
+  }, [options, originOptions]);
   useEffect(function () {
     var setFieldValue = rest.setFieldValue;
     var foundValue = options.find(function (option) {
       return Array.isArray(valueProp) ? valueProp.includes(option.value) : option.value === valueProp;
     });
 
-    if (!foundValue) {
+    if (!foundValue && valueProp !== undefined) {
       typeof setFieldValue === 'function' && setFieldValue();
     }
   }, [valueProp, options]);
 
-  var _useState7 = useState(false),
-      _useState8 = _slicedToArray(_useState7, 2),
-      dropVisible = _useState8[0],
-      setDropVisible = _useState8[1];
+  var _useState9 = useState(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      dropVisible = _useState10[0],
+      setDropVisible = _useState10[1];
 
   var handleDropDownVisibleChange = function handleDropDownVisibleChange(open) {
     typeof onDropdownVisibleChange === 'function' && onDropdownVisibleChange(open);
@@ -309,14 +343,12 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       datasourceKey = _ref11.datasourceKey,
       dependField = _ref11.dependField,
       children = _ref11.children,
-      _ref11$clearWhenOptio = _ref11.clearWhenOptionsUpdated,
-      clearWhenOptionsUpdated = _ref11$clearWhenOptio === void 0 ? false : _ref11$clearWhenOptio,
       rest = _objectWithoutProperties(_ref11, _excluded2);
 
-  var _useState9 = useState(options || []),
-      _useState10 = _slicedToArray(_useState9, 2),
-      _options = _useState10[0],
-      setOptions = _useState10[1];
+  var _useState11 = useState(),
+      _useState12 = _slicedToArray(_useState11, 2),
+      _options = _useState12[0],
+      setOptions = _useState12[1];
 
   var _useContext2 = useContext(FormContext),
       selectDatasourceApi = _useContext2.selectDatasourceApi;
@@ -434,36 +466,15 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       };
     }();
 
-    var compareOptions = function compareOptions(newOptions) {
-      var updateOptions = _options.length !== newOptions.length;
-
-      if (!updateOptions) {
-        for (var i = 0; i < _options.length; i++) {
-          var newOption = _options[i];
-          var originOption = newOptions[i];
-
-          if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
-            updateOptions = true;
-            break;
-          }
-        }
-      }
-
-      if (updateOptions) {
+    calcOptions().then(function (newOptions) {
+      if (compareOptions(newOptions, _options || [])) {
         setOptions(newOptions);
-        var setFieldValue = rest.setFieldValue;
-
-        if (clearWhenOptionsUpdated) {
-          typeof setFieldValue === 'function' && setFieldValue();
-        }
       }
-    };
-
-    calcOptions().then(compareOptions);
-  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions]);
-  return _jsx(IglooSelect, _objectSpread({
+    });
+  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions, _options]);
+  return _options ? _jsx(IglooSelect, _objectSpread({
     options: _options
-  }, rest));
+  }, rest)) : null;
 };
 
 AttachedSelect.formItemPropsHandler = function (config) {

package/lib/input/amount.js

@@ -63,8 +63,15 @@ var Amount = function Amount(_ref) {
   var handleOnBlur = function handleOnBlur(e) {
     var onChange = rest.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -91,7 +98,11 @@ Amount.formItemPropsHandler = function (_ref2) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(seperator, '').replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return str;
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     },
     rules: [{

package/lib/input/input-number.js

@@ -30,8 +30,15 @@ var IglooInputNumber = function IglooInputNumber(props) {
     var value = props.value,
         onChange = props.onChange;
 
-    if (typeof value === 'string' && value.endsWith('.')) {
-      e.target.value = value.replace('.', '');
+    if (typeof value === 'string') {
+      if (value.endsWith('.')) {
+        e.target.value = value.replace('.', '');
+      }
+
+      if (value.endsWith('0') && value.includes('.')) {
+        e.target.value = value.replace(/[0]+$/, '');
+      }
+
       onChange && onChange(e);
     }
   };
@@ -49,7 +56,11 @@ IglooInputNumber.formItemPropsHandler = function (config) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return parseInt(str);
+
+      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+        return str;
+      }
+
       return str ? parseFloat(str) : undefined;
     }
   };

package/lib/select/attached-select.js

@@ -35,8 +35,8 @@ require("./style");
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
-var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options"],
-    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children", "clearWhenOptionsUpdated"];
+var _excluded = ["value", "className", "placeholder", "onDropdownVisibleChange", "showSearch", "filterOption", "optionFilterProp", "multiple", "options", "clearWhenOptionsUpdated"],
+    _excluded2 = ["options", "optionGroups", "getOptions", "datasourceKey", "dependField", "children"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -81,6 +81,25 @@ var Option = _select.default.Option,
 exports.OptGroup = OptGroup;
 exports.Option = Option;
 
+var compareOptions = function compareOptions(newOptions, oldOptions) {
+  if ((oldOptions === null || oldOptions === void 0 ? void 0 : oldOptions.length) !== newOptions.length) {
+    return true;
+  }
+
+  if (Array.isArray(oldOptions)) {
+    for (var i = 0; i < oldOptions.length; i++) {
+      var newOption = oldOptions[i];
+      var originOption = newOptions[i];
+
+      if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
+        return true;
+      }
+    }
+  }
+
+  return false;
+};
+
 var IglooSelect = function IglooSelect(_ref) {
   var valueProp = _ref.value,
       className = _ref.className,
@@ -93,6 +112,8 @@ var IglooSelect = function IglooSelect(_ref) {
       multiple = _ref.multiple,
       _ref$options = _ref.options,
       options = _ref$options === void 0 ? [] : _ref$options,
+      _ref$clearWhenOptions = _ref.clearWhenOptionsUpdated,
+      clearWhenOptionsUpdated = _ref$clearWhenOptions === void 0 ? false : _ref$clearWhenOptions,
       rest = _objectWithoutProperties(_ref, _excluded);
 
   var _useContext = (0, _react.useContext)(_localeContext.default),
@@ -113,6 +134,11 @@ var IglooSelect = function IglooSelect(_ref) {
       displayOptions = _useState6[0],
       setDisplay = _useState6[1];
 
+  var _useState7 = (0, _react.useState)(options),
+      _useState8 = _slicedToArray(_useState7, 2),
+      originOptions = _useState8[0],
+      setOrigin = _useState8[1];
+
   (0, _react.useEffect)(function () {
     typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
   }, [selected]);
@@ -121,22 +147,30 @@ var IglooSelect = function IglooSelect(_ref) {
   }, [valueProp]);
   (0, _react.useEffect)(function () {
     setDisplay(options);
+    setOrigin(options);
   }, [options]);
+  (0, _react.useEffect)(function () {
+    var setFieldValue = rest.setFieldValue;
+
+    if (clearWhenOptionsUpdated && compareOptions(options, originOptions)) {
+      typeof setFieldValue === 'function' && setFieldValue();
+    }
+  }, [options, originOptions]);
   (0, _react.useEffect)(function () {
     var setFieldValue = rest.setFieldValue;
     var foundValue = options.find(function (option) {
       return Array.isArray(valueProp) ? valueProp.includes(option.value) : option.value === valueProp;
     });
 
-    if (!foundValue) {
+    if (!foundValue && valueProp !== undefined) {
       typeof setFieldValue === 'function' && setFieldValue();
     }
   }, [valueProp, options]);
 
-  var _useState7 = (0, _react.useState)(false),
-      _useState8 = _slicedToArray(_useState7, 2),
-      dropVisible = _useState8[0],
-      setDropVisible = _useState8[1];
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      dropVisible = _useState10[0],
+      setDropVisible = _useState10[1];
 
   var handleDropDownVisibleChange = function handleDropDownVisibleChange(open) {
     typeof onDropdownVisibleChange === 'function' && onDropdownVisibleChange(open);
@@ -334,14 +368,12 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       datasourceKey = _ref11.datasourceKey,
       dependField = _ref11.dependField,
       children = _ref11.children,
-      _ref11$clearWhenOptio = _ref11.clearWhenOptionsUpdated,
-      clearWhenOptionsUpdated = _ref11$clearWhenOptio === void 0 ? false : _ref11$clearWhenOptio,
       rest = _objectWithoutProperties(_ref11, _excluded2);
 
-  var _useState9 = (0, _react.useState)(options || []),
-      _useState10 = _slicedToArray(_useState9, 2),
-      _options = _useState10[0],
-      setOptions = _useState10[1];
+  var _useState11 = (0, _react.useState)(),
+      _useState12 = _slicedToArray(_useState11, 2),
+      _options = _useState12[0],
+      setOptions = _useState12[1];
 
   var _useContext2 = (0, _react.useContext)(_formContext.default),
       selectDatasourceApi = _useContext2.selectDatasourceApi;
@@ -459,36 +491,15 @@ var AttachedSelect = function AttachedSelect(_ref11) {
       };
     }();
 
-    var compareOptions = function compareOptions(newOptions) {
-      var updateOptions = _options.length !== newOptions.length;
-
-      if (!updateOptions) {
-        for (var i = 0; i < _options.length; i++) {
-          var newOption = _options[i];
-          var originOption = newOptions[i];
-
-          if (newOption.label !== originOption.label || newOption.value !== originOption.value) {
-            updateOptions = true;
-            break;
-          }
-        }
-      }
-
-      if (updateOptions) {
+    calcOptions().then(function (newOptions) {
+      if (compareOptions(newOptions, _options || [])) {
         setOptions(newOptions);
-        var setFieldValue = rest.setFieldValue;
-
-        if (clearWhenOptionsUpdated) {
-          typeof setFieldValue === 'function' && setFieldValue();
-        }
       }
-    };
-
-    calcOptions().then(compareOptions);
-  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions]);
-  return (0, _jsxRuntime.jsx)(IglooSelect, _objectSpread({
+    });
+  }, [options, optionGroups, dependFieldValue, optionsFromGetOptions, _options]);
+  return _options ? (0, _jsxRuntime.jsx)(IglooSelect, _objectSpread({
     options: _options
-  }, rest));
+  }, rest)) : null;
 };
 
 AttachedSelect.formItemPropsHandler = function (config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",