assui 3.1.69 → 3.1.71

package/es/color-select/index.js

@@ -41,7 +41,7 @@ import classNames from 'classnames';
 import useControllableValue from "ahooks/es/useControllableValue";
 import ChevronRightOutlined from "a-icons/es/ChevronRightOutlined";
 import LocaleContext from '../config-provider/context';
-import formatMessage from '../messages';
+import formatMessage, { langTypeEnum } from '../messages';
 var ColorSelect = function ColorSelect(props) {
   var className = props.className,
     classNameWrap = props.classNameWrap,
@@ -69,7 +69,7 @@ var ColorSelect = function ColorSelect(props) {
     } : undefined
   }) : /*#__PURE__*/React.createElement("span", {
     className: "color-select-placeholder"
-  }, formatMessage(messages, 'global', 'placeholder')), /*#__PURE__*/React.createElement("div", {
+  }, formatMessage(messages, langTypeEnum.global, 'placeholder')), /*#__PURE__*/React.createElement("div", {
     className: "color-select-arrow"
   }, /*#__PURE__*/React.createElement(ChevronRightOutlined, {
     rotate: 90

package/es/complex-val-select/index.d.ts

@@ -1,11 +1,17 @@
 import * as React from 'react';
-import type { SelectProps } from 'antd/lib/select';
+import type { BaseOptionType, SelectProps } from 'antd/lib/select';
 declare const Option: import("rc-select/lib/Option").OptionFC;
 export { Option };
-export declare type ValueType = string | number | any[] | Record<string, any> | null | undefined;
-export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange'> {
+export declare type ComplexValSelectValueType = string | number | any[] | Record<string, any> | null | undefined;
+export interface ComplexValSelectOptionType extends Omit<BaseOptionType, 'value' | 'children' | 'options'> {
+    value?: ComplexValSelectValueType;
+    children?: ComplexValSelectOptionType[];
+    options?: Omit<ComplexValSelectOptionType, 'children' | 'options'>[];
+}
+export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange' | 'options'> {
     value?: T;
-    onChange?: (val: T, opt: SelectProps['options']) => void;
+    onChange?: (val: T, opt?: ComplexValSelectOptionType[]) => void;
+    options?: ComplexValSelectOptionType[];
 }
-declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ValueType> & React.RefAttributes<unknown>>;
+declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ComplexValSelectValueType> & React.RefAttributes<unknown>>;
 export default ComplexValSelect;

package/es/complex-val-select/index.js

@@ -44,6 +44,21 @@ import Select from "antd/es/select";
 import useControllableValue from "ahooks/es/useControllableValue";
 var Option = Select.Option;
 export { Option };
+var formatOptions = function formatOptions(dateSource) {
+  if (dateSource) {
+    var options = dateSource.map(function (item) {
+      var otherProps = item.options ? {
+        options: formatOptions(item.options)
+      } : {};
+      return __assign(__assign(__assign({}, item), {
+        label: item.label,
+        value: item.value ? JSON.stringify(item.value) : undefined
+      }), otherProps);
+    });
+    return options;
+  }
+  return dateSource;
+};
 var ComplexValSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _a = __read(useControllableValue(props), 2),
     value = _a[0],
@@ -57,31 +72,32 @@ var ComplexValSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
   // 判断是否需要将optionValue转为JSON字符串
   var isReferenceTypeVal = some(options, function (item) {
-    return isArray(item.value) || isObject(item.value);
+    if (item.value) {
+      return isArray(item.value) || isObject(item.value);
+    }
+    if (item.options) {
+      return some(item.options, function (i) {
+        return isArray(i.value) || isObject(i.value);
+      });
+    }
+    return false;
   });
-  var finalOptions = isReferenceTypeVal ? options === null || options === void 0 ? void 0 : options.map(function (item) {
-    return __assign(__assign({}, item), {
-      value: JSON.stringify(item.value)
-    });
-  }) : options;
+  var finalOptions = isReferenceTypeVal ? formatOptions(options) : options;
   var handleChange = function handleChange(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     setValue(nextVal);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextVal, options);
   };
   var handleSelect = function handleSelect(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     var selectOption = find(finalOptions, {
       value: val
     });
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, {
-      label: selectOption.label,
-      value: nextVal
-    });
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, selectOption);
   };
   return /*#__PURE__*/React.createElement(Select, __assign({
     ref: selectRef,
-    value: isReferenceTypeVal ? JSON.stringify(value) : value,
+    value: value && isReferenceTypeVal ? JSON.stringify(value) : value,
     options: finalOptions,
     onChange: handleChange,
     onSelect: handleSelect

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

@@ -1,3 +1,4 @@
+import { ComplexValSelectProps, ComplexValSelectValueType } from '../complex-val-select';
 import type { SelectProps } from 'antd/lib/select';
 import type { ConditionInputProps } from '../condition-input';
 export declare enum InputTypeEnum {
@@ -10,16 +11,16 @@ export declare enum EntryTypeEnum {
 }
 export declare type ChangedEntryType = typeof EntryTypeEnum[keyof typeof EntryTypeEnum];
 declare type SelectOptionsType = {
-    value: number;
+    value: ComplexValSelectValueType;
     label: string;
 };
 export interface MainSelectOptionsType extends SelectOptionsType {
     children?: SelectOptionsType[];
 }
 export interface ValueType {
-    selectValue?: number | string | null;
+    selectValue?: ComplexValSelectValueType;
     inputValue?: SelectProps['value'] | ConditionInputProps['value'];
-    finalSelectValue?: SelectProps['value'] | ConditionInputProps['value'][];
+    finalSelectValue?: ComplexValSelectProps<any>['value'] | ConditionInputProps['value'][];
     changedEntryType?: ChangedEntryType;
 }
 export interface ConditionSelectInputProps {
@@ -27,11 +28,11 @@ export interface ConditionSelectInputProps {
     /** 不需要展示联动输入框的字段值 */
     hiddenInputKeys?: ValueType['selectValue'][];
     /** selectProps */
-    selectProps?: SelectProps;
+    selectProps?: ComplexValSelectProps<any>;
     /** 联动inputProps */
     conditionInputProps?: ConditionInputProps;
     /** 联动selectProps */
-    conditionSelectProps?: SelectProps;
+    conditionSelectProps?: ComplexValSelectProps<any>;
     /** onChange */
     onChange?: (value: ValueType) => void;
     /** onBlur */

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

@@ -33,7 +33,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 import { isNumber } from 'lodash';
 import dateUtils from "aa-utils/es/dateUtils";
-import formatMessage from '../messages';
+import formatMessage, { langTypeEnum } from '../messages';
 export var dateTypeEnum;
 (function (dateTypeEnum) {
   dateTypeEnum[dateTypeEnum["TODAY"] = 1] = "TODAY";
@@ -63,68 +63,68 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
   var now = isNumber(timeOffset) ? dateUtils.getToday(timeOffset) : dateUtils.getToday();
   var allRadio = displayAllOption ? [{
     key: dateTypeEnum.ALL,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'all'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'all'),
     value: [startTimeOfAllOption || dateUtils.parseDate('2022/09/01'), now.endOf('day')]
   }] : [];
   var defaultRadioList = __spreadArray([{
     key: dateTypeEnum.TODAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'toDay'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'toDay'),
     value: [now.clone().startOf('day'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.YESTERDAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'yesterDay'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'yesterDay'),
     value: [now.clone().subtract(1, 'day').startOf('day'), now.clone().subtract(1, 'day').endOf('day')]
   }, {
     key: dateTypeEnum.WEEK,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'week'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'week'),
     value: [now.clone().startOf('week'), naturalDate ? now.clone().endOf('week') : now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_WEEK,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastWeek'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'lastWeek'),
     value: [now.clone().subtract(1, 'week').startOf('week'), now.clone().subtract(1, 'week').endOf('week')]
   }, {
     key: dateTypeEnum.MONTH,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'month'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'month'),
     value: [now.clone().startOf('month'), naturalDate ? now.clone().endOf('month') : now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_MONTH,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastMonth'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'lastMonth'),
     value: [now.clone().subtract(1, 'month').startOf('month'), now.clone().subtract(1, 'month').endOf('month')]
   }, {
     key: dateTypeEnum.QUARTER,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'quarter'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'quarter'),
     value: [now.clone().startOf('quarter'), naturalDate ? now.clone().endOf('quarter') : now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_QUARTER,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastQuarter'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'lastQuarter'),
     value: [now.clone().subtract(1, 'quarter').startOf('quarter'), now.clone().subtract(1, 'quarter').endOf('quarter')]
   }, {
     key: dateTypeEnum.YEAR,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'year'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'year'),
     value: [now.clone().startOf('year'), naturalDate ? now.clone().endOf('year') : now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_7_DAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last7days'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'last7days'),
     value: [now.clone().subtract(6, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_14_DAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last14days'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'last14days'),
     value: [now.clone().subtract(13, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_30_DAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last30days'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'last30days'),
     value: [now.clone().subtract(29, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_90_DAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last90days'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'last90days'),
     value: [now.clone().subtract(89, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_180_DAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last180days'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'last180days'),
     value: [now.clone().subtract(179, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_365_DAY,
-    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last365days'),
+    text: formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'last365days'),
     value: [now.clone().subtract(364, 'day').startOf('day'), now.endOf('day')]
   }], __read(allRadio), false);
   return defaultRadioList;

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

@@ -53,7 +53,7 @@ import omit from 'lodash/omit';
 import getDefaultRadioList from './defaultRadioList';
 import LabelRangePicker from '../label-range-picker';
 import LocaleContext from '../config-provider/context';
-import formatMessage from '../messages';
+import formatMessage, { langTypeEnum } from '../messages';
 import { formatMaxScope, getDateDiffScope, ONE_DAY_MILLISECOND, getTimeDiffOfShowTime } from './utils';
 var RangePicker = DatePicker.RangePicker;
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
@@ -218,7 +218,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       onChange: onDiyTimeChange
     }), /*#__PURE__*/React.createElement("span", {
       className: "customize-select-text"
-    }, formatMessage(messages, 'labelCustomizeRangePicker', 'customTime')))), isVisiblePanel ? /*#__PURE__*/React.createElement("div", {
+    }, formatMessage(messages, langTypeEnum.labelCustomizeRangePicker, 'customTime')))), isVisiblePanel ? /*#__PURE__*/React.createElement("div", {
       className: "panel"
     }, panel) : /*#__PURE__*/React.createElement("div", {
       className: "pick-box"

package/es/messages/index.d.ts

@@ -20,10 +20,12 @@ export declare type LabelCustomizeRangePickerType = {
 export declare type Global = {
     placeholder: string;
 };
-export declare type All = LabelCustomizeRangePickerType & Global;
+export declare enum langTypeEnum {
+    labelCustomizeRangePicker = "labelCustomizeRangePicker",
+    global = "global"
+}
 export declare type LangType = {
-    labelCustomizeRangePicker: LabelCustomizeRangePickerType;
-    global: Global;
+    [langTypeEnum.labelCustomizeRangePicker]: LabelCustomizeRangePickerType;
+    [langTypeEnum.global]: Global;
 };
-export declare type DisplayNameType = 'labelCustomizeRangePicker' | 'global';
-export default function formatMessage(message: LangType, displayName: DisplayNameType, key: keyof All): any;
+export default function formatMessage<T extends LangType, K extends keyof T>(message: Record<K, T[K]>, displayName: K, key: keyof T[K]): Record<K, T[K]>[K][keyof T[K]];

package/es/messages/index.js

@@ -1,3 +1,8 @@
+export var langTypeEnum;
+(function (langTypeEnum) {
+  langTypeEnum["labelCustomizeRangePicker"] = "labelCustomizeRangePicker";
+  langTypeEnum["global"] = "global";
+})(langTypeEnum || (langTypeEnum = {}));
 export default function formatMessage(message, displayName, key) {
   return message[displayName][key];
 }

package/lib/color-select/index.js

@@ -84,7 +84,7 @@ var classnames_1 = __importDefault(require("classnames"));
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 var ChevronRightOutlined_1 = __importDefault(require("a-icons/lib/ChevronRightOutlined"));
 var context_1 = __importDefault(require("../config-provider/context"));
-var messages_1 = __importDefault(require("../messages"));
+var messages_1 = __importStar(require("../messages"));
 var ColorSelect = function ColorSelect(props) {
   var className = props.className,
     classNameWrap = props.classNameWrap,
@@ -112,7 +112,7 @@ var ColorSelect = function ColorSelect(props) {
     } : undefined
   }) : react_1["default"].createElement("span", {
     className: "color-select-placeholder"
-  }, (0, messages_1["default"])(messages, 'global', 'placeholder')), react_1["default"].createElement("div", {
+  }, (0, messages_1["default"])(messages, messages_1.langTypeEnum.global, 'placeholder')), react_1["default"].createElement("div", {
     className: "color-select-arrow"
   }, react_1["default"].createElement(ChevronRightOutlined_1["default"], {
     rotate: 90

package/lib/complex-val-select/index.d.ts

@@ -1,11 +1,17 @@
 import * as React from 'react';
-import type { SelectProps } from 'antd/lib/select';
+import type { BaseOptionType, SelectProps } from 'antd/lib/select';
 declare const Option: import("rc-select/lib/Option").OptionFC;
 export { Option };
-export declare type ValueType = string | number | any[] | Record<string, any> | null | undefined;
-export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange'> {
+export declare type ComplexValSelectValueType = string | number | any[] | Record<string, any> | null | undefined;
+export interface ComplexValSelectOptionType extends Omit<BaseOptionType, 'value' | 'children' | 'options'> {
+    value?: ComplexValSelectValueType;
+    children?: ComplexValSelectOptionType[];
+    options?: Omit<ComplexValSelectOptionType, 'children' | 'options'>[];
+}
+export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange' | 'options'> {
     value?: T;
-    onChange?: (val: T, opt: SelectProps['options']) => void;
+    onChange?: (val: T, opt?: ComplexValSelectOptionType[]) => void;
+    options?: ComplexValSelectOptionType[];
 }
-declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ValueType> & React.RefAttributes<unknown>>;
+declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ComplexValSelectValueType> & React.RefAttributes<unknown>>;
 export default ComplexValSelect;

package/lib/complex-val-select/index.js

@@ -88,6 +88,21 @@ var select_1 = __importDefault(require("antd/lib/select"));
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 var Option = select_1["default"].Option;
 exports.Option = Option;
+var formatOptions = function formatOptions(dateSource) {
+  if (dateSource) {
+    var options = dateSource.map(function (item) {
+      var otherProps = item.options ? {
+        options: formatOptions(item.options)
+      } : {};
+      return __assign(__assign(__assign({}, item), {
+        label: item.label,
+        value: item.value ? JSON.stringify(item.value) : undefined
+      }), otherProps);
+    });
+    return options;
+  }
+  return dateSource;
+};
 var ComplexValSelect = React.forwardRef(function (props, ref) {
   var _a = __read((0, useControllableValue_1["default"])(props), 2),
     value = _a[0],
@@ -101,31 +116,32 @@ var ComplexValSelect = React.forwardRef(function (props, ref) {
   });
   // 判断是否需要将optionValue转为JSON字符串
   var isReferenceTypeVal = (0, some_1["default"])(options, function (item) {
-    return (0, isArray_1["default"])(item.value) || (0, isObject_1["default"])(item.value);
+    if (item.value) {
+      return (0, isArray_1["default"])(item.value) || (0, isObject_1["default"])(item.value);
+    }
+    if (item.options) {
+      return (0, some_1["default"])(item.options, function (i) {
+        return (0, isArray_1["default"])(i.value) || (0, isObject_1["default"])(i.value);
+      });
+    }
+    return false;
   });
-  var finalOptions = isReferenceTypeVal ? options === null || options === void 0 ? void 0 : options.map(function (item) {
-    return __assign(__assign({}, item), {
-      value: JSON.stringify(item.value)
-    });
-  }) : options;
+  var finalOptions = isReferenceTypeVal ? formatOptions(options) : options;
   var handleChange = function handleChange(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     setValue(nextVal);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextVal, options);
   };
   var handleSelect = function handleSelect(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     var selectOption = (0, find_1["default"])(finalOptions, {
       value: val
     });
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, {
-      label: selectOption.label,
-      value: nextVal
-    });
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, selectOption);
   };
   return React.createElement(select_1["default"], __assign({
     ref: selectRef,
-    value: isReferenceTypeVal ? JSON.stringify(value) : value,
+    value: value && isReferenceTypeVal ? JSON.stringify(value) : value,
     options: finalOptions,
     onChange: handleChange,
     onSelect: handleSelect

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

@@ -1,3 +1,4 @@
+import { ComplexValSelectProps, ComplexValSelectValueType } from '../complex-val-select';
 import type { SelectProps } from 'antd/lib/select';
 import type { ConditionInputProps } from '../condition-input';
 export declare enum InputTypeEnum {
@@ -10,16 +11,16 @@ export declare enum EntryTypeEnum {
 }
 export declare type ChangedEntryType = typeof EntryTypeEnum[keyof typeof EntryTypeEnum];
 declare type SelectOptionsType = {
-    value: number;
+    value: ComplexValSelectValueType;
     label: string;
 };
 export interface MainSelectOptionsType extends SelectOptionsType {
     children?: SelectOptionsType[];
 }
 export interface ValueType {
-    selectValue?: number | string | null;
+    selectValue?: ComplexValSelectValueType;
     inputValue?: SelectProps['value'] | ConditionInputProps['value'];
-    finalSelectValue?: SelectProps['value'] | ConditionInputProps['value'][];
+    finalSelectValue?: ComplexValSelectProps<any>['value'] | ConditionInputProps['value'][];
     changedEntryType?: ChangedEntryType;
 }
 export interface ConditionSelectInputProps {
@@ -27,11 +28,11 @@ export interface ConditionSelectInputProps {
     /** 不需要展示联动输入框的字段值 */
     hiddenInputKeys?: ValueType['selectValue'][];
     /** selectProps */
-    selectProps?: SelectProps;
+    selectProps?: ComplexValSelectProps<any>;
     /** 联动inputProps */
     conditionInputProps?: ConditionInputProps;
     /** 联动selectProps */
-    conditionSelectProps?: SelectProps;
+    conditionSelectProps?: ComplexValSelectProps<any>;
     /** onChange */
     onChange?: (value: ValueType) => void;
     /** onBlur */

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

@@ -1,5 +1,38 @@
 "use strict";
 
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function get() {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+var __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function (o, v) {
+  Object.defineProperty(o, "default", {
+    enumerable: true,
+    value: v
+  });
+} : function (o, v) {
+  o["default"] = v;
+});
+var __importStar = this && this.__importStar || function (mod) {
+  if (mod && mod.__esModule) return mod;
+  var result = {};
+  if (mod != null) for (var k in mod) {
+    if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+  }
+  __setModuleDefault(result, mod);
+  return result;
+};
 var __read = this && this.__read || function (o, n) {
   var m = typeof Symbol === "function" && o[Symbol.iterator];
   if (!m) return o;
@@ -44,7 +77,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.dateTypeEnum = void 0;
 var lodash_1 = require("lodash");
 var dateUtils_1 = __importDefault(require("aa-utils/lib/dateUtils"));
-var messages_1 = __importDefault(require("../messages"));
+var messages_1 = __importStar(require("../messages"));
 var dateTypeEnum;
 (function (dateTypeEnum) {
   dateTypeEnum[dateTypeEnum["TODAY"] = 1] = "TODAY";
@@ -74,68 +107,68 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
   var now = (0, lodash_1.isNumber)(timeOffset) ? dateUtils_1["default"].getToday(timeOffset) : dateUtils_1["default"].getToday();
   var allRadio = displayAllOption ? [{
     key: dateTypeEnum.ALL,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'all'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'all'),
     value: [startTimeOfAllOption || dateUtils_1["default"].parseDate('2022/09/01'), now.endOf('day')]
   }] : [];
   var defaultRadioList = __spreadArray([{
     key: dateTypeEnum.TODAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'toDay'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'toDay'),
     value: [now.clone().startOf('day'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.YESTERDAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'yesterDay'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'yesterDay'),
     value: [now.clone().subtract(1, 'day').startOf('day'), now.clone().subtract(1, 'day').endOf('day')]
   }, {
     key: dateTypeEnum.WEEK,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'week'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'week'),
     value: [now.clone().startOf('week'), naturalDate ? now.clone().endOf('week') : now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_WEEK,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'lastWeek'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'lastWeek'),
     value: [now.clone().subtract(1, 'week').startOf('week'), now.clone().subtract(1, 'week').endOf('week')]
   }, {
     key: dateTypeEnum.MONTH,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'month'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'month'),
     value: [now.clone().startOf('month'), naturalDate ? now.clone().endOf('month') : now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_MONTH,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'lastMonth'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'lastMonth'),
     value: [now.clone().subtract(1, 'month').startOf('month'), now.clone().subtract(1, 'month').endOf('month')]
   }, {
     key: dateTypeEnum.QUARTER,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'quarter'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'quarter'),
     value: [now.clone().startOf('quarter'), naturalDate ? now.clone().endOf('quarter') : now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_QUARTER,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'lastQuarter'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'lastQuarter'),
     value: [now.clone().subtract(1, 'quarter').startOf('quarter'), now.clone().subtract(1, 'quarter').endOf('quarter')]
   }, {
     key: dateTypeEnum.YEAR,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'year'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'year'),
     value: [now.clone().startOf('year'), naturalDate ? now.clone().endOf('year') : now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_7_DAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last7days'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'last7days'),
     value: [now.clone().subtract(6, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_14_DAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last14days'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'last14days'),
     value: [now.clone().subtract(13, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_30_DAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last30days'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'last30days'),
     value: [now.clone().subtract(29, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_90_DAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last90days'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'last90days'),
     value: [now.clone().subtract(89, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_180_DAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last180days'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'last180days'),
     value: [now.clone().subtract(179, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_365_DAY,
-    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last365days'),
+    text: (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'last365days'),
     value: [now.clone().subtract(364, 'day').startOf('day'), now.endOf('day')]
   }], __read(allRadio), false);
   return defaultRadioList;

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

@@ -96,7 +96,7 @@ var omit_1 = __importDefault(require("lodash/omit"));
 var defaultRadioList_1 = __importDefault(require("./defaultRadioList"));
 var label_range_picker_1 = __importDefault(require("../label-range-picker"));
 var context_1 = __importDefault(require("../config-provider/context"));
-var messages_1 = __importDefault(require("../messages"));
+var messages_1 = __importStar(require("../messages"));
 var utils_1 = require("./utils");
 var RangePicker = date_picker_1["default"].RangePicker;
 var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
@@ -261,7 +261,7 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
       onChange: onDiyTimeChange
     }), react_1["default"].createElement("span", {
       className: "customize-select-text"
-    }, (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'customTime')))), isVisiblePanel ? react_1["default"].createElement("div", {
+    }, (0, messages_1["default"])(messages, messages_1.langTypeEnum.labelCustomizeRangePicker, 'customTime')))), isVisiblePanel ? react_1["default"].createElement("div", {
       className: "panel"
     }, panel) : react_1["default"].createElement("div", {
       className: "pick-box"

package/lib/messages/index.d.ts

@@ -20,10 +20,12 @@ export declare type LabelCustomizeRangePickerType = {
 export declare type Global = {
     placeholder: string;
 };
-export declare type All = LabelCustomizeRangePickerType & Global;
+export declare enum langTypeEnum {
+    labelCustomizeRangePicker = "labelCustomizeRangePicker",
+    global = "global"
+}
 export declare type LangType = {
-    labelCustomizeRangePicker: LabelCustomizeRangePickerType;
-    global: Global;
+    [langTypeEnum.labelCustomizeRangePicker]: LabelCustomizeRangePickerType;
+    [langTypeEnum.global]: Global;
 };
-export declare type DisplayNameType = 'labelCustomizeRangePicker' | 'global';
-export default function formatMessage(message: LangType, displayName: DisplayNameType, key: keyof All): any;
+export default function formatMessage<T extends LangType, K extends keyof T>(message: Record<K, T[K]>, displayName: K, key: keyof T[K]): Record<K, T[K]>[K][keyof T[K]];

package/lib/messages/index.js

@@ -3,6 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.langTypeEnum = void 0;
+var langTypeEnum;
+(function (langTypeEnum) {
+  langTypeEnum["labelCustomizeRangePicker"] = "labelCustomizeRangePicker";
+  langTypeEnum["global"] = "global";
+})(langTypeEnum = exports.langTypeEnum || (exports.langTypeEnum = {}));
 function formatMessage(message, displayName, key) {
   return message[displayName][key];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.69",
+  "version": "3.1.71",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "7093234ad09208aa396990803c7dcc52514eeda8"
+  "gitHead": "fc3a7c7f61f1fd586dfb7d28e0bf6b83f2f73610"
 }