dtable-ui-component 6.0.39-gzc2 → 6.0.39-gzc39
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,11 +32,9 @@ class FilterCalendar extends _react.Component {
|
|
|
32
32
|
value
|
|
33
33
|
}, () => {
|
|
34
34
|
if (this.state.value) {
|
|
35
|
-
console.log('value', this.state.value);
|
|
36
35
|
const filterStr = this.state.value.format(this.getCalendarFormat()[0]);
|
|
37
36
|
if (typeof filterStr === 'string') {
|
|
38
37
|
const changeVal = (0, _dateFormat.filterChangeValue)(filterStr, searchFormat);
|
|
39
|
-
console.log('changeVal', changeVal);
|
|
40
38
|
onChange(changeVal);
|
|
41
39
|
}
|
|
42
40
|
}
|
|
@@ -102,9 +100,6 @@ class FilterCalendar extends _react.Component {
|
|
|
102
100
|
lang
|
|
103
101
|
} = this.props;
|
|
104
102
|
const iszhcn = lang === 'zh-cn';
|
|
105
|
-
console.log('formatDay', this.formatDay);
|
|
106
|
-
console.log('formatMonth', this.formatMonth);
|
|
107
|
-
console.log('formatYear', this.formatYear);
|
|
108
103
|
if (iszhcn) {
|
|
109
104
|
now = now.locale('zh-cn');
|
|
110
105
|
} else {
|
|
@@ -124,15 +119,14 @@ class FilterCalendar extends _react.Component {
|
|
|
124
119
|
firstDayOfWeek
|
|
125
120
|
} = this.props;
|
|
126
121
|
const state = this.state;
|
|
127
|
-
const calendarFormat = this.getCalendarFormat();
|
|
128
122
|
const inputStr = state.value ? state.value.format(this.columnDataFormat) : '';
|
|
129
|
-
const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr,
|
|
123
|
+
const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr, this.columnDataFormat, (0, _dateFormat.delimate)(this.columnDataFormat));
|
|
130
124
|
if (isReadOnly) return /*#__PURE__*/_react.default.createElement("input", {
|
|
131
125
|
className: "ant-calendar-picker-input ant-input form-control",
|
|
132
126
|
value: displayContentValue,
|
|
133
127
|
disabled: true
|
|
134
128
|
});
|
|
135
|
-
|
|
129
|
+
const calendarFormat = this.getCalendarFormat();
|
|
136
130
|
const clearStyle = {
|
|
137
131
|
position: 'absolute',
|
|
138
132
|
top: '15px',
|
|
@@ -150,7 +144,6 @@ class FilterCalendar extends _react.Component {
|
|
|
150
144
|
style: {
|
|
151
145
|
zIndex: 1001
|
|
152
146
|
},
|
|
153
|
-
dateInputPlaceholder: calendarFormat[0],
|
|
154
147
|
format: calendarFormat,
|
|
155
148
|
defaultValue: this.defaultCalendarValue,
|
|
156
149
|
showDateInput: true,
|
|
@@ -350,8 +350,6 @@ class FilterItem extends _react.default.Component {
|
|
|
350
350
|
const inputRangeLabel = [_dtableUtils.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_AGO, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_FROM_NOW, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.THE_NEXT_NUMBERS_OF_DAYS, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.THE_PAST_NUMBERS_OF_DAYS];
|
|
351
351
|
if (inputRangeLabel.indexOf(filter_term_modifier) > -1) {
|
|
352
352
|
if (filter_term_modifier === 'exact_date') {
|
|
353
|
-
console.log('filterTerm', this.state.filterTerm);
|
|
354
|
-
console.log('filterColumn', filterColumn);
|
|
355
353
|
return /*#__PURE__*/_react.default.createElement(_filterCalendar.default, {
|
|
356
354
|
lang: lang,
|
|
357
355
|
value: this.state.filterTerm,
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dtable-ui-component",
|
|
3
|
-
"version": "6.0.39-
|
|
3
|
+
"version": "6.0.39-gzc39",
|
|
4
4
|
"main": "./lib/index.js",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@seafile/react-image-lightbox": "4.0.2",
|
|
7
|
-
"@seafile/seafile-calendar": "^0.0.29-
|
|
7
|
+
"@seafile/seafile-calendar": "^0.0.29-gzc3",
|
|
8
8
|
"@seafile/seafile-editor": "~2.0.6",
|
|
9
9
|
"classnames": "2.3.2",
|
|
10
10
|
"dayjs": "1.10.7",
|