dtable-ui-component 6.0.88 → 6.0.91

package/lib/DepartmentSingleSelectFormatter/index.js

@@ -16,6 +16,7 @@ function DepartmentSingleSelectFormatter(props) {
     containerClassName,
     tip
   } = props;
+  console.log('DepartmentSingleSelectFormatter', props);
   if (!value || !Array.isArray(departments)) return null;
   const deletedTip = tip || (0, _lang.getLocale)('Deleted_department');
   const department = departments.find(department => department.id === value);

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,13 +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 = {
-        column: {
-          data: array_data
-        },
-        readOnly: true
-      };
+      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));
@@ -127,8 +122,6 @@ class RowExpandFormulaFormatter extends _react.default.Component {
         formulaEmail = cellValue[0];
         formulaEmail = formulaEmail ? formulaEmail.trim() : '';
       }
-      console.log('Formatter', Formatter);
-      console.log('formatterProps', formatterProps);
       return this.renderBorder( /*#__PURE__*/_react.default.createElement("div", {
         className: "dtable-ui formula-formatter multiple"
       }, cellValue.map((v, index) => {
@@ -151,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:
           {
@@ -164,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/package.json

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