dtable-ui-component 6.0.39-alpha43 → 6.0.39-alpha89

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
       }, () => {
         if (this.state.value) {
-          onChange(this.state.value.format(searchFormat));
+          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);
+          }
         }
       });
     };
@@ -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 {
@@ -92,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 {
@@ -101,7 +114,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).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,12 +124,16 @@ 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: state.value ? state.value.format(this.columnDataFormat) : '',
+      value: displayContentValue,
       disabled: true
     });
-    const calendarFormat = this.getCalendarFormat();
+    const calendarFormat1 = ['YYYY-MM-DD'];
+    console.log('calendarFormat', calendarFormat, displayContentValue);
     const clearStyle = {
       position: 'absolute',
       top: '15px',
@@ -134,7 +151,7 @@ class FilterCalendar extends _react.Component {
       style: {
         zIndex: 1001
       },
-      format: calendarFormat,
+      format: calendarFormat1,
       defaultValue: this.defaultCalendarValue,
       showDateInput: true,
       focusablePanel: false,
@@ -165,7 +182,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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.currentYear = exports.currentTime = exports.DATE_FORMATS = void 0;
 exports.delimate = delimate;
+exports.filterChangeValue = filterChangeValue;
 exports.formatDateLocal = formatDateLocal;
 exports.fullValidYear = fullValidYear;
 exports.getDay = getDay;
@@ -155,6 +156,32 @@ function renderFilterInputFormat(str, localeFormat, delimiter) {
     return "".concat(Number(day)).concat(delimiter).concat(Number(month)).concat(delimiter).concat(year, " ").concat(time);
   }
 }
+function filterChangeValue(str, localeFormat) {
+  const format = String(localeFormat).toLowerCase();
+  const parts = formatDateLocal(str, format);
+  if (parts.length < 3) {
+    return '';
+  }
+  let day;
+  let month;
+  let year;
+  if (format === DATE_FORMATS.ISO || format === DATE_FORMATS.ISOAndTime) {
+    day = parts[2];
+    month = parts[1];
+    year = fullValidYear(parts[0]);
+  }
+  if (format === DATE_FORMATS.US || format === DATE_FORMATS.USAndTime) {
+    day = parts[1];
+    month = parts[0];
+    year = fullValidYear(parts[2]);
+  }
+  if (format === DATE_FORMATS.European || format === DATE_FORMATS.Germany_Russia_etc || format === DATE_FORMATS.EuropeanAndTime || format === DATE_FORMATS.Germany_Russia_etcAndTime) {
+    day = parts[0];
+    month = parts[1];
+    year = fullValidYear(parts[2]);
+  }
+  return "".concat(String(year).padStart(4, '0'), "-").concat(String(month).padStart(2, '0'), "-").concat(String(day).padStart(2, '0'));
+}
 function getDay(str, localeFormat, mode) {
   const format = String(localeFormat).toLowerCase();
   const parts = formatDateLocal(str, format);

package/package.json

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