dtable-ui-component 6.0.110-xko.2 → 6.0.110-xms.2

package/lib/DTableGroupSelect/index.css

@@ -118,7 +118,7 @@
   box-shadow: none !important;
 }
 
-.seatable-group-select .option-group-content .dtable-icon-check {
+.option-group-content .dtable-icon-check {
   color: #666666;
   font-size: 14px;
 }
@@ -136,3 +136,19 @@
 .seatable-group-select .seatable-icon-btn:not(.disabled):hover {
   background-color:#FFFFFF;
 }
+
+.option-group-dtable-filter-select-column .seatable-icon-btn {
+  height: 12px !important;
+  width: 12px !important;
+  font-size: 12px !important;
+}
+
+.option-group-dtable-filter-select-column .clear-search-text {
+  position: absolute;
+  display: inline-block;
+  height: 12px;
+  width: 12px;
+  line-height: 12px;
+  top: 12px;
+  right: 18px;
+}

package/lib/DTableSelect/index.js

@@ -30,10 +30,11 @@ class DTableSelect extends _react.default.Component {
       autoFocus,
       className
     } = this.props;
+    const processedOptions = (0, _utils.processOptionsWithClear)(options, isClearable);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSelect.default, {
       value: value,
-      onChange: onChange,
-      options: options,
+      onChange: (0, _utils.createHandleChange)(onChange),
+      options: processedOptions,
       isMulti: isMulti,
       className: className,
       classNamePrefix: classNamePrefix,
@@ -41,12 +42,10 @@ class DTableSelect extends _react.default.Component {
       components: {
         Option: _utils.Option,
         DropdownIndicator: _utils.DropdownIndicator,
-        MenuList: _utils.MenuList,
-        ClearIndicator: _utils.ClearIndicator
+        MenuList: _utils.MenuList
       },
       placeholder: placeholder,
       isSearchable: isSearchable,
-      isClearable: isClearable,
       menuPosition: menuPosition || 'fixed' // when use default menuPosition(absolute), menuPortalTarget is unnecessary.
       ,
       menuShouldScrollIntoView: true,
@@ -58,10 +57,7 @@ class DTableSelect extends _react.default.Component {
       ref: innerRef,
       filterOption: customFilterOption,
       form: form,
-      autoFocus: autoFocus,
-      menuIsOpen: true,
-      onMenuClose: () => {},
-      onMenuOpen: () => {}
+      autoFocus: autoFocus
     });
   }
 }

package/lib/DTableSelect/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.UserSelectStyle = exports.Option = exports.MenuSelectStyle = exports.MenuList = exports.DropdownIndicator = exports.ClearIndicator = void 0;
+exports.processOptionsWithClear = exports.handleSelectChange = exports.createHandleChange = exports.UserSelectStyle = exports.Option = exports.MenuSelectStyle = exports.MenuList = exports.DropdownIndicator = exports.ClearIndicator = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactSelect = require("react-select");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -122,10 +122,10 @@ const MenuSelectStyle = exports.MenuSelectStyle = {
         backgroundColor: '#f5f5f5'
       },
       '.header-icon .dtable-font': {
-        color: '#aaa'
+        color: '#999'
       },
       '.header-icon .multicolor-icon': {
-        color: '#aaa'
+        color: '#999'
       },
       '.seatable-ui-select-tip': {
         fontSize: '12px',
@@ -146,6 +146,10 @@ const MenuSelectStyle = exports.MenuSelectStyle = {
   valueContainer: (provided, state) => ({
     ...provided,
     padding: '2px 8px 2px 16px'
+  }),
+  dropdownIndicator: (provided, state) => ({
+    ...provided,
+    padding: 0
   })
 };
 const DropdownIndicator = props => {
@@ -224,4 +228,31 @@ const Option = props => {
     })
   });
 };
-exports.Option = Option;
+exports.Option = Option;
+const processOptionsWithClear = (options, isClearable) => {
+  if (isClearable && options && options.length > 0) {
+    return [{
+      label: '--',
+      value: '__clear__'
+    }, ...options];
+  }
+  return options;
+};
+exports.processOptionsWithClear = processOptionsWithClear;
+const handleSelectChange = (selectedOption, actionMeta, onChangeCallback) => {
+  if (selectedOption && selectedOption.value === '__clear__') {
+    onChangeCallback(null, {
+      ...actionMeta,
+      action: 'clear'
+    });
+  } else {
+    onChangeCallback(selectedOption, actionMeta);
+  }
+};
+exports.handleSelectChange = handleSelectChange;
+const createHandleChange = onChange => {
+  return (selectedOption, actionMeta) => {
+    handleSelectChange(selectedOption, actionMeta, onChange);
+  };
+};
+exports.createHandleChange = createHandleChange;

package/lib/SelectOptionGroup/index.css

@@ -20,6 +20,12 @@
   padding: 0 0 8px 0 !important;
 }
 
+.option-group .option-group-content .label-space {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
 .option-group-search .form-control {
   height: 32px;
 }

package/lib/SelectOptionGroup/index.js

@@ -12,6 +12,8 @@ var _option = _interopRequireDefault(require("./option"));
 var _DTableSearchInput = _interopRequireDefault(require("../DTableSearchInput"));
 var _KeyCodes = _interopRequireDefault(require("./KeyCodes"));
 var _ClickOutside = _interopRequireDefault(require("../ClickOutside"));
+var _IconButton = _interopRequireDefault(require("../IconButton"));
+var _lang = require("../lang");
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 const OPTION_HEIGHT = 32;
@@ -81,6 +83,11 @@ class SelectOptionGroup extends _react.Component {
         });
       }
     };
+    this.isEqual = (obj1, obj2) => {
+      if (obj1 === obj2) return true;
+      if (!obj1 || !obj2) return false;
+      return JSON.stringify(obj1) === JSON.stringify(obj2);
+    };
     this.onMouseDown = e => {
       const {
         isInModal
@@ -132,10 +139,17 @@ class SelectOptionGroup extends _react.Component {
         });
       }
     };
+    this.isEqual = (obj1, obj2) => {
+      if (obj1 === obj2) return true;
+      if (!obj1 || !obj2) return false;
+      return JSON.stringify(obj1) === JSON.stringify(obj2);
+    };
     this.renderOptGroup = searchVal => {
       let {
         noOptionsPlaceholder,
-        onSelectOption
+        onSelectOption,
+        value,
+        supportMultipleSelect
       } = this.props;
       this.filterOptions = this.props.getFilterOptions(searchVal);
       if (this.filterOptions.length === 0) {
@@ -147,6 +161,7 @@ class SelectOptionGroup extends _react.Component {
       return this.filterOptions.map((opt, i) => {
         let key = opt.value.column ? opt.value.column.key : i;
         let isActive = this.state.activeIndex === i;
+        let isSelected = value && typeof value === 'object' && !supportMultipleSelect ? this.isEqual(value.value, opt.value) : Array.isArray(value.value) ? value.value.includes(opt.value.column_key) : false;
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_option.default, {
           index: i,
           isActive: isActive,
@@ -155,10 +170,23 @@ class SelectOptionGroup extends _react.Component {
           changeIndex: this.changeIndex,
           supportMultipleSelect: this.props.supportMultipleSelect,
           disableHover: this.state.disableHover,
-          children: opt.label
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            className: "label-space",
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+              children: [" ", opt.label]
+            }), isSelected && /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
+              className: "dtable-font dtable-icon-check"
+            })]
+          })
         }, `${key}-${i}`);
       });
     };
+    this.clearValue = () => {
+      this.setState({
+        searchVal: '',
+        activeIndex: -1
+      });
+    };
     this.state = {
       searchVal: '',
       activeIndex: -1,
@@ -243,7 +271,22 @@ class SelectOptionGroup extends _react.Component {
             placeholder: searchPlaceholder,
             onChange: this.onChangeSearch,
             autoFocus: true,
-            ref: this.searchInputRef
+            ref: this.searchInputRef,
+            clearValue: this.clearValue,
+            isClearable: true,
+            components: {
+              ClearIndicator: props => {
+                return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+                  className: "clear-search-text",
+                  onClick: props.clearValue,
+                  title: (0, _lang.getLocale)('Clear_search_text'),
+                  "aria-label": (0, _lang.getLocale)('Clear_search_text'),
+                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
+                    icon: "x"
+                  })
+                });
+              }
+            }
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: `option-group-content ${!searchable && !supportMultipleSelect ? 'option-group-top' : ''}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.110-xko.2",
+  "version": "6.0.110-xms.2",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "^5.0.4",