ztxkui 2.9.3 → 2.9.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;
|
|
@@ -380,9 +380,10 @@ function EnhanceSelect(_a) {
|
|
|
380
380
|
else {
|
|
381
381
|
// 找到了,需要替换
|
|
382
382
|
var newItem = __assign({}, item);
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
383
|
+
if (!newItem[titleKey]) {
|
|
384
|
+
Reflect.deleteProperty(newItem, titleKey);
|
|
385
|
+
}
|
|
386
|
+
resultData.splice(index, 1, __assign(__assign({}, resultData[index]), newItem));
|
|
386
387
|
}
|
|
387
388
|
});
|
|
388
389
|
}
|
|
@@ -501,6 +502,8 @@ function EnhanceSelect(_a) {
|
|
|
501
502
|
}
|
|
502
503
|
currentClick.current = true;
|
|
503
504
|
};
|
|
504
|
-
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,
|
|
505
|
+
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,
|
|
506
|
+
// getPopupContainer={(trigger) => trigger || document.body}
|
|
507
|
+
open: isOpen }, restProps, { disabled: remoteSearch ? restProps.disabled : loading || restProps.disabled }), renderSelectOption()));
|
|
505
508
|
}
|
|
506
509
|
export default memo(EnhanceSelect);
|