dtable-ui-component 6.0.39-alpha42 → 6.0.40

package/lib/DateEditor/mb-editor/index.js

@@ -76,11 +76,10 @@ class MBDateEditor extends _react.default.PureComponent {
       const {
         time
       } = this.state;
-      const calanderFormat = Array.of(this.format);
       const calendar = /*#__PURE__*/_react.default.createElement(_seafileCalendar.default, {
         className: (0, _classnames.default)('dtable-rc-calendar', className),
         locale: (0, _editorUtils.initDateEditorLanguage)(lang),
-        format: calanderFormat,
+        format: this.format,
         defaultValue: this.defaultCalendarValue,
         showDateInput: false,
         focusablePanel: false,

package/lib/DateEditor/pc-editor.js

@@ -143,14 +143,13 @@ class PCDateEditor extends _react.default.Component {
       } = this.props;
       let defaultValue = (0, _dayjs.default)().clone();
       const defaultTime = this.getDefaultTime();
-      const calanderFormat = Array.isArray(dateFormat) ? dateFormat : Array.of(dateFormat);
       return /*#__PURE__*/_react.default.createElement(_seafileCalendar.default, {
         className: (0, _classnames.default)('dtable-rc-calendar', className),
         locale: (0, _editorUtils.initDateEditorLanguage)(lang),
         style: {
           zIndex: 1001
         },
-        format: calanderFormat,
+        format: dateFormat,
         defaultValue: defaultValue,
         showHourAndMinute: showHourAndMinute,
         defaultMinutesTime: defaultTime,

package/lib/DateFormatter/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _dateFormat = require("../utils/dateFormat.js");
+var _dtableUtils = require("dtable-utils");
 require("./index.css");
 class DateFormatter extends _react.default.Component {
   render() {
@@ -18,7 +18,7 @@ class DateFormatter extends _react.default.Component {
     } = this.props;
     let classname = (0, _classnames.default)('dtable-ui cell-formatter-container date-formatter', containerClassName);
     if (date !== '') {
-      date = (0, _dateFormat.renderDisplayContent)(date, format, (0, _dateFormat.delimate)(format));
+      date = (0, _dtableUtils.getDateDisplayString)(date, format);
     }
     return /*#__PURE__*/_react.default.createElement("div", {
       title: date,

package/lib/RowExpandEditor/single-select-editor/mb-editor/index.js

@@ -58,7 +58,9 @@ class RowExpandMBSingleSelectEditor extends _react.default.Component {
     };
     this.onChange = option => {
       let newValue = option[this.key];
-      if (this.state.value === newValue) newValue = null;
+      if (this.state.value === newValue) {
+        newValue = null;
+      }
       this.setState({
         value: newValue
       });

package/lib/SelectItem/index.css

@@ -0,0 +1,24 @@
+.dtable-ui.dtable-ui-select-item {
+  display: flex;
+  align-items: center;
+  padding: 0px 10px;
+  height: 20px;
+  line-height: 20px;
+  text-align: center;
+  border-radius: 10px;
+  width: min-content;
+  max-width: 300px;
+  margin: 5px 10px 5px 0;
+}
+
+.dtable-ui.dtable-ui-select-item .dtable-ui-select-item-remove-btn {
+  cursor: pointer;
+  margin-left: 5px;
+}
+
+.dtable-ui.dtable-ui-select-item .dtable-ui-select-item-remove-btn .dtable-icon-fork-number {
+  font-size: 12px;
+  transform: scale(0.8);
+  display: inline-block;
+  line-height: 12px;
+}

package/lib/SelectItem/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
+require("./index.css");
 const SelectItem = _ref => {
   let {
     option,
@@ -16,50 +17,31 @@ const SelectItem = _ref => {
     isShowRemove,
     onRemove
   } = _ref;
-  const style = (0, _react.useMemo)(() => {
+  const selectItemStyle = (0, _react.useMemo)(() => {
     return {
-      display: 'flex',
-      alignItems: 'center',
-      padding: '0px 10px',
-      marginRight: 8,
-      height: 20,
-      lineHeight: '20px',
-      textAlign: 'center',
-      borderRadius: 10,
-      width: 'min-content',
-      maxWidth: 300,
-      margin: '5px 10px 5px 0',
       fontSize: fontSize || 13,
       backgroundColor: option.color,
       color: option.textColor || null
     };
   }, [option, fontSize]);
-  const opBtnStyle = (0, _react.useMemo)(() => {
+  const removeBtnStyle = (0, _react.useMemo)(() => {
     const textColor = option.textColor || null;
     return {
-      cursor: 'pointer',
-      color: textColor === '#FFFFFF' ? '#FFFFFF' : '#909090',
-      marginLeft: 5
+      color: textColor === '#FFFFFF' ? '#FFFFFF' : '#909090'
     };
   }, [option]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('dtable-ui dtable-ui-select-item', className),
-    style: style
+    style: selectItemStyle
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "dtable-ui-select-item-name text-truncate",
     title: option.name
   }, option.name), isShowRemove && /*#__PURE__*/_react.default.createElement("div", {
-    className: "dtable-ui-select-item-operation-btn",
-    style: opBtnStyle,
+    className: "dtable-ui-select-item-remove-btn",
+    style: removeBtnStyle,
     onClick: onRemove
   }, /*#__PURE__*/_react.default.createElement("i", {
-    className: "dtable-font dtable-icon-fork-number",
-    style: {
-      fontSize: '12px',
-      transform: 'scale(0.8)',
-      display: 'inline-block',
-      lineHeight: '12px'
-    }
+    className: "dtable-font dtable-icon-fork-number"
   })));
 };
 var _default = exports.default = SelectItem;

package/lib/SingleSelectFormatter/index.js

@@ -15,7 +15,7 @@ class SingleSelectFormatter extends _react.default.PureComponent {
     this.getOption = () => {
       let {
         value,
-        options,
+        options = [],
         fontSize
       } = this.props;
       let option = options.find(item => item.id === value || item.name === value);
@@ -38,7 +38,4 @@ class SingleSelectFormatter extends _react.default.PureComponent {
     }, value ? this.getOption() : '');
   }
 }
-SingleSelectFormatter.defaultProps = {
-  options: []
-};
 var _default = exports.default = SingleSelectFormatter;

package/package.json

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

package/lib/utils/dateFormat.js

@@ -1,211 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.currentYear = exports.currentTime = exports.DATE_FORMATS = void 0;
-exports.delimate = delimate;
-exports.formatDateLocal = formatDateLocal;
-exports.fullValidYear = fullValidYear;
-exports.getDay = getDay;
-exports.getMonth = getMonth;
-exports.getYear = getYear;
-exports.renderDisplayContent = renderDisplayContent;
-exports.renderFilterInputFormat = renderFilterInputFormat;
-var _dayjs = _interopRequireDefault(require("dayjs"));
-var _utc = _interopRequireDefault(require("dayjs/plugin/utc"));
-_dayjs.default.extend(_utc.default);
-const currentTime = exports.currentTime = (0, _dayjs.default)().format('HH:mm');
-const currentYear = exports.currentYear = (0, _dayjs.default)().year();
-const DATE_FORMATS = exports.DATE_FORMATS = {
-  ISO: 'yyyy-mm-dd',
-  ISOAndTime: 'yyyy-mm-dd hh:mm',
-  US: 'm/d/yyyy',
-  USAndTime: 'm/d/yyyy hh:mm',
-  European: 'dd/mm/yyyy',
-  EuropeanAndTime: 'dd/mm/yyyy hh:mm',
-  Germany_Russia_etc: 'dd.mm.yyyy',
-  Germany_Russia_etcAndTime: 'dd.mm.yyyy hh:mm'
-};
-function fullValidYear(yearStr) {
-  const year = yearStr;
-  if (!year || isNaN(year)) return currentYear;
-  if (year.length === 2) {
-    if (Number(year) >= 0 && Number(year) < 69) {
-      return year ? "20".concat(year) : currentYear;
-    } else if (Number(year) >= 69 && Number(year) < 100) {
-      return year ? "19".concat(year) : currentYear;
-    }
-  }
-  if (year.length === 4) {
-    return year;
-  }
-  return year ? year.padStart(4, '0') : currentYear;
-}
-function formatDateLocal(formatStr, localeFormat) {
-  const str = formatStr || '';
-  const format = String(localeFormat).toLowerCase();
-  let cleanStr;
-  switch (format) {
-    case DATE_FORMATS.ISO:
-    case DATE_FORMATS.ISOAndTime:
-      cleanStr = str.replace(/[^0-9]+/g, '-');
-      return cleanStr.split('-').filter(Boolean).map(String);
-    case DATE_FORMATS.US:
-    case DATE_FORMATS.USAndTime:
-    case DATE_FORMATS.European:
-    case DATE_FORMATS.EuropeanAndTime:
-      cleanStr = str.replace(/[^0-9]+/g, '/');
-      return cleanStr.split('/').filter(Boolean).map(String);
-    case DATE_FORMATS.Germany_Russia_etc:
-    case DATE_FORMATS.Germany_Russia_etcAndTime:
-      cleanStr = str.replace(/[^0-9]+/g, '.');
-      return cleanStr.split('.').filter(Boolean).map(String);
-    default:
-      return [];
-  }
-}
-function delimate(localeFormat) {
-  const formatPrefix = String(localeFormat).toLowerCase();
-  let delimiter;
-  if (formatPrefix === DATE_FORMATS.Germany_Russia_etc || formatPrefix === DATE_FORMATS.Germany_Russia_etcAndTime) {
-    delimiter = '.';
-  } else if (formatPrefix === DATE_FORMATS.ISO || formatPrefix === DATE_FORMATS.ISOAndTime) {
-    delimiter = '-';
-  } else {
-    delimiter = '/';
-  }
-  return delimiter;
-}
-function renderDisplayContent(str, localeFormat, delimiter) {
-  const format = String(localeFormat).toLowerCase();
-  const parts = formatDateLocal(str, localeFormat);
-  if (parts.length < 3) {
-    return '';
-  }
-  let day = parts[2];
-  let month = parts[1];
-  let year = String(fullValidYear(parts[0])).padStart(4, '0');
-  let time = "".concat(parts[3], ":").concat(parts[4]) || currentTime;
-  if (format === DATE_FORMATS.ISO) {
-    return "".concat(year).concat(delimiter).concat(month).concat(delimiter).concat(day);
-  }
-  if (format === DATE_FORMATS.ISOAndTime) {
-    return "".concat(year).concat(delimiter).concat(month).concat(delimiter).concat(day, " ").concat(time);
-  }
-  if (format === DATE_FORMATS.US) {
-    return "".concat(Number(month)).concat(delimiter).concat(Number(day)).concat(delimiter).concat(year);
-  }
-  if (format === DATE_FORMATS.USAndTime) {
-    return "".concat(Number(month)).concat(delimiter).concat(Number(day)).concat(delimiter).concat(year, " ").concat(time);
-  }
-  if (format === DATE_FORMATS.European || format === DATE_FORMATS.Germany_Russia_etc) {
-    return "".concat(Number(day)).concat(delimiter).concat(Number(month)).concat(delimiter).concat(year);
-  }
-  if (format === DATE_FORMATS.EuropeanAndTime || format === DATE_FORMATS.Germany_Russia_etcAndTime) {
-    return "".concat(Number(day)).concat(delimiter).concat(Number(month)).concat(delimiter).concat(year, " ").concat(time);
-  }
-}
-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 '';
-  }
-  let day;
-  let month;
-  let year;
-  let time = "".concat(parts[3], ":").concat(parts[4]) || currentTime;
-  if (format === DATE_FORMATS.ISO) {
-    day = parts[2];
-    month = parts[1];
-    year = String(fullValidYear(parts[0])).padStart(4, '0');
-    return "".concat(year).concat(delimiter).concat(month).concat(delimiter).concat(day);
-  }
-  if (format === DATE_FORMATS.ISOAndTime) {
-    day = parts[2];
-    month = parts[1];
-    year = String(fullValidYear(parts[0])).padStart(4, '0');
-    return "".concat(year).concat(delimiter).concat(month).concat(delimiter).concat(day, " ").concat(time);
-  }
-  if (format === DATE_FORMATS.US) {
-    day = parts[1];
-    month = parts[0];
-    year = String(fullValidYear(parts[2])).padStart(4, '0');
-    return "".concat(Number(month)).concat(delimiter).concat(Number(day)).concat(delimiter).concat(year);
-  }
-  if (format === DATE_FORMATS.USAndTime) {
-    day = parts[1];
-    month = parts[0];
-    year = String(fullValidYear(parts[2])).padStart(4, '0');
-    return "".concat(Number(month)).concat(delimiter).concat(Number(day)).concat(delimiter).concat(year, " ").concat(time);
-  }
-  if (format === DATE_FORMATS.European || format === DATE_FORMATS.Germany_Russia_etc) {
-    day = parts[0];
-    month = parts[1];
-    year = String(fullValidYear(parts[2])).padStart(4, '0');
-    return "".concat(Number(day)).concat(delimiter).concat(Number(month)).concat(delimiter).concat(year);
-  }
-  if (format === DATE_FORMATS.EuropeanAndTime || format === DATE_FORMATS.Germany_Russia_etcAndTime) {
-    day = parts[0];
-    month = parts[1];
-    year = String(fullValidYear(parts[2])).padStart(4, '0');
-    return "".concat(Number(day)).concat(delimiter).concat(Number(month)).concat(delimiter).concat(year, " ").concat(time);
-  }
-}
-function getDay(str, localeFormat, mode) {
-  const format = String(localeFormat).toLowerCase();
-  const parts = formatDateLocal(str, format);
-  if (parts.length < 3) {
-    return '';
-  }
-  if (!mode) {
-    if (format === DATE_FORMATS.ISO || format === DATE_FORMATS.ISOAndTime) {
-      return String(parts[2]).padStart(2, '0');
-    }
-    return String(Number(parts[2]));
-  }
-  if (format === DATE_FORMATS.ISO || format === DATE_FORMATS.ISOAndTime) {
-    return String(parts[2]).padStart(2, '0');
-  }
-  if (format === DATE_FORMATS.US || format === DATE_FORMATS.USAndTime) {
-    return String(Number(parts[1]));
-  }
-  return String(Number(parts[0]));
-}
-function getMonth(str, localeFormat, mode) {
-  const format = String(localeFormat).toLowerCase();
-  const parts = formatDateLocal(str, format);
-  if (parts.length < 3) {
-    return '';
-  }
-  if (!mode) {
-    if (format === DATE_FORMATS.ISO || format === DATE_FORMATS.ISOAndTime) {
-      return String(Number(parts[1]) - 1).padStart(2, '0');
-    }
-    return String(Number(parts[1]) - 1);
-  }
-  if (format === DATE_FORMATS.ISO || format === DATE_FORMATS.ISOAndTime) {
-    return String(Number(parts[1]) - 1).padStart(2, '0');
-  }
-  if (format === DATE_FORMATS.US || format === DATE_FORMATS.USAndTime) {
-    return String(Number(parts[0]) - 1);
-  }
-  return String(Number(parts[1]) - 1);
-}
-function getYear(str, localeFormat, mode) {
-  const format = String(localeFormat).toLowerCase();
-  const parts = formatDateLocal(str, format);
-  if (parts.length < 3) {
-    return '';
-  }
-  if (!mode) {
-    return String(fullValidYear(parts[0])).padStart(4, '0');
-  }
-  if (format === DATE_FORMATS.ISO || format === DATE_FORMATS.ISOAndTime) {
-    return String(fullValidYear(parts[0])).padStart(4, '0');
-  }
-  return String(fullValidYear(parts[2])).padStart(4, '0');
-}