dtable-ui-component 5.0.1 → 5.0.3

package/lib/DTableCustomizeSelect/index.css

@@ -97,6 +97,5 @@
 .dtable-select .select-placeholder {
   line-height: 1;
   font-size: 14px;
-  color: #999;
   white-space: nowrap;
 }

package/lib/DTableFiltersPopover/index.js

@@ -156,7 +156,6 @@ class DTableFiltersPopover extends _react.Component {
       target,
       columns,
       className,
-      roleId,
       userDepartmentIdsMap,
       departments,
       lang,
@@ -186,7 +185,6 @@ class DTableFiltersPopover extends _react.Component {
       }, /*#__PURE__*/_react.default.createElement(_filterList.default, {
         filterConjunction: filterConjunction,
         filters: filters,
-        roleId: roleId,
         columns: columns,
         emptyPlaceholder: (0, _lang.getLocale)('No_filters'),
         collaborators: this.props.collaborators,

package/lib/DTableFiltersPopover/utils/index.js

@@ -178,7 +178,7 @@ const getFilterOptionsByArrayType = array_type => {
   let checkType = array_type;
   if (_dtableUtils.COLLABORATOR_COLUMN_TYPES.includes(array_type)) {
     checkType = _dtableUtils.CellType.COLLABORATOR;
-  } else if (array_type === _dtableUtils.CellType.SINGLE_SELECT) {
+  } else if (array_type === _dtableUtils.CellType.SINGLE_SELECT || array_type === _dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT) {
     checkType = _dtableUtils.CellType.MULTIPLE_SELECT;
   } else if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(array_type)) {
     checkType = _dtableUtils.CellType.DATE;

package/lib/DTableFiltersPopover/widgets/department-select-filter/department-single-select-filter.js

@@ -17,7 +17,6 @@ function DepartmentSingleSelectFilter(props) {
   const {
     value,
     column,
-    roleId,
     departments,
     userDepartmentIdsMap
   } = props;
@@ -31,7 +30,7 @@ function DepartmentSingleSelectFilter(props) {
     onClickOutside: () => setIsShowSelector(false)
   }, [selectedDepartment]);
   function renderUserDepartmentOptions(onSelect) {
-    if (!roleId) return [];
+    if (!departments || departments.length === 0) return [];
     return _constants.DEPARTMENT_SELECT_RANGE_OPTIONS.slice(0, 2).map((option, index) => {
       const {
         type,

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

@@ -323,7 +323,6 @@ class FilterItem extends _react.default.Component {
         index,
         filter,
         collaborators,
-        roleId,
         userDepartmentIdsMap,
         departments,
         lang
@@ -432,7 +431,6 @@ class FilterItem extends _react.default.Component {
           {
             if ([_dtableUtils.FILTER_PREDICATE_TYPE.IS_ANY_OF, _dtableUtils.FILTER_PREDICATE_TYPE.IS_NONE_OF].includes(filter_predicate)) {
               return /*#__PURE__*/_react.default.createElement(_departmentMultipleSelectFilter.default, {
-                column: filterColumn,
                 value: filter_term || [],
                 userDepartmentIdsMap: userDepartmentIdsMap,
                 departments: departments,
@@ -440,7 +438,6 @@ class FilterItem extends _react.default.Component {
               });
             }
             return /*#__PURE__*/_react.default.createElement(_departmentSingleSelectFilter.default, {
-              roleId: roleId,
               column: filterColumn,
               value: filter_term || '',
               userDepartmentIdsMap: userDepartmentIdsMap,
@@ -540,7 +537,8 @@ class FilterItem extends _react.default.Component {
     };
     this.renderFilterTermByArrayType = (filterPredicate, filterTerm, index, filterColumn) => {
       const {
-        collaborators
+        collaborators,
+        departments
       } = this.props;
       const {
         data
@@ -562,6 +560,13 @@ class FilterItem extends _react.default.Component {
         } = array_data || {};
         return this.renderMultipleSelectOption(options, filterTerm);
       }
+      if (array_type === _dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT) {
+        return /*#__PURE__*/_react.default.createElement(_departmentMultipleSelectFilter.default, {
+          value: filterTerm || [],
+          departments: departments,
+          onCommit: this.onSelectMultiple
+        });
+      }
       if (_dtableUtils.DATE_COLUMN_OPTIONS.includes(array_type) || array_type === _dtableUtils.CellType.RATE || array_type === _dtableUtils.CellType.CHECKBOX) {
         return this.renderFilterTerm(linkedColumn);
       }

package/lib/DTableFiltersPopover/widgets/filter-list/index.css

@@ -205,7 +205,7 @@
 .filters-list .delete-filter .dtable-icon-fork-number {
   display: inline-block;
   font-size: 12px;
-  color: #949494;
+  color: #666;
 }
 
 .filters-list .multiple-option-name {

package/lib/DTableFiltersPopover/widgets/filter-list/index.js

@@ -64,7 +64,6 @@ class FiltersList extends _react.Component {
       const {
         filterConjunction,
         value,
-        roleId,
         isLocked,
         collaborators,
         userDepartmentIdsMap,
@@ -76,7 +75,6 @@ class FiltersList extends _react.Component {
       return /*#__PURE__*/_react.default.createElement(_filterItem.default, {
         key: index,
         isLocked: isLocked,
-        roleId: roleId,
         index: index,
         filter: filter,
         errMsg: errMsg,

package/lib/Department-editor/department-single-select.js

@@ -11,6 +11,7 @@ var _dtableUtils = require("dtable-utils");
 var _Loading = _interopRequireDefault(require("../Loading"));
 var _utils = require("./utils");
 var _lang = require("../lang");
+require("./index.css");
 class DepartmentSingleSelect extends _react.Component {
   constructor(props) {
     var _this;
@@ -22,7 +23,8 @@ class DepartmentSingleSelect extends _react.Component {
         bottom
       } = this.departmentsRef.getBoundingClientRect();
       if (bottom > window.innerHeight) {
-        this.departmentsRef.style.top = parseInt(this.departmentsRef.style.top) - bottom + window.innerHeight + 'px';
+        const currentTop = this.departmentsRef.style.top || 0;
+        this.departmentsRef.style.top = parseInt(currentTop) - bottom + window.innerHeight + 'px';
       }
     };
     this.initDepartments = departments => {
@@ -249,7 +251,7 @@ class DepartmentSingleSelect extends _react.Component {
   render() {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "dropdown-menu department-editor-list dtable-ui show m-0 p-0",
-      style: this.props.menuStyle,
+      style: this.props.menuStyle || {},
       ref: ref => this.departmentsRef = ref,
       onClick: this.onStopPropagation,
       onMouseDown: this.onStopPropagation

package/lib/DepartmentSelectFilter/index.js

@@ -0,0 +1,30 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _departmentSingleSelectFilter = _interopRequireDefault(require("../DTableFiltersPopover/widgets/department-select-filter/department-single-select-filter"));
+var _departmentMultipleSelectFilter = _interopRequireDefault(require("../DTableFiltersPopover/widgets/department-select-filter/department-multiple-select-filter"));
+function DepartmentSelectFilter(props) {
+  const {
+    isMultiple,
+    value,
+    column,
+    userDepartmentIdsMap,
+    departments,
+    onCommit
+  } = props;
+  const filterProps = {
+    column,
+    value,
+    userDepartmentIdsMap,
+    departments,
+    onCommit
+  };
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isMultiple ? /*#__PURE__*/_react.default.createElement(_departmentMultipleSelectFilter.default, filterProps) : /*#__PURE__*/_react.default.createElement(_departmentSingleSelectFilter.default, filterProps));
+}
+;
+var _default = exports.default = DepartmentSelectFilter;

package/lib/SimpleLongTextFormatter/index.css

@@ -57,7 +57,7 @@
   font-style: normal;
   font-size: 12px;
   border-radius: 6px;
-  background-color: #999;
+  background-color: #666;
   color: #fff;
   transform: translate(-50%, 9px) scale(0.8);
 }

package/lib/index.js

@@ -136,6 +136,12 @@ Object.defineProperty(exports, "DateFormatter", {
     return _DateFormatter.default;
   }
 });
+Object.defineProperty(exports, "DepartmentSelectFilter", {
+  enumerable: true,
+  get: function () {
+    return _DepartmentSelectFilter.default;
+  }
+});
 Object.defineProperty(exports, "DepartmentSingleSelectFormatter", {
   enumerable: true,
   get: function () {
@@ -449,6 +455,7 @@ var _DTableCustomizeCollaboratorSelect = _interopRequireDefault(require("./DTabl
 var _DTableSearchInput = _interopRequireDefault(require("./DTableSearchInput"));
 var _ModalPortal = _interopRequireDefault(require("./ModalPortal"));
 var _RoleStatusEditor = _interopRequireDefault(require("./RoleStatusEditor"));
+var _DepartmentSelectFilter = _interopRequireDefault(require("./DepartmentSelectFilter"));
 var _FieldDisplaySetting = _interopRequireDefault(require("./FieldDisplaySetting"));
 var _DTableFiltersPopover = _interopRequireDefault(require("./DTableFiltersPopover"));
 var _ClickOutside = _interopRequireDefault(require("./ClickOutside"));

package/lib/toaster/index.css

@@ -94,7 +94,7 @@
 
 .dtable-toast-alert-container .toast-text-child {
   font-size: 14px;
-  color: #999;
+  color: #666;
   margin: 0;
 }
 

package/package.json

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