iglooform 2.5.12 → 2.5.15

package/es/input/amount.d.ts

@@ -6,7 +6,9 @@ export interface AmountProps extends InputProps, IglooComponentProps {
     currencyProps?: InputProps;
     amount?: number;
     amountProps?: InputProps;
-    seperator?: ',';
+    seperator?: ',' | '.';
+    separator?: ',' | '.';
+    decimalSeparator?: ',' | '.';
 }
 declare const Amount: FC<AmountProps>;
 export default Amount;

package/es/input/amount.js

@@ -1,6 +1,6 @@
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-var _excluded = ["className", "currency", "currencyProps", "amountProps", "value", "seperator", "disabled"];
+var _excluded = ["className", "currency", "currencyProps", "amountProps", "value", "seperator", "separator", "decimalSeparator", "disabled"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -19,16 +19,16 @@ import classnames from 'classnames';
 import { staticFormatMessage } from '../locale';
 import './style/index.less';
 
-var thousands = function thousands(number) {
+var thousands = function thousands(number, decimalSeparator, separator) {
   if (number === null || number === undefined) return undefined;
-  var arr = String(number).split('.');
+  var arr = String(number).replace('.', decimalSeparator).split(decimalSeparator);
   return arr.map(function (s, index) {
     if (index === 0) {
-      return s.replace(/(?=(?!\b)(\d{3})+$)/g, ',');
+      return s.replace(/(?=(?!\b)(\d{3})+$)/g, separator);
     }
 
-    return s.replace(/(\d{3})(?=[^$])/g, '$1,');
-  }).join('.');
+    return s.replace(/(\d{3})(?=[^$])/g, "$1".concat(separator));
+  }).join(decimalSeparator);
 };
 
 var Amount = function Amount(_ref) {
@@ -39,8 +39,11 @@ var Amount = function Amount(_ref) {
       _ref$amountProps = _ref.amountProps,
       amountProps = _ref$amountProps === void 0 ? {} : _ref$amountProps,
       value = _ref.value,
-      _ref$seperator = _ref.seperator,
-      seperator = _ref$seperator === void 0 ? ',' : _ref$seperator,
+      seperator = _ref.seperator,
+      _ref$separator = _ref.separator,
+      separator = _ref$separator === void 0 ? seperator || ',' : _ref$separator,
+      _ref$decimalSeparator = _ref.decimalSeparator,
+      decimalSeparator = _ref$decimalSeparator === void 0 ? '.' : _ref$decimalSeparator,
       disabled = _ref.disabled,
       rest = _objectWithoutProperties(_ref, _excluded);
 
@@ -48,11 +51,11 @@ var Amount = function Amount(_ref) {
     var onChange = rest.onChange;
 
     if (typeof value === 'string') {
-      if (value.endsWith('.')) {
-        e.target.value = value.replace('.', '');
+      if (value.endsWith(decimalSeparator)) {
+        e.target.value = value.replace(decimalSeparator, '');
       }
 
-      if (value.endsWith('0') && value.includes('.')) {
+      if (value.endsWith('0') && value.includes(decimalSeparator)) {
         e.target.value = value.replace(/[0]+$/, '');
       }
 
@@ -67,7 +70,7 @@ var Amount = function Amount(_ref) {
     className: classnames('igloo-input-amount', {
       'igloo-input-disable': disabled
     }, className),
-    value: thousands(value),
+    value: thousands(value, decimalSeparator, separator),
     addonBefore: currency ? _jsx("span", {
       className: "igloo-input-areacode",
       children: currency
@@ -76,24 +79,31 @@ var Amount = function Amount(_ref) {
 };
 
 Amount.formItemPropsHandler = function (_ref2) {
-  var _ref2$seperator = _ref2.seperator,
-      seperator = _ref2$seperator === void 0 ? ',' : _ref2$seperator;
+  var _ref2$separator = _ref2.separator,
+      separator = _ref2$separator === void 0 ? ',' : _ref2$separator,
+      _ref2$decimalSeparato = _ref2.decimalSeparator,
+      decimalSeparator = _ref2$decimalSeparato === void 0 ? '.' : _ref2$decimalSeparato;
   return {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
-      var str = value.replaceAll(seperator, '').replaceAll(/[^0-9\.]/g, '');
+      console.log('======', separator, decimalSeparator);
+      var str = value.replaceAll(separator, '').replaceAll(/[^0-9\.,]/g, '');
 
-      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+      if (str.endsWith(decimalSeparator) || str.includes(decimalSeparator) && str.endsWith('0')) {
         return str;
       }
 
+      if (decimalSeparator === ',') {
+        str = str.replace(',', '.');
+      }
+
       return str ? parseFloat(str) : undefined;
     },
     rules: [{
       validator: function validator(_, value) {
         if (!value) return Promise.resolve();
-        var seperatorArr = String(value).split('.');
-        return seperatorArr.length > 2 ? Promise.reject(staticFormatMessage({
+        var separatorArr = String(value).split(decimalSeparator);
+        return separatorArr.length > 2 ? Promise.reject(staticFormatMessage({
           id: 'Please enter a valid amount.'
         })) : Promise.resolve();
       }

package/es/select/attached-select.js

@@ -43,7 +43,7 @@ import LocaleContext from '../locale/locale-context';
 import Button from '../button';
 import Input from '../input';
 import './style';
-import { compareOptions, optionsHOC } from '../utils/option-utils';
+import { compareOptions, compareSelected, optionsHOC } from '../utils/option-utils';
 var Option = _Select.Option,
     OptGroup = _Select.OptGroup;
 export { Option, OptGroup };
@@ -84,7 +84,7 @@ var IglooSelect = function IglooSelect(_ref) {
 
   var originOptions = useRef(options);
   useEffect(function () {
-    typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
+    typeof rest.onChange === 'function' && compareSelected(selected, valueProp) && rest.onChange(selected, selectedOptions);
   }, [selected]);
   useEffect(function () {
     valueProp !== selected && setSelected(valueProp);

package/es/utils/option-utils.d.ts

@@ -3,6 +3,7 @@ import { FormInstance } from 'antd/es/form';
 import { NamePath } from 'antd/es/form/interface';
 import { SelectProps, SelectValue } from 'antd/es/select';
 export declare const compareOptions: (newOptions: any[], oldOptions?: any[] | undefined) => boolean;
+export declare const compareSelected: (newValue: any | any[], oldValue: any | any[]) => boolean;
 declare type Options = SelectProps<SelectValue>['options'];
 export interface HOCProps extends IglooComponentProps {
     options?: Options;

package/es/utils/option-utils.js

@@ -14,8 +14,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-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); }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -36,6 +34,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
+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); }
+
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useState, useContext, useRef } from 'react';
 import FormContext from '../form-context';
@@ -62,6 +62,25 @@ export var compareOptions = function compareOptions(newOptions, oldOptions) {
 
   return false;
 };
+export var compareSelected = function compareSelected(newValue, oldValue) {
+  if (_typeof(newValue) !== _typeof(oldValue)) {
+    return true;
+  }
+
+  if (Array.isArray(newValue) && Array.isArray(oldValue)) {
+    if (newValue.length !== oldValue.length) {
+      return true;
+    }
+
+    return !newValue.every(function (v) {
+      return oldValue.find(function (ov) {
+        return v === ov;
+      });
+    });
+  }
+
+  return newValue !== oldValue;
+};
 export function optionsHOC(Component) {
   return function (props) {
     var options = props.options,

package/lib/input/amount.d.ts

@@ -6,7 +6,9 @@ export interface AmountProps extends InputProps, IglooComponentProps {
     currencyProps?: InputProps;
     amount?: number;
     amountProps?: InputProps;
-    seperator?: ',';
+    seperator?: ',' | '.';
+    separator?: ',' | '.';
+    decimalSeparator?: ',' | '.';
 }
 declare const Amount: FC<AmountProps>;
 export default Amount;

package/lib/input/amount.js

@@ -21,7 +21,7 @@ var _locale = require("../locale");
 
 require("./style/index.less");
 
-var _excluded = ["className", "currency", "currencyProps", "amountProps", "value", "seperator", "disabled"];
+var _excluded = ["className", "currency", "currencyProps", "amountProps", "value", "seperator", "separator", "decimalSeparator", "disabled"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -35,16 +35,16 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var thousands = function thousands(number) {
+var thousands = function thousands(number, decimalSeparator, separator) {
   if (number === null || number === undefined) return undefined;
-  var arr = String(number).split('.');
+  var arr = String(number).replace('.', decimalSeparator).split(decimalSeparator);
   return arr.map(function (s, index) {
     if (index === 0) {
-      return s.replace(/(?=(?!\b)(\d{3})+$)/g, ',');
+      return s.replace(/(?=(?!\b)(\d{3})+$)/g, separator);
     }
 
-    return s.replace(/(\d{3})(?=[^$])/g, '$1,');
-  }).join('.');
+    return s.replace(/(\d{3})(?=[^$])/g, "$1".concat(separator));
+  }).join(decimalSeparator);
 };
 
 var Amount = function Amount(_ref) {
@@ -55,8 +55,11 @@ var Amount = function Amount(_ref) {
       _ref$amountProps = _ref.amountProps,
       amountProps = _ref$amountProps === void 0 ? {} : _ref$amountProps,
       value = _ref.value,
-      _ref$seperator = _ref.seperator,
-      seperator = _ref$seperator === void 0 ? ',' : _ref$seperator,
+      seperator = _ref.seperator,
+      _ref$separator = _ref.separator,
+      separator = _ref$separator === void 0 ? seperator || ',' : _ref$separator,
+      _ref$decimalSeparator = _ref.decimalSeparator,
+      decimalSeparator = _ref$decimalSeparator === void 0 ? '.' : _ref$decimalSeparator,
       disabled = _ref.disabled,
       rest = _objectWithoutProperties(_ref, _excluded);
 
@@ -64,11 +67,11 @@ var Amount = function Amount(_ref) {
     var onChange = rest.onChange;
 
     if (typeof value === 'string') {
-      if (value.endsWith('.')) {
-        e.target.value = value.replace('.', '');
+      if (value.endsWith(decimalSeparator)) {
+        e.target.value = value.replace(decimalSeparator, '');
       }
 
-      if (value.endsWith('0') && value.includes('.')) {
+      if (value.endsWith('0') && value.includes(decimalSeparator)) {
         e.target.value = value.replace(/[0]+$/, '');
       }
 
@@ -83,7 +86,7 @@ var Amount = function Amount(_ref) {
     className: (0, _classnames.default)('igloo-input-amount', {
       'igloo-input-disable': disabled
     }, className),
-    value: thousands(value),
+    value: thousands(value, decimalSeparator, separator),
     addonBefore: currency ? (0, _jsxRuntime.jsx)("span", {
       className: "igloo-input-areacode",
       children: currency
@@ -92,24 +95,31 @@ var Amount = function Amount(_ref) {
 };
 
 Amount.formItemPropsHandler = function (_ref2) {
-  var _ref2$seperator = _ref2.seperator,
-      seperator = _ref2$seperator === void 0 ? ',' : _ref2$seperator;
+  var _ref2$separator = _ref2.separator,
+      separator = _ref2$separator === void 0 ? ',' : _ref2$separator,
+      _ref2$decimalSeparato = _ref2.decimalSeparator,
+      decimalSeparator = _ref2$decimalSeparato === void 0 ? '.' : _ref2$decimalSeparato;
   return {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
-      var str = value.replaceAll(seperator, '').replaceAll(/[^0-9\.]/g, '');
+      console.log('======', separator, decimalSeparator);
+      var str = value.replaceAll(separator, '').replaceAll(/[^0-9\.,]/g, '');
 
-      if (str.endsWith('.') || str.includes('.') && str.endsWith('0')) {
+      if (str.endsWith(decimalSeparator) || str.includes(decimalSeparator) && str.endsWith('0')) {
         return str;
       }
 
+      if (decimalSeparator === ',') {
+        str = str.replace(',', '.');
+      }
+
       return str ? parseFloat(str) : undefined;
     },
     rules: [{
       validator: function validator(_, value) {
         if (!value) return Promise.resolve();
-        var seperatorArr = String(value).split('.');
-        return seperatorArr.length > 2 ? Promise.reject((0, _locale.staticFormatMessage)({
+        var separatorArr = String(value).split(decimalSeparator);
+        return separatorArr.length > 2 ? Promise.reject((0, _locale.staticFormatMessage)({
           id: 'Please enter a valid amount.'
         })) : Promise.resolve();
       }

package/lib/select/attached-select.js

@@ -108,7 +108,7 @@ var IglooSelect = function IglooSelect(_ref) {
 
   var originOptions = (0, _react.useRef)(options);
   (0, _react.useEffect)(function () {
-    typeof rest.onChange === 'function' && valueProp !== selected && rest.onChange(selected, selectedOptions);
+    typeof rest.onChange === 'function' && (0, _optionUtils.compareSelected)(selected, valueProp) && rest.onChange(selected, selectedOptions);
   }, [selected]);
   (0, _react.useEffect)(function () {
     valueProp !== selected && setSelected(valueProp);

package/lib/utils/option-utils.d.ts

@@ -3,6 +3,7 @@ import { FormInstance } from 'antd/es/form';
 import { NamePath } from 'antd/es/form/interface';
 import { SelectProps, SelectValue } from 'antd/es/select';
 export declare const compareOptions: (newOptions: any[], oldOptions?: any[] | undefined) => boolean;
+export declare const compareSelected: (newValue: any | any[], oldValue: any | any[]) => boolean;
 declare type Options = SelectProps<SelectValue>['options'];
 export interface HOCProps extends IglooComponentProps {
     options?: Options;

package/lib/utils/option-utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.compareOptions = void 0;
+exports.compareSelected = exports.compareOptions = void 0;
 exports.optionsHOC = optionsHOC;
 
 var _jsxRuntime = require("react/jsx-runtime");
@@ -32,8 +32,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-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); }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -54,6 +52,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
+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); }
+
 var compareOptions = function compareOptions(newOptions, oldOptions) {
   if (!Array.isArray(oldOptions)) {
     return true;
@@ -79,6 +79,28 @@ var compareOptions = function compareOptions(newOptions, oldOptions) {
 
 exports.compareOptions = compareOptions;
 
+var compareSelected = function compareSelected(newValue, oldValue) {
+  if (_typeof(newValue) !== _typeof(oldValue)) {
+    return true;
+  }
+
+  if (Array.isArray(newValue) && Array.isArray(oldValue)) {
+    if (newValue.length !== oldValue.length) {
+      return true;
+    }
+
+    return !newValue.every(function (v) {
+      return oldValue.find(function (ov) {
+        return v === ov;
+      });
+    });
+  }
+
+  return newValue !== oldValue;
+};
+
+exports.compareSelected = compareSelected;
+
 function optionsHOC(Component) {
   return function (props) {
     var options = props.options,

package/package.json

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