dtable-ui-component 6.0.103-beat.1 → 6.0.103

package/lib/DTableCustomizeSelect/index.js

@@ -104,7 +104,6 @@ class DTableCustomizeSelect extends _react.Component {
         'disabled': isLocked
       }, className),
       onClick: this.onSelectToggle,
-      title: value && value.label ? value.label : placeholder,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "selected-option",
         children: [value && value.label ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {

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

@@ -36,17 +36,21 @@ class FilterItemUtils {
     };
   }
   static generatorPredicateOption(filterPredicate) {
+    let isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    // When an option is selected and shown in the select component, the ellipsis at the end of the predicate text is not displayed.
+    const translatedPredicateText = isActive ? (0, _lang.getLocale)(filterPredicate).replace(/\s*\.{3}$/, '') : (0, _lang.getLocale)(filterPredicate);
     return {
       value: {
         filterPredicate
       },
       label: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: "select-option-name",
-        children: (0, _lang.getLocale)(filterPredicate)
+        children: translatedPredicateText
       })
     };
   }
   static generatorTermModifierOption(filterTermModifier) {
+    let isActive = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const FILTER_TERM_MODIFIER_SHOW = {
       'today': (0, _lang.getLocale)('today'),
       'tomorrow': (0, _lang.getLocale)('tomorrow'),
@@ -70,13 +74,17 @@ class FilterItemUtils {
       'this_month': (0, _lang.getLocale)('this_month'),
       'this_year': (0, _lang.getLocale)('this_year')
     };
+    const filterTermModifierText = FILTER_TERM_MODIFIER_SHOW[filterTermModifier];
+
+    // When an option is selected and shown in the select component, the ellipsis at the end of the term modifier text is not displayed.
+    const translatedTermModifierText = isActive ? (0, _lang.getLocale)(filterTermModifierText).replace(/\s*\.{3}$/, '') : (0, _lang.getLocale)(filterTermModifierText);
     return {
       value: {
         filterTermModifier
       },
       label: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: "select-option-name",
-        children: FILTER_TERM_MODIFIER_SHOW[filterTermModifier]
+        children: translatedTermModifierText
       })
     };
   }

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

@@ -744,11 +744,11 @@ class FilterItem extends _react.default.Component {
       filter_term_modifier
     } = filter;
     const activeColumn = _filterItemUtils.default.generatorColumnOption(filterColumn);
-    const activePredicate = _filterItemUtils.default.generatorPredicateOption(filter_predicate);
+    const activePredicate = _filterItemUtils.default.generatorPredicateOption(filter_predicate, true);
     let activeTermModifier = null;
     let _isCheckboxColumn = false;
     if ((0, _dtableUtils.isDateColumn)(filterColumn)) {
-      activeTermModifier = _filterItemUtils.default.generatorTermModifierOption(filter_term_modifier);
+      activeTermModifier = _filterItemUtils.default.generatorTermModifierOption(filter_term_modifier, true);
     } else if ((0, _columnUtils.isCheckboxColumn)(filterColumn)) {
       _isCheckboxColumn = true;
     }

package/lib/DepartmentSingleSelectEditor/pc-editor/index.js

@@ -49,14 +49,20 @@ class PCDepartmentSingleSelectEditor extends _react.Component {
   }
   componentDidMount() {
     if (this.isRowExpand) {
-      if (this.outerRef.getBoundingClientRect().top > 330) {
-        const menuStyle = {
-          top: -200
-        };
-        this.setState({
-          menuStyle
-        });
+      let menuStyle = {};
+      const {
+        top,
+        left
+      } = this.outerRef.getBoundingClientRect();
+      if (top > 330) {
+        menuStyle.top = -200;
+      }
+      if (left > window.innerWidth - 300) {
+        menuStyle.left = left - window.innerWidth;
       }
+      this.setState({
+        menuStyle
+      });
     }
   }
   render() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "6.0.103-beat.1",
+  "version": "6.0.103",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "4.0.2",
@@ -130,7 +130,7 @@
     "sass-loader": "^12.3.0",
     "semver": "^7.3.5",
     "source-map-loader": "^3.0.0",
-    "storybook": "^9.1.0",
+    "storybook": "^9.1.17",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.2.5",
     "url-loader": "^4.1.1",