dtable-ui-component 0.3.2-alpha3 → 0.3.2-alpha5

package/lib/ButtonFormatter/index.js

@@ -23,25 +23,11 @@ var ButtonFormatter = /*#__PURE__*/function (_React$Component) {
     _this = _super.call.apply(_super, [this].concat(args));
 
     _this.handleClick = function () {
-      var _this$props$data = _this.props.data,
-          button_type = _this$props$data.button_type,
-          url_address = _this$props$data.url_address;
-
-      if (button_type === 'open_url' && url_address) {
-        _this.openUrlLink(url_address);
+      if (_this.props.onClickButton) {
+        _this.props.onClickButton(_this.props.data);
       }
     };
 
-    _this.openUrlLink = function (url) {
-      var a = document.createElement('a');
-      document.body.appendChild(a);
-      a.href = url;
-      a.target = '_blank';
-      a.rel = 'noopener noreferrer';
-      a.click();
-      document.body.removeChild(a);
-    };
-
     return _this;
   }
 

package/lib/RowExpandFileFormatter/index.css

@@ -1,3 +1,5 @@
+@import url('../css/cell-formatter.css');
+
 .dtable-ui.row-expand-file-formatter {
   display: flex;
   flex-wrap: wrap;
@@ -18,6 +20,10 @@
   position: relative;
 }
 
+.dtable-ui.row-expand-file-formatter .row-expand-item-file:nth-child(5n + 1) {
+  margin-left: 0;
+}
+
 .dtable-ui.row-expand-file-formatter .row-expand-item-file:hover {
   border-color: #c9c9c9;
 }
@@ -58,3 +64,9 @@
   font-size: 12px;
   transform: scale(.7);
 }
+
+.tooltip-inner {
+  font-weight: lighter;
+  text-align: justify;
+  background-color: #303133;
+}

package/lib/RowExpandFileFormatter/index.js

@@ -4,8 +4,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React from 'react';
 import classname from 'classnames';
-import RowExpandFileItemFormatter from '../FileItemFormatter/row-expand-file-item-formatter';
-import '../FileFormatter/index.css';
+import RowExpandFileItemFormatter from './row-expand-file-item-formatter';
 import './index.css';
 
 var RowExpandFileFormatter = /*#__PURE__*/function (_React$PureComponent) {

package/lib/{FileItemFormatter → RowExpandFileFormatter}/row-expand-file-item-formatter.js

@@ -5,7 +5,7 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import { Tooltip } from 'reactstrap';
 import { getLocale } from '../lang';
-import { getFileIconUrl } from './utils';
+import { getFileIconUrl } from '../FileItemFormatter/utils';
 import DeleteTip from '../common/delete-tip';
 
 var RowExpandFileItemFormatter = /*#__PURE__*/function (_Component) {
@@ -54,7 +54,7 @@ var RowExpandFileItemFormatter = /*#__PURE__*/function (_Component) {
 
     _this.getFileIconData = function (item) {
       var fileIconUrl = getFileIconUrl(item.name, item.type);
-      return require('./' + fileIconUrl);
+      return require('../FileItemFormatter/' + fileIconUrl);
     };
 
     _this.state = {

package/lib/RowExpandFormatter/index.css

@@ -0,0 +1,7 @@
+.row-cell-empty {
+  height: 8px;
+  width: 20px;
+  background-color: #f1f1f1;
+  border-radius: 4px;
+  display: inline-block;
+}

package/lib/{editor-formatter.js → RowExpandFormatter/index.js}

@@ -1,3 +1,4 @@
+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";
@@ -8,51 +9,86 @@ var _emptyTypeMap;
 
 import React, { Fragment } from 'react';
 import { CellType } from 'dtable-store';
-import { TextFormatter, NumberFormatter, CheckboxFormatter, DateFormatter, SingleSelectFormatter, MultipleSelectFormatter, CollaboratorFormatter, SimpleLongTextFormatter, GeolocationFormatter, LinkFormatter, CTimeFormatter, CreatorFormatter, LastModifierFormatter, MTimeFormatter, AutoNumberFormatter, UrlFormatter, EmailFormatter, DurationFormatter, RateFormatter, ButtonFormatter, ImageFormatter, RowExpandFileFormatter // LongTextFormatter,
-// FormulaFormatter,
-} from './index';
-import { COLLABORATORS } from './data/dtable-value';
+import { TextFormatter, NumberFormatter, CheckboxFormatter, DateFormatter, SingleSelectFormatter, MultipleSelectFormatter, CollaboratorFormatter, SimpleLongTextFormatter, GeolocationFormatter, CTimeFormatter, CreatorFormatter, LastModifierFormatter, MTimeFormatter, AutoNumberFormatter, UrlFormatter, EmailFormatter, DurationFormatter, RateFormatter, ButtonFormatter, RowExpandImageFormatter, RowExpandFileFormatter, RowExpandLinkFormatter } from '../index';
+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.DURATION, true), _defineProperty(_emptyTypeMap, CellType.IMAGE, true), _defineProperty(_emptyTypeMap, CellType.FILE, true), _emptyTypeMap);
 
-var noop = function noop() {};
-
 var EditorFormatter = /*#__PURE__*/function (_React$Component) {
   _inherits(EditorFormatter, _React$Component);
 
   var _super = _createSuper(EditorFormatter);
 
-  function EditorFormatter(props) {
+  function EditorFormatter(_props) {
     var _this;
 
     _classCallCheck(this, EditorFormatter);
 
-    _this = _super.call(this, props);
+    _this = _super.call(this, _props);
 
-    _this.renderEmptyFormatter = function () {
-      var emptyFormatter = /*#__PURE__*/React.createElement("span", {
-        className: "row-cell-empty d-inline-block"
+    _this.updateCollaborators = function () {
+      _this.setState({
+        collaborators: _this.getCollaborator()
       });
+    };
+
+    _this.calculateCollaboratorData = function (props) {
+      var row = props.row,
+          column = props.column;
+
+      if (column.type === CellType.CREATOR || column.type === CellType.LAST_MODIFIER) {
+        var email = row[column.name];
+
+        _this.loadCollaborator(email);
+      } else if (column.type === CellType.COLLABORATOR) {
+        var emails = row[column.name];
+
+        if (Array.isArray(emails)) {
+          emails.forEach(function (email) {
+            _this.loadCollaborator(email);
+          });
+        }
+      }
+    };
+
+    _this.getCollaborator = function () {
+      var _this$props = _this.props,
+          context = _this$props.context,
+          collaborators = _this$props.collaborators;
 
-      if (_this.props.type === 'row_title') {
-        emptyFormatter = /*#__PURE__*/React.createElement("span", null, "\u672A\u547D\u540D\u884C");
+      if (context && context.getCollaboratorsFromCache) {
+        return context.getCollaboratorsFromCache();
       }
 
-      return emptyFormatter;
+      return collaborators || [];
+    };
+
+    _this.loadCollaborator = function (email) {
+      var context = _this.props.context;
+
+      if (context && context.loadCollaborator) {
+        context.loadCollaborator(email);
+      }
+    };
+
+    _this.renderEmpty = function () {
+      return /*#__PURE__*/React.createElement("span", {
+        className: "row-cell-empty"
+      });
     };
 
     _this.renderFormatter = function () {
-      var _this$props = _this.props,
-          column = _this$props.column,
-          row = _this$props.row,
-          CellType = _this$props.CellType,
-          className = _this$props.className;
-      var columnType = column.type;
+      var _this$props2 = _this.props,
+          column = _this$props2.column,
+          row = _this$props2.row,
+          className = _this$props2.className;
+      var _column = column,
+          columnType = _column.type;
       var collaborators = _this.state.collaborators;
       var containerClassName = "dtable-".concat(columnType, "-formatter ").concat(className || '');
-      var cellValue = row[column.key];
+      var cellValue = row[column.key] || row[column.name];
 
       if (!cellValue && emptyTypeMap[columnType]) {
-        return _this.renderEmptyFormatter();
+        return _this.renderEmpty();
       }
 
       switch (columnType) {
@@ -67,7 +103,7 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
         case CellType.COLLABORATOR:
           {
             if (!cellValue || cellValue.length === 0) {
-              return _this.renderEmptyFormatter();
+              return _this.renderEmpty();
             }
 
             var collaboratorFormatter = /*#__PURE__*/React.createElement(CollaboratorFormatter, {
@@ -80,124 +116,87 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.LONG_TEXT:
           {
-            var longTextFormatter = /*#__PURE__*/React.createElement(SimpleLongTextFormatter, {
+            return /*#__PURE__*/React.createElement(SimpleLongTextFormatter, {
               value: cellValue,
               containerClassName: containerClassName
             });
-
-            if (!cellValue) {
-              longTextFormatter = _this.renderEmptyFormatter();
-            }
-
-            return longTextFormatter;
-          }
-
-        case CellType.IMAGE:
-          {
-            var imageFormatter = /*#__PURE__*/React.createElement(ImageFormatter, {
-              value: cellValue
-            });
-
-            if (!cellValue || cellValue.length === 0) {
-              imageFormatter = _this.renderEmptyFormatter();
-            }
-
-            return imageFormatter;
           }
 
         case CellType.GEOLOCATION:
           {
-            var geolocationFormatter = /*#__PURE__*/React.createElement(GeolocationFormatter, {
+            return /*#__PURE__*/React.createElement(GeolocationFormatter, {
               value: cellValue,
               data: column.data,
               containerClassName: containerClassName
             });
-
-            if (!cellValue) {
-              geolocationFormatter = _this.renderEmptyFormatter();
-            }
-
-            return geolocationFormatter;
           }
 
         case CellType.NUMBER:
           {
-            var numberFormatter = /*#__PURE__*/React.createElement(NumberFormatter, {
+            if (!cellValue && cellValue !== 0) {
+              return _this.renderEmpty();
+            }
+
+            return /*#__PURE__*/React.createElement(NumberFormatter, {
               value: cellValue,
               data: column.data,
               containerClassName: containerClassName
             });
-
-            if (!cellValue) {
-              numberFormatter = _this.renderEmptyFormatter();
-            }
-
-            return numberFormatter;
           }
 
         case CellType.DATE:
           {
-            var dateFormatter = /*#__PURE__*/React.createElement(DateFormatter, {
+            return /*#__PURE__*/React.createElement(DateFormatter, {
               value: cellValue,
               format: column.data.format,
               containerClassName: containerClassName
             });
-
-            if (!cellValue) {
-              dateFormatter = _this.renderEmptyFormatter();
-            }
-
-            return dateFormatter;
           }
 
         case CellType.MULTIPLE_SELECT:
           {
+            if (!cellValue || cellValue.length === 0) {
+              return _this.renderEmpty();
+            }
+
             var options = column.data ? column.data.options : [];
-            var multipleSelectFormatter = /*#__PURE__*/React.createElement(MultipleSelectFormatter, {
+            return /*#__PURE__*/React.createElement(MultipleSelectFormatter, {
               value: cellValue,
               options: options,
               containerClassName: containerClassName
             });
-
-            if (!cellValue || cellValue.length === 0) {
-              multipleSelectFormatter = _this.renderEmptyFormatter();
-            }
-
-            return multipleSelectFormatter;
           }
 
         case CellType.SINGLE_SELECT:
           {
             var _options = column.data ? column.data.options : [];
 
-            var singleSelectFormatter = /*#__PURE__*/React.createElement(SingleSelectFormatter, {
+            return /*#__PURE__*/React.createElement(SingleSelectFormatter, {
               value: cellValue,
               options: _options,
               containerClassName: containerClassName
             });
-
-            if (!cellValue) {
-              singleSelectFormatter = _this.renderEmptyFormatter();
-            }
-
-            return singleSelectFormatter;
           }
 
         case CellType.FILE:
           {
-            var fileFormatter = /*#__PURE__*/React.createElement(RowExpandFileFormatter, {
+            return /*#__PURE__*/React.createElement(RowExpandFileFormatter, {
               value: cellValue,
               column: column,
-              downloadFile: noop,
-              deleteFile: noop,
-              readOnly: false
+              downloadFile: _this.props.downloadFile,
+              deleteFile: _this.props.deleteFile
             });
+          }
 
-            if (!cellValue || cellValue.length === 0) {
-              fileFormatter = _this.renderEmptyFormatter();
-            }
-
-            return fileFormatter;
+        case CellType.IMAGE:
+          {
+            return /*#__PURE__*/React.createElement(RowExpandImageFormatter, {
+              value: cellValue,
+              column: column,
+              downloadFile: _this.props.downloadFile,
+              deleteFile: _this.props.deleteFile,
+              onRotateImage: _this.props.onRotateImage
+            });
           }
 
         case CellType.CHECKBOX:
@@ -215,7 +214,7 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
             });
 
             if (!row._ctime) {
-              cTimeFormatter = _this.renderEmptyFormatter();
+              cTimeFormatter = _this.renderEmpty();
             }
 
             return cTimeFormatter;
@@ -229,7 +228,7 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
             });
 
             if (!row._mtime) {
-              mTimeFormatter = _this.renderEmptyFormatter();
+              mTimeFormatter = _this.renderEmpty();
             }
 
             return mTimeFormatter;
@@ -237,7 +236,7 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.CREATOR:
           {
-            if (!cellValue) return _this.renderEmptyFormatter();
+            if (!cellValue) return _this.renderEmpty();
             var creatorFormatter = /*#__PURE__*/React.createElement(CreatorFormatter, {
               collaborators: collaborators,
               value: cellValue,
@@ -248,7 +247,7 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.LAST_MODIFIER:
           {
-            if (!cellValue) return _this.renderEmptyFormatter();
+            if (!cellValue) return _this.renderEmpty();
             var lastModifierFormatter = /*#__PURE__*/React.createElement(LastModifierFormatter, {
               collaborators: collaborators,
               value: cellValue,
@@ -266,7 +265,7 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
             });
 
             if (!cellValue) {
-              textFormatter = _this.renderEmptyFormatter();
+              textFormatter = _this.renderEmpty();
             }
 
             return textFormatter;
@@ -274,16 +273,36 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.LINK:
           {
-            if (!Array.isArray(cellValue) || cellValue.length === 0) return _this.renderEmptyFormatter();
-            return /*#__PURE__*/React.createElement(LinkFormatter, {
+            // handle link column do not have column.data.display_column
+            var _column2 = column,
+                data = _column2.data;
+            var display_column_key = data.display_column_key,
+                array_type = data.array_type,
+                array_data = data.array_data;
+
+            if (!data.display_column) {
+              column = _objectSpread(_objectSpread({}, column), {}, {
+                data: _objectSpread(_objectSpread({}, data), {}, {
+                  display_column: {
+                    key: display_column_key || '0000',
+                    type: array_type || CellType.TEXT,
+                    data: array_data || null
+                  }
+                })
+              });
+            }
+
+            if (!Array.isArray(cellValue) || cellValue.length === 0) {
+              return _this.renderEmpty();
+            }
+
+            return /*#__PURE__*/React.createElement(RowExpandLinkFormatter, {
               value: cellValue,
               column: column,
               collaborators: collaborators,
-              containerClassName: 'map-app-link-formatter',
-              renderEmptyFormatter: _this.renderEmptyFormatter,
-              getOptionColors: _this.props.getOptionColors,
-              getUserCommonInfo: function getUserCommonInfo() {},
-              CellType: CellType
+              containerClassName: containerClassName,
+              renderEmpty: _this.renderEmpty,
+              getOptionColors: _this.props.getOptionColors
             });
           }
 
@@ -331,18 +350,11 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
 
         case CellType.BUTTON:
           {
-            var _column$data = column.data,
-                data = _column$data === void 0 ? {} : _column$data;
-            var buttonFormatter = /*#__PURE__*/React.createElement(ButtonFormatter, {
-              data: data,
-              containerClassName: containerClassName
+            return /*#__PURE__*/React.createElement(ButtonFormatter, {
+              data: column.data,
+              containerClassName: containerClassName,
+              onClickButton: _this.props.onClickButton
             });
-
-            if (!data.button_name) {
-              buttonFormatter = _this.renderEmptyFormatter();
-            }
-
-            return buttonFormatter;
           }
 
         default:
@@ -351,12 +363,31 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.state = {
-      collaborators: COLLABORATORS
+      collaborators: _this.getCollaborator()
     };
     return _this;
   }
 
   _createClass(EditorFormatter, [{
+    key: "componentDidMount",
+    value: function componentDidMount() {
+      this.calculateCollaboratorData(this.props);
+
+      if (this.props.eventBus) {
+        this.listenCollaboratorsUpdated = this.props.eventBus.subscribe('collaborators-updated', this.updateCollaborators);
+      }
+    }
+  }, {
+    key: "componentWillReceiveProps",
+    value: function componentWillReceiveProps(nextProps) {
+      this.calculateCollaboratorData(nextProps);
+    }
+  }, {
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      this.listenCollaboratorsUpdated();
+    }
+  }, {
     key: "render",
     value: function render() {
       return /*#__PURE__*/React.createElement(Fragment, null, this.renderFormatter());
@@ -366,4 +397,4 @@ var EditorFormatter = /*#__PURE__*/function (_React$Component) {
   return EditorFormatter;
 }(React.Component);
 
-export default EditorFormatter;
+export { EditorFormatter as default };

package/lib/RowExpandImageFormatter/index.css

@@ -0,0 +1,79 @@
+@import url('../css/cell-formatter.css');
+
+.dtable-ui.row-expand-image-formatter {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  width: 550px;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image {
+  height: 100px;
+  width: 100px;
+  border: 2px solid #ededed;
+  border-radius: 4px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin: 5px;
+  position: relative;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image:nth-child(5n + 1) {
+  margin-left: 0;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image:hover {
+  border-color: #c9c9c9;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image .dtable-image-icons-choice {
+  height: 20px;
+  width: 100%;
+  top: 0;
+  position: absolute;
+  color: #fff;
+  display: none;
+  padding: 0 3px;
+  justify-content: flex-end;
+  align-items: center;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image:hover .dtable-image-icons-choice {
+  display: flex;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image .dtable-image-icons-choice .image-icon {
+  height: 16px;
+  width: 16px;
+  border-radius: 50%;
+  background: rgba(0,0,0,.5);
+  color: #fff;
+  cursor: pointer;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image .dtable-image-icons-choice .image-icon:nth-child(2) {
+  margin-left: 5px;
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image .dtable-image-icons-choice .image-icon .dtable-font {
+  font-size: 12px;
+  transform: scale(.7);
+}
+
+.dtable-ui.row-expand-image-formatter .row-expand-item-image img {
+  display: block;
+  max-width: 96px;
+  max-height: 96px;
+  border-radius: 4px;
+}
+
+.tooltip-inner {
+  font-weight: lighter;
+  text-align: justify;
+  background-color: #303133;
+}