assui 2.1.30 → 2.1.33

package/es/button-modal/index.js

@@ -72,19 +72,13 @@ var ButtonModal = function ButtonModal(props, ref) {
       restModalProps = __rest(props, ["children", "trigger", "onOpen", "onClose", "onOk", "onCancel"]);
 
   var openModal = function openModal() {
-    if (onOpen) {
-      onOpen();
-    }
-
     setModalVisible(true);
+    onOpen === null || onOpen === void 0 ? void 0 : onOpen();
   };
 
   var closeModal = function closeModal() {
-    if (onClose) {
-      onClose();
-    }
-
     setModalVisible(false);
+    onClose === null || onClose === void 0 ? void 0 : onClose();
   };
 
   var modalActionRef = React.useRef({

package/es/label-auto-complete/index.js

@@ -74,13 +74,11 @@ var LabelAutoComplete = function LabelAutoComplete(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     if (!open) {
       setOpen(!open);
     }
 
-    (_a = autoComplete.current) === null || _a === void 0 ? void 0 : _a.focus();
+    autoComplete.current.focus();
   };
 
   var onDropdownVisibleChange = function onDropdownVisibleChange(nextOpen) {

package/es/label-condition-input/index.d.ts

@@ -1,10 +1,12 @@
 import React from 'react';
 import type { ConditionInputProps } from '../condition-input';
-export interface LabelConditionInputProps extends ConditionInputProps {
+export interface LabelConditionInputProps extends Omit<ConditionInputProps, 'onBlur' | 'onChange'> {
     /** label 标签的文本 */
     label?: React.ReactNode;
     /** 输入框内容变化时的回调 */
     onChange?: (value: string) => void;
+    /** 输入框失去焦点的回调 */
+    onBlur?: (value: string) => void;
     /** 输入框除去label之后的最小末尾宽度 */
     baseMinWidth?: number;
     /** 组件dom id */

package/es/label-condition-input/index.js

@@ -70,10 +70,8 @@ var LabelConditionInput = function LabelConditionInput(props) {
       setFocused = _c[1];
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     setFocused(true);
-    (_a = InputDomRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    InputDomRef.current.focus();
   };
 
   var handleFocus = function handleFocus() {
@@ -81,9 +79,9 @@ var LabelConditionInput = function LabelConditionInput(props) {
     onFocus === null || onFocus === void 0 ? void 0 : onFocus(value);
   };
 
-  var handleBlur = function handleBlur(e) {
+  var handleBlur = function handleBlur() {
     setFocused(false);
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value);
   };
 
   var controlMinWidth = (labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) ? labelSize.width + baseMinWidth : undefined;
@@ -95,9 +93,9 @@ var LabelConditionInput = function LabelConditionInput(props) {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: classNames('label-condition-input-field', {
-      'label-condition-input-focused': focused || value
+      'label-condition-input-focused': focused
     })
-  }, /*#__PURE__*/React.createElement(ConditionInput, __assign({}, omit(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder']), {
+  }, /*#__PURE__*/React.createElement(ConditionInput, __assign({}, omit(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder', 'baseMinWidth']), {
     ref: InputDomRef,
     "data-value": value ? value.length : 0,
     value: value,

package/es/label-customize-range-picker/index.d.ts

@@ -12,6 +12,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     customizeTimeList?: dateTypeEnum[];
     rangePickerType?: 'label' | 'origin';
     label?: React.ReactNode;
+    /** 最大时间范围 */
+    maxScope?: number;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

package/es/label-customize-range-picker/index.js

@@ -59,6 +59,8 @@ import Radio from 'antd/lib/radio';
 import Checkbox from 'antd/lib/checkbox';
 import DatePicker from 'antd/lib/date-picker';
 import useControllableValue from 'ahooks/lib/useControllableValue';
+import moment from 'moment';
+import omit from 'lodash/omit';
 import getDefaultRadioList from './defaultRadioList';
 import LabelRangePicker from '../label-range-picker';
 import LocaleContext from '../config-provider/context';
@@ -71,7 +73,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       _a = props.rangePickerType,
       rangePickerType = _a === void 0 ? 'label' : _a,
       label = props.label,
-      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label"]);
+      maxScope = props.maxScope,
+      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
 
   var _b = __read(useControllableValue(props), 2),
       date = _b[0],
@@ -92,7 +95,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var messages = useContext(LocaleContext);
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : getDefaultRadioList(messages);
   useEffect(function () {
-    var foundItem = dataSource.find(function (item) {
+    var filterItemList = dataSource.filter(function (item) {
       if (!date) return false;
 
       var _a = __read(item.value, 2),
@@ -109,8 +112,21 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
 
       return false;
     });
-    var data = foundItem ? foundItem.key : null;
-    setRadioKey(data);
+
+    if (filterItemList.length === 0) {
+      setRadioKey(null);
+    } else if (filterItemList.length > 1) {
+      var findItem = filterItemList.find(function (item) {
+        return item.key === radioKey;
+      });
+      var resutRadioKey = findItem ? findItem.key : filterItemList[0].key;
+      setRadioKey(resutRadioKey);
+    } else {
+      var _a = __read(filterItemList, 1),
+          item = _a[0];
+
+      setRadioKey(item.key);
+    }
   }, [date]);
 
   var onDiyTimeChange = function onDiyTimeChange(event) {
@@ -119,7 +135,47 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
 
   var onDateChange = function onDateChange(nextValue) {
-    setDate(nextValue);
+    var _a, _b;
+
+    var _c = __read(nextValue || [], 2),
+        start = _c[0],
+        end = _c[1];
+
+    var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+    var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+
+    if (!nextStartDate && !nextEndDate) {
+      return setDate(undefined);
+    }
+
+    if (!maxScope) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    var _d = __read(date || [], 1),
+        startDate = _d[0];
+
+    if (nextStartDate && nextEndDate) {
+      var isChangeStartData = !(startDate === null || startDate === void 0 ? void 0 : startDate.clone().isSame(nextStartDate, 'day'));
+
+      if (isChangeStartData) {
+        if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+          nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+        }
+      } else if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+        nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+      }
+    } else if (!nextStartDate && nextEndDate) {
+      nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+    } else if (nextStartDate && !nextEndDate) {
+      nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+    }
+
+    if (nextStartDate && nextEndDate) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    return setDate([nextStartDate, nextEndDate]);
   };
 
   var onRadioChange = function onRadioChange(event) {
@@ -135,6 +191,14 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var list = radioList !== null && radioList !== void 0 ? radioList : getDefaultRadioList(messages).filter(function (item) {
     return customizeTimeList ? customizeTimeList.includes(item.key) : true;
   });
+  var resultList = maxScope ? list.filter(function (item) {
+    var _a = __read(item.value, 2),
+        startTime = _a[0],
+        entTime = _a[1];
+
+    var space = moment.duration(entTime.diff(startTime)).asDays();
+    return space <= maxScope;
+  }) : list;
 
   var panelRender = function panelRender(panel) {
     return /*#__PURE__*/React.createElement("div", {
@@ -154,7 +218,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }, /*#__PURE__*/React.createElement(Radio.Group, {
       onChange: onRadioChange,
       value: radioKey
-    }, list.map(function (_a) {
+    }, resultList.map(function (_a) {
       var key = _a.key,
           text = _a.text;
       return /*#__PURE__*/React.createElement(Radio, {
@@ -179,7 +243,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
   return rangePickerType === 'label' ? /*#__PURE__*/React.createElement(LabelRangePicker, __assign({
     label: label
-  }, baseOptions, options)) : /*#__PURE__*/React.createElement(RangePicker, __assign({}, baseOptions, options));
+  }, baseOptions, omit(options, 'onChange'))) : /*#__PURE__*/React.createElement(RangePicker, __assign({}, baseOptions, omit(options, 'onChange')));
 };
 
 export default LabelCustomizeRangePicker;

package/es/label-customize-range-picker/style/index.css

@@ -1793,6 +1793,12 @@ html {
   padding: 8px 11px 6px;
   border-bottom: 1px solid #f5f6fa;
 }
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-wrapper {
+  pointer-events: none;
+}
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-input {
+  pointer-events: auto;
+}
 .label-customize-range-picker-panel .pick-box {
   display: flex;
   justify-content: space-between;

package/es/label-customize-range-picker/style/index.less

@@ -8,6 +8,14 @@
   .check-wrapper {
     padding: 8px 11px 6px;
     border-bottom: 1px solid #f5f6fa;
+
+    .@{ant-prefix}-checkbox-wrapper {
+      pointer-events: none;
+    }
+
+    .@{ant-prefix}-checkbox-input {
+      pointer-events: auto;
+    }
   }
 
   .pick-box {

package/es/label-date-picker/index.js

@@ -68,13 +68,11 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     if (!open) {
       setOpen(!open);
     }
 
-    (_a = datePickerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    datePickerRef.current.focus();
   };
 
   var onBlur = function onBlur() {

package/es/label-input/index.js

@@ -97,9 +97,7 @@ var LabelInput = function LabelInput(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
-    (_a = InputDomRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    InputDomRef.current.focus();
   };
 
   var onChangeInputType = React.useCallback(function (nextInputType) {

package/es/label-number-input/index.js

@@ -70,10 +70,8 @@ var LabelNumberInput = function LabelNumberInput(props) {
       setFocused = _c[1];
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     setFocused(true);
-    (_a = numberInputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    numberInputRef.current.focus();
   };
 
   var handleFocus = function handleFocus() {
@@ -81,9 +79,9 @@ var LabelNumberInput = function LabelNumberInput(props) {
     onFocus === null || onFocus === void 0 ? void 0 : onFocus(value);
   };
 
-  var handleBlur = function handleBlur(e) {
+  var handleBlur = function handleBlur() {
     setFocused(false);
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value);
   };
 
   var controlMinWidth = (labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) ? labelSize.width + baseMinWidth : undefined;
@@ -97,7 +95,7 @@ var LabelNumberInput = function LabelNumberInput(props) {
     className: classNames('label-number-input-field', {
       'label-number-input-focused': focused
     })
-  }, /*#__PURE__*/React.createElement(NumberInput, __assign({}, omit(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder']), {
+  }, /*#__PURE__*/React.createElement(NumberInput, __assign({}, omit(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder', 'baseMinWidth']), {
     ref: numberInputRef,
     "data-value": !isUndefined(value) ? "".concat(value).length : 0,
     value: value,

package/es/label-range-picker/index.js

@@ -80,6 +80,7 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleOpenChange = function handleOpenChange(nextOpen) {
+    console.log('--');
     onOpenChange(nextOpen);
   };
 

package/es/label-select/index.js

@@ -72,13 +72,11 @@ var LabelSelect = function LabelSelect(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     if (!open) {
       setOpen(!open);
     }
 
-    (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    selectRef.current.focus();
   };
 
   var onDropdownVisibleChange = function onDropdownVisibleChange(nextOpen) {
@@ -93,7 +91,7 @@ var LabelSelect = function LabelSelect(props) {
   }, /*#__PURE__*/React.createElement(Select, __assign({
     maxTagCount: 3,
     showSearch: false
-  }, omit(props, ['open', 'onChange', 'className', 'label']), {
+  }, omit(props, ['open', 'onChange', 'className', 'label', 'setOpen']), {
     open: open,
     ref: selectRef,
     size: "large",

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

@@ -89,9 +89,7 @@ var LabelTextArea = function LabelTextArea(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
-    (_a = TextAreaDomRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    TextAreaDomRef.current.focus();
   };
 
   var handleChange = function handleChange(e) {

package/es/messages/zh_CN.js

@@ -9,7 +9,7 @@ var locale = {
       lastWeek: '上周',
       month: '本月',
       lastMonth: '上月',
-      quarter: '季度',
+      quarter: '本季度',
       lastQuarter: '上季度',
       last7days: '最近7天',
       last14days: '最近14天',

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

@@ -1,10 +1,10 @@
 export interface FilterIntType {
     value: string;
     enableMinus?: boolean;
-    preValue: string;
+    preValue?: string;
 }
 export declare const filterInt: ({ value, enableMinus, preValue }: FilterIntType) => string;
 export interface FilterFloatType extends FilterIntType {
-    precision: number;
+    precision?: number;
 }
-export declare const filterFloat: ({ value, preValue, precision, enableMinus }: FilterFloatType) => string;
+export declare const filterFloat: ({ value, preValue, precision, enableMinus, }: FilterFloatType) => string;

package/es/number-input/utils.js

@@ -1,4 +1,5 @@
 /* eslint-disable no-useless-escape */
+var intNumberReg = /^-?\d+$/;
 export var filterInt = function filterInt(_a) {
   var value = _a.value,
       enableMinus = _a.enableMinus,
@@ -9,18 +10,18 @@ export var filterInt = function filterInt(_a) {
     nextValue = value.replace(/\D/g, '');
   }
 
-  var intNumberReg = /^-?\d+$/;
-
   if (nextValue && nextValue.length > 1 && !intNumberReg.test(nextValue)) {
-    return preValue;
+    return preValue !== null && preValue !== void 0 ? preValue : '';
   }
 
   return nextValue;
 };
 export var filterFloat = function filterFloat(_a) {
   var value = _a.value,
-      preValue = _a.preValue,
-      precision = _a.precision,
+      _b = _a.preValue,
+      preValue = _b === void 0 ? '' : _b,
+      _c = _a.precision,
+      precision = _c === void 0 ? 2 : _c,
       enableMinus = _a.enableMinus;
   var nextValue = value.replace(/[^\d.\-]/g, '');
   var matchDecimalPoint = nextValue.match(/\./g) || [];

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

@@ -7,7 +7,7 @@ export interface StepNumberInputProps {
     /** 精度，只对float有效 */
     precision: number;
     /** 内容最大长度 */
-    maxLength: number;
+    maxLength?: number;
     /** 指定输入框展示值的格式 */
     formatter?: (value: string) => string;
     /** 指定从 formatter 里转换回数字的方式，和 formatter 搭配使用 */

package/es/step-number-input/index.js

@@ -58,41 +58,36 @@ import * as React from 'react';
 import classNames from 'classnames';
 import BigNumber from 'bignumber.js';
 import isUndefined from 'lodash/isUndefined';
+import useControllableValue from 'ahooks/lib/useControllableValue';
 import { INT } from './const/numberType';
 import { PLUS, MINUS } from './const/countType';
 import NumberInput from '../number-input';
 
 var StepNumberInput = function StepNumberInput(props) {
-  var value = props.value,
-      onChange = props.onChange,
+  var _a = __read(useControllableValue(props, {
+    defaultValue: ''
+  }), 2),
+      value = _a[0],
+      setValue = _a[1];
+
+  var onChange = props.onChange,
       onBlur = props.onBlur,
       numberType = props.numberType,
       precision = props.precision,
       step = props.step,
       max = props.max,
       min = props.min,
-      restProps = __rest(props, ["value", "onChange", "onBlur", "numberType", "precision", "step", "max", "min"]);
-
-  var _a = __read(React.useState(''), 2),
-      inputValue = _a[0],
-      setInputValue = _a[1];
+      restProps = __rest(props, ["onChange", "onBlur", "numberType", "precision", "step", "max", "min"]);
 
-  var resultValue = isUndefined(value) ? inputValue : value;
-  var isEmpty = isUndefined(resultValue) || resultValue === '';
-  var plusNumber = new BigNumber(resultValue).plus(step).toString();
-  var minusNumber = new BigNumber(resultValue).minus(step).toString();
-  var maxCondition = isUndefined(max) ? false : max === Number(resultValue) || Number(max) < Number(plusNumber);
-  var minCondition = isUndefined(min) ? false : min === Number(resultValue) || Number(min) > Number(minusNumber);
+  var isEmpty = isUndefined(value) || value === '';
+  var plusNumber = new BigNumber(value).plus(step).toString();
+  var minusNumber = new BigNumber(value).minus(step).toString();
+  var maxCondition = isUndefined(max) ? false : max === Number(value) || Number(max) < Number(plusNumber);
+  var minCondition = isUndefined(min) ? false : min === Number(value) || Number(min) > Number(minusNumber);
 
   var onNumberChange = function onNumberChange(lastValue) {
-    if (resultValue !== lastValue) {
-      if (isUndefined(value)) {
-        setInputValue(lastValue);
-      }
-
-      if (onChange) {
-        onChange(lastValue);
-      }
+    if (value !== lastValue) {
+      setValue(lastValue);
     }
   };
 
@@ -109,49 +104,26 @@ var StepNumberInput = function StepNumberInput(props) {
       newNumber = minCondition ? "".concat(min) : minusNumber;
     }
 
-    if (value === undefined) {
-      setInputValue(newNumber);
-    }
-
-    if (onChange) {
-      onChange(newNumber);
-    }
+    setValue(newNumber);
   };
 
   var onNumberBlur = function onNumberBlur() {
-    if (resultValue === '-' || resultValue === '.') {
-      if (value === undefined) {
-        setInputValue('');
-      }
+    var resultValue = value;
 
-      if (onChange) {
-        onChange('');
-      }
+    if (value === '-' || value === '.') {
+      resultValue = '';
     }
 
-    if (!isUndefined(max) && Number(resultValue) > max) {
-      if (isUndefined(value)) {
-        setInputValue("".concat(max));
-      }
-
-      if (onChange) {
-        onChange("".concat(max));
-      }
+    if (!isUndefined(max) && Number(value) > max) {
+      resultValue = "".concat(max);
     }
 
-    if (!isUndefined(min) && Number(resultValue) < min) {
-      if (isUndefined(value)) {
-        setInputValue("".concat(min));
-      }
-
-      if (onChange) {
-        onChange("".concat(min));
-      }
+    if (!isUndefined(min) && Number(value) < min) {
+      resultValue = "".concat(min);
     }
 
-    if (onBlur) {
-      onBlur("".concat(resultValue) || '');
-    }
+    setValue(resultValue);
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(resultValue);
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -173,7 +145,7 @@ var StepNumberInput = function StepNumberInput(props) {
         'disabled-btn': isEmpty || maxCondition
       })
     }, "+"),
-    value: "".concat(resultValue),
+    value: "".concat(value),
     onChange: onNumberChange,
     onBlur: onNumberBlur,
     numberType: numberType,

package/lib/button-modal/index.js

@@ -126,19 +126,13 @@ var ButtonModal = function ButtonModal(props, ref) {
       restModalProps = __rest(props, ["children", "trigger", "onOpen", "onClose", "onOk", "onCancel"]);
 
   var openModal = function openModal() {
-    if (onOpen) {
-      onOpen();
-    }
-
     setModalVisible(true);
+    onOpen === null || onOpen === void 0 ? void 0 : onOpen();
   };
 
   var closeModal = function closeModal() {
-    if (onClose) {
-      onClose();
-    }
-
     setModalVisible(false);
+    onClose === null || onClose === void 0 ? void 0 : onClose();
   };
 
   var modalActionRef = React.useRef({

package/lib/label-auto-complete/index.js

@@ -91,13 +91,11 @@ var LabelAutoComplete = function LabelAutoComplete(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     if (!open) {
       setOpen(!open);
     }
 
-    (_a = autoComplete.current) === null || _a === void 0 ? void 0 : _a.focus();
+    autoComplete.current.focus();
   };
 
   var onDropdownVisibleChange = function onDropdownVisibleChange(nextOpen) {

package/lib/label-condition-input/index.d.ts

@@ -1,10 +1,12 @@
 import React from 'react';
 import type { ConditionInputProps } from '../condition-input';
-export interface LabelConditionInputProps extends ConditionInputProps {
+export interface LabelConditionInputProps extends Omit<ConditionInputProps, 'onBlur' | 'onChange'> {
     /** label 标签的文本 */
     label?: React.ReactNode;
     /** 输入框内容变化时的回调 */
     onChange?: (value: string) => void;
+    /** 输入框失去焦点的回调 */
+    onBlur?: (value: string) => void;
     /** 输入框除去label之后的最小末尾宽度 */
     baseMinWidth?: number;
     /** 组件dom id */

package/lib/label-condition-input/index.js

@@ -87,10 +87,8 @@ var LabelConditionInput = function LabelConditionInput(props) {
       setFocused = _c[1];
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     setFocused(true);
-    (_a = InputDomRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    InputDomRef.current.focus();
   };
 
   var handleFocus = function handleFocus() {
@@ -98,9 +96,9 @@ var LabelConditionInput = function LabelConditionInput(props) {
     onFocus === null || onFocus === void 0 ? void 0 : onFocus(value);
   };
 
-  var handleBlur = function handleBlur(e) {
+  var handleBlur = function handleBlur() {
     setFocused(false);
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value);
   };
 
   var controlMinWidth = (labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) ? labelSize.width + baseMinWidth : undefined;
@@ -112,9 +110,9 @@ var LabelConditionInput = function LabelConditionInput(props) {
     }
   }, react_1["default"].createElement("div", {
     className: (0, classnames_1["default"])('label-condition-input-field', {
-      'label-condition-input-focused': focused || value
+      'label-condition-input-focused': focused
     })
-  }, react_1["default"].createElement(condition_input_1["default"], __assign({}, (0, omit_1["default"])(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder']), {
+  }, react_1["default"].createElement(condition_input_1["default"], __assign({}, (0, omit_1["default"])(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder', 'baseMinWidth']), {
     ref: InputDomRef,
     "data-value": value ? value.length : 0,
     value: value,

package/lib/label-customize-range-picker/index.d.ts

@@ -12,6 +12,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     customizeTimeList?: dateTypeEnum[];
     rangePickerType?: 'label' | 'origin';
     label?: React.ReactNode;
+    /** 最大时间范围 */
+    maxScope?: number;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

package/lib/label-customize-range-picker/index.js

@@ -116,6 +116,10 @@ var date_picker_1 = __importDefault(require("antd/lib/date-picker"));
 
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 
+var moment_1 = __importDefault(require("moment"));
+
+var omit_1 = __importDefault(require("lodash/omit"));
+
 var defaultRadioList_1 = __importDefault(require("./defaultRadioList"));
 
 var label_range_picker_1 = __importDefault(require("../label-range-picker"));
@@ -132,7 +136,8 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       _a = props.rangePickerType,
       rangePickerType = _a === void 0 ? 'label' : _a,
       label = props.label,
-      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label"]);
+      maxScope = props.maxScope,
+      options = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "maxScope"]);
 
   var _b = __read((0, useControllableValue_1["default"])(props), 2),
       date = _b[0],
@@ -153,7 +158,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var messages = (0, react_1.useContext)(context_1["default"]);
   var dataSource = radioList !== null && radioList !== void 0 ? radioList : (0, defaultRadioList_1["default"])(messages);
   (0, react_1.useEffect)(function () {
-    var foundItem = dataSource.find(function (item) {
+    var filterItemList = dataSource.filter(function (item) {
       if (!date) return false;
 
       var _a = __read(item.value, 2),
@@ -170,8 +175,21 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
 
       return false;
     });
-    var data = foundItem ? foundItem.key : null;
-    setRadioKey(data);
+
+    if (filterItemList.length === 0) {
+      setRadioKey(null);
+    } else if (filterItemList.length > 1) {
+      var findItem = filterItemList.find(function (item) {
+        return item.key === radioKey;
+      });
+      var resutRadioKey = findItem ? findItem.key : filterItemList[0].key;
+      setRadioKey(resutRadioKey);
+    } else {
+      var _a = __read(filterItemList, 1),
+          item = _a[0];
+
+      setRadioKey(item.key);
+    }
   }, [date]);
 
   var onDiyTimeChange = function onDiyTimeChange(event) {
@@ -180,7 +198,47 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
 
   var onDateChange = function onDateChange(nextValue) {
-    setDate(nextValue);
+    var _a, _b;
+
+    var _c = __read(nextValue || [], 2),
+        start = _c[0],
+        end = _c[1];
+
+    var nextStartDate = (_a = start === null || start === void 0 ? void 0 : start.clone().startOf('day')) !== null && _a !== void 0 ? _a : null;
+    var nextEndDate = (_b = end === null || end === void 0 ? void 0 : end.clone().endOf('day')) !== null && _b !== void 0 ? _b : null;
+
+    if (!nextStartDate && !nextEndDate) {
+      return setDate(undefined);
+    }
+
+    if (!maxScope) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    var _d = __read(date || [], 1),
+        startDate = _d[0];
+
+    if (nextStartDate && nextEndDate) {
+      var isChangeStartData = !(startDate === null || startDate === void 0 ? void 0 : startDate.clone().isSame(nextStartDate, 'day'));
+
+      if (isChangeStartData) {
+        if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+          nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+        }
+      } else if (nextEndDate.diff(nextStartDate, 'day') > maxScope) {
+        nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+      }
+    } else if (!nextStartDate && nextEndDate) {
+      nextStartDate = nextEndDate.clone().subtract(maxScope - 1, 'day');
+    } else if (nextStartDate && !nextEndDate) {
+      nextEndDate = nextStartDate.clone().add(maxScope - 1, 'day');
+    }
+
+    if (nextStartDate && nextEndDate) {
+      return setDate([nextStartDate, nextEndDate]);
+    }
+
+    return setDate([nextStartDate, nextEndDate]);
   };
 
   var onRadioChange = function onRadioChange(event) {
@@ -196,6 +254,14 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   var list = radioList !== null && radioList !== void 0 ? radioList : (0, defaultRadioList_1["default"])(messages).filter(function (item) {
     return customizeTimeList ? customizeTimeList.includes(item.key) : true;
   });
+  var resultList = maxScope ? list.filter(function (item) {
+    var _a = __read(item.value, 2),
+        startTime = _a[0],
+        entTime = _a[1];
+
+    var space = moment_1["default"].duration(entTime.diff(startTime)).asDays();
+    return space <= maxScope;
+  }) : list;
 
   var panelRender = function panelRender(panel) {
     return react_1["default"].createElement("div", {
@@ -215,7 +281,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     }, react_1["default"].createElement(radio_1["default"].Group, {
       onChange: onRadioChange,
       value: radioKey
-    }, list.map(function (_a) {
+    }, resultList.map(function (_a) {
       var key = _a.key,
           text = _a.text;
       return react_1["default"].createElement(radio_1["default"], {
@@ -240,7 +306,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
   };
   return rangePickerType === 'label' ? react_1["default"].createElement(label_range_picker_1["default"], __assign({
     label: label
-  }, baseOptions, options)) : react_1["default"].createElement(RangePicker, __assign({}, baseOptions, options));
+  }, baseOptions, (0, omit_1["default"])(options, 'onChange'))) : react_1["default"].createElement(RangePicker, __assign({}, baseOptions, (0, omit_1["default"])(options, 'onChange')));
 };
 
 exports["default"] = LabelCustomizeRangePicker;

package/lib/label-customize-range-picker/style/index.css

@@ -1793,6 +1793,12 @@ html {
   padding: 8px 11px 6px;
   border-bottom: 1px solid #f5f6fa;
 }
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-wrapper {
+  pointer-events: none;
+}
+.label-customize-range-picker-panel .check-wrapper .ant-checkbox-input {
+  pointer-events: auto;
+}
 .label-customize-range-picker-panel .pick-box {
   display: flex;
   justify-content: space-between;

package/lib/label-customize-range-picker/style/index.less

@@ -8,6 +8,14 @@
   .check-wrapper {
     padding: 8px 11px 6px;
     border-bottom: 1px solid #f5f6fa;
+
+    .@{ant-prefix}-checkbox-wrapper {
+      pointer-events: none;
+    }
+
+    .@{ant-prefix}-checkbox-input {
+      pointer-events: auto;
+    }
   }
 
   .pick-box {

package/lib/label-date-picker/index.js

@@ -84,13 +84,11 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     if (!open) {
       setOpen(!open);
     }
 
-    (_a = datePickerRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    datePickerRef.current.focus();
   };
 
   var onBlur = function onBlur() {

package/lib/label-input/index.js

@@ -116,9 +116,7 @@ var LabelInput = function LabelInput(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
-    (_a = InputDomRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    InputDomRef.current.focus();
   };
 
   var onChangeInputType = react_1["default"].useCallback(function (nextInputType) {

package/lib/label-number-input/index.js

@@ -88,10 +88,8 @@ var LabelNumberInput = function LabelNumberInput(props) {
       setFocused = _c[1];
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     setFocused(true);
-    (_a = numberInputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    numberInputRef.current.focus();
   };
 
   var handleFocus = function handleFocus() {
@@ -99,9 +97,9 @@ var LabelNumberInput = function LabelNumberInput(props) {
     onFocus === null || onFocus === void 0 ? void 0 : onFocus(value);
   };
 
-  var handleBlur = function handleBlur(e) {
+  var handleBlur = function handleBlur() {
     setFocused(false);
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(e);
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(value);
   };
 
   var controlMinWidth = (labelSize === null || labelSize === void 0 ? void 0 : labelSize.width) ? labelSize.width + baseMinWidth : undefined;
@@ -115,7 +113,7 @@ var LabelNumberInput = function LabelNumberInput(props) {
     className: (0, classnames_1["default"])('label-number-input-field', {
       'label-number-input-focused': focused
     })
-  }, react_1["default"].createElement(number_input_1["default"], __assign({}, (0, omit_1["default"])(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder']), {
+  }, react_1["default"].createElement(number_input_1["default"], __assign({}, (0, omit_1["default"])(props, ['onChange', 'onBlur', 'onFocus', 'className', 'label', 'placeholder', 'baseMinWidth']), {
     ref: numberInputRef,
     "data-value": !(0, isUndefined_1["default"])(value) ? "".concat(value).length : 0,
     value: value,

package/lib/label-range-picker/index.js

@@ -98,6 +98,7 @@ var LabelDatePicker = function LabelDatePicker(props) {
   };
 
   var handleOpenChange = function handleOpenChange(nextOpen) {
+    console.log('--');
     onOpenChange(nextOpen);
   };
 

package/lib/label-select/index.js

@@ -92,13 +92,11 @@ var LabelSelect = function LabelSelect(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
     if (!open) {
       setOpen(!open);
     }
 
-    (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    selectRef.current.focus();
   };
 
   var onDropdownVisibleChange = function onDropdownVisibleChange(nextOpen) {
@@ -113,7 +111,7 @@ var LabelSelect = function LabelSelect(props) {
   }, react_1["default"].createElement(select_1["default"], __assign({
     maxTagCount: 3,
     showSearch: false
-  }, (0, omit_1["default"])(props, ['open', 'onChange', 'className', 'label']), {
+  }, (0, omit_1["default"])(props, ['open', 'onChange', 'className', 'label', 'setOpen']), {
     open: open,
     ref: selectRef,
     size: "large",

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

@@ -104,9 +104,7 @@ var LabelTextArea = function LabelTextArea(props) {
   };
 
   var handleLabelClick = function handleLabelClick() {
-    var _a;
-
-    (_a = TextAreaDomRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    TextAreaDomRef.current.focus();
   };
 
   var handleChange = function handleChange(e) {

package/lib/messages/zh_CN.js

@@ -14,7 +14,7 @@ var locale = {
       lastWeek: '上周',
       month: '本月',
       lastMonth: '上月',
-      quarter: '季度',
+      quarter: '本季度',
       lastQuarter: '上季度',
       last7days: '最近7天',
       last14days: '最近14天',

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

@@ -1,10 +1,10 @@
 export interface FilterIntType {
     value: string;
     enableMinus?: boolean;
-    preValue: string;
+    preValue?: string;
 }
 export declare const filterInt: ({ value, enableMinus, preValue }: FilterIntType) => string;
 export interface FilterFloatType extends FilterIntType {
-    precision: number;
+    precision?: number;
 }
-export declare const filterFloat: ({ value, preValue, precision, enableMinus }: FilterFloatType) => string;
+export declare const filterFloat: ({ value, preValue, precision, enableMinus, }: FilterFloatType) => string;

package/lib/number-input/utils.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.filterFloat = exports.filterInt = void 0;
+var intNumberReg = /^-?\d+$/;
 
 var filterInt = function filterInt(_a) {
   var value = _a.value,
@@ -16,10 +17,8 @@ var filterInt = function filterInt(_a) {
     nextValue = value.replace(/\D/g, '');
   }
 
-  var intNumberReg = /^-?\d+$/;
-
   if (nextValue && nextValue.length > 1 && !intNumberReg.test(nextValue)) {
-    return preValue;
+    return preValue !== null && preValue !== void 0 ? preValue : '';
   }
 
   return nextValue;
@@ -29,8 +28,10 @@ exports.filterInt = filterInt;
 
 var filterFloat = function filterFloat(_a) {
   var value = _a.value,
-      preValue = _a.preValue,
-      precision = _a.precision,
+      _b = _a.preValue,
+      preValue = _b === void 0 ? '' : _b,
+      _c = _a.precision,
+      precision = _c === void 0 ? 2 : _c,
       enableMinus = _a.enableMinus;
   var nextValue = value.replace(/[^\d.\-]/g, '');
   var matchDecimalPoint = nextValue.match(/\./g) || [];

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

@@ -7,7 +7,7 @@ export interface StepNumberInputProps {
     /** 精度，只对float有效 */
     precision: number;
     /** 内容最大长度 */
-    maxLength: number;
+    maxLength?: number;
     /** 指定输入框展示值的格式 */
     formatter?: (value: string) => string;
     /** 指定从 formatter 里转换回数字的方式，和 formatter 搭配使用 */

package/lib/step-number-input/index.js

@@ -114,6 +114,8 @@ var bignumber_js_1 = __importDefault(require("bignumber.js"));
 
 var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
 
+var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
+
 var numberType_1 = require("./const/numberType");
 
 var countType_1 = require("./const/countType");
@@ -121,36 +123,30 @@ var countType_1 = require("./const/countType");
 var number_input_1 = __importDefault(require("../number-input"));
 
 var StepNumberInput = function StepNumberInput(props) {
-  var value = props.value,
-      onChange = props.onChange,
+  var _a = __read((0, useControllableValue_1["default"])(props, {
+    defaultValue: ''
+  }), 2),
+      value = _a[0],
+      setValue = _a[1];
+
+  var onChange = props.onChange,
       onBlur = props.onBlur,
       numberType = props.numberType,
       precision = props.precision,
       step = props.step,
       max = props.max,
       min = props.min,
-      restProps = __rest(props, ["value", "onChange", "onBlur", "numberType", "precision", "step", "max", "min"]);
-
-  var _a = __read(React.useState(''), 2),
-      inputValue = _a[0],
-      setInputValue = _a[1];
+      restProps = __rest(props, ["onChange", "onBlur", "numberType", "precision", "step", "max", "min"]);
 
-  var resultValue = (0, isUndefined_1["default"])(value) ? inputValue : value;
-  var isEmpty = (0, isUndefined_1["default"])(resultValue) || resultValue === '';
-  var plusNumber = new bignumber_js_1["default"](resultValue).plus(step).toString();
-  var minusNumber = new bignumber_js_1["default"](resultValue).minus(step).toString();
-  var maxCondition = (0, isUndefined_1["default"])(max) ? false : max === Number(resultValue) || Number(max) < Number(plusNumber);
-  var minCondition = (0, isUndefined_1["default"])(min) ? false : min === Number(resultValue) || Number(min) > Number(minusNumber);
+  var isEmpty = (0, isUndefined_1["default"])(value) || value === '';
+  var plusNumber = new bignumber_js_1["default"](value).plus(step).toString();
+  var minusNumber = new bignumber_js_1["default"](value).minus(step).toString();
+  var maxCondition = (0, isUndefined_1["default"])(max) ? false : max === Number(value) || Number(max) < Number(plusNumber);
+  var minCondition = (0, isUndefined_1["default"])(min) ? false : min === Number(value) || Number(min) > Number(minusNumber);
 
   var onNumberChange = function onNumberChange(lastValue) {
-    if (resultValue !== lastValue) {
-      if ((0, isUndefined_1["default"])(value)) {
-        setInputValue(lastValue);
-      }
-
-      if (onChange) {
-        onChange(lastValue);
-      }
+    if (value !== lastValue) {
+      setValue(lastValue);
     }
   };
 
@@ -167,49 +163,26 @@ var StepNumberInput = function StepNumberInput(props) {
       newNumber = minCondition ? "".concat(min) : minusNumber;
     }
 
-    if (value === undefined) {
-      setInputValue(newNumber);
-    }
-
-    if (onChange) {
-      onChange(newNumber);
-    }
+    setValue(newNumber);
   };
 
   var onNumberBlur = function onNumberBlur() {
-    if (resultValue === '-' || resultValue === '.') {
-      if (value === undefined) {
-        setInputValue('');
-      }
+    var resultValue = value;
 
-      if (onChange) {
-        onChange('');
-      }
+    if (value === '-' || value === '.') {
+      resultValue = '';
     }
 
-    if (!(0, isUndefined_1["default"])(max) && Number(resultValue) > max) {
-      if ((0, isUndefined_1["default"])(value)) {
-        setInputValue("".concat(max));
-      }
-
-      if (onChange) {
-        onChange("".concat(max));
-      }
+    if (!(0, isUndefined_1["default"])(max) && Number(value) > max) {
+      resultValue = "".concat(max);
     }
 
-    if (!(0, isUndefined_1["default"])(min) && Number(resultValue) < min) {
-      if ((0, isUndefined_1["default"])(value)) {
-        setInputValue("".concat(min));
-      }
-
-      if (onChange) {
-        onChange("".concat(min));
-      }
+    if (!(0, isUndefined_1["default"])(min) && Number(value) < min) {
+      resultValue = "".concat(min);
     }
 
-    if (onBlur) {
-      onBlur("".concat(resultValue) || '');
-    }
+    setValue(resultValue);
+    onBlur === null || onBlur === void 0 ? void 0 : onBlur(resultValue);
   };
 
   return React.createElement("div", {
@@ -231,7 +204,7 @@ var StepNumberInput = function StepNumberInput(props) {
         'disabled-btn': isEmpty || maxCondition
       })
     }, "+"),
-    value: "".concat(resultValue),
+    value: "".concat(value),
     onChange: onNumberChange,
     onBlur: onNumberBlur,
     numberType: numberType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "2.1.30",
+  "version": "2.1.33",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -72,5 +72,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "2eba46555ad72daf70aa5c31b1179c416c2bce13"
+  "gitHead": "7330af2e067f21810cd803f0ddaef53539f4b157"
 }