dtable-ui-component 6.0.55-beta.2 → 6.0.55-beta.4

package/lib/DTableColumnIcon/index.js

@@ -45,13 +45,15 @@ const COLUMN_DISPLAY_TYPE_ICON_CONFIG = {
 };
 const DTableColumnIcon = _ref => {
   let {
-    columnType,
-    columnDisplayType,
+    column,
     color,
     className,
     ariaHidden = false,
     getSvg
   } = _ref;
+  if (!column) return null;
+  const columnType = (column === null || column === void 0 ? void 0 : column.type) || _dtableUtils.CellType.TEXT;
+  const columnDisplayType = (0, _dtableUtils.getColumnDisplayType)(column);
   let symbol = null;
   let displayTypeIconConfig = COLUMN_DISPLAY_TYPE_ICON_CONFIG[columnType];
   if (displayTypeIconConfig && columnDisplayType) {

package/lib/DTableFiltersPopover/utils/filter-item-utils.js

@@ -14,9 +14,7 @@ class FilterItemUtils {
   static generatorColumnOption(column) {
     if (!column) return null;
     const {
-      type,
-      name,
-      data
+      name
     } = column;
     return {
       value: {
@@ -26,8 +24,7 @@ class FilterItemUtils {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: "filter-header-icon",
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableColumnIcon.default, {
-            columnType: type,
-            columnDisplayType: data === null || data === void 0 ? void 0 : data.display_type
+            column: column
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: "select-option-name",

package/lib/DTableFiltersPopover/utils/index.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "FilterItemUtils", {
     return _filterItemUtils.default;
   }
 });
-exports.isFilterTermArray = exports.getUpdatedFilterBySelectSingle = exports.getUpdatedFilterBySelectMultiple = exports.getUpdatedFilterByRate = exports.getUpdatedFilterByPredicate = exports.getUpdatedFilterByCreator = exports.getUpdatedFilterByColumn = exports.getUpdatedFilterByCollaborator = exports.getSingleSelectUpdatedFilterTerm = exports.getMultipleSelectUpdatedFilterTerm = exports.getFormulaColumnFilter = exports.getFormulaAndLinkFilters = exports.getFilterConfigOptions = exports.getFilterColumns = exports.getFilterByColumn = exports.getDefaultFilterGroup = exports.getDefaultFilter = exports.getCreatorUpdatedFilterTerm = exports.getColumnOptions = exports.getColumnByKey = exports.getCollaboratorUpdatedFilterTerm = exports.generateDefaultUser = exports.checkColumnHasFilterOptions = exports.applyFilterOperation = void 0;
+exports.isFilterTermArray = exports.getUpdatedFilterBySelectSingle = exports.getUpdatedFilterBySelectMultiple = exports.getUpdatedFilterByRate = exports.getUpdatedFilterByPredicate = exports.getUpdatedFilterByCreator = exports.getUpdatedFilterByColumn = exports.getUpdatedFilterByCollaborator = exports.getSingleSelectUpdatedFilterTerm = exports.getMultipleSelectUpdatedFilterTerm = exports.getFormulaColumnFilter = exports.getFormulaAndLinkFilters = exports.getFilterConfigOptions = exports.getFilterColumns = exports.getFilterByColumn = exports.getDefaultFilterGroup = exports.getDefaultFilter = exports.getCreatorUpdatedFilterTerm = exports.getColumnOptions = exports.getColumnByKey = exports.getCollaboratorUpdatedFilterTerm = exports.generateDefaultUser = exports.applyFilterOperation = void 0;
 var _dtableUtils = require("dtable-utils");
 var _filterItemUtils = _interopRequireDefault(require("./filter-item-utils"));
 var _constants = require("../constants");
@@ -138,20 +138,17 @@ const getColumnOptions = column => {
     } = data || {};
     if (array_type === _dtableUtils.FORMULA_RESULT_TYPE.BOOL) {
       return (0, _dtableUtils.getColumnFilterOptions)({
-        columnType: _dtableUtils.CellType.CHECKBOX
+        type: _dtableUtils.CellType.CHECKBOX
       });
     }
     if (array_type === _dtableUtils.FORMULA_RESULT_TYPE.STRING) {
       return (0, _dtableUtils.getColumnFilterOptions)({
-        columnType: _dtableUtils.CellType.TEXT
+        type: _dtableUtils.CellType.TEXT
       });
     }
     return getFilterOptionsByArrayType(array_type, array_data);
   }
-  return (0, _dtableUtils.getColumnFilterOptions)({
-    columnType: type,
-    columnDisplayType: data === null || data === void 0 ? void 0 : data.display_type
-  });
+  return (0, _dtableUtils.getColumnFilterOptions)(column);
 };
 exports.getColumnOptions = getColumnOptions;
 const getFormulaColumnFilterOptions = column => {
@@ -165,24 +162,24 @@ const getFormulaColumnFilterOptions = column => {
   } = data || {};
   if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.BOOL) {
     return (0, _dtableUtils.getColumnFilterOptions)({
-      columnType: _dtableUtils.CellType.CHECKBOX
+      type: _dtableUtils.CellType.CHECKBOX
     });
   }
   if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.STRING) {
     return (0, _dtableUtils.getColumnFilterOptions)({
-      columnType: _dtableUtils.CellType.TEXT
+      type: _dtableUtils.CellType.TEXT
     });
   }
   if ([_dtableUtils.FORMULA_RESULT_TYPE.NUMBER, _dtableUtils.FORMULA_RESULT_TYPE.DATE].includes(result_type)) {
     return (0, _dtableUtils.getColumnFilterOptions)({
-      columnType: result_type
+      type: result_type
     });
   }
   if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY) {
     return getFilterOptionsByArrayType(array_type, array_data);
   }
   return (0, _dtableUtils.getColumnFilterOptions)({
-    columnType: _dtableUtils.CellType.TEXT
+    type: _dtableUtils.CellType.TEXT
   });
 };
 const getFilterOptionsByArrayType = (array_type, array_data) => {
@@ -205,18 +202,18 @@ const getFilterOptionsByArrayType = (array_type, array_data) => {
   // only support: is
   if (checkType === _dtableUtils.CellType.CHECKBOX || checkType === _dtableUtils.CellType.BOOL) {
     return (0, _dtableUtils.getColumnFilterOptions)({
-      columnType: _dtableUtils.CellType.CHECKBOX
+      type: _dtableUtils.CellType.CHECKBOX
     });
   }
-  const filterOptions = checkColumnHasFilterOptions({
-    columnType: checkType,
-    columnDisplayType: array_data === null || array_data === void 0 ? void 0 : array_data.display_type
+  const filterOptions = (0, _dtableUtils.checkColumnHasFilterOptions)({
+    type: checkType,
+    data: array_data
   }) ? (0, _dtableUtils.getColumnFilterOptions)({
-    columnType: checkType,
-    columnDisplayType: array_data === null || array_data === void 0 ? void 0 : array_data.display_type
+    type: checkType,
+    data: array_data
   }) : (0, _dtableUtils.getColumnFilterOptions)({
-    columnType: _dtableUtils.CellType.TEXT,
-    columnDisplayType: array_data === null || array_data === void 0 ? void 0 : array_data.display_type
+    type: _dtableUtils.CellType.TEXT,
+    data: array_data
   });
   const {
     filterPredicateList
@@ -418,33 +415,11 @@ const generateDefaultUser = name => {
   };
 };
 exports.generateDefaultUser = generateDefaultUser;
-const checkColumnHasFilterOptions = _ref => {
-  let {
-    columnType,
-    columnDisplayType
-  } = _ref;
-  const filterOptions = (0, _dtableUtils.getColumnFilterOptions)({
-    columnType,
-    columnDisplayType
-  });
-  return filterOptions ? Object.keys(filterOptions).length > 0 : false;
-};
-exports.checkColumnHasFilterOptions = checkColumnHasFilterOptions;
 const getDefaultFilter = columns => {
-  var _defaultColumn$data;
   if (!columns) return null;
   let defaultColumn = columns[0];
-  if (!checkColumnHasFilterOptions({
-    columnType: defaultColumn.type,
-    columnDisplayType: (_defaultColumn$data = defaultColumn.data) === null || _defaultColumn$data === void 0 ? void 0 : _defaultColumn$data.display_type
-  })) {
-    defaultColumn = columns.find(c => {
-      var _c$data;
-      return checkColumnHasFilterOptions({
-        columnType: c.type,
-        columnDisplayType: (_c$data = c.data) === null || _c$data === void 0 ? void 0 : _c$data.display_type
-      });
-    });
+  if (!(0, _dtableUtils.checkColumnHasFilterOptions)(defaultColumn)) {
+    defaultColumn = columns.find(c => (0, _dtableUtils.checkColumnHasFilterOptions)(c));
   }
   if (!defaultColumn) return null;
   return getFilterByColumn(defaultColumn);
@@ -483,16 +458,12 @@ const getFilterColumns = columns => {
       type
     } = column;
     if (data && (type === _dtableUtils.CellType.LINK || _dtableUtils.FORMULA_COLUMN_TYPES_MAP[type] && data.result_type === _dtableUtils.FORMULA_RESULT_TYPE.ARRAY)) {
-      var _data$array_data;
-      return checkColumnHasFilterOptions({
-        columnType: data.array_type,
-        columnDisplayType: (_data$array_data = data.array_data) === null || _data$array_data === void 0 ? void 0 : _data$array_data.display_type
+      return (0, _dtableUtils.checkColumnHasFilterOptions)({
+        type: data.array_type,
+        data: data.array_data
       });
     }
-    return checkColumnHasFilterOptions({
-      columnType: type,
-      columnDisplayType: data === null || data === void 0 ? void 0 : data.display_type
-    });
+    return (0, _dtableUtils.checkColumnHasFilterOptions)(column);
   });
 };
 exports.getFilterColumns = getFilterColumns;
@@ -764,20 +735,17 @@ const getFilterConfigOptions = column => {
     } = data || {};
     if (array_type === _dtableUtils.FORMULA_RESULT_TYPE.BOOL) {
       return (0, _dtableUtils.getColumnFilterOptions)({
-        columnType: _dtableUtils.CellType.CHECKBOX
+        type: _dtableUtils.CellType.CHECKBOX
       });
     }
     if (array_type === _dtableUtils.FORMULA_RESULT_TYPE.STRING) {
       return (0, _dtableUtils.getColumnFilterOptions)({
-        columnType: _dtableUtils.CellType.TEXT
+        type: _dtableUtils.CellType.TEXT
       });
     }
     return getFilterOptionsByArrayType(array_type, array_data);
   }
-  return (0, _dtableUtils.getColumnFilterOptions)({
-    columnType: type,
-    columnDisplayType: data === null || data === void 0 ? void 0 : data.display_type
-  }) || {};
+  return (0, _dtableUtils.getColumnFilterOptions)(column) || {};
 };
 exports.getFilterConfigOptions = getFilterConfigOptions;
 const getMultipleSelectUpdatedFilterTerm = (filterTerm, option) => {

package/lib/FieldDisplaySetting/field-item.js

@@ -70,8 +70,10 @@ function FieldItem(_ref) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "field-switch",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableColumnIcon.default, {
-        columnType: type,
-        columnDisplayType: data === null || data === void 0 ? void 0 : data.display_type
+        column: {
+          type,
+          data
+        }
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         children: field.name
       })]

package/lib/RowExpandDialog/column-content/index.js

@@ -19,9 +19,7 @@ const ColumnContent = _ref => {
   const descriptionRef = (0, _react.useRef)(null);
   const {
     name,
-    type,
     key,
-    data,
     description
   } = column;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactstrap.Row, {
@@ -33,8 +31,7 @@ const ColumnContent = _ref => {
         className: "dtable-ui-header-icon",
         id: `header-icon-${key}`,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableColumnIcon.default, {
-          columnType: type,
-          columnDisplayType: data === null || data === void 0 ? void 0 : data.display_type
+          column: column
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: "dtable-ui-row-expand-column-name",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.55-beta.2",
+  "version": "6.0.55-beta.4",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",
@@ -8,7 +8,7 @@
     "@seafile/seafile-editor": "~2.0.14",
     "classnames": "~2.5.*",
     "dayjs": "1.10.7",
-    "dtable-utils": "~5.0.26-beta.1",
+    "dtable-utils": "~5.0.26-beta.3",
     "is-hotkey": "0.2.0",
     "rc-checkbox": "3.5.0",
     "react-color": "2.19.3",