dtable-ui-component 6.0.48 → 6.0.49

package/lib/CollapsibleSettingLayout/index.css

@@ -10,11 +10,6 @@
 
 .collapsible-setting-layout-header .dtable-font {
   font-size: 10px;
-  color: #ccc;
-}
-
-.collapsible-setting-layout-header .dtable-font:hover {
-  color: #666;
 }
 
 .collapsible-setting-layout-header .dtable-font.dtable-icon-spin {

package/lib/CollapsibleSettingLayout/index.js

@@ -19,7 +19,7 @@ const CollapsibleSettingLayout = props => {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('collapsible-setting-layout', className)
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "collapsible-setting-layout-header w-100 d-flex align-items-center",
+    className: "collapsible-setting-layout-header seatable-collapse-header w-100 d-flex align-items-center",
     onClick: () => setIsShowSettings(!isShowSettings)
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "collapsible-setting-layout-title"

package/lib/DTableModalHeader/index.css

@@ -9,7 +9,6 @@
   font-weight: 700;
   line-height: 1;
   color: #000;
-  text-shadow: 0 1px 0 #fff;
 }
 
 .modal-header .dtable-modal-close.close:not(:disabled):not(.disabled):hover {

package/lib/FieldDisplaySetting/index.css

@@ -1,5 +1,9 @@
+.field-setting .field-setting-header,
+.field-setting .field-setting-header .form-label {
+  cursor: pointer;
+}
+
 .field-setting .field-setting-header .expand-button {
-  color: #ccc;
   font-size: 10px;
   cursor: pointer;
   transition: transform .3s cubic-bezier(.645,.045,.355,1);
@@ -9,13 +13,8 @@
   transform: rotate(90deg);
 }
 
-.field-setting .field-setting-header .expand-button:hover {
-  color: #3a2121;
-  cursor: pointer;
-}
-
 .field-setting .field-setting-banner .show-all-button {
-  color: #FF8000;
+  color: #ed7109;
   cursor: pointer;
   font-size: 12px;
 }

package/lib/FieldDisplaySetting/index.js

@@ -53,7 +53,7 @@ function FieldDisplaySetting(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "field-setting"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "field-setting-header d-flex align-items-center justify-content-between",
+    className: "field-setting-header seatable-collapse-header d-flex align-items-center justify-content-between",
     onClick: expandAllFields
   }, /*#__PURE__*/_react.default.createElement(_reactstrap.Label, {
     className: "mb-0"

package/lib/GeolocationEditor/pc-editor/map-editor/index.js

@@ -492,7 +492,7 @@ class MapEditor extends _react.Component {
       }))))));
     }
     return /*#__PURE__*/_react.default.createElement(_largeEditor.default, Object.assign({}, this.props, {
-      value: value,
+      value: this.state.value,
       setValue: this.setValue,
       toggleFullScreen: this.toggleFullScreen
     }));

package/lib/RowExpandFormatter/formula-formatter/index.js

@@ -91,7 +91,8 @@ class RowExpandFormulaFormatter extends _react.default.Component {
       const {
         value,
         column,
-        collaborators
+        collaborators,
+        departments
       } = this.props;
       const {
         array_type,
@@ -101,7 +102,7 @@ class RowExpandFormulaFormatter extends _react.default.Component {
         return null;
       }
       const Formatter = _baseFormatterConfig.default[array_type];
-      let formatterProps = this.getFormatterProps(array_type, array_data, collaborators);
+      let formatterProps = this.getFormatterProps(array_type, array_data, collaborators, departments);
       if ((0, _utils.isArrayFormatColumn)(array_type)) {
         formatterProps.value = value;
         return this.renderBorder(this.createColumnFormatter(Formatter, formatterProps));
@@ -143,7 +144,7 @@ class RowExpandFormulaFormatter extends _react.default.Component {
         }), this.createColumnFormatter(Formatter, formatterProps));
       })));
     };
-    this.getFormatterProps = (array_type, array_data, collaborators) => {
+    this.getFormatterProps = (array_type, array_data, collaborators, departments) => {
       switch (array_type) {
         case _dtableUtils.CellType.DURATION:
           {
@@ -156,6 +157,16 @@ class RowExpandFormulaFormatter extends _react.default.Component {
           }
         case _dtableUtils.CellType.NUMBER:
         case _dtableUtils.CellType.RATE:
+        case _dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT:
+          {
+            return {
+              column: {
+                data: array_data
+              },
+              readOnly: true,
+              departments
+            };
+          }
         case _dtableUtils.CellType.GEOLOCATION:
           {
             return {

package/lib/RowExpandFormatter/index.js

@@ -235,7 +235,8 @@ class RowExpandFormatter extends _react.default.Component {
               value: cellValue,
               column: column,
               collaborators: collaborators,
-              containerClassName: containerClassName
+              containerClassName: containerClassName,
+              departments: this.props.departments
             });
           }
         case _dtableUtils.CellType.LINK:

package/lib/formatterConfig/base-formatter-config.js

@@ -28,6 +28,7 @@ var _EmailFormatter = _interopRequireDefault(require("../EmailFormatter"));
 var _DurationFormatter = _interopRequireDefault(require("../DurationFormatter"));
 var _RateFormatter = _interopRequireDefault(require("../RateFormatter"));
 var _ButtonFormatter = _interopRequireDefault(require("../ButtonFormatter"));
+var _DepartmentSingleSelectFormatter = _interopRequireDefault(require("../DepartmentSingleSelectFormatter"));
 const BaseFormatterConfig = {
   [_dtableUtils.CellType.DEFAULT]: /*#__PURE__*/_react.default.createElement(_TextFormatter.default, null),
   [_dtableUtils.CellType.TEXT]: /*#__PURE__*/_react.default.createElement(_TextFormatter.default, null),
@@ -50,6 +51,7 @@ const BaseFormatterConfig = {
   [_dtableUtils.CellType.EMAIL]: /*#__PURE__*/_react.default.createElement(_EmailFormatter.default, null),
   [_dtableUtils.CellType.DURATION]: /*#__PURE__*/_react.default.createElement(_DurationFormatter.default, null),
   [_dtableUtils.CellType.RATE]: /*#__PURE__*/_react.default.createElement(_RateFormatter.default, null),
-  [_dtableUtils.CellType.BUTTON]: /*#__PURE__*/_react.default.createElement(_ButtonFormatter.default, null)
+  [_dtableUtils.CellType.BUTTON]: /*#__PURE__*/_react.default.createElement(_ButtonFormatter.default, null),
+  [_dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT]: /*#__PURE__*/_react.default.createElement(_DepartmentSingleSelectFormatter.default, null)
 };
 var _default = exports.default = BaseFormatterConfig;

package/package.json

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