@nutui/nutui-react 1.4.13-beta.0 → 1.4.14-beta.0

package/dist/esm/Input.js

@@ -205,7 +205,7 @@ var Input = forwardRef(function (props, ref) {
     if (maxlength && val.length > Number(maxlength)) {
       val = val.slice(0, Number(maxlength));
     }
-    updateValue(getModelValue(), 'onBlur');
+    updateValue(val, 'onBlur');
     onBlur && onBlur(val, event);
   };
   var handleClickInput = function handleClickInput(event) {

package/dist/esm/InputNumber.js

@@ -1,10 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-var _excluded = ["children", "disabled", "buttonSize", "min", "max", "inputWidth", "readonly", "modelValue", "decimalPlaces", "step", "isAsync", "className", "style", "add", "reduce", "change", "overlimit", "blur", "focus", "onAdd", "onReduce", "onOverlimit", "onBlurFuc", "onFocus", "onChangeFuc", "iconClassPrefix", "iconFontClassName"];
+var _excluded = ["children", "disabled", "buttonSize", "min", "max", "inputWidth", "readonly", "modelValue", "decimalPlaces", "step", "isAsync", "className", "style", "formatter", "add", "reduce", "change", "overlimit", "blur", "focus", "onAdd", "onReduce", "onOverlimit", "onBlurFuc", "onFocus", "onChangeFuc", "iconClassPrefix", "iconFontClassName"];
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React__default, { useState, useEffect } from 'react';
+import React__default, { useState, useRef, useEffect } from 'react';
 import classNames from 'classnames';
 import Icon from './Icon.js';
 import { c as cn } from './bem-3b438e61.js';
@@ -40,6 +40,7 @@ var InputNumber = function InputNumber(props) {
     isAsync = _defaultProps$props.isAsync,
     className = _defaultProps$props.className,
     style = _defaultProps$props.style,
+    formatter = _defaultProps$props.formatter,
     add = _defaultProps$props.add,
     reduce = _defaultProps$props.reduce,
     change = _defaultProps$props.change,
@@ -59,9 +60,15 @@ var InputNumber = function InputNumber(props) {
     _useState2 = _slicedToArray(_useState, 2),
     inputValue = _useState2[0],
     setInputValue = _useState2[1];
+  var inputRef = useRef('');
   useEffect(function () {
-    setInputValue(modelValue);
-  }, [modelValue]);
+    if (formatter) {
+      inputRef.current = formatter(modelValue);
+      setInputValue(formatter(modelValue));
+    } else {
+      setInputValue(modelValue);
+    }
+  }, [modelValue, formatter]);
   var b = cn('inputnumber');
   var classes = classNames(_defineProperty({}, "".concat(b(''), "--disabled"), disabled), className, b(''));
   var styles = _objectSpread({
@@ -69,6 +76,10 @@ var InputNumber = function InputNumber(props) {
   }, style);
   var addAllow = function addAllow() {
     var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : inputValue;
+    if (formatter) {
+      var numValue = String(value).replace(/[^0-9|\.]/gi, '');
+      return Number(numValue) < Number(max) && !disabled;
+    }
     if (value || typeof value === 'number') {
       return value < Number(max) && !disabled;
     }
@@ -76,6 +87,10 @@ var InputNumber = function InputNumber(props) {
   };
   var reduceAllow = function reduceAllow() {
     var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : inputValue;
+    if (formatter) {
+      var numValue = String(value).replace(/[^0-9|\.]/gi, '');
+      return Number(numValue) > Number(min) && !disabled;
+    }
     if (value || typeof value === 'number') {
       return value > Number(min) && !disabled;
     }
@@ -96,11 +111,11 @@ var InputNumber = function InputNumber(props) {
     change && change(outputValue, e);
     if (!isAsync) {
       if (Number(outputValue) < Number(min)) {
-        setInputValue(Number(min));
+        formatter ? setInputValue(formatter(Number(min))) : setInputValue(Number(min));
       } else if (Number(outputValue) > Number(max)) {
-        setInputValue(Number(max));
+        formatter ? setInputValue(formatter(Number(max))) : setInputValue(Number(max));
       } else {
-        setInputValue(outputValue);
+        formatter ? setInputValue(formatter(outputValue)) : setInputValue(outputValue);
       }
     }
   };
@@ -108,8 +123,15 @@ var InputNumber = function InputNumber(props) {
     onReduce && onReduce(e);
     reduce && reduce(e);
     if (reduceAllow()) {
-      var outputValue = Number(inputValue) - Number(step);
-      emitChange(outputValue, e);
+      if (formatter) {
+        var numValue = String(inputValue).replace(/[^0-9|\.]/gi, '');
+        var outputValue = Number(numValue) - Number(step);
+        inputRef.current = formatter(outputValue);
+        emitChange(outputValue, e);
+      } else {
+        var _outputValue = Number(inputValue) - Number(step);
+        emitChange(_outputValue, e);
+      }
     } else {
       onOverlimit && onOverlimit(e);
       overlimit && overlimit(e);
@@ -119,8 +141,15 @@ var InputNumber = function InputNumber(props) {
     onAdd && onAdd(e);
     add && add(e);
     if (addAllow()) {
-      var outputValue = Number(inputValue) + Number(step);
-      emitChange(outputValue, e);
+      if (formatter) {
+        var numValue = String(inputValue).replace(/[^0-9|\.]/gi, '');
+        var outputValue = Number(numValue) + Number(step);
+        inputRef.current = formatter(outputValue);
+        emitChange(outputValue, e);
+      } else {
+        var _outputValue2 = Number(inputValue) + Number(step);
+        emitChange(_outputValue2, e);
+      }
     } else {
       onOverlimit && onOverlimit(e);
       overlimit && overlimit(e);
@@ -138,6 +167,42 @@ var InputNumber = function InputNumber(props) {
       }
     }
   };
+  var changeFormatValue = function changeFormatValue(e) {
+    var input = e.target.value;
+    var numReg = new RegExp('^[0-9]*$');
+    var numValue = input.replace(/[^0-9|\.]/gi, '');
+    if (formatter) {
+      if (!numReg.test(input[0]) && numValue) {
+        setInputValue(formatter(numValue));
+      } else if (!numReg.test(input[0]) && !numValue) {
+        setInputValue(input);
+      } else if (numReg.test(input[0])) {
+        console.log('inputRef.current', inputRef.current);
+        console.log('formatter(numValue)', formatter(numValue));
+        // 针对于100%这种尾字符例子，直接删除会进行匹配
+        if (formatter(numValue) === inputRef.current) {
+          setInputValue(numValue);
+        } else {
+          setInputValue(formatter(numValue));
+          inputRef.current = formatter(numValue);
+        }
+      }
+    }
+  };
+  var burFormatValue = function burFormatValue(e) {
+    var input = e.target.value;
+    var numReg = new RegExp('^[0-9]*$');
+    var numValue = input.replace(/[^0-9|\.]/gi, '');
+    if (formatter) {
+      if (formatter(numValue) === input) {
+        emitChange(numValue, e);
+        return;
+      }
+      if (!numReg.test(input) || !input) {
+        setInputValue(formatter(''));
+      }
+    }
+  };
   var focusValue = function focusValue(e) {
     if (disabled) return;
     if (readonly) return;
@@ -170,7 +235,20 @@ var InputNumber = function InputNumber(props) {
     size: buttonSize,
     name: "minus",
     onClick: reduceNumber
-  })), React__default.createElement("input", {
+  })), React__default.createElement(React__default.Fragment, null, formatter ? React__default.createElement("input", {
+    type: "text",
+    min: min,
+    max: max,
+    style: {
+      width: pxCheck(inputWidth)
+    },
+    disabled: disabled,
+    readOnly: readonly,
+    value: inputValue,
+    onInput: changeFormatValue,
+    onBlur: burFormatValue,
+    onFocus: focusValue
+  }) : React__default.createElement("input", {
     type: "number",
     min: min,
     max: max,
@@ -183,7 +261,7 @@ var InputNumber = function InputNumber(props) {
     onInput: changeValue,
     onBlur: burValue,
     onFocus: focusValue
-  }), React__default.createElement("div", {
+  })), React__default.createElement("div", {
     className: "nut-input-add"
   }, React__default.createElement(Icon, {
     classPrefix: iconClassPrefix,

package/dist/esm/Picker.js

@@ -45,7 +45,6 @@ var InternalPickerSlot = function InternalPickerSlot(props, ref) {
   var rotation = 20;
   var moving = useRef(false);
   var timer;
-  useRef(null);
   var rollerRef = useRef(null);
   var pickerSlotRef = useRef(null);
   var _useState7 = useState(0),

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.4.13-beta.0 Wed Mar 29 2023 15:41:22 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.4.14-beta.0 Thu Apr 06 2023 15:52:22 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.4.13-beta.0 Wed Mar 29 2023 15:41:22 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.4.14-beta.0 Thu Apr 06 2023 15:52:22 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/id-ID.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.4.13-beta.0 Wed Mar 29 2023 15:41:22 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.4.14-beta.0 Thu Apr 06 2023 15:52:22 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-CN.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.4.13-beta.0 Wed Mar 29 2023 15:41:22 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.4.14-beta.0 Thu Apr 06 2023 15:52:22 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-TW.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.4.13-beta.0 Wed Mar 29 2023 15:41:22 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.4.14-beta.0 Thu Apr 06 2023 15:52:22 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-UG.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.4.13-beta.0 Wed Mar 29 2023 15:41:22 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.4.14-beta.0 Thu Apr 06 2023 15:52:22 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/nutui.react.mjs

@@ -6,7 +6,7 @@ var __publicField = (obj, key, value) => {
 };
 var _a;
 /*!
-* @nutui/nutui-react v1.4.13-beta.0 Wed Mar 29 2023 15:40:29 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.4.14-beta.0 Thu Apr 06 2023 15:51:39 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -10186,7 +10186,7 @@ const Utils = {
    * @return {String}
    */
   getWhatDay(year, month, day) {
-    const date4 = /* @__PURE__ */ new Date(`${year}/${month}/${day}`);
+    const date4 = new Date(`${year}/${month}/${day}`);
     const index = date4.getDay();
     const dayNames = [
       "星期日",
@@ -10204,7 +10204,7 @@ const Utils = {
    * @return {Number}
    */
   getMonthPreDay(year, month) {
-    const date4 = /* @__PURE__ */ new Date(`${year}/${month}/01`);
+    const date4 = new Date(`${year}/${month}/01`);
     let day = date4.getDay();
     if (day == 0) {
       day = 7;
@@ -10261,7 +10261,7 @@ const Utils = {
    */
   getDay(i) {
     i = i || 0;
-    let date4 = /* @__PURE__ */ new Date();
+    let date4 = new Date();
     const diff = i * (1e3 * 60 * 60 * 24);
     date4 = new Date(date4.getTime() + diff);
     return this.date2Str(date4);
@@ -10451,7 +10451,7 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
   };
   const isCurrDay = (month, day) => {
     const date4 = `${month.curData[0]}-${month.curData[1]}-${day}`;
-    return Utils.isEqual(date4, Utils.date2Str(/* @__PURE__ */ new Date()));
+    return Utils.isEqual(date4, Utils.date2Str(new Date()));
   };
   const confirm2 = () => {
     const { type: type22 } = props;
@@ -10787,8 +10787,8 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
         }
       });
     } else {
-      const currentYear2 = (/* @__PURE__ */ new Date()).getFullYear();
-      const currentMonth = (/* @__PURE__ */ new Date()).getMonth() + 1;
+      const currentYear2 = new Date().getFullYear();
+      const currentMonth = new Date().getMonth() + 1;
       const currentYearMonthIndex = state.monthsData.findIndex((item) => {
         return +item.curData[0] === currentYear2 && +item.curData[1] === currentMonth;
       });
@@ -11888,7 +11888,6 @@ const InternalPickerSlot = (props, ref) => {
   const rotation = 20;
   const moving = useRef(false);
   let timer;
-  useRef(null);
   const rollerRef = useRef(null);
   const pickerSlotRef = useRef(null);
   const [startTime, setStartTime] = useState(0);
@@ -12295,7 +12294,7 @@ const InternalPicker = (props, ref) => {
 };
 const Picker = React__default.forwardRef(InternalPicker);
 const Picker$1 = Picker;
-const currentYear = (/* @__PURE__ */ new Date()).getFullYear();
+const currentYear = new Date().getFullYear();
 const defaultProps$X = {
   modelValue: null,
   visible: false,
@@ -14171,7 +14170,7 @@ const Input = forwardRef((props, ref) => {
     if (maxlength && val.length > Number(maxlength)) {
       val = val.slice(0, Number(maxlength));
     }
-    updateValue(getModelValue(), "onBlur");
+    updateValue(val, "onBlur");
     onBlur && onBlur(val, event);
   };
   const handleClickInput = (event) => {
@@ -14382,6 +14381,7 @@ const InputNumber = (props) => {
     isAsync,
     className,
     style,
+    formatter,
     add,
     reduce,
     change,
@@ -14402,9 +14402,15 @@ const InputNumber = (props) => {
     ...props
   };
   const [inputValue, setInputValue] = useState(modelValue);
+  const inputRef = useRef("");
   useEffect(() => {
-    setInputValue(modelValue);
-  }, [modelValue]);
+    if (formatter) {
+      inputRef.current = formatter(modelValue);
+      setInputValue(formatter(modelValue));
+    } else {
+      setInputValue(modelValue);
+    }
+  }, [modelValue, formatter]);
   const b2 = cn("inputnumber");
   const classes = classNames(
     {
@@ -14418,12 +14424,20 @@ const InputNumber = (props) => {
     ...style
   };
   const addAllow = (value = inputValue) => {
+    if (formatter) {
+      const numValue = String(value).replace(/[^0-9|\.]/gi, "");
+      return Number(numValue) < Number(max) && !disabled;
+    }
     if (value || typeof value === "number") {
       return value < Number(max) && !disabled;
     }
     return false;
   };
   const reduceAllow = (value = inputValue) => {
+    if (formatter) {
+      const numValue = String(value).replace(/[^0-9|\.]/gi, "");
+      return Number(numValue) > Number(min) && !disabled;
+    }
     if (value || typeof value === "number") {
       return value > Number(min) && !disabled;
     }
@@ -14444,11 +14458,11 @@ const InputNumber = (props) => {
     change && change(outputValue, e);
     if (!isAsync) {
       if (Number(outputValue) < Number(min)) {
-        setInputValue(Number(min));
+        formatter ? setInputValue(formatter(Number(min))) : setInputValue(Number(min));
       } else if (Number(outputValue) > Number(max)) {
-        setInputValue(Number(max));
+        formatter ? setInputValue(formatter(Number(max))) : setInputValue(Number(max));
       } else {
-        setInputValue(outputValue);
+        formatter ? setInputValue(formatter(outputValue)) : setInputValue(outputValue);
       }
     }
   };
@@ -14456,8 +14470,15 @@ const InputNumber = (props) => {
     onReduce && onReduce(e);
     reduce && reduce(e);
     if (reduceAllow()) {
-      const outputValue = Number(inputValue) - Number(step);
-      emitChange(outputValue, e);
+      if (formatter) {
+        const numValue = String(inputValue).replace(/[^0-9|\.]/gi, "");
+        const outputValue = Number(numValue) - Number(step);
+        inputRef.current = formatter(outputValue);
+        emitChange(outputValue, e);
+      } else {
+        const outputValue = Number(inputValue) - Number(step);
+        emitChange(outputValue, e);
+      }
     } else {
       onOverlimit && onOverlimit(e);
       overlimit && overlimit(e);
@@ -14467,8 +14488,15 @@ const InputNumber = (props) => {
     onAdd && onAdd(e);
     add && add(e);
     if (addAllow()) {
-      const outputValue = Number(inputValue) + Number(step);
-      emitChange(outputValue, e);
+      if (formatter) {
+        const numValue = String(inputValue).replace(/[^0-9|\.]/gi, "");
+        const outputValue = Number(numValue) + Number(step);
+        inputRef.current = formatter(outputValue);
+        emitChange(outputValue, e);
+      } else {
+        const outputValue = Number(inputValue) + Number(step);
+        emitChange(outputValue, e);
+      }
     } else {
       onOverlimit && onOverlimit(e);
       overlimit && overlimit(e);
@@ -14486,6 +14514,41 @@ const InputNumber = (props) => {
       }
     }
   };
+  const changeFormatValue = (e) => {
+    const input = e.target.value;
+    const numReg = new RegExp("^[0-9]*$");
+    const numValue = input.replace(/[^0-9|\.]/gi, "");
+    if (formatter) {
+      if (!numReg.test(input[0]) && numValue) {
+        setInputValue(formatter(numValue));
+      } else if (!numReg.test(input[0]) && !numValue) {
+        setInputValue(input);
+      } else if (numReg.test(input[0])) {
+        console.log("inputRef.current", inputRef.current);
+        console.log("formatter(numValue)", formatter(numValue));
+        if (formatter(numValue) === inputRef.current) {
+          setInputValue(numValue);
+        } else {
+          setInputValue(formatter(numValue));
+          inputRef.current = formatter(numValue);
+        }
+      }
+    }
+  };
+  const burFormatValue = (e) => {
+    const input = e.target.value;
+    const numReg = new RegExp("^[0-9]*$");
+    const numValue = input.replace(/[^0-9|\.]/gi, "");
+    if (formatter) {
+      if (formatter(numValue) === input) {
+        emitChange(numValue, e);
+        return;
+      }
+      if (!numReg.test(input) || !input) {
+        setInputValue(formatter(""));
+      }
+    }
+  };
   const focusValue = (e) => {
     if (disabled)
       return;
@@ -14520,7 +14583,21 @@ const InputNumber = (props) => {
       name: "minus",
       onClick: reduceNumber
     }
-  )), /* @__PURE__ */ React__default.createElement(
+  )), /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, formatter ? /* @__PURE__ */ React__default.createElement(
+    "input",
+    {
+      type: "text",
+      min,
+      max,
+      style: { width: pxCheck(inputWidth) },
+      disabled,
+      readOnly: readonly,
+      value: inputValue,
+      onInput: changeFormatValue,
+      onBlur: burFormatValue,
+      onFocus: focusValue
+    }
+  ) : /* @__PURE__ */ React__default.createElement(
     "input",
     {
       type: "number",
@@ -14534,7 +14611,7 @@ const InputNumber = (props) => {
       onBlur: burValue,
       onFocus: focusValue
     }
-  ), /* @__PURE__ */ React__default.createElement("div", { className: "nut-input-add" }, /* @__PURE__ */ React__default.createElement(
+  )), /* @__PURE__ */ React__default.createElement("div", { className: "nut-input-add" }, /* @__PURE__ */ React__default.createElement(
     Icon,
     {
       classPrefix: iconClassPrefix,
@@ -16499,7 +16576,7 @@ class FileItem {
   constructor() {
     __publicField(this, "status", "ready");
     __publicField(this, "message", "准备中..");
-    __publicField(this, "uid", (/* @__PURE__ */ new Date()).getTime().toString());
+    __publicField(this, "uid", new Date().getTime().toString());
     __publicField(this, "name");
     __publicField(this, "url");
     __publicField(this, "type");
@@ -17062,7 +17139,7 @@ const BackTop = (props) => {
   };
   const scrollAnimation = () => {
     let cid = requestAniFrame2()(function fn() {
-      const t = duration - Math.max(0, startTime - +/* @__PURE__ */ new Date() + duration / 2);
+      const t = duration - Math.max(0, startTime - +new Date() + duration / 2);
       const y = t * -scrollTop / duration + scrollTop;
       scroll(y);
       cid = requestAniFrame2()(fn);
@@ -17091,7 +17168,7 @@ const BackTop = (props) => {
   }
   const goTop = (e) => {
     onClick && onClick(e);
-    const otime = +/* @__PURE__ */ new Date();
+    const otime = +new Date();
     startTime = otime;
     isAnimation && duration > 0 ? scrollAnimation() : scroll();
   };
@@ -17806,7 +17883,7 @@ class Notification extends React.PureComponent {
 __publicField(Notification, "newInstance");
 Notification.newInstance = (properties, callback) => {
   const element = document.createElement("div");
-  const id = properties.id ? properties.id : `${(/* @__PURE__ */ new Date()).getTime()}`;
+  const id = properties.id ? properties.id : `${new Date().getTime()}`;
   element.id = id;
   properties.id = id;
   document.body.appendChild(element);
@@ -20282,7 +20359,7 @@ const ImagePreview = (props) => {
     const touches = event.touches;
     const events = touches[0];
     const events2 = touches[1];
-    const curTouchTime = (/* @__PURE__ */ new Date()).getTime();
+    const curTouchTime = new Date().getTime();
     if (curTouchTime - lastTouchEndTime < 300) {
       const store12 = store;
       if (store12.scale > 1) {
@@ -20336,7 +20413,7 @@ const ImagePreview = (props) => {
     }
   };
   const onTouchEnd = () => {
-    setLastTouchEndTime((/* @__PURE__ */ new Date()).getTime());
+    setLastTouchEndTime(new Date().getTime());
     const store1 = store;
     store1.moveable = false;
     if (store1.scale < 1.1 && store1.scale > 1 || store1.scale < 1) {