assui 2.0.34 → 2.0.39

package/es/number-input/const/dataTypeEnum.d.ts

@@ -0,0 +1,5 @@
+declare enum dataType {
+    number = "number",
+    string = "string"
+}
+export default dataType;

package/es/number-input/const/dataTypeEnum.js

@@ -0,0 +1,8 @@
+var dataType;
+
+(function (dataType) {
+  dataType["number"] = "number";
+  dataType["string"] = "string";
+})(dataType || (dataType = {}));
+
+export default dataType;

package/es/number-input/index.d.ts

@@ -1,10 +1,14 @@
 import * as React from 'react';
+import type { InputProps } from 'antd/es/input';
+import dataTypeEnum from './const/dataTypeEnum';
 import * as numberTypeEnum from './const/numberType';
-export interface NumberInputProps {
+export interface NumberInputProps extends Omit<InputProps, 'onChange' | 'onBlur'> {
     /** 输入框的内容 */
     value?: string | number;
     /** 输入数据的类型 */
     numberType?: 'int' | 'float';
+    /** value的数据类型 */
+    dataType?: dataTypeEnum.number | dataTypeEnum.string;
     /** 精度，只对float有效 */
     precision?: number;
     /** 同html input属性功能 */
@@ -16,7 +20,7 @@ export interface NumberInputProps {
     /** 是否允许输入负数 */
     enableMinus?: boolean;
     /** 变化回调 */
-    onChange?: (value: string) => void;
+    onChange?: (value: string | number) => void;
     /** 失去焦点回调 */
     onBlur?: (value: string) => void;
     /** 按下回车的回调 */
@@ -32,12 +36,6 @@ export interface NumberInputProps {
     /** 可以点击清除图标删除内容 */
     allowClear?: boolean;
 }
-declare const NumberInput: {
-    (props: NumberInputProps): JSX.Element;
-    defaultProps: {
-        numberType: string;
-        enableMinus: boolean;
-    };
-    numberType: typeof numberTypeEnum;
-};
+declare const NumberInput: React.ForwardRefExoticComponent<NumberInputProps & React.RefAttributes<unknown>>;
+export { numberTypeEnum, dataTypeEnum };
 export default NumberInput;

package/es/number-input/index.js

@@ -57,24 +57,28 @@ var __read = this && this.__read || function (o, n) {
 import * as React from 'react';
 import Input from 'antd/es/input';
 import isUndefined from 'lodash/isUndefined';
+import endsWith from 'lodash/endsWith';
+import dataTypeEnum from './const/dataTypeEnum';
 import * as numberTypeEnum from './const/numberType';
 import { filterInt, filterFloat } from './utils';
-
-var NumberInput = function NumberInput(props) {
+var NumberInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,
-      numberType = props.numberType,
+      _a = props.numberType,
+      numberType = _a === void 0 ? numberTypeEnum.INT : _a,
+      _b = props.dataType,
+      dataType = _b === void 0 ? dataTypeEnum.number : _b,
       precision = props.precision,
       formatter = props.formatter,
       parser = props.parser,
       enableMinus = props.enableMinus,
       onBlur = props.onBlur,
       maxLength = props.maxLength,
-      restProps = __rest(props, ["value", "onChange", "numberType", "precision", "formatter", "parser", "enableMinus", "onBlur", "maxLength"]);
+      restProps = __rest(props, ["value", "onChange", "numberType", "dataType", "precision", "formatter", "parser", "enableMinus", "onBlur", "maxLength"]);
 
-  var _a = __read(React.useState(''), 2),
-      inputValue = _a[0],
-      setInputValue = _a[1];
+  var _c = __read(React.useState(''), 2),
+      inputValue = _c[0],
+      setInputValue = _c[1];
 
   var resultValue = isUndefined(value) ? inputValue : value;
 
@@ -107,7 +111,20 @@ var NumberInput = function NumberInput(props) {
       }
 
       if (onChange) {
-        onChange(newNumber);
+        if (dataType === dataTypeEnum.number) {
+          if (newNumber === '') {
+            onChange(newNumber);
+            return;
+          }
+
+          if (numberType === numberTypeEnum.INT) {
+            onChange(+newNumber);
+          } else {
+            endsWith(newNumber, '.') ? onChange(newNumber) : onChange(+newNumber);
+          }
+        } else {
+          onChange(newNumber);
+        }
       }
     }
   };
@@ -123,24 +140,29 @@ var NumberInput = function NumberInput(props) {
       }
     }
 
+    if (dataType === dataTypeEnum.number) {
+      if (numberType === numberTypeEnum.FLOAT && onChange && endsWith("" + resultValue, '.')) {
+        onChange(+resultValue);
+      }
+    }
+
     if (onBlur) {
-      onBlur("" + resultValue || '');
+      onBlur("" + resultValue);
     }
   };
 
   var finallyValue = formatter ? formatter("" + resultValue) : resultValue;
   return /*#__PURE__*/React.createElement(Input, __assign({
     type: "text",
+    ref: ref,
     value: finallyValue,
     onBlur: onNumberBlur,
     onChange: onNumberChange,
     maxLength: maxLength
   }, restProps));
-};
-
+});
 NumberInput.defaultProps = {
-  numberType: numberTypeEnum.INT,
   enableMinus: false
 };
-NumberInput.numberType = numberTypeEnum;
+export { numberTypeEnum, dataTypeEnum };
 export default NumberInput;

package/lib/number-input/const/dataTypeEnum.d.ts

@@ -0,0 +1,5 @@
+declare enum dataType {
+    number = "number",
+    string = "string"
+}
+export default dataType;

package/lib/number-input/const/dataTypeEnum.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var dataType;
+
+(function (dataType) {
+  dataType["number"] = "number";
+  dataType["string"] = "string";
+})(dataType || (dataType = {}));
+
+exports["default"] = dataType;

package/lib/number-input/index.d.ts

@@ -1,10 +1,14 @@
 import * as React from 'react';
+import type { InputProps } from 'antd/es/input';
+import dataTypeEnum from './const/dataTypeEnum';
 import * as numberTypeEnum from './const/numberType';
-export interface NumberInputProps {
+export interface NumberInputProps extends Omit<InputProps, 'onChange' | 'onBlur'> {
     /** 输入框的内容 */
     value?: string | number;
     /** 输入数据的类型 */
     numberType?: 'int' | 'float';
+    /** value的数据类型 */
+    dataType?: dataTypeEnum.number | dataTypeEnum.string;
     /** 精度，只对float有效 */
     precision?: number;
     /** 同html input属性功能 */
@@ -16,7 +20,7 @@ export interface NumberInputProps {
     /** 是否允许输入负数 */
     enableMinus?: boolean;
     /** 变化回调 */
-    onChange?: (value: string) => void;
+    onChange?: (value: string | number) => void;
     /** 失去焦点回调 */
     onBlur?: (value: string) => void;
     /** 按下回车的回调 */
@@ -32,12 +36,6 @@ export interface NumberInputProps {
     /** 可以点击清除图标删除内容 */
     allowClear?: boolean;
 }
-declare const NumberInput: {
-    (props: NumberInputProps): JSX.Element;
-    defaultProps: {
-        numberType: string;
-        enableMinus: boolean;
-    };
-    numberType: typeof numberTypeEnum;
-};
+declare const NumberInput: React.ForwardRefExoticComponent<NumberInputProps & React.RefAttributes<unknown>>;
+export { numberTypeEnum, dataTypeEnum };
 export default NumberInput;

package/lib/number-input/index.js

@@ -99,6 +99,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.dataTypeEnum = exports.numberTypeEnum = void 0;
 
 var React = __importStar(require("react"));
 
@@ -106,25 +107,36 @@ var input_1 = __importDefault(require("antd/es/input"));
 
 var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
 
+var endsWith_1 = __importDefault(require("lodash/endsWith"));
+
+var dataTypeEnum_1 = __importDefault(require("./const/dataTypeEnum"));
+
+exports.dataTypeEnum = dataTypeEnum_1["default"];
+
 var numberTypeEnum = __importStar(require("./const/numberType"));
 
+exports.numberTypeEnum = numberTypeEnum;
+
 var utils_1 = require("./utils");
 
-var NumberInput = function NumberInput(props) {
+var NumberInput = React.forwardRef(function (props, ref) {
   var value = props.value,
       onChange = props.onChange,
-      numberType = props.numberType,
+      _a = props.numberType,
+      numberType = _a === void 0 ? numberTypeEnum.INT : _a,
+      _b = props.dataType,
+      dataType = _b === void 0 ? dataTypeEnum_1["default"].number : _b,
       precision = props.precision,
       formatter = props.formatter,
       parser = props.parser,
       enableMinus = props.enableMinus,
       onBlur = props.onBlur,
       maxLength = props.maxLength,
-      restProps = __rest(props, ["value", "onChange", "numberType", "precision", "formatter", "parser", "enableMinus", "onBlur", "maxLength"]);
+      restProps = __rest(props, ["value", "onChange", "numberType", "dataType", "precision", "formatter", "parser", "enableMinus", "onBlur", "maxLength"]);
 
-  var _a = __read(React.useState(''), 2),
-      inputValue = _a[0],
-      setInputValue = _a[1];
+  var _c = __read(React.useState(''), 2),
+      inputValue = _c[0],
+      setInputValue = _c[1];
 
   var resultValue = isUndefined_1["default"](value) ? inputValue : value;
 
@@ -157,7 +169,20 @@ var NumberInput = function NumberInput(props) {
       }
 
       if (onChange) {
-        onChange(newNumber);
+        if (dataType === dataTypeEnum_1["default"].number) {
+          if (newNumber === '') {
+            onChange(newNumber);
+            return;
+          }
+
+          if (numberType === numberTypeEnum.INT) {
+            onChange(+newNumber);
+          } else {
+            endsWith_1["default"](newNumber, '.') ? onChange(newNumber) : onChange(+newNumber);
+          }
+        } else {
+          onChange(newNumber);
+        }
       }
     }
   };
@@ -173,24 +198,28 @@ var NumberInput = function NumberInput(props) {
       }
     }
 
+    if (dataType === dataTypeEnum_1["default"].number) {
+      if (numberType === numberTypeEnum.FLOAT && onChange && endsWith_1["default"]("" + resultValue, '.')) {
+        onChange(+resultValue);
+      }
+    }
+
     if (onBlur) {
-      onBlur("" + resultValue || '');
+      onBlur("" + resultValue);
     }
   };
 
   var finallyValue = formatter ? formatter("" + resultValue) : resultValue;
   return React.createElement(input_1["default"], __assign({
     type: "text",
+    ref: ref,
     value: finallyValue,
     onBlur: onNumberBlur,
     onChange: onNumberChange,
     maxLength: maxLength
   }, restProps));
-};
-
+});
 NumberInput.defaultProps = {
-  numberType: numberTypeEnum.INT,
   enableMinus: false
 };
-NumberInput.numberType = numberTypeEnum;
 exports["default"] = NumberInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.0.34",
+  "version": "2.0.39",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -33,7 +33,7 @@
     "@ahooksjs/use-url-state": "^2.5.8",
     "@tinymce/tinymce-react": "^3.13.0",
     "@types/react-beautiful-dnd": "^13.1.2",
-    "a-icons": "^1.0.20",
+    "a-icons": "^1.0.24",
     "ahooks": "^2.10.9",
     "bignumber.js": "^9.0.1",
     "copy-to-clipboard": "^3.3.1",
@@ -69,5 +69,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "f5a14525d523426cc473063c0d004a609fc53f43"
+  "gitHead": "2c935268a3d1f4d731fb20f7803eac30216fd03f"
 }