@zat-design/sisyphus-react 3.5.3-beta.3 → 3.5.3-beta.4
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.
|
@@ -92,6 +92,10 @@ var DatePicker = function DatePicker(props) {
|
|
|
92
92
|
if (isObject(_rest.showTime)) {
|
|
93
93
|
_rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
|
|
94
94
|
}
|
|
95
|
+
// 传进来showTime权重最高
|
|
96
|
+
if (isBoolean(rest.showTime)) {
|
|
97
|
+
_rest.showTime = rest.showTime;
|
|
98
|
+
}
|
|
95
99
|
return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
|
|
96
100
|
format: _format
|
|
97
101
|
}, _rest), {}, {
|
|
@@ -97,6 +97,10 @@ var DatePicker = function DatePicker(props) {
|
|
|
97
97
|
if ((0, _lodash.isObject)(_rest.showTime)) {
|
|
98
98
|
_rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
|
|
99
99
|
}
|
|
100
|
+
// 传进来showTime权重最高
|
|
101
|
+
if ((0, _lodash.isBoolean)(rest.showTime)) {
|
|
102
|
+
_rest.showTime = rest.showTime;
|
|
103
|
+
}
|
|
100
104
|
return (0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
|
|
101
105
|
format: _format
|
|
102
106
|
}, _rest), {}, {
|