Merge pull request #359 from seatable/fix-link-error

add DepartmentSingleSelectFormatter

Author: LJHAAAAA

src/RowExpandFormatter/formula-formatter/index.js

@@ -21,6 +21,7 @@ export default class RowExpandFormulaFormatter extends React.Component {
     column: PropTypes.object,
     containerClassName: PropTypes.string,
     collaborators: PropTypes.array,
+    departments: PropTypes.array,
   };
 
   getGridCellClassName = (resultType) => {
@@ -80,13 +81,13 @@ export default class RowExpandFormulaFormatter extends React.Component {
   };
 
   renderOtherColumnFormatter = () => {
-    const { value, column, collaborators } = this.props;
+    const { value, column, collaborators, departments } = this.props;
     const { array_type, array_data } = column.data;
     if (!array_type || array_type === CellType.LINK) {
       return null;
     }
     const Formatter = BaseFormatterConfig[array_type];
-    let formatterProps = this.getFormatterProps(array_type, array_data, collaborators);
+    let formatterProps = this.getFormatterProps(array_type, array_data, collaborators, departments);
 
     if (isArrayFormatColumn(array_type)) {
       formatterProps.value = value;
@@ -146,14 +147,17 @@ export default class RowExpandFormulaFormatter extends React.Component {
     }
   }
 
-  getFormatterProps = (array_type, array_data, collaborators) => {
+  getFormatterProps = (array_type, array_data, collaborators, departments) => {
     switch (array_type) {
       case CellType.DURATION: {
         const { duration_format } = array_data;
         return { format: duration_format };
       }
       case CellType.NUMBER:
       case CellType.RATE:
+      case CellType.DEPARTMENT_SINGLE_SELECT: {
+        return { column: { data: array_data }, readOnly: true, departments };
+      }
       case CellType.GEOLOCATION: {
         return { data: array_data };
       }

src/RowExpandFormatter/index.js

@@ -235,6 +235,7 @@ class RowExpandFormatter extends React.Component {
             column={column}
             collaborators={collaborators}
             containerClassName={containerClassName}
+            departments={this.props.departments}
           />
         );
       }

src/formatterConfig/base-formatter-config.js

@@ -21,6 +21,7 @@ import EmailFormatter from '../EmailFormatter';
 import DurationFormatter from '../DurationFormatter';
 import RateFormatter from '../RateFormatter';
 import ButtonFormatter from '../ButtonFormatter';
+import DepartmentSingleSelectFormatter from '../DepartmentSingleSelectFormatter';
 
 const BaseFormatterConfig = {
   [CellType.DEFAULT]: <TextCellFormatter />,
@@ -45,6 +46,7 @@ const BaseFormatterConfig = {
   [CellType.DURATION]: <DurationFormatter />,
   [CellType.RATE]: <RateFormatter />,
   [CellType.BUTTON]: <ButtonFormatter />,
+  [CellType.DEPARTMENT_SINGLE_SELECT]: <DepartmentSingleSelectFormatter />,
 };
 
 export default BaseFormatterConfig;