dtable-ui-component 6.0.39-alpha88 → 6.0.39-alpha89
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.
|
@@ -32,10 +32,10 @@ class FilterCalendar extends _react.Component {
|
|
|
32
32
|
value
|
|
33
33
|
}, () => {
|
|
34
34
|
if (this.state.value) {
|
|
35
|
+
console.log('value', this.state.value);
|
|
35
36
|
const filterStr = this.state.value.format(this.getCalendarFormat()[0]);
|
|
36
37
|
if (typeof filterStr === 'string') {
|
|
37
38
|
const changeVal = (0, _dateFormat.filterChangeValue)(filterStr, searchFormat);
|
|
38
|
-
console.log('value', this.state.value);
|
|
39
39
|
console.log('changeVal', changeVal);
|
|
40
40
|
onChange(changeVal);
|
|
41
41
|
}
|
|
@@ -124,14 +124,14 @@ class FilterCalendar extends _react.Component {
|
|
|
124
124
|
firstDayOfWeek
|
|
125
125
|
} = this.props;
|
|
126
126
|
const state = this.state;
|
|
127
|
+
const calendarFormat = this.getCalendarFormat();
|
|
127
128
|
const inputStr = state.value ? state.value.format(this.columnDataFormat) : '';
|
|
128
|
-
const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr,
|
|
129
|
+
const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr, calendarFormat[0], (0, _dateFormat.delimate)(calendarFormat[0]));
|
|
129
130
|
if (isReadOnly) return /*#__PURE__*/_react.default.createElement("input", {
|
|
130
131
|
className: "ant-calendar-picker-input ant-input form-control",
|
|
131
132
|
value: displayContentValue,
|
|
132
133
|
disabled: true
|
|
133
134
|
});
|
|
134
|
-
const calendarFormat = this.getCalendarFormat();
|
|
135
135
|
const calendarFormat1 = ['YYYY-MM-DD'];
|
|
136
136
|
console.log('calendarFormat', calendarFormat, displayContentValue);
|
|
137
137
|
const clearStyle = {
|