ztxkui 2.8.6 → 2.8.9

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.
@@ -49,7 +49,7 @@ function BasicDemo() {
49
49
  var _a = useState(10), value = _a[0], setValue = _a[1];
50
50
  var _b = useState([
51
51
  dayjs('2022-05-11'),
52
- dayjs('9999-12-31'),
52
+ dayjs('2022-05-31'),
53
53
  ]), rangeValue = _b[0], setRangeValue = _b[1];
54
54
  return (React.createElement(React.Fragment, null,
55
55
  React.createElement(InputNumber, { value: value, onChange: function (value) {
@@ -50,6 +50,7 @@ function RangePicker(_a) {
50
50
  var _b = _a.showFar, showFar = _b === void 0 ? false : _b, _c = _a.farChecked, farChecked = _c === void 0 ? false : _c, _d = _a.picker, picker = _d === void 0 ? 'date' : _d, restProps = __rest(_a, ["showFar", "farChecked", "picker"]);
51
51
  var _e = useState(farChecked), checked = _e[0], setChecked = _e[1];
52
52
  var _f = useState(), datePickerValue = _f[0], setDatePickerValue = _f[1];
53
+ var _g = useState(), calendarValue = _g[0], setCalendarValue = _g[1];
53
54
  /**
54
55
  * @description 获取formatString
55
56
  */
@@ -67,6 +68,7 @@ function RangePicker(_a) {
67
68
  var _a, _b;
68
69
  if (Array.isArray(restProps.value)) {
69
70
  setDatePickerValue(restProps.value[0]);
71
+ setCalendarValue(restProps.value);
70
72
  if (showFar &&
71
73
  restProps.value[1] &&
72
74
  ['9999', '9999-12-31', '9999-12'].includes((_b = (_a = restProps.value[1]) === null || _a === void 0 ? void 0 : _a.format) === null || _b === void 0 ? void 0 : _b.call(_a, formatString))) {
@@ -76,21 +78,31 @@ function RangePicker(_a) {
76
78
  }, [restProps.value, formatString, showFar]);
77
79
  /**至今组件切换 */
78
80
  var onFarChangeHandle = function (e) {
79
- // if (
80
- // e.target.checked &&
81
- // Array.isArray(restProps.value) &&
82
- // restProps.value[0]
83
- // ) {
84
- // const firstValue = restProps.value[0];
85
- // restProps.onChange &&
86
- // restProps.onChange(
87
- // [firstValue, dayjs('9999-12-31')],
88
- // [firstValue.format(formatString), '9999-12-31']
89
- // );
90
- // setDatePickerValue(firstValue);
91
- // }
92
- restProps.onChange && restProps.onChange([null, null], ['', '']);
81
+ // 如果选中
82
+ if (e.target.checked) {
83
+ var firstValue = '';
84
+ // 如果选中了第一项
85
+ if (Array.isArray(calendarValue) && calendarValue[0]) {
86
+ firstValue = calendarValue[0];
87
+ }
88
+ else if (Array.isArray(restProps.value) && restProps.value[0]) {
89
+ // 如果初始化时有值
90
+ firstValue = restProps.value[0];
91
+ }
92
+ firstValue &&
93
+ restProps.onChange &&
94
+ restProps.onChange([firstValue, dayjs('9999-12-31')], [firstValue.format(formatString), '9999-12-31']);
95
+ setDatePickerValue(firstValue);
96
+ }
97
+ else {
98
+ restProps.onChange && restProps.onChange([null, null], ['', '']);
99
+ }
93
100
  setChecked(e.target.checked);
101
+ // restProps.onChange && restProps.onChange([null, null], ['', '']);
102
+ // setChecked(e.target.checked);
103
+ };
104
+ var onCalendarChangeHandle = function (dates) {
105
+ setCalendarValue(dates);
94
106
  };
95
107
  /**至今组件 */
96
108
  var renderExtraFooterHandle = function () {
@@ -107,8 +119,8 @@ function RangePicker(_a) {
107
119
  */
108
120
  var onDatePickerChangeHandle = function (value, dateString) {
109
121
  restProps.onChange &&
110
- restProps.onChange([value, dayjs('9999-12-31')], [value.format(formatString), '9999-12-31']);
122
+ restProps.onChange(value ? [value, dayjs('9999-12-31')] : [null, null], value ? [value.format(formatString), '9999-12-31'] : ['', '']);
111
123
  };
112
- return checked ? (React.createElement(DatePicker, { value: datePickerValue, onChange: onDatePickerChangeHandle, renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, format: noformat.includes(picker) ? undefined : formatHandle })) : (React.createElement(AntRangePicker, __assign({ renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, picker: picker }, restProps)));
124
+ return checked ? (React.createElement(DatePicker, { value: datePickerValue, onChange: onDatePickerChangeHandle, renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, format: noformat.includes(picker) ? undefined : formatHandle })) : (React.createElement(AntRangePicker, __assign({ renderExtraFooter: showFar ? renderExtraFooterHandle : undefined, picker: picker, onCalendarChange: onCalendarChangeHandle }, restProps)));
113
125
  }
114
126
  export default RangePicker;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkui",
3
- "version": "2.8.6",
3
+ "version": "2.8.9",
4
4
  "private": false,
5
5
  "description": "React components library",
6
6
  "author": "zt-front-end",