assui 3.0.67 → 3.0.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/es/label-customize-range-picker/defaultRadioList.d.ts +3 -1
  2. package/es/label-customize-range-picker/defaultRadioList.js +6 -5
  3. package/es/label-customize-range-picker/index.d.ts +2 -0
  4. package/es/label-customize-range-picker/index.js +19 -15
  5. package/lib/label-customize-range-picker/defaultRadioList.d.ts +3 -1
  6. package/lib/label-customize-range-picker/defaultRadioList.js +6 -5
  7. package/lib/label-customize-range-picker/index.d.ts +2 -0
  8. package/lib/label-customize-range-picker/index.js +19 -15
  9. package/package.json +3 -3
package/es/label-customize-range-picker/defaultRadioList.d.ts CHANGED
@@ -25,6 +25,8 @@ export declare type RadioListType = {
25
25
  declare type GetDefaultRadioListPropsType = {
26
26
  messages: LangType;
27
27
  timeOffset?: number;
28
+ /** 自然日期 */
29
+ naturalDate: boolean;
28
30
  };
29
- declare const getDefaultRadioList: ({ messages, timeOffset }: GetDefaultRadioListPropsType) => RadioListType[];
31
+ declare const getDefaultRadioList: ({ messages, timeOffset, naturalDate, }: GetDefaultRadioListPropsType) => RadioListType[];
30
32
  export default getDefaultRadioList;
package/es/label-customize-range-picker/defaultRadioList.js CHANGED
@@ -21,7 +21,8 @@ export var dateTypeEnum;
21
21
  })(dateTypeEnum || (dateTypeEnum = {}));
22
22
  var getDefaultRadioList = function getDefaultRadioList(_a) {
23
23
  var messages = _a.messages,
24
- timeOffset = _a.timeOffset;
24
+ timeOffset = _a.timeOffset,
25
+ naturalDate = _a.naturalDate;
25
26
  var now = isNumber(timeOffset) ? dateUtils.getToday(timeOffset) : dateUtils.getToday();
26
27
  var defaultRadioList = [{
27
28
  key: dateTypeEnum.TODAY,
@@ -34,7 +35,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
34
35
  }, {
35
36
  key: dateTypeEnum.WEEK,
36
37
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'week'),
37
- value: [now.clone().startOf('week'), now.clone().endOf('day')]
38
+ value: [now.clone().startOf('week'), naturalDate ? now.clone().endOf('week') : now.clone().endOf('day')]
38
39
  }, {
39
40
  key: dateTypeEnum.LAST_WEEK,
40
41
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastWeek'),
@@ -42,7 +43,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
42
43
  }, {
43
44
  key: dateTypeEnum.MONTH,
44
45
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'month'),
45
- value: [now.clone().startOf('month'), now.clone().endOf('day')]
46
+ value: [now.clone().startOf('month'), naturalDate ? now.clone().endOf('month') : now.clone().endOf('day')]
46
47
  }, {
47
48
  key: dateTypeEnum.LAST_MONTH,
48
49
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastMonth'),
@@ -50,7 +51,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
50
51
  }, {
51
52
  key: dateTypeEnum.QUARTER,
52
53
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'quarter'),
53
- value: [now.clone().startOf('quarter'), now.clone().endOf('day')]
54
+ value: [now.clone().startOf('quarter'), naturalDate ? now.clone().endOf('quarter') : now.clone().endOf('day')]
54
55
  }, {
55
56
  key: dateTypeEnum.LAST_QUARTER,
56
57
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'lastQuarter'),
@@ -58,7 +59,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
58
59
  }, {
59
60
  key: dateTypeEnum.YEAR,
60
61
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'year'),
61
- value: [now.clone().startOf('year'), now.endOf('day')]
62
+ value: [now.clone().startOf('year'), naturalDate ? now.clone().endOf('year') : now.endOf('day')]
62
63
  }, {
63
64
  key: dateTypeEnum.BEFORE_7_DAY,
64
65
  text: formatMessage(messages, 'labelCustomizeRangePicker', 'last7days'),
package/es/label-customize-range-picker/index.d.ts CHANGED
@@ -19,6 +19,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
19
19
  showShortcutPanel?: boolean;
20
20
  /** 时间偏移量 秒 */
21
21
  timeOffset?: number;
22
+ /** 自然日期, 作用于本周，本月等日期 */
23
+ naturalDate?: boolean;
22
24
  }
23
25
  declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
24
26
  export default LabelCustomizeRangePicker;
package/es/label-customize-range-picker/index.js CHANGED
@@ -73,28 +73,32 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
73
73
  fillDefaultDate = _c === void 0 ? true : _c,
74
74
  _d = props.showShortcutPanel,
75
75
  showShortcutPanel = _d === void 0 ? true : _d,
76
- restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "timeOffset", "fillDefaultDate", "showShortcutPanel"]);
77
- var _e = __read(useControllableValue(props), 2),
78
- date = _e[0],
79
- setDate = _e[1];
80
- var _f = __read(useState(false), 2),
81
- isVisiblePanel = _f[0],
82
- setIsVisiblePanel = _f[1];
83
- var _g = __read(useState(), 2),
84
- radioKey = _g[0],
85
- setRadioKey = _g[1];
86
- var _h = __read(useState(false), 2),
87
- open = _h[0],
88
- setOpen = _h[1];
76
+ _e = props.naturalDate,
77
+ naturalDate = _e === void 0 ? false : _e,
78
+ restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "timeOffset", "fillDefaultDate", "showShortcutPanel", "naturalDate"]);
79
+ var _f = __read(useControllableValue(props), 2),
80
+ date = _f[0],
81
+ setDate = _f[1];
82
+ var _g = __read(useState(false), 2),
83
+ isVisiblePanel = _g[0],
84
+ setIsVisiblePanel = _g[1];
85
+ var _h = __read(useState(), 2),
86
+ radioKey = _h[0],
87
+ setRadioKey = _h[1];
88
+ var _j = __read(useState(false), 2),
89
+ open = _j[0],
90
+ setOpen = _j[1];
89
91
  var messages = useContext(LocaleContext);
90
92
  var defaultRadioList = customizeTimeList ? getDefaultRadioList({
91
93
  messages: messages,
92
- timeOffset: timeOffset
94
+ timeOffset: timeOffset,
95
+ naturalDate: naturalDate
93
96
  }).filter(function (item) {
94
97
  return customizeTimeList.includes(item.key);
95
98
  }) : getDefaultRadioList({
96
99
  messages: messages,
97
- timeOffset: timeOffset
100
+ timeOffset: timeOffset,
101
+ naturalDate: naturalDate
98
102
  });
99
103
  var dataSource = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList;
100
104
  useEffect(function () {
package/lib/label-customize-range-picker/defaultRadioList.d.ts CHANGED
@@ -25,6 +25,8 @@ export declare type RadioListType = {
25
25
  declare type GetDefaultRadioListPropsType = {
26
26
  messages: LangType;
27
27
  timeOffset?: number;
28
+ /** 自然日期 */
29
+ naturalDate: boolean;
28
30
  };
29
- declare const getDefaultRadioList: ({ messages, timeOffset }: GetDefaultRadioListPropsType) => RadioListType[];
31
+ declare const getDefaultRadioList: ({ messages, timeOffset, naturalDate, }: GetDefaultRadioListPropsType) => RadioListType[];
30
32
  export default getDefaultRadioList;
package/lib/label-customize-range-picker/defaultRadioList.js CHANGED
@@ -32,7 +32,8 @@ var dateTypeEnum;
32
32
  })(dateTypeEnum = exports.dateTypeEnum || (exports.dateTypeEnum = {}));
33
33
  var getDefaultRadioList = function getDefaultRadioList(_a) {
34
34
  var messages = _a.messages,
35
- timeOffset = _a.timeOffset;
35
+ timeOffset = _a.timeOffset,
36
+ naturalDate = _a.naturalDate;
36
37
  var now = (0, lodash_1.isNumber)(timeOffset) ? dateUtils_1["default"].getToday(timeOffset) : dateUtils_1["default"].getToday();
37
38
  var defaultRadioList = [{
38
39
  key: dateTypeEnum.TODAY,
@@ -45,7 +46,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
45
46
  }, {
46
47
  key: dateTypeEnum.WEEK,
47
48
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'week'),
48
- value: [now.clone().startOf('week'), now.clone().endOf('day')]
49
+ value: [now.clone().startOf('week'), naturalDate ? now.clone().endOf('week') : now.clone().endOf('day')]
49
50
  }, {
50
51
  key: dateTypeEnum.LAST_WEEK,
51
52
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'lastWeek'),
@@ -53,7 +54,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
53
54
  }, {
54
55
  key: dateTypeEnum.MONTH,
55
56
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'month'),
56
- value: [now.clone().startOf('month'), now.clone().endOf('day')]
57
+ value: [now.clone().startOf('month'), naturalDate ? now.clone().endOf('month') : now.clone().endOf('day')]
57
58
  }, {
58
59
  key: dateTypeEnum.LAST_MONTH,
59
60
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'lastMonth'),
@@ -61,7 +62,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
61
62
  }, {
62
63
  key: dateTypeEnum.QUARTER,
63
64
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'quarter'),
64
- value: [now.clone().startOf('quarter'), now.clone().endOf('day')]
65
+ value: [now.clone().startOf('quarter'), naturalDate ? now.clone().endOf('quarter') : now.clone().endOf('day')]
65
66
  }, {
66
67
  key: dateTypeEnum.LAST_QUARTER,
67
68
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'lastQuarter'),
@@ -69,7 +70,7 @@ var getDefaultRadioList = function getDefaultRadioList(_a) {
69
70
  }, {
70
71
  key: dateTypeEnum.YEAR,
71
72
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'year'),
72
- value: [now.clone().startOf('year'), now.endOf('day')]
73
+ value: [now.clone().startOf('year'), naturalDate ? now.clone().endOf('year') : now.endOf('day')]
73
74
  }, {
74
75
  key: dateTypeEnum.BEFORE_7_DAY,
75
76
  text: (0, messages_1["default"])(messages, 'labelCustomizeRangePicker', 'last7days'),
package/lib/label-customize-range-picker/index.d.ts CHANGED
@@ -19,6 +19,8 @@ export interface LabelCustomizeRangePickerProps extends Omit<LabelRangePickerPro
19
19
  showShortcutPanel?: boolean;
20
20
  /** 时间偏移量 秒 */
21
21
  timeOffset?: number;
22
+ /** 自然日期, 作用于本周，本月等日期 */
23
+ naturalDate?: boolean;
22
24
  }
23
25
  declare const LabelCustomizeRangePicker: (props: LabelCustomizeRangePickerProps) => JSX.Element;
24
26
  export default LabelCustomizeRangePicker;
package/lib/label-customize-range-picker/index.js CHANGED
@@ -116,28 +116,32 @@ var LabelCustomizeRangePicker = function LabelCustomizeRangePicker(props) {
116
116
  fillDefaultDate = _c === void 0 ? true : _c,
117
117
  _d = props.showShortcutPanel,
118
118
  showShortcutPanel = _d === void 0 ? true : _d,
119
- restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "timeOffset", "fillDefaultDate", "showShortcutPanel"]);
120
- var _e = __read((0, useControllableValue_1["default"])(props), 2),
121
- date = _e[0],
122
- setDate = _e[1];
123
- var _f = __read((0, react_1.useState)(false), 2),
124
- isVisiblePanel = _f[0],
125
- setIsVisiblePanel = _f[1];
126
- var _g = __read((0, react_1.useState)(), 2),
127
- radioKey = _g[0],
128
- setRadioKey = _g[1];
129
- var _h = __read((0, react_1.useState)(false), 2),
130
- open = _h[0],
131
- setOpen = _h[1];
119
+ _e = props.naturalDate,
120
+ naturalDate = _e === void 0 ? false : _e,
121
+ restProps = __rest(props, ["customizeTimeList", "radioList", "rangePickerType", "label", "showTime", "allowClear", "maxScope", "onOpenChange", "timeOffset", "fillDefaultDate", "showShortcutPanel", "naturalDate"]);
122
+ var _f = __read((0, useControllableValue_1["default"])(props), 2),
123
+ date = _f[0],
124
+ setDate = _f[1];
125
+ var _g = __read((0, react_1.useState)(false), 2),
126
+ isVisiblePanel = _g[0],
127
+ setIsVisiblePanel = _g[1];
128
+ var _h = __read((0, react_1.useState)(), 2),
129
+ radioKey = _h[0],
130
+ setRadioKey = _h[1];
131
+ var _j = __read((0, react_1.useState)(false), 2),
132
+ open = _j[0],
133
+ setOpen = _j[1];
132
134
  var messages = (0, react_1.useContext)(context_1["default"]);
133
135
  var defaultRadioList = customizeTimeList ? (0, defaultRadioList_1["default"])({
134
136
  messages: messages,
135
- timeOffset: timeOffset
137
+ timeOffset: timeOffset,
138
+ naturalDate: naturalDate
136
139
  }).filter(function (item) {
137
140
  return customizeTimeList.includes(item.key);
138
141
  }) : (0, defaultRadioList_1["default"])({
139
142
  messages: messages,
140
- timeOffset: timeOffset
143
+ timeOffset: timeOffset,
144
+ naturalDate: naturalDate
141
145
  });
142
146
  var dataSource = radioList !== null && radioList !== void 0 ? radioList : defaultRadioList;
143
147
  (0, react_1.useEffect)(function () {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "assui",
3
- "version": "3.0.67",
3
+ "version": "3.0.69",
4
4
  "description": "react ui library",
5
5
  "author": "jason <usochen@gmail.com>",
6
6
  "main": "./lib/index.js",
@@ -35,7 +35,7 @@
35
35
  "@types/react-beautiful-dnd": "^13.1.2",
36
36
  "@types/react-color": "^3.0.6",
37
37
  "@types/react-resizable": "^3.0.0",
38
- "a-icons": "^1.1.29",
38
+ "a-icons": "^1.1.30",
39
39
  "aa-utils": "^2.1.17",
40
40
  "ahooks": "^3.0.8",
41
41
  "bignumber.js": "^9.0.1",
@@ -80,5 +80,5 @@
80
80
  "node": ">=10.0.0"
81
81
  },
82
82
  "license": "MIT",
83
- "gitHead": "637c735c832325c58723034afe221fb840488741"
83
+ "gitHead": "9179bf907a442955dbfa356df96b55fa30727e6d"
84
84
  }