dtable-ui-component 6.0.39-alpha992 → 6.0.39-gzc2

package/lib/DTableFiltersPopover/index.js

@@ -19,7 +19,7 @@ var _constants = require("../constants");
 var _lang = require("../lang");
 require("./index.css");
 /**
- * filter222 = {
+ * filter = {
  *  column_key: '',
  *  filter_predicate: '',
  *  filter_term: '',

package/lib/DTableFiltersPopover/widgets/filter-calendar.js

@@ -32,9 +32,11 @@ class FilterCalendar extends _react.Component {
         value
       }, () => {
         if (this.state.value) {
+          console.log('value', this.state.value);
           const filterStr = this.state.value.format(this.getCalendarFormat()[0]);
           if (typeof filterStr === 'string') {
             const changeVal = (0, _dateFormat.filterChangeValue)(filterStr, searchFormat);
+            console.log('changeVal', changeVal);
             onChange(changeVal);
           }
         }
@@ -100,6 +102,9 @@ class FilterCalendar extends _react.Component {
       lang
     } = this.props;
     const iszhcn = lang === 'zh-cn';
+    console.log('formatDay', this.formatDay);
+    console.log('formatMonth', this.formatMonth);
+    console.log('formatYear', this.formatYear);
     if (iszhcn) {
       now = now.locale('zh-cn');
     } else {
@@ -119,15 +124,15 @@ class FilterCalendar extends _react.Component {
       firstDayOfWeek
     } = this.props;
     const state = this.state;
+    const calendarFormat = this.getCalendarFormat();
     const inputStr = state.value ? state.value.format(this.columnDataFormat) : '';
-    const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr, this.columnDataFormat, (0, _dateFormat.delimate)(this.columnDataFormat));
+    const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr, calendarFormat[0], (0, _dateFormat.delimate)(calendarFormat[0]));
     if (isReadOnly) return /*#__PURE__*/_react.default.createElement("input", {
       className: "ant-calendar-picker-input ant-input form-control",
       value: displayContentValue,
       disabled: true
     });
-    const calendarFormat = this.getCalendarFormat();
-    const calendarFormat1 = ['YYYY-MM-DD'];
+    console.log('calendarFormat', calendarFormat, displayContentValue);
     const clearStyle = {
       position: 'absolute',
       top: '15px',
@@ -145,7 +150,8 @@ class FilterCalendar extends _react.Component {
       style: {
         zIndex: 1001
       },
-      format: calendarFormat1,
+      dateInputPlaceholder: calendarFormat[0],
+      format: calendarFormat,
       defaultValue: this.defaultCalendarValue,
       showDateInput: true,
       focusablePanel: false,

package/lib/DTableFiltersPopover/widgets/filter-item.js

@@ -350,6 +350,8 @@ class FilterItem extends _react.default.Component {
         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];
         if (inputRangeLabel.indexOf(filter_term_modifier) > -1) {
           if (filter_term_modifier === 'exact_date') {
+            console.log('filterTerm', this.state.filterTerm);
+            console.log('filterColumn', filterColumn);
             return /*#__PURE__*/_react.default.createElement(_filterCalendar.default, {
               lang: lang,
               value: this.state.filterTerm,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.39-alpha992",
+  "version": "6.0.39-gzc2",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",