dtable-ui-component 6.0.124 → 6.0.125-vjs.2

package/lib/SelectOptionGroup/index.css

@@ -6,7 +6,7 @@
   min-height: 60px;
   min-width: 100%;
   max-width: 15rem;
-  padding: 0.5rem 0;
+  padding-top: 0;
   box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
   background: #fff;
   border: 1px solid rgba(0, 40, 100, 0.12);
@@ -17,17 +17,23 @@
 .option-group .option-group-search {
   width: 100%;
   min-width: 170px;
-  padding: 0 10px 6px;
+}
+
+.option-group .option-group-content .label-space {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
 }
 
 .option-group-search .form-control {
-  height: 31px;
+  height: 32px;
+  border-radius: 4px;
 }
 
 .option-group .none-search-result {
   height: 100px;
   width: 100%;
-  padding: 10px;
   color: #666666;
 }
 
@@ -35,13 +41,18 @@
   flex: 1;
   max-height: 252px;
   overflow-y: auto;
+  padding: 8px;
+}
+
+.option-group .option-group-top {
+  padding-top: 8px !important;
 }
 
 .option {
   display: block;
   width: 100%;
   line-height: 24px;
-  padding: 0.25rem 10px;
+  padding: 0.25rem 8px;
   clear: both;
   font-weight: 400;
   text-align: inherit;
@@ -50,34 +61,40 @@
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  border-radius: 4px;
 }
 
-.option.option-active {
-  background-color: #20a0ff;
-  color: #fff;
-  cursor: pointer;
+.option-group .option-group-search .form-control {
+  border: none;
+  border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
+  border-radius: 4px 4px 0 0;
+  padding: .375rem 0 .375rem 1rem;
+  height: 32px;
 }
 
-.option:hover .header-icon .dtable-font,
-.option:hover .header-icon .multicolor-icon,
-.option.option-active .select-option-name {
-  color: #fff;
+.option-group .option-group-search .form-control:focus {
+  border-color: transparent !important;
+  border-bottom: 1px solid rgb(0 40 100 / 12%) !important;
+  box-shadow: none !important;
 }
 
-.option.option-active .header-icon .dtable-font,
-.option.option-active .header-icon .multicolor-icon {
-  color: #fff;
+
+.option-group-content .label-check-icon {
+  margin-left: 16px;
 }
 
-.option:not(.option-active):hover .header-icon .dtable-font,
-.option:not(.option-active):hover .header-icon .multicolor-icon {
-  color: #aaa;
+.option-group-content .dtable-icon-check {
+  font-size: 14px !important;
+  color: var(--bs-icon-color);
 }
 
-.option .select-option-name .single-select-option {
-  margin: 0 0 0 12px;
+.option.option-active {
+  background-color: #f5f5f5;
+  color: #212529;
+  cursor: pointer;
 }
 
+
 .option .select-option-name .multiple-select-option {
   margin: 0;
 }
@@ -97,7 +114,7 @@
 
 .option-group-dtable-ui-multiple-select-selector .multiple-check-icon .dtable-icon-check-mark {
   font-size: 12px;
-  color: #798d99;
+  color: #666666;
 }
 
 .option-group-dtable-ui-single-select-selector .option:hover,
@@ -111,3 +128,11 @@
 .option-group-selector-multiple-select .option.option-active .select-option-name {
   color: #212529;
 }
+
+.option-group-selector-single-select .option .select-option-name .single-select-option {
+  margin: 0;
+}
+
+.option-group-selector-single-select .form-control {
+  padding: .375rem .5rem !important;
+}

package/lib/SelectOptionGroup/index.js

@@ -132,10 +132,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 +154,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 +163,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"
+              })]
+            })]
+          })
         }, "".concat(key, "-").concat(i));
       });
     };
+    this.clearValue = () => {
+      this.setState({
+        searchVal: '',
+        activeIndex: -1
+      });
+    };
     this.state = {
       searchVal: '',
       activeIndex: -1,
@@ -192,7 +216,8 @@ class SelectOptionGroup extends _react.Component {
       position,
       className,
       addOptionAble,
-      component
+      component,
+      supportMultipleSelect
     } = this.props;
     const {
       AddOption
@@ -215,7 +240,7 @@ class SelectOptionGroup extends _react.Component {
       style = {
         position: 'fixed',
         left: position.x,
-        top: position.y + position.height,
+        top: "".concat(position.y + position.height + 4, "px"),
         minWidth: position.width,
         opacity: 0
       };
@@ -232,20 +257,34 @@ class SelectOptionGroup extends _react.Component {
         style: style,
         onMouseDown: this.onMouseDown,
         children: [isShowSelected && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "editor-list-delete mb-2",
+          className: "editor-list-delete",
           onClick: e => e.stopPropagation(),
           children: value.label || ''
-        }), searchable && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        }), searchable && this.props.options && this.props.options.length > 10 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           className: "option-group-search",
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableSearchInput.default, {
             className: "option-search-control",
             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)("i", {
+                  className: (0, _classnames.default)('select-search-text-clear input-icon-addon seatable-icon dtable-font dtable-icon-x'),
+                  onClick: e => {
+                    e.stopPropagation();
+                    e.nativeEvent.stopImmediatePropagation();
+                    props.clearValue();
+                  }
+                });
+              }
+            }
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          className: "option-group-content",
+          className: "option-group-content ".concat(!searchable && !supportMultipleSelect ? 'option-group-top' : ''),
           ref: ref => this.optionGroupContentRef = ref,
           children: this.renderOptGroup(searchVal)
         }), addOptionAble && AddOption]

package/lib/assets/icons/close.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1718937171668" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18368" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M489.6 444.8l294.4-294.4 67.2 67.2-294.4 294.4 294.4 294.4-67.2 67.2-294.4-294.4-272 272-67.2-67.2 272-272-272-272 67.2-67.2z" p-id="18369" fill="currentColor"></path></svg>

package/lib/assets/icons/down.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.27148 11.2718L6.09991 8.44336L15.9994 18.3429L25.8989 8.44336L28.7273 11.2718L15.9994 23.9997L3.27148 11.2718Z" fill="currentColor"/>
+</svg>

package/lib/index.js

@@ -124,6 +124,12 @@ Object.defineProperty(exports, "DTableCustomizeCollaboratorSelect", {
     return _DTableCustomizeCollaboratorSelect.default;
   }
 });
+Object.defineProperty(exports, "DTableCustomizeSearchInput", {
+  enumerable: true,
+  get: function () {
+    return _DTableCustomizeSearchInput.default;
+  }
+});
 Object.defineProperty(exports, "DTableCustomizeSelect", {
   enumerable: true,
   get: function () {
@@ -724,6 +730,7 @@ var _DTableSwitch = _interopRequireDefault(require("./DTableSwitch"));
 var _DTableCustomizeSelect = _interopRequireDefault(require("./DTableCustomizeSelect"));
 var _DTableCustomizeCollaboratorSelect = _interopRequireDefault(require("./DTableCustomizeCollaboratorSelect"));
 var _DTableSearchInput = _interopRequireDefault(require("./DTableSearchInput"));
+var _DTableCustomizeSearchInput = _interopRequireDefault(require("./DTableCustomizeSearchInput"));
 var _DTableColorPicker = _interopRequireDefault(require("./DTableColorPicker"));
 var _ModalPortal = _interopRequireDefault(require("./ModalPortal"));
 var _RoleStatusEditor = _interopRequireDefault(require("./RoleStatusEditor"));

package/lib/locales/de.json

@@ -12,8 +12,8 @@
   "Rotate_image": "Rotate image",
   "Delete_image": "delete image",
   "Download_image": "Download image",
-  "Pre_Line": "previous Line",
-  "Next_Line": "next Line",
+  "Previous_record": "Vorheriger Eintrag",
+  "Next_record": "Nächster Eintrag",
   "Zoom_in": "Zoom in",
   "Zoom_out": "Zoom out",
   "Choose_a_collaborator": "Wählen Sie einen Mitarbeiter",

package/lib/locales/en.json

@@ -12,8 +12,8 @@
   "Rotate_image": "Rotate image",
   "Delete_image": "delete image",
   "Download_image": "Download image",
-  "Pre_Line": "previous Line",
-  "Next_Line": "next Line",
+  "Previous_record": "Previous record",
+  "Next_record": "Next record",
   "Zoom_in": "Zoom in",
   "Zoom_out": "Zoom out",
   "Choose_a_collaborator": "Choose a collaborator",

package/lib/locales/es.json

@@ -12,8 +12,8 @@
   "Rotate_image": "Rotate image",
   "Delete_image": "delete image",
   "Download_image": "Download image",
-  "Pre_Line": "previous Line",
-  "Next_Line": "next Line",
+  "Previous_record": "Registro previo",
+  "Next_record": "Próximo registro",
   "Zoom_in": "Zoom in",
   "Zoom_out": "Zoom out",
   "Choose_a_collaborator": "Choose a collaborator",

package/lib/locales/fr.json

@@ -12,8 +12,8 @@
   "Rotate_image": "Rotate image",
   "Delete_image": "delete image",
   "Download_image": "Download image",
-  "Pre_Line": "previous Line",
-  "Next_Line": "next Line",
+  "Previous_record": "Enregistrement précédent",
+  "Next_record": "Enregistrement suivant",
   "Zoom_in": "Zoom in",
   "Zoom_out": "Zoom out",
   "Choose_a_collaborator": "Choisissez un collaborateur",

package/lib/locales/pt.json

@@ -12,8 +12,8 @@
   "Rotate_image": "Rotate image",
   "Delete_image": "delete image",
   "Download_image": "Download image",
-  "Pre_Line": "previous Line",
-  "Next_Line": "next Line",
+  "Previous_record": "Registro anterior",
+  "Next_record": "Próximo registro",
   "Zoom_in": "Zoom in",
   "Zoom_out": "Zoom out",
   "Choose_a_collaborator": "Choose a collaborator",

package/lib/locales/ru.json

@@ -12,8 +12,8 @@
   "Rotate_image": "Rotate image",
   "Delete_image": "delete image",
   "Download_image": "Download image",
-  "Pre_Line": "previous Line",
-  "Next_Line": "next Line",
+  "Previous_record": "Предыдущая запись",
+  "Next_record": "Следующая запись",
   "Zoom_in": "Zoom in",
   "Zoom_out": "Zoom out",
   "Choose_a_collaborator": "Choose a collaborator",

package/lib/locales/zh-CN.json

@@ -12,8 +12,8 @@
   "Rotate_image": "旋转",
   "Delete_image": "删除",
   "Download_image": "下载",
-  "Pre_Line": "上一行",
-  "Next_Line": "下一行",
+  "Previous_record": "前一行",
+  "Next_record": "后一行",
   "Zoom_in": "放大",
   "Zoom_out": "缩小",
   "Choose_a_collaborator": "选择一个协作人",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.124",
+  "version": "6.0.125vjs.2",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "5.0.9",