iglooform 2.4.21 → 2.4.25

package/es/form/element/index.js

@@ -308,7 +308,7 @@ var Element = function Element(_ref) {
             children: [error && !!error.length && _jsx(AlertFilled, {
               className: "igloo-element-preview-value-icon"
             }, void 0), _jsx("div", {
-              children: previewFormater ? previewFormater(value, form) : JSON.stringify(value)
+              children: previewFormater ? previewFormater(value, form) : _typeof(value) === 'object' ? JSON.stringify(value) : value
             }, void 0)]
           }, void 0)]
         }, void 0)

package/es/form/step/index.js

@@ -43,6 +43,7 @@ var Step = function Step(_ref) {
       editButtonLabel = _ref$config.editButtonLabel,
       getButtonDisabledState = _ref$config.getButtonDisabledState,
       disableEditButton = _ref$config.disableEditButton,
+      buttonText = _ref$config.buttonText,
       edit = _ref.edit,
       preview = _ref.preview,
       index = _ref.index,
@@ -139,7 +140,7 @@ var Step = function Step(_ref) {
           className: 'igloo-step-button',
           type: "primary",
           disabled: buttonDisabled,
-          children: continueText || formatMessage({
+          children: buttonText || continueText || formatMessage({
             id: 'Continue'
           })
         }, void 0)
@@ -153,7 +154,7 @@ var Step = function Step(_ref) {
           className: 'igloo-step-button',
           loading: submitting,
           disabled: buttonDisabled,
-          children: submitText || formatMessage({
+          children: buttonText || submitText || formatMessage({
             id: 'Submit'
           })
         }, void 0)

package/es/free-form/element/index.js

@@ -263,7 +263,7 @@ var Element = function Element(props) {
             children: [error && !!error.length && _jsx(AlertFilled, {
               className: "igloo-freeform-element-preview-value-icon"
             }, void 0), _jsx("div", {
-              children: previewFormater ? previewFormater(value, form) : JSON.stringify(value)
+              children: previewFormater ? previewFormater(value, form) : _typeof(value) === 'object' ? JSON.stringify(value) : value
             }, void 0)]
           }, void 0)]
         }, void 0)

package/es/free-form/step/index.d.ts

@@ -15,6 +15,7 @@ export interface StepProps extends FormItemConfig {
     shouldScroll?: boolean;
     editButtonLabel?: string;
     disableEditButton?: boolean;
+    buttonText?: string;
 }
 declare const Step: FC<StepProps>;
 export default Step;

package/es/free-form/step/index.js

@@ -60,7 +60,8 @@ var Step = function Step(_ref) {
       shouldScroll = _ref.shouldScroll,
       children = _ref.children,
       shouldRender = _ref.shouldRender,
-      subscribedFields = _ref.subscribedFields;
+      subscribedFields = _ref.subscribedFields,
+      buttonText = _ref.buttonText;
 
   var _useContext = useContext(LocaleContext),
       formatMessage = _useContext.formatMessage;
@@ -261,7 +262,7 @@ var Step = function Step(_ref) {
           className: 'igloo-freeform-step-button',
           type: "primary",
           disabled: buttonDisabled,
-          children: continueText || formatMessage({
+          children: buttonText || continueText || formatMessage({
             id: 'Continue'
           })
         }, void 0)
@@ -275,7 +276,7 @@ var Step = function Step(_ref) {
           className: 'igloo-freeform-step-button',
           loading: submitting,
           disabled: buttonDisabled,
-          children: submitText || formatMessage({
+          children: buttonText || submitText || formatMessage({
             id: 'Submit'
           })
         }, void 0)

package/es/input/credit-card.js

@@ -172,6 +172,7 @@ var IglooCredit = function IglooCredit(props) {
       }
     }
 
+    formOnChange && formOnChange('error type');
     setFieldError && setFieldError(formatMessage({
       id: 'Credit card must be {typeNames} or {finalName}',
       values: getErrorMessage(cardRules)
@@ -179,7 +180,7 @@ var IglooCredit = function IglooCredit(props) {
   }
 
   useEffect(function () {
-    if (value) {
+    if (value && value !== 'error type') {
       handleOnChange(value, [].concat(_toConsumableArray(cardConfig), defaultCheck), formChangeProps);
     }
   }, [value]);

package/es/input/expiry-date.js

@@ -100,7 +100,8 @@ var IglooExpiryDate = function IglooExpiryDate(props) {
       setInput = _useState4[1];
 
   useEffect(function () {
-    if (!value) return;
+    if (!value || typeof value === 'string') return; //=== string 就是value='error type'
+
     setInput(value);
     inputValueRef.current = value;
   }, [value.year, value.month]);
@@ -119,6 +120,7 @@ var IglooExpiryDate = function IglooExpiryDate(props) {
     if (userCheck && compCheck) {
       onChangeProps && onChangeProps(value);
     } else {
+      onChangeProps && onChangeProps('error type');
       setFieldError && setFieldError(formatMessage({
         id: 'Please enter a valid date.'
       }));

package/es/input/input-date.js

@@ -105,7 +105,7 @@ var IglooInputDate = function IglooInputDate(props) {
       formatMessage = _useContext.formatMessage;
 
   useEffect(function () {
-    if (!value) return;
+    if (!value || value === 'error type') return;
     var init = value.split(delimiter);
     setInput(init);
     inputValueRef.current = init;
@@ -119,6 +119,7 @@ var IglooInputDate = function IglooInputDate(props) {
     if (available) {
       onChangeProps && onChangeProps(value);
     } else {
+      onChangeProps && onChangeProps('error type');
       setFieldError && setFieldError(formatMessage({
         id: 'Please enter a valid date.'
       }));

package/es/input/input-number.js

@@ -36,8 +36,8 @@ IglooInputNumber.formItemPropsHandler = function (config) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return str;
-      return str ? parseFloat(str) : str;
+      if (value.endsWith('.')) return parseInt(str);
+      return str ? parseFloat(str) : undefined;
     }
   };
 };

package/es/platform/platform-card/index.d.ts

@@ -1,7 +1,10 @@
 import { FC, CSSProperties } from 'react';
 import './style/index.less';
 declare const PlatformCard: FC<{
-    platform: string;
+    platform: string | {
+        name: string;
+        key: string;
+    };
     onClick: any;
     className?: any;
     style?: CSSProperties;

package/es/platform/platform-card/index.js

@@ -30,6 +30,8 @@ var PlatformCard = function PlatformCard(_ref) {
       showDefault = _useState2[0],
       setShowDefault = _useState2[1];
 
+  var key = typeof platform === 'string' ? platform : platform.key;
+  var name = typeof platform === 'string' ? platform : platform.name;
   return _jsxs("div", {
     className: classnames('igloo-platform', className),
     onClick: onClick,
@@ -43,12 +45,12 @@ var PlatformCard = function PlatformCard(_ref) {
         className: "igloo-platform-defaultLogo"
       }, void 0), _jsx("div", {
         className: "igloo-platform-name",
-        children: platform
+        children: name
       }, void 0)]
     }, void 0), !showDefault && _jsx(_Image, {
       width: 200,
       height: 200,
-      src: "https://static.iglooinsure.com/partner/normal/".concat(platform.toLowerCase(), ".svg"),
+      src: "https://static.iglooinsure.com/partner/normal/".concat(key.toLowerCase(), ".svg"),
       onError: function onError() {
         return setShowDefault(true);
       },

package/es/platform/switch-platform/index.d.ts

@@ -1,7 +1,10 @@
 import { FC } from 'react';
 import './style/index.less';
 interface Props {
-    platforms: string[];
+    platforms: (string | {
+        name: string;
+        key: string;
+    })[];
     currentPlatform: string;
     onChange: (platform: string) => any;
 }

package/es/platform/switch-platform/index.js

@@ -7,6 +7,8 @@ import _Menu from "antd/es/menu";
 import "antd/es/dropdown/style";
 import _Dropdown from "antd/es/dropdown";
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -20,7 +22,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from 'react';
+import { useState, useMemo } from 'react';
 import defaultIcon from '../square/default.svg';
 import { ArrowDownOutlined } from 'iglooicon';
 import './style/index.less';
@@ -40,12 +42,41 @@ var SwitchPlatform = function SwitchPlatform(_ref) {
     onChange(e.key);
   };
 
+  var currentName = useMemo(function () {
+    var name = currentPlatform;
+
+    var _iterator = _createForOfIteratorHelper(platforms),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var platform = _step.value;
+
+        if (typeof platform === 'string') {
+          break;
+        }
+
+        if (platform.key === currentPlatform) {
+          name = platform.name;
+          break;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+
+    return name;
+  }, [platforms, currentPlatform]);
   return _jsx(_Dropdown, {
     className: "igloo-switch-platform",
     trigger: ['click'],
     overlay: _jsx(_Menu, {
       onClick: handleChange,
-      children: platforms === null || platforms === void 0 ? void 0 : platforms.map(function (name) {
+      children: platforms === null || platforms === void 0 ? void 0 : platforms.map(function (platform) {
+        var name = typeof platform === 'string' ? platform : platform.name;
+        var key = typeof platform === 'string' ? platform : platform.key;
         return _jsxs(_Menu.Item, {
           className: "igloo-switch-platform-option",
           children: [_jsx(_Image, {
@@ -57,7 +88,7 @@ var SwitchPlatform = function SwitchPlatform(_ref) {
             className: "igloo-switch-platform-name",
             children: name
           }, void 0)]
-        }, name);
+        }, key);
       })
     }, void 0),
     getPopupContainer: function getPopupContainer(trigger) {
@@ -84,7 +115,7 @@ var SwitchPlatform = function SwitchPlatform(_ref) {
             className: "igloo-switch-platform-default-logo"
           }, void 0), _jsx("span", {
             className: "igloo-switch-platform-name",
-            children: currentPlatform
+            children: currentName
           }, void 0)]
         }, void 0)
       }, void 0), _jsx(ArrowDownOutlined, {

package/lib/form/element/index.js

@@ -337,7 +337,7 @@ var Element = function Element(_ref) {
             children: [error && !!error.length && (0, _jsxRuntime.jsx)(_iglooicon.AlertFilled, {
               className: "igloo-element-preview-value-icon"
             }, void 0), (0, _jsxRuntime.jsx)("div", {
-              children: previewFormater ? previewFormater(value, form) : JSON.stringify(value)
+              children: previewFormater ? previewFormater(value, form) : _typeof(value) === 'object' ? JSON.stringify(value) : value
             }, void 0)]
           }, void 0)]
         }, void 0)

package/lib/form/step/index.js

@@ -67,6 +67,7 @@ var Step = function Step(_ref) {
       editButtonLabel = _ref$config.editButtonLabel,
       getButtonDisabledState = _ref$config.getButtonDisabledState,
       disableEditButton = _ref$config.disableEditButton,
+      buttonText = _ref$config.buttonText,
       edit = _ref.edit,
       preview = _ref.preview,
       index = _ref.index,
@@ -163,7 +164,7 @@ var Step = function Step(_ref) {
           className: 'igloo-step-button',
           type: "primary",
           disabled: buttonDisabled,
-          children: continueText || formatMessage({
+          children: buttonText || continueText || formatMessage({
             id: 'Continue'
           })
         }, void 0)
@@ -177,7 +178,7 @@ var Step = function Step(_ref) {
           className: 'igloo-step-button',
           loading: submitting,
           disabled: buttonDisabled,
-          children: submitText || formatMessage({
+          children: buttonText || submitText || formatMessage({
             id: 'Submit'
           })
         }, void 0)

package/lib/free-form/element/index.js

@@ -289,7 +289,7 @@ var Element = function Element(props) {
             children: [error && !!error.length && (0, _jsxRuntime.jsx)(_iglooicon.AlertFilled, {
               className: "igloo-freeform-element-preview-value-icon"
             }, void 0), (0, _jsxRuntime.jsx)("div", {
-              children: previewFormater ? previewFormater(value, form) : JSON.stringify(value)
+              children: previewFormater ? previewFormater(value, form) : _typeof(value) === 'object' ? JSON.stringify(value) : value
             }, void 0)]
           }, void 0)]
         }, void 0)

package/lib/free-form/step/index.d.ts

@@ -15,6 +15,7 @@ export interface StepProps extends FormItemConfig {
     shouldScroll?: boolean;
     editButtonLabel?: string;
     disableEditButton?: boolean;
+    buttonText?: string;
 }
 declare const Step: FC<StepProps>;
 export default Step;

package/lib/free-form/step/index.js

@@ -83,7 +83,8 @@ var Step = function Step(_ref) {
       shouldScroll = _ref.shouldScroll,
       children = _ref.children,
       shouldRender = _ref.shouldRender,
-      subscribedFields = _ref.subscribedFields;
+      subscribedFields = _ref.subscribedFields,
+      buttonText = _ref.buttonText;
 
   var _useContext = (0, _react.useContext)(_locale.LocaleContext),
       formatMessage = _useContext.formatMessage;
@@ -284,7 +285,7 @@ var Step = function Step(_ref) {
           className: 'igloo-freeform-step-button',
           type: "primary",
           disabled: buttonDisabled,
-          children: continueText || formatMessage({
+          children: buttonText || continueText || formatMessage({
             id: 'Continue'
           })
         }, void 0)
@@ -298,7 +299,7 @@ var Step = function Step(_ref) {
           className: 'igloo-freeform-step-button',
           loading: submitting,
           disabled: buttonDisabled,
-          children: submitText || formatMessage({
+          children: buttonText || submitText || formatMessage({
             id: 'Submit'
           })
         }, void 0)

package/lib/input/credit-card.js

@@ -187,6 +187,7 @@ var IglooCredit = function IglooCredit(props) {
       }
     }
 
+    formOnChange && formOnChange('error type');
     setFieldError && setFieldError(formatMessage({
       id: 'Credit card must be {typeNames} or {finalName}',
       values: getErrorMessage(cardRules)
@@ -194,7 +195,7 @@ var IglooCredit = function IglooCredit(props) {
   }
 
   (0, _react.useEffect)(function () {
-    if (value) {
+    if (value && value !== 'error type') {
       handleOnChange(value, [].concat(_toConsumableArray(cardConfig), defaultCheck), formChangeProps);
     }
   }, [value]);

package/lib/input/expiry-date.js

@@ -116,7 +116,8 @@ var IglooExpiryDate = function IglooExpiryDate(props) {
       setInput = _useState4[1];
 
   (0, _react.useEffect)(function () {
-    if (!value) return;
+    if (!value || typeof value === 'string') return; //=== string 就是value='error type'
+
     setInput(value);
     inputValueRef.current = value;
   }, [value.year, value.month]);
@@ -135,6 +136,7 @@ var IglooExpiryDate = function IglooExpiryDate(props) {
     if (userCheck && compCheck) {
       onChangeProps && onChangeProps(value);
     } else {
+      onChangeProps && onChangeProps('error type');
       setFieldError && setFieldError(formatMessage({
         id: 'Please enter a valid date.'
       }));

package/lib/input/input-date.js

@@ -122,7 +122,7 @@ var IglooInputDate = function IglooInputDate(props) {
       formatMessage = _useContext.formatMessage;
 
   (0, _react.useEffect)(function () {
-    if (!value) return;
+    if (!value || value === 'error type') return;
     var init = value.split(delimiter);
     setInput(init);
     inputValueRef.current = init;
@@ -136,6 +136,7 @@ var IglooInputDate = function IglooInputDate(props) {
     if (available) {
       onChangeProps && onChangeProps(value);
     } else {
+      onChangeProps && onChangeProps('error type');
       setFieldError && setFieldError(formatMessage({
         id: 'Please enter a valid date.'
       }));

package/lib/input/input-number.js

@@ -49,8 +49,8 @@ IglooInputNumber.formItemPropsHandler = function (config) {
     getValueFromEvent: function getValueFromEvent(e) {
       var value = e.target.value;
       var str = value.replaceAll(/[^0-9\.]/g, '');
-      if (value.endsWith('.')) return str;
-      return str ? parseFloat(str) : str;
+      if (value.endsWith('.')) return parseInt(str);
+      return str ? parseFloat(str) : undefined;
     }
   };
 };

package/lib/platform/platform-card/index.d.ts

@@ -1,7 +1,10 @@
 import { FC, CSSProperties } from 'react';
 import './style/index.less';
 declare const PlatformCard: FC<{
-    platform: string;
+    platform: string | {
+        name: string;
+        key: string;
+    };
     onClick: any;
     className?: any;
     style?: CSSProperties;

package/lib/platform/platform-card/index.js

@@ -44,6 +44,8 @@ var PlatformCard = function PlatformCard(_ref) {
       showDefault = _useState2[0],
       setShowDefault = _useState2[1];
 
+  var key = typeof platform === 'string' ? platform : platform.key;
+  var name = typeof platform === 'string' ? platform : platform.name;
   return (0, _jsxRuntime.jsxs)("div", {
     className: (0, _classnames.default)('igloo-platform', className),
     onClick: onClick,
@@ -57,12 +59,12 @@ var PlatformCard = function PlatformCard(_ref) {
         className: "igloo-platform-defaultLogo"
       }, void 0), (0, _jsxRuntime.jsx)("div", {
         className: "igloo-platform-name",
-        children: platform
+        children: name
       }, void 0)]
     }, void 0), !showDefault && (0, _jsxRuntime.jsx)(_image.default, {
       width: 200,
       height: 200,
-      src: "https://static.iglooinsure.com/partner/normal/".concat(platform.toLowerCase(), ".svg"),
+      src: "https://static.iglooinsure.com/partner/normal/".concat(key.toLowerCase(), ".svg"),
       onError: function onError() {
         return setShowDefault(true);
       },

package/lib/platform/switch-platform/index.d.ts

@@ -1,7 +1,10 @@
 import { FC } from 'react';
 import './style/index.less';
 interface Props {
-    platforms: string[];
+    platforms: (string | {
+        name: string;
+        key: string;
+    })[];
     currentPlatform: string;
     onChange: (platform: string) => any;
 }

package/lib/platform/switch-platform/index.js

@@ -33,6 +33,8 @@ require("./style/index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -60,12 +62,41 @@ var SwitchPlatform = function SwitchPlatform(_ref) {
     onChange(e.key);
   };
 
+  var currentName = (0, _react.useMemo)(function () {
+    var name = currentPlatform;
+
+    var _iterator = _createForOfIteratorHelper(platforms),
+        _step;
+
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var platform = _step.value;
+
+        if (typeof platform === 'string') {
+          break;
+        }
+
+        if (platform.key === currentPlatform) {
+          name = platform.name;
+          break;
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+
+    return name;
+  }, [platforms, currentPlatform]);
   return (0, _jsxRuntime.jsx)(_dropdown.default, {
     className: "igloo-switch-platform",
     trigger: ['click'],
     overlay: (0, _jsxRuntime.jsx)(_menu.default, {
       onClick: handleChange,
-      children: platforms === null || platforms === void 0 ? void 0 : platforms.map(function (name) {
+      children: platforms === null || platforms === void 0 ? void 0 : platforms.map(function (platform) {
+        var name = typeof platform === 'string' ? platform : platform.name;
+        var key = typeof platform === 'string' ? platform : platform.key;
         return (0, _jsxRuntime.jsxs)(_menu.default.Item, {
           className: "igloo-switch-platform-option",
           children: [(0, _jsxRuntime.jsx)(_image.default, {
@@ -77,7 +108,7 @@ var SwitchPlatform = function SwitchPlatform(_ref) {
             className: "igloo-switch-platform-name",
             children: name
           }, void 0)]
-        }, name);
+        }, key);
       })
     }, void 0),
     getPopupContainer: function getPopupContainer(trigger) {
@@ -104,7 +135,7 @@ var SwitchPlatform = function SwitchPlatform(_ref) {
             className: "igloo-switch-platform-default-logo"
           }, void 0), (0, _jsxRuntime.jsx)("span", {
             className: "igloo-switch-platform-name",
-            children: currentPlatform
+            children: currentName
           }, void 0)]
         }, void 0)
       }, void 0), (0, _jsxRuntime.jsx)(_iglooicon.ArrowDownOutlined, {

package/package.json

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