dtable-ui-component 5.1.3 → 5.1.4

package/lib/FormulaFormatter/index.js

@@ -18,6 +18,7 @@ class FormulaFormatter extends _react.default.Component {
     this.getGridCellClassName = resultType => {
       switch (resultType) {
         case _dtableUtils.FORMULA_RESULT_TYPE.NUMBER:
+        case _dtableUtils.FORMULA_RESULT_TYPE.DATE:
           {
             return 'text-right';
           }
@@ -27,6 +28,20 @@ class FormulaFormatter extends _react.default.Component {
           }
       }
     };
+    this.renderCellValue = (cellValue, resultType) => {
+      const {
+        containerClassName
+      } = this.props;
+      const gridCellClassName = this.getGridCellClassName(resultType);
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "dtable-ui cell-formatter-container formula-formatter ".concat(containerClassName, " ").concat(gridCellClassName),
+        title: cellValue,
+        "aria-label": cellValue
+      }, cellValue);
+    };
+    this.renderInternalErrorValue = (errorValue, resultType) => {
+      return this.renderCellValue(errorValue, resultType);
+    };
     this.renderOtherColumnFormatter = () => {
       const {
         value,
@@ -106,23 +121,23 @@ class FormulaFormatter extends _react.default.Component {
   }
   render() {
     const {
-      containerClassName,
       column,
       collaborators
     } = this.props;
     const {
       data
     } = column;
+    let value = this.props.value;
+    if (!data || !value && value !== 0 && value !== false) return null;
     const {
       array_type,
       result_type: resultType
     } = data;
-    let value = this.props.value;
-    if (Array.isArray(value)) {
-      value = (0, _utils.getFormulaArrayValue)(value);
-      if (array_type === _dtableUtils.CellType.LONG_TEXT) {
-        value = value.map(item => (0, _utils.convertValueToDtableLongTextValue)(item));
-      }
+    if (_dtableUtils.DISPLAY_INTERNAL_ERRORS.includes(value)) {
+      return this.renderInternalErrorValue(value, resultType);
+    }
+    if (array_type && array_type === _dtableUtils.CellType.LONG_TEXT && Array.isArray(value)) {
+      value = value.map(item => (0, _utils.convertValueToDtableLongTextValue)(item));
     }
     if (resultType === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
       return this.renderOtherColumnFormatter();
@@ -130,15 +145,10 @@ class FormulaFormatter extends _react.default.Component {
     if (typeof value === 'object') {
       return null;
     }
-    const gridCellClassName = this.getGridCellClassName(resultType);
     const formattedValue = (0, _dtableUtils.getFormulaDisplayString)(value, data, {
       collaborators
     });
-    return /*#__PURE__*/_react.default.createElement("div", {
-      className: "dtable-ui cell-formatter-container formula-formatter ".concat(containerClassName, " ").concat(gridCellClassName),
-      title: formattedValue,
-      "aria-label": formattedValue
-    }, formattedValue);
+    return this.renderCellValue(formattedValue, resultType);
   }
 }
 var _default = exports.default = FormulaFormatter;

package/lib/FormulaFormatter/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getTwoDimensionArrayValue = exports.getFormulaArrayValue = exports.convertValueToDtableLongTextValue = void 0;
+exports.convertValueToDtableLongTextValue = void 0;
 exports.isArrayFormatColumn = isArrayFormatColumn;
 exports.isFunction = void 0;
 exports.isSimpleCellFormatter = isSimpleCellFormatter;
@@ -46,69 +46,6 @@ const openUrlLink = url => {
   document.body.removeChild(a);
 };
 exports.openUrlLink = openUrlLink;
-const getFormulaArrayValue = function (value) {
-  let isFlat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  if (!Array.isArray(value)) {
-    return [];
-  }
-  if (!isFlat) {
-    return getTwoDimensionArrayValue(value);
-  }
-  return value.map(item => {
-    if (Object.prototype.toString.call(item) !== '[object Object]' || !Object.prototype.hasOwnProperty.call(item, 'display_value')) {
-      return item;
-    }
-    const {
-      display_value
-    } = item;
-    if (!Array.isArray(display_value) || display_value.length === 0) {
-      return display_value;
-    }
-    return display_value.map(i => {
-      if (Object.prototype.toString.call(i) === '[object Object]') {
-        if (!Object.prototype.hasOwnProperty.call(i, 'display_value')) {
-          return i;
-        }
-        const {
-          display_value
-        } = i;
-        return display_value;
-      }
-      return i;
-    });
-  }).flat().filter(item => isValidCellValue(item));
-};
-exports.getFormulaArrayValue = getFormulaArrayValue;
-const getTwoDimensionArrayValue = value => {
-  if (!Array.isArray(value)) return [];
-  return value.map(item => {
-    if (Object.prototype.toString.call(item) !== '[object Object]') {
-      return item;
-    }
-    if (!Object.prototype.hasOwnProperty.call(item, 'display_value')) {
-      return item;
-    }
-    const {
-      display_value
-    } = item;
-    if (!Array.isArray(display_value) || display_value.length === 0) {
-      return display_value;
-    }
-    return display_value.map(i => {
-      if (Object.prototype.toString.call(i) === '[object Object]') {
-        if (!Object.prototype.hasOwnProperty.call(i, 'display_value')) {
-          return i;
-        }
-        const {
-          display_value
-        } = i;
-        return display_value;
-      }
-      return i;
-    });
-  });
-};
-exports.getTwoDimensionArrayValue = getTwoDimensionArrayValue;
 const convertValueToDtableLongTextValue = value => {
   const valueType = Object.prototype.toString.call(value);
   if (value && valueType === '[object String]') {

package/lib/RowExpandFormatter/index.js

@@ -95,7 +95,7 @@ class EditorFormatter extends _react.default.Component {
         collaborators
       } = this.state;
       const containerClassName = "dtable-".concat(columnType, "-formatter ").concat(className || '');
-      let cellValue = row[column.key] || row[column.name];
+      let cellValue = row[column.key] !== null && row[column.key] !== undefined ? row[column.key] : row[column.name];
       switch (columnType) {
         case _constants.CellType.TEXT:
           {

package/lib/RowExpandFormulaFormatter/index.js

@@ -18,6 +18,19 @@ require("../FormulaFormatter/index.css");
 class RowExpandFormulaFormatter extends _react.default.Component {
   constructor() {
     super(...arguments);
+    this.getGridCellClassName = resultType => {
+      switch (resultType) {
+        case _dtableUtils.FORMULA_RESULT_TYPE.NUMBER:
+        case _dtableUtils.FORMULA_RESULT_TYPE.DATE:
+          {
+            return 'text-right';
+          }
+        default:
+          {
+            return '';
+          }
+      }
+    };
     this.onOpenUrlLink = url => {
       if (!(0, _utils.isValidUrl)(url)) {
         url = "http://".concat(url);
@@ -58,6 +71,21 @@ class RowExpandFormulaFormatter extends _react.default.Component {
         style: style
       }, dom);
     };
+    this.renderCellValue = (cellValue, resultType) => {
+      const {
+        containerClassName
+      } = this.props;
+      const customClassName = this.getGridCellClassName(resultType);
+      const className = "dtable-ui cell-formatter-container formula-formatter ".concat(containerClassName, " ").concat(customClassName);
+      return this.renderBorder( /*#__PURE__*/_react.default.createElement("div", {
+        className: className,
+        title: cellValue,
+        "aria-label": cellValue
+      }, cellValue));
+    };
+    this.renderInternalErrorValue = (errorValue, resultType) => {
+      return this.renderCellValue(errorValue, resultType);
+    };
     this.renderOtherColumnFormatter = () => {
       const {
         value,
@@ -156,7 +184,6 @@ class RowExpandFormulaFormatter extends _react.default.Component {
   }
   render() {
     let {
-      containerClassName,
       column,
       collaborators,
       value
@@ -168,12 +195,11 @@ class RowExpandFormulaFormatter extends _react.default.Component {
       array_type,
       result_type
     } = data;
-    if (!value) return null;
-    if (Array.isArray(value)) {
-      value = (0, _utils.getFormulaArrayValue)(value);
-      if (array_type === _dtableUtils.CellType.LONG_TEXT) {
-        value = value.map(item => (0, _utils.convertValueToDtableLongTextValue)(item));
-      }
+    if (_dtableUtils.DISPLAY_INTERNAL_ERRORS.includes(value)) {
+      return this.renderInternalErrorValue(value, result_type);
+    }
+    if (array_type === _dtableUtils.CellType.LONG_TEXT && Array.isArray(value)) {
+      value = value.map(item => (0, _utils.convertValueToDtableLongTextValue)(item));
     }
     if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
       return this.renderOtherColumnFormatter();
@@ -184,15 +210,7 @@ class RowExpandFormulaFormatter extends _react.default.Component {
     const formattedValue = (0, _dtableUtils.getFormulaDisplayString)(value, data, {
       collaborators
     });
-    let className = "dtable-ui cell-formatter-container formula-formatter ".concat(containerClassName);
-    if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
-      className = className + ' text-right';
-    }
-    return this.renderBorder( /*#__PURE__*/_react.default.createElement("div", {
-      className: className,
-      title: formattedValue,
-      "aria-label": formattedValue
-    }, formattedValue));
+    return this.renderCellValue(formattedValue, result_type);
   }
 }
 exports.default = RowExpandFormulaFormatter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "5.1.3",
+  "version": "5.1.4",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "2.0.5",