dtable-ui-component 6.0.39-alpha991 → 6.0.39-alphaG21
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,9 +32,11 @@ 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);
|
|
39
|
+
console.log('changeVal', changeVal);
|
|
38
40
|
onChange(changeVal);
|
|
39
41
|
}
|
|
40
42
|
}
|
|
@@ -100,6 +102,9 @@ class FilterCalendar extends _react.Component {
|
|
|
100
102
|
lang
|
|
101
103
|
} = this.props;
|
|
102
104
|
const iszhcn = lang === 'zh-cn';
|
|
105
|
+
console.log('formatDay', this.formatDay);
|
|
106
|
+
console.log('formatMonth', this.formatMonth);
|
|
107
|
+
console.log('formatYear', this.formatYear);
|
|
103
108
|
if (iszhcn) {
|
|
104
109
|
now = now.locale('zh-cn');
|
|
105
110
|
} else {
|
|
@@ -119,14 +124,16 @@ class FilterCalendar extends _react.Component {
|
|
|
119
124
|
firstDayOfWeek
|
|
120
125
|
} = this.props;
|
|
121
126
|
const state = this.state;
|
|
127
|
+
const calendarFormat = this.getCalendarFormat();
|
|
122
128
|
const inputStr = state.value ? state.value.format(this.columnDataFormat) : '';
|
|
123
|
-
const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr,
|
|
129
|
+
const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr, calendarFormat[0], (0, _dateFormat.delimate)(calendarFormat[0]));
|
|
124
130
|
if (isReadOnly) return /*#__PURE__*/_react.default.createElement("input", {
|
|
125
131
|
className: "ant-calendar-picker-input ant-input form-control",
|
|
126
132
|
value: displayContentValue,
|
|
127
133
|
disabled: true
|
|
128
134
|
});
|
|
129
|
-
const
|
|
135
|
+
const calendarFormat1 = ['YYYY-MM-DD'];
|
|
136
|
+
console.log('calendarFormat', calendarFormat, displayContentValue);
|
|
130
137
|
const clearStyle = {
|
|
131
138
|
position: 'absolute',
|
|
132
139
|
top: '15px',
|
|
@@ -144,7 +151,7 @@ class FilterCalendar extends _react.Component {
|
|
|
144
151
|
style: {
|
|
145
152
|
zIndex: 1001
|
|
146
153
|
},
|
|
147
|
-
format:
|
|
154
|
+
format: calendarFormat1,
|
|
148
155
|
defaultValue: this.defaultCalendarValue,
|
|
149
156
|
showDateInput: true,
|
|
150
157
|
focusablePanel: false,
|