assui 3.0.24 → 3.0.26

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

@@ -21,5 +21,9 @@ export declare type RadioListType = {
     text: string;
     value: [Moment, Moment];
 };
-declare const getDefaultRadioList: (message: LangType) => RadioListType[];
+declare type GetDefaultRadioListPropsType = {
+    messages: LangType;
+    timeOffset?: number;
+};
+declare const getDefaultRadioList: ({ messages, timeOffset }: GetDefaultRadioListPropsType) => RadioListType[];
 export default getDefaultRadioList;

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

@@ -1,3 +1,4 @@
+import { isNumber } from 'lodash';
 import dateUtils from "aa-utils/es/dateUtils";
 import formatMessage from '../messages';
 export var dateTypeEnum;
@@ -17,63 +18,65 @@ export var dateTypeEnum;
   dateTypeEnum[dateTypeEnum["BEFORE_180_DAY"] = 13] = "BEFORE_180_DAY";
   dateTypeEnum[dateTypeEnum["BEFORE_365_DAY"] = 14] = "BEFORE_365_DAY";
 })(dateTypeEnum || (dateTypeEnum = {}));
-var getDefaultRadioList = function getDefaultRadioList(message) {
-  var now = dateUtils.getToday();
+var getDefaultRadioList = function getDefaultRadioList(_a) {
+  var messages = _a.messages,
+    timeOffset = _a.timeOffset;
+  var now = isNumber(timeOffset) ? dateUtils.getToday(timeOffset) : dateUtils.getToday();
   var defaultRadioList = [{
     key: dateTypeEnum.TODAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'toDay'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'toDay'),
     value: [now.clone().startOf('day'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.YESTERDAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'yesterDay'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'yesterDay'),
     value: [now.clone().subtract(1, 'day').startOf('day'), now.clone().subtract(1, 'day').endOf('day')]
   }, {
     key: dateTypeEnum.WEEK,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'week'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'week'),
     value: [now.clone().startOf('week'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_WEEK,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'lastWeek'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastWeek'),
     value: [now.clone().subtract(1, 'week').startOf('week'), now.clone().subtract(1, 'week').endOf('week')]
   }, {
     key: dateTypeEnum.MONTH,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'month'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'month'),
     value: [now.clone().startOf('month'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_MONTH,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'lastMonth'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastMonth'),
     value: [now.clone().subtract(1, 'month').startOf('month'), now.clone().subtract(1, 'month').endOf('month')]
   }, {
     key: dateTypeEnum.QUARTER,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'quarter'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'quarter'),
     value: [now.clone().startOf('quarter'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_QUARTER,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'lastQuarter'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastQuarter'),
     value: [now.clone().subtract(1, 'quarter').startOf('quarter'), now.clone().subtract(1, 'quarter').endOf('quarter')]
   }, {
     key: dateTypeEnum.BEFORE_7_DAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'last7days'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last7days'),
     value: [now.clone().subtract(6, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_14_DAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'last14days'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last14days'),
     value: [now.clone().subtract(13, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_30_DAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'last30days'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last30days'),
     value: [now.clone().subtract(29, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_90_DAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'last90days'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last90days'),
     value: [now.clone().subtract(89, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_180_DAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'last180days'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last180days'),
     value: [now.clone().subtract(179, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_365_DAY,
-    text: formatMessage(message, 'labelCustomizeRangePicker', 'last365days'),
+    text: formatMessage(messages, 'labelCustomizeRangePicker', 'last365days'),
     value: [now.clone().subtract(364, 'day').startOf('day'), now.endOf('day')]
   }];
   return defaultRadioList;

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

@@ -17,6 +17,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     /** 如果有MaxScope，在没有默认值的情况下自动填充默认值 */
     fillDefaultDate?: boolean;
     showShortcutPanel?: boolean;
+    /** 时间偏移量 秒 */
+    timeOffset?: number;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

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

@@ -68,11 +68,12 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     allowClear = _b === void 0 ? false : _b,
     maxScope = props.maxScope,
     onOpenChange = props.onOpenChange,
+    timeOffset = props.timeOffset,
     _c = props.fillDefaultDate,
     fillDefaultDate = _c === void 0 ? true : _c,
     _d = props.showShortcutPanel,
     showShortcutPanel = _d === void 0 ? true : _d,
-    restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "fillDefaultDate", "showShortcutPanel"]);
+    restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "timeOffset", "fillDefaultDate", "showShortcutPanel"]);
   var _e = __read(useControllableValue(props), 2),
     date = _e[0],
     setDate = _e[1];
@@ -86,7 +87,16 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     open = _h[0],
     setOpen = _h[1];
   var messages = useContext(LocaleContext);
-  var dataSource = radioList !== null && radioList !== void 0 ? radioList : getDefaultRadioList(messages);
+  var defaultRadioList = customizeTimeList ? getDefaultRadioList({
+    messages: messages,
+    timeOffset: timeOffset
+  }).filter(function (item) {
+    return customizeTimeList.includes(item.key);
+  }) : getDefaultRadioList({
+    messages: messages,
+    timeOffset: timeOffset
+  });
+  var dataSource = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList;
   useEffect(function () {
     var filterItemList = dataSource.filter(function (item) {
       if (!date) return false;
@@ -176,16 +186,13 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     setDate(selectRadioInfo === null || selectRadioInfo === void 0 ? void 0 : selectRadioInfo.value);
     setOpen(false);
   };
-  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 resultList = maxScope ? dataSource.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;
+  }) : dataSource;
   var panelRender = function panelRender(panel) {
     return /*#__PURE__*/React.createElement("div", {
       className: "label-customize-range-picker-panel"

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

@@ -21,5 +21,9 @@ export declare type RadioListType = {
     text: string;
     value: [Moment, Moment];
 };
-declare const getDefaultRadioList: (message: LangType) => RadioListType[];
+declare type GetDefaultRadioListPropsType = {
+    messages: LangType;
+    timeOffset?: number;
+};
+declare const getDefaultRadioList: ({ messages, timeOffset }: GetDefaultRadioListPropsType) => RadioListType[];
 export default getDefaultRadioList;

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

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 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 dateTypeEnum;
@@ -28,63 +29,65 @@ var dateTypeEnum;
   dateTypeEnum[dateTypeEnum["BEFORE_180_DAY"] = 13] = "BEFORE_180_DAY";
   dateTypeEnum[dateTypeEnum["BEFORE_365_DAY"] = 14] = "BEFORE_365_DAY";
 })(dateTypeEnum = exports.dateTypeEnum || (exports.dateTypeEnum = {}));
-var getDefaultRadioList = function getDefaultRadioList(message) {
-  var now = dateUtils_1["default"].getToday();
+var getDefaultRadioList = function getDefaultRadioList(_a) {
+  var messages = _a.messages,
+    timeOffset = _a.timeOffset;
+  var now = (0, lodash_1.isNumber)(timeOffset) ? dateUtils_1["default"].getToday(timeOffset) : dateUtils_1["default"].getToday();
   var defaultRadioList = [{
     key: dateTypeEnum.TODAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'toDay'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'toDay'),
     value: [now.clone().startOf('day'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.YESTERDAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'yesterDay'),
+    text: (0, messages_1["default"])(messages, '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"])(message, 'labelCustomizeRangePicker', 'week'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'week'),
     value: [now.clone().startOf('week'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_WEEK,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'lastWeek'),
+    text: (0, messages_1["default"])(messages, '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"])(message, 'labelCustomizeRangePicker', 'month'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'month'),
     value: [now.clone().startOf('month'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_MONTH,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'lastMonth'),
+    text: (0, messages_1["default"])(messages, '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"])(message, 'labelCustomizeRangePicker', 'quarter'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'quarter'),
     value: [now.clone().startOf('quarter'), now.clone().endOf('day')]
   }, {
     key: dateTypeEnum.LAST_QUARTER,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'lastQuarter'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'lastQuarter'),
     value: [now.clone().subtract(1, 'quarter').startOf('quarter'), now.clone().subtract(1, 'quarter').endOf('quarter')]
   }, {
     key: dateTypeEnum.BEFORE_7_DAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'last7days'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last7days'),
     value: [now.clone().subtract(6, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_14_DAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'last14days'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last14days'),
     value: [now.clone().subtract(13, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_30_DAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'last30days'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last30days'),
     value: [now.clone().subtract(29, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_90_DAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'last90days'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last90days'),
     value: [now.clone().subtract(89, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_180_DAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'last180days'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last180days'),
     value: [now.clone().subtract(179, 'day').startOf('day'), now.endOf('day')]
   }, {
     key: dateTypeEnum.BEFORE_365_DAY,
-    text: (0, messages_1["default"])(message, 'labelCustomizeRangePicker', 'last365days'),
+    text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last365days'),
     value: [now.clone().subtract(364, 'day').startOf('day'), now.endOf('day')]
   }];
   return defaultRadioList;

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

@@ -17,6 +17,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
     /** 如果有MaxScope，在没有默认值的情况下自动填充默认值 */
     fillDefaultDate?: boolean;
     showShortcutPanel?: boolean;
+    /** 时间偏移量 秒 */
+    timeOffset?: number;
 }
 declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
 export default LabelCustomizeRangePicker;

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

@@ -111,11 +111,12 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     allowClear = _b === void 0 ? false : _b,
     maxScope = props.maxScope,
     onOpenChange = props.onOpenChange,
+    timeOffset = props.timeOffset,
     _c = props.fillDefaultDate,
     fillDefaultDate = _c === void 0 ? true : _c,
     _d = props.showShortcutPanel,
     showShortcutPanel = _d === void 0 ? true : _d,
-    restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "fillDefaultDate", "showShortcutPanel"]);
+    restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "timeOffset", "fillDefaultDate", "showShortcutPanel"]);
   var _e = __read((0, useControllableValue_1["default"])(props), 2),
     date = _e[0],
     setDate = _e[1];
@@ -129,7 +130,16 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     open = _h[0],
     setOpen = _h[1];
   var messages = (0, react_1.useContext)(context_1["default"]);
-  var dataSource = radioList !== null && radioList !== void 0 ? radioList : (0, defaultRadioList_1["default"])(messages);
+  var defaultRadioList = customizeTimeList ? (0, defaultRadioList_1["default"])({
+    messages: messages,
+    timeOffset: timeOffset
+  }).filter(function (item) {
+    return customizeTimeList.includes(item.key);
+  }) : (0, defaultRadioList_1["default"])({
+    messages: messages,
+    timeOffset: timeOffset
+  });
+  var dataSource = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList;
   (0, react_1.useEffect)(function () {
     var filterItemList = dataSource.filter(function (item) {
       if (!date) return false;
@@ -219,16 +229,13 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
     setDate(selectRadioInfo === null || selectRadioInfo === void 0 ? void 0 : selectRadioInfo.value);
     setOpen(false);
   };
-  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 resultList = maxScope ? dataSource.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;
+  }) : dataSource;
   var panelRender = function panelRender(panel) {
     return react_1["default"].createElement("div", {
       className: "label-customize-range-picker-panel"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.0.24",
+  "version": "3.0.26",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -35,7 +35,7 @@
     "@types/react-beautiful-dnd": "^13.1.2",
     "@types/react-color": "^3.0.6",
     "@types/react-resizable": "^3.0.0",
-    "a-icons": "^1.1.8",
+    "a-icons": "^1.1.9",
     "aa-utils": "^2.1.12",
     "ahooks": "^3.0.8",
     "bignumber.js": "^9.0.1",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "4f0b3073705cc6f4c4ea2f75c051ecf2c1131ca5"
+  "gitHead": "67b6bbb27eb2f9fa1279f7388987af40227be36c"
 }