dtable-ui-component 0.3.8 → 0.3.9

package/lib/RowExpandFormatter/index.js

@@ -1,18 +1,14 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-
-var _emptyTypeMap;
-
 import React from 'react';
 import classnames from 'classnames';
 import { TextFormatter, NumberFormatter, CheckboxFormatter, DateFormatter, SingleSelectFormatter, MultipleSelectFormatter, CollaboratorFormatter, LongTextFormatter, GeolocationFormatter, CTimeFormatter, CreatorFormatter, LastModifierFormatter, MTimeFormatter, AutoNumberFormatter, DurationFormatter, ButtonFormatter, RowExpandUrlFormatter, RowExpandEmailFormatter, RowExpandRateFormatter, RowExpandImageFormatter, RowExpandFileFormatter, RowExpandLinkFormatter, RowExpandFormulaFormatter, DigitalSignFormatter } from '../index';
 import { CellType } from '../constants';
 import './index.css';
-var emptyTypeMap = (_emptyTypeMap = {}, _defineProperty(_emptyTypeMap, CellType.TEXT, true), _defineProperty(_emptyTypeMap, CellType.LONG_TEXT, true), _defineProperty(_emptyTypeMap, CellType.GEOLOCATION, true), _defineProperty(_emptyTypeMap, CellType.SINGLE_SELECT, true), _defineProperty(_emptyTypeMap, CellType.MULTIPLE_SELECT, true), _defineProperty(_emptyTypeMap, CellType.CTIME, true), _defineProperty(_emptyTypeMap, CellType.MTIME, true), _defineProperty(_emptyTypeMap, CellType.DATE, true), _defineProperty(_emptyTypeMap, CellType.AUTO_NUMBER, true), _defineProperty(_emptyTypeMap, CellType.URL, true), _defineProperty(_emptyTypeMap, CellType.EMAIL, true), _defineProperty(_emptyTypeMap, CellType.IMAGE, true), _defineProperty(_emptyTypeMap, CellType.FILE, true), _defineProperty(_emptyTypeMap, CellType.CREATOR, true), _defineProperty(_emptyTypeMap, CellType.LAST_MODIFIER, true), _emptyTypeMap);
 
 var EditorFormatter = /*#__PURE__*/function (_React$Component) {
   _inherits(EditorFormatter, _React$Component);
@@ -72,8 +68,8 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.renderEmpty = function () {
-      return /*#__PURE__*/React.createElement("span", {
-        className: "row-cell-empty"
+      return /*#__PURE__*/React.createElement("div", {
+        className: "d-flex align-items-center form-control disabled h-auto"
       });
     };
 
@@ -88,10 +84,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
       var containerClassName = "dtable-".concat(columnType, "-formatter ").concat(className || '');
       var cellValue = row[column.key] || row[column.name];
 
-      if (!cellValue && emptyTypeMap[columnType]) {
-        return _this.renderEmpty();
-      }
-
       switch (columnType) {
         case CellType.TEXT:
           {
@@ -105,10 +97,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.COLLABORATOR:
           {
-            if (!cellValue || cellValue.length === 0) {
-              return _this.renderEmpty();
-            }
-
             return /*#__PURE__*/React.createElement("div", {
               className: "form-control d-flex align-items-center w-100 h-auto"
             }, /*#__PURE__*/React.createElement(CollaboratorFormatter, {
@@ -142,10 +130,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.NUMBER:
           {
-            if (!cellValue && cellValue !== 0) {
-              return _this.renderEmpty();
-            }
-
             return /*#__PURE__*/React.createElement("div", {
               className: "form-control d-flex align-items-center",
               style: {
@@ -174,10 +158,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.CTIME:
           {
-            if (!row._ctime) {
-              return _this.renderEmpty();
-            }
-
             return /*#__PURE__*/React.createElement("div", {
               className: "form-control d-flex align-items-center ctime-formatter-container",
               style: {
@@ -191,10 +171,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.MTIME:
           {
-            if (!row._mtime) {
-              return _this.renderEmpty();
-            }
-
             return /*#__PURE__*/React.createElement("div", {
               className: "form-control d-flex align-items-center mtime-formatter-container",
               style: {
@@ -208,10 +184,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.MULTIPLE_SELECT:
           {
-            if (!cellValue || cellValue.length === 0) {
-              return _this.renderEmpty();
-            }
-
             var options = column.data ? column.data.options : [];
             return /*#__PURE__*/React.createElement("div", {
               className: "form-control d-flex align-items-center w-100 h-auto"
@@ -286,10 +258,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
         case CellType.FORMULA:
         case CellType.LINK_FORMULA:
           {
-            if (!cellValue && cellValue !== 0 && cellValue !== false) {
-              return _this.renderEmpty();
-            }
-
             return /*#__PURE__*/React.createElement(RowExpandFormulaFormatter, {
               value: cellValue,
               column: column,
@@ -319,10 +287,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
               });
             }
 
-            if (!Array.isArray(cellValue) || cellValue.length === 0) {
-              return _this.renderEmpty();
-            }
-
             return /*#__PURE__*/React.createElement(RowExpandLinkFormatter, {
               value: cellValue,
               column: column,
@@ -362,10 +326,6 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.DURATION:
           {
-            if (!cellValue && cellValue !== 0) {
-              return _this.renderEmpty();
-            }
-
             return /*#__PURE__*/React.createElement("div", {
               className: "form-control d-flex align-items-center",
               style: {

package/lib/RowExpandFormulaFormatter/index.js

@@ -138,6 +138,7 @@ var RowExpandFormulaFormatter = /*#__PURE__*/function (_React$Component) {
       var data = column.data;
       var array_type = data.array_type,
           result_type = data.result_type;
+      if (!value) return null;
 
       if (Array.isArray(value)) {
         value = getFormulaArrayValue(value);
@@ -152,7 +153,7 @@ var RowExpandFormulaFormatter = /*#__PURE__*/function (_React$Component) {
           });
         }
       } else {
-        if (result_type === FORMULA_RESULT_TYPE.DATE) {
+        if (result_type === FORMULA_RESULT_TYPE.DATE && typeof value === 'string') {
           value = value.replace('T', ' ').replace('Z', '');
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "0.3.8",
+  "version": "0.3.9",
   "main": "./lib/index.js",
   "dependencies": {
     "dtable-utils": "0.0.2",