ztxkui 2.8.3 → 2.8.6
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.
|
@@ -2,24 +2,20 @@ import dayjsGenerateConfig from 'rc-picker/lib/generate/dayjs';
|
|
|
2
2
|
import generatePicker from 'antd/es/date-picker/generatePicker';
|
|
3
3
|
import 'antd/es/date-picker/style/index';
|
|
4
4
|
var DatePicker = generatePicker(dayjsGenerateConfig);
|
|
5
|
-
if (DatePicker.defaultProps) {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
DatePicker.RangePicker.defaultProps = {
|
|
22
|
-
getPopupContainer: function (trigger) { return trigger || document.body; },
|
|
23
|
-
};
|
|
24
|
-
}
|
|
5
|
+
// if (DatePicker.defaultProps) {
|
|
6
|
+
// DatePicker.defaultProps.getPopupContainer = (trigger) =>
|
|
7
|
+
// trigger || document.body;
|
|
8
|
+
// } else {
|
|
9
|
+
// DatePicker.defaultProps = {
|
|
10
|
+
// getPopupContainer: (trigger) => trigger || document.body,
|
|
11
|
+
// };
|
|
12
|
+
// }
|
|
13
|
+
// if (DatePicker.RangePicker.defaultProps) {
|
|
14
|
+
// DatePicker.RangePicker.defaultProps.getPopupContainer = (trigger) =>
|
|
15
|
+
// trigger || document.body;
|
|
16
|
+
// } else {
|
|
17
|
+
// DatePicker.RangePicker.defaultProps = {
|
|
18
|
+
// getPopupContainer: (trigger) => trigger || document.body,
|
|
19
|
+
// };
|
|
20
|
+
// }
|
|
25
21
|
export default DatePicker;
|
|
@@ -498,6 +498,8 @@ function EnhanceSelect(_a) {
|
|
|
498
498
|
}
|
|
499
499
|
currentClick.current = true;
|
|
500
500
|
};
|
|
501
|
-
return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : onSearch, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle,
|
|
501
|
+
return (React.createElement(Select, __assign({ defaultValue: showAll ? '' : undefined, allowClear: true, showSearch: true, filterOption: remoteSearch ? false : filterOptionHandle, onSearch: remoteSearch ? onSearchHandle : onSearch, onChange: onChangeHandle, optionLabelProp: "title", loading: loading, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle,
|
|
502
|
+
// getPopupContainer={(trigger) => trigger || document.body}
|
|
503
|
+
open: isOpen }, restProps, { disabled: remoteSearch ? restProps.disabled : loading || restProps.disabled }), renderSelectOption()));
|
|
502
504
|
}
|
|
503
505
|
export default memo(EnhanceSelect);
|
|
@@ -64,26 +64,32 @@ function RangePicker(_a) {
|
|
|
64
64
|
* @description 监听值改变触发单独选择框的值改变
|
|
65
65
|
*/
|
|
66
66
|
useEffect(function () {
|
|
67
|
-
var _a, _b
|
|
67
|
+
var _a, _b;
|
|
68
68
|
if (Array.isArray(restProps.value)) {
|
|
69
69
|
setDatePickerValue(restProps.value[0]);
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
['9999', '9999-12-31', '9999-12'].includes((
|
|
70
|
+
if (showFar &&
|
|
71
|
+
restProps.value[1] &&
|
|
72
|
+
['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))) {
|
|
73
73
|
setChecked(true);
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
|
-
}, [restProps.value, formatString]);
|
|
76
|
+
}, [restProps.value, formatString, showFar]);
|
|
77
77
|
/**至今组件切换 */
|
|
78
78
|
var onFarChangeHandle = function (e) {
|
|
79
|
-
if (
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
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], ['', '']);
|
|
87
93
|
setChecked(e.target.checked);
|
|
88
94
|
};
|
|
89
95
|
/**至今组件 */
|
|
@@ -72,7 +72,7 @@ function Select(props) {
|
|
|
72
72
|
}
|
|
73
73
|
currentClick.current = true;
|
|
74
74
|
};
|
|
75
|
-
return (React.createElement(AntSelect, __assign({ onChange: onChangeHandle, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, open: isOpen
|
|
75
|
+
return (React.createElement(AntSelect, __assign({ onChange: onChangeHandle, onFocus: onFocusHandle, onBlur: onBlurHandle, onClear: onClearHandle, onSelect: onSelectHandle, onClick: onClickHandle, open: isOpen }, restProps), children));
|
|
76
76
|
}
|
|
77
77
|
Select.Option = AntSelect.Option;
|
|
78
78
|
Select.OptGroup = AntSelect.OptGroup;
|