dtable-ui-component 6.0.110-pzy.2 → 6.0.110-ssk.3

package/lib/DTableGroupSelect/index.css

@@ -108,7 +108,7 @@
   border: none;
   border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
   border-radius: 4px 4px 0 0;
-  padding: .375rem .5rem !important;
+  padding: .375rem 1rem !important;
   height: 32px;
 }
 
@@ -118,9 +118,14 @@
   box-shadow: none !important;
 }
 
-.seatable-group-select .option-group-content .dtable-icon-check {
+.option-group-content .dtable-icon-check {
   color: #666666;
   font-size: 14px;
+  margin-left: 16px;
+}
+
+.option-group-content .label-check-icon {
+  width: 30px;
 }
 
 .seatable-group-select .clear-search-text {
@@ -136,3 +141,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/DTableGroupSelect/select-option-group.css

@@ -16,10 +16,10 @@
   padding: 0.25rem 8px;
 }
 
-.group-selector .option .dtable-icon-check-mark {
-  font-size: 12px;
+.group-selector .option .dtable-icon-check{
+  font-size: 14px;
   color: #666666;
-  height: 12px !important;
+  height: 14px !important;
   display: flex;
   align-items: center;
   justify-content: center;

package/lib/DTableGroupSelect/select-option-group.js

@@ -154,7 +154,7 @@ class SelectOptionGroup extends _react.Component {
             title: option.label,
             children: option.label
           }), isSelected && /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
-            className: "dtable-font dtable-icon-check-mark"
+            className: "dtable-font dtable-icon-check"
           })]
         }, `${option.id}-${index}`);
       });

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;
@@ -132,10 +134,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 +156,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 +165,26 @@ 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]
+            }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+              className: "label-check-icon",
+              children: [" ", 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 +269,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-pzy.2",
+  "version": "6.0.110-ssk.3",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "^5.0.4",