dtable-ui-component 6.0.39-alphaG21 → 6.0.39-gzc33

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

@@ -14,7 +14,6 @@ var _seafileCalendar = _interopRequireDefault(require("@seafile/seafile-calendar
 var _Picker = _interopRequireDefault(require("@seafile/seafile-calendar/lib/Picker"));
 var _lang = require("../../lang");
 var _columnUtils = require("../../utils/column-utils");
-var _dateFormat = require("../../utils/dateFormat.js");
 require("@seafile/seafile-calendar/assets/index.css");
 let now = (0, _dayjs.default)();
 class FilterCalendar extends _react.Component {
@@ -27,18 +26,12 @@ class FilterCalendar extends _react.Component {
       const {
         onChange
       } = this.props;
-      const searchFormat = this.columnDataFormat;
+      const searchFormat = 'YYYY-MM-DD';
       this.setState({
         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);
-          }
+          onChange(this.state.value.format(searchFormat));
         }
       });
     };
@@ -92,9 +85,6 @@ class FilterCalendar extends _react.Component {
     this.columnDataFormat = DataFormat.split(' ')[0];
     this.calendarContainerRef = /*#__PURE__*/_react.default.createRef();
     this.defaultCalendarValue = null;
-    this.formatDay = this.props.value ? (0, _dateFormat.getDay)(this.props.value, this.getCalendarFormat()[0]) : null;
-    this.formatMonth = this.props.value ? (0, _dateFormat.getMonth)(this.props.value, this.getCalendarFormat()[0]) : null;
-    this.formatYear = this.props.value ? (0, _dateFormat.getYear)(this.props.value, this.getCalendarFormat()[0]) : null;
   }
   componentDidMount() {
     const {
@@ -102,9 +92,6 @@ 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 {
@@ -114,7 +101,7 @@ class FilterCalendar extends _react.Component {
     if (value && (0, _dayjs.default)(value).isValid()) {
       let validValue = (0, _dayjs.default)(value).isValid() ? (0, _dayjs.default)(value) : (0, _dayjs.default)(this.defaultCalendarValue);
       this.setState({
-        value: iszhcn ? (0, _dayjs.default)(validValue).year(this.formatYear).month(this.formatMonth).date(this.formatDay).locale('zh-cn') : (0, _dayjs.default)(validValue).year(this.formatYear).month(this.formatMonth).date(this.formatDay).locale('en-gb')
+        value: iszhcn ? (0, _dayjs.default)(validValue).locale('zh-cn') : (0, _dayjs.default)(validValue).locale('en-gb')
       });
     }
   }
@@ -124,16 +111,12 @@ 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, 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,
+      value: state.value ? state.value.format(this.columnDataFormat) : '',
       disabled: true
     });
-    const calendarFormat1 = ['YYYY-MM-DD'];
-    console.log('calendarFormat', calendarFormat, displayContentValue);
+    const calendarFormat = this.getCalendarFormat();
     const clearStyle = {
       position: 'absolute',
       top: '15px',
@@ -151,7 +134,8 @@ class FilterCalendar extends _react.Component {
       style: {
         zIndex: 1001
       },
-      format: calendarFormat1,
+      dateInputPlaceholder: calendarFormat[0],
+      format: calendarFormat,
       defaultValue: this.defaultCalendarValue,
       showDateInput: true,
       focusablePanel: false,
@@ -182,7 +166,7 @@ class FilterCalendar extends _react.Component {
         tabIndex: "-1",
         readOnly: true,
         className: "ant-calendar-picker-input ant-input form-control",
-        value: displayContentValue,
+        value: value ? value.format(this.columnDataFormat) : '',
         onMouseDown: this.handleMouseDown
       }), /*#__PURE__*/_react.default.createElement("div", {
         ref: this.calendarContainerRef

package/package.json

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