assui 2.0.120 → 2.0.123

package/lib/label-number-input/style/index.less

@@ -0,0 +1,59 @@
+@import '../../style/themes/default.less';
+
+@color_263241: #263241;
+@color_9aa5b5: #9aa5b5;
+@color_e5e5e5: #e5e5e5;
+
+@font-size-base: 14px;
+@font-size-lg: @font-size-base + 2px;
+
+@font-weight-500: 500;
+
+.label-number-input {
+  z-index: 1;
+  width: 100%;
+  height: 100%;
+  padding: 19px 15px 2px 15px;
+  color: @color_263241;
+  font-size: @font-size-base;
+  line-height: 16px;
+  border: 0;
+  outline: 0;
+
+  &:focus + label,
+  &:not([data-value='0']) + label {
+    transform: translateY(@labelTextLabeltranslateY) scale(@labelTextLabelScale);
+  }
+
+  &-field {
+    height: 45px;
+    overflow: hidden;
+    border: 1px solid @color_e5e5e5;
+    border-radius: 8px;
+    transition: border 0.3s;
+  }
+
+  &-focused {
+    border-color: @labelFocusBorderColor;
+  }
+
+  &-warper {
+    position: relative;
+    width: 100%;
+    height: 100%;
+  }
+
+  &-text {
+    position: absolute;
+    top: 12px;
+    left: 15px;
+    z-index: 2;
+    height: 20px;
+    color: @color_9aa5b5;
+    font-size: @font-size-base;
+    line-height: 20px;
+    transform-origin: top left;
+    cursor: text;
+    transition: all 0.2s ease-out;
+  }
+}

package/lib/label-select/index.js

@@ -60,7 +60,7 @@ var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllable
 
 var select_1 = __importDefault(require("antd/es/select"));
 
-var lodash_1 = require("lodash");
+var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
 
 var classnames_1 = __importDefault(require("classnames"));
 
@@ -108,7 +108,7 @@ var LabelSelect = function LabelSelect(props) {
   return react_1["default"].createElement("div", {
     className: classnames_1["default"]({
       'label-select': true,
-      'label-select-label-scale': open || !lodash_1.isUndefined(value)
+      'label-select-label-scale': open || !isUndefined_1["default"](value)
     }, className)
   }, react_1["default"].createElement(select_1["default"], __assign({}, omit_1["default"](props, ['open', 'onChange', 'className', 'label']), {
     open: open,

package/lib/label-text-area/index.js

@@ -70,7 +70,7 @@ var react_1 = __importDefault(require("react"));
 
 var classnames_1 = __importDefault(require("classnames"));
 
-var ahooks_1 = require("ahooks");
+var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 
 var trimStart_1 = __importDefault(require("lodash/trimStart"));
 
@@ -87,7 +87,7 @@ var LabelTextArea = function LabelTextArea(props) {
       focused = _a[0],
       setFocused = _a[1];
 
-  var _b = __read(ahooks_1.useControllableValue(props), 2),
+  var _b = __read(useControllableValue_1["default"](props), 2),
       value = _b[0],
       setValue = _b[1];
 

package/lib/label-text-area/style/index.css

@@ -21,6 +21,7 @@
   width: 100%;
   height: 100%;
   padding-top: 24px;
+  overflow: hidden;
   border: 1px solid #e5e5e5;
   border-radius: 12px;
   outline: 0;

package/lib/label-text-area/style/index.less

@@ -33,6 +33,7 @@
     width: 100%;
     height: 100%;
     padding-top: 24px;
+    overflow: hidden;
     border: 1px solid @color_e5e5e5;
     border-radius: 12px;
     outline: 0;

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

@@ -2,9 +2,10 @@ import * as React from 'react';
 import type { InputProps } from 'antd/es/input';
 import * as dataTypeEnum from './const/dataTypeEnum';
 import * as numberTypeEnum from './const/numberType';
+export declare type NumberInputValueType = string | number;
 export interface NumberInputProps extends Omit<InputProps, 'onChange' | 'onBlur'> {
     /** 输入框的内容 */
-    value?: string | number;
+    value?: NumberInputValueType;
     /** 输入数据的类型 */
     numberType?: 'int' | 'float';
     /** value的数据类型 */
@@ -20,9 +21,9 @@ export interface NumberInputProps extends Omit<InputProps, 'onChange' | 'onBlur'
     /** 是否允许输入负数 */
     enableMinus?: boolean;
     /** 变化回调 */
-    onChange?: (value: string | number) => void;
+    onChange?: (value: NumberInputValueType) => void;
     /** 失去焦点回调 */
-    onBlur?: (value: string) => void;
+    onBlur?: (value: NumberInputValueType) => void;
     /** 按下回车的回调 */
     onPressEnter?: React.KeyboardEventHandler<HTMLInputElement>;
     /** 带标签的 input，设置前置标签 */

package/lib/number-input/index.js

@@ -105,7 +105,9 @@ var React = __importStar(require("react"));
 
 var input_1 = __importDefault(require("antd/es/input"));
 
-var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
+var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
+
+var omit_1 = __importDefault(require("lodash/omit"));
 
 var dataTypeEnum = __importStar(require("./const/dataTypeEnum"));
 
@@ -118,25 +120,24 @@ exports.numberTypeEnum = numberTypeEnum;
 var utils_1 = require("./utils");
 
 var NumberInput = React.forwardRef(function (props, ref) {
-  var value = props.value,
-      onChange = props.onChange,
-      _a = props.numberType,
-      numberType = _a === void 0 ? numberTypeEnum.INT : _a,
-      _b = props.dataType,
-      dataType = _b === void 0 ? dataTypeEnum.NUMBER : _b,
+  var _a = __read(useControllableValue_1["default"](props, {
+    defaultValue: ''
+  }), 2),
+      value = _a[0],
+      setValue = _a[1];
+
+  var onChange = props.onChange,
+      _b = props.numberType,
+      numberType = _b === void 0 ? numberTypeEnum.INT : _b,
+      _c = props.dataType,
+      dataType = _c === void 0 ? dataTypeEnum.NUMBER : _c,
       precision = props.precision,
       formatter = props.formatter,
       parser = props.parser,
       enableMinus = props.enableMinus,
       onBlur = props.onBlur,
       maxLength = props.maxLength,
-      restProps = __rest(props, ["value", "onChange", "numberType", "dataType", "precision", "formatter", "parser", "enableMinus", "onBlur", "maxLength"]);
-
-  var _c = __read(React.useState(''), 2),
-      inputValue = _c[0],
-      setInputValue = _c[1];
-
-  var resultValue = isUndefined_1["default"](value) ? inputValue : value;
+      restProps = __rest(props, ["onChange", "numberType", "dataType", "precision", "formatter", "parser", "enableMinus", "onBlur", "maxLength"]);
 
   var onNumberChange = function onNumberChange(e) {
     var newNumber;
@@ -145,13 +146,13 @@ var NumberInput = React.forwardRef(function (props, ref) {
     if (numberType === numberTypeEnum.INT) {
       newNumber = utils_1.filterInt({
         value: newValue,
-        preValue: "" + resultValue,
+        preValue: "" + value,
         enableMinus: enableMinus
       });
     } else {
       newNumber = utils_1.filterFloat({
         value: newValue,
-        preValue: "" + resultValue,
+        preValue: "" + value,
         precision: precision !== null && precision !== void 0 ? precision : 2,
         enableMinus: enableMinus
       });
@@ -161,42 +162,29 @@ var NumberInput = React.forwardRef(function (props, ref) {
       newNumber = parser(newNumber);
     }
 
-    if (resultValue !== newNumber) {
-      if (value === undefined) {
-        setInputValue(newNumber);
-      }
-
-      if (onChange) {
-        onChange(newNumber);
-      }
+    if (value !== newNumber) {
+      setValue(newNumber);
     }
   };
 
   var onNumberBlur = function onNumberBlur() {
-    if (resultValue === '-' || resultValue === '.') {
-      if (value === undefined) {
-        setInputValue('');
-      }
+    var resultValue = value;
 
-      if (onChange) {
-        onChange('');
-      }
-    }
-
-    if (dataType === dataTypeEnum.NUMBER && resultValue) {
+    if (value === '-' || value === '.') {
+      resultValue = '';
+    } else if (value && dataType === dataTypeEnum.NUMBER) {
       if (numberType === numberTypeEnum.FLOAT) {
-        onChange && onChange(+resultValue);
+        resultValue = +value;
       } else {
-        onChange && onChange(parseInt("" + resultValue, 10));
+        resultValue = parseInt("" + value, 10);
       }
     }
 
-    if (onBlur) {
-      onBlur("" + resultValue);
-    }
+    setValue(resultValue);
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(resultValue);
   };
 
-  var finallyValue = formatter ? formatter("" + resultValue) : resultValue;
+  var finallyValue = formatter ? formatter("" + value) : value;
   return React.createElement(input_1["default"], __assign({
     type: "text",
     ref: ref,
@@ -204,7 +192,7 @@ var NumberInput = React.forwardRef(function (props, ref) {
     onBlur: onNumberBlur,
     onChange: onNumberChange,
     maxLength: maxLength
-  }, restProps));
+  }, omit_1["default"](restProps, ['value'])));
 });
 NumberInput.defaultProps = {
   enableMinus: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.0.120",
+  "version": "2.0.123",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -69,5 +69,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "06e30bd22efb48f7333e7beefabc3756aa0399be"
+  "gitHead": "90952a6585aab0568fc109904ce28bd322e9052d"
 }