dtable-ui-component 6.0.39-gzc33 → 6.0.39-gzc40

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

@@ -14,6 +14,7 @@ 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 {
@@ -26,12 +27,18 @@ class FilterCalendar extends _react.Component {
       const {
         onChange
       } = this.props;
-      const searchFormat = 'YYYY-MM-DD';
+      const searchFormat = this.columnDataFormat;
       this.setState({
         value
       }, () => {
+        console.log(111);
         if (this.state.value) {
-          onChange(this.state.value.format(searchFormat));
+          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);
+          }
         }
       });
     };
@@ -85,6 +92,9 @@ 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 {
@@ -100,8 +110,9 @@ class FilterCalendar extends _react.Component {
     this.defaultCalendarValue = now.clone();
     if (value && (0, _dayjs.default)(value).isValid()) {
       let validValue = (0, _dayjs.default)(value).isValid() ? (0, _dayjs.default)(value) : (0, _dayjs.default)(this.defaultCalendarValue);
+      console.log('validValue', validValue);
       this.setState({
-        value: iszhcn ? (0, _dayjs.default)(validValue).locale('zh-cn') : (0, _dayjs.default)(validValue).locale('en-gb')
+        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')
       });
     }
   }
@@ -111,9 +122,12 @@ class FilterCalendar extends _react.Component {
       firstDayOfWeek
     } = this.props;
     const state = this.state;
+    const inputStr = state.value ? state.value.format(this.columnDataFormat) : '';
+    const displayContentValue = (0, _dateFormat.renderFilterInputFormat)(inputStr, this.columnDataFormat, (0, _dateFormat.delimate)(this.columnDataFormat));
+    console.log('displayContentValue', displayContentValue);
     if (isReadOnly) return /*#__PURE__*/_react.default.createElement("input", {
       className: "ant-calendar-picker-input ant-input form-control",
-      value: state.value ? state.value.format(this.columnDataFormat) : '',
+      value: displayContentValue,
       disabled: true
     });
     const calendarFormat = this.getCalendarFormat();
@@ -134,7 +148,6 @@ class FilterCalendar extends _react.Component {
       style: {
         zIndex: 1001
       },
-      dateInputPlaceholder: calendarFormat[0],
       format: calendarFormat,
       defaultValue: this.defaultCalendarValue,
       showDateInput: true,
@@ -166,7 +179,7 @@ class FilterCalendar extends _react.Component {
         tabIndex: "-1",
         readOnly: true,
         className: "ant-calendar-picker-input ant-input form-control",
-        value: value ? value.format(this.columnDataFormat) : '',
+        value: displayContentValue,
         onMouseDown: this.handleMouseDown
       }), /*#__PURE__*/_react.default.createElement("div", {
         ref: this.calendarContainerRef

package/lib/utils/dateFormat.js

@@ -111,7 +111,6 @@ function renderDisplayContent(str, localeFormat, delimiter) {
 function renderFilterInputFormat(str, localeFormat, delimiter) {
   const format = String(localeFormat).toLowerCase();
   const parts = formatDateLocal(str, localeFormat);
-  // console.log('parts', str, parts);
   if (parts.length < 3) {
     return '';
   }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.39-gzc33",
+  "version": "6.0.39-gzc40",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",
-    "@seafile/seafile-calendar": "^0.0.29-alpha79",
+    "@seafile/seafile-calendar": "^0.0.29-gzc31",
     "@seafile/seafile-editor": "~2.0.6",
     "classnames": "2.3.2",
     "dayjs": "1.10.7",