dtable-ui-component 6.0.125 → 6.0.126

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

@@ -21,12 +21,8 @@ class FilterGroup extends _react.Component {
   constructor() {
     super(...arguments);
     this.onSelectGroupConjunction = conjunctionOption => {
-      const {
-        filterConjunction
-      } = this.props;
-      const {
-        filterConjunction: newConjunction
-      } = conjunctionOption;
+      const filterConjunction = this.props.filterConjunction;
+      const newConjunction = conjunctionOption.filterConjunction;
       if (newConjunction === filterConjunction) {
         return;
       }
@@ -34,22 +30,17 @@ class FilterGroup extends _react.Component {
     };
     this.deleteFilterGroup = event => {
       event.nativeEvent.stopImmediatePropagation();
-      const {
-        index
-      } = this.props;
+      const index = this.props.index;
       this.props.deleteFilterGroup(index);
     };
     this.modifyConjunctionInGroup = new_filter_conjunction => {
-      const {
-        index
-      } = this.props;
+      const index = this.props.index;
       this.props.modifyConjunctionInGroup(index, new_filter_conjunction);
     };
     this.addFilterIntoGroup = () => {
-      const {
-        columns,
-        index
-      } = this.props;
+      const _this$props = this.props,
+        columns = _this$props.columns,
+        index = _this$props.index;
       const newFilter = (0, _utils.getDefaultFilter)(columns);
       if (!newFilter) {
         return;
@@ -57,23 +48,18 @@ class FilterGroup extends _react.Component {
       this.props.addFilterIntoGroup(index, newFilter);
     };
     this.deleteFilterInGroup = filter_index => {
-      const {
-        index
-      } = this.props;
+      const index = this.props.index;
       this.props.deleteFilterInGroup(index, filter_index);
     };
     this.updateFilterInGroup = (filter_index, new_filter) => {
-      const {
-        index
-      } = this.props;
+      const index = this.props.index;
       this.props.updateFilterInGroup(index, filter_index, new_filter);
     };
     this.renderConjunction = () => {
-      const {
-        index,
-        filterConjunction,
-        conjunctionOptions
-      } = this.props;
+      const _this$props2 = this.props,
+        index = _this$props2.index,
+        filterConjunction = _this$props2.filterConjunction,
+        conjunctionOptions = _this$props2.conjunctionOptions;
       switch (index) {
         case 0:
           {
@@ -98,35 +84,29 @@ class FilterGroup extends _react.Component {
       }
     };
     this.renderGroupFilters = () => {
-      const {
-        columns,
-        conjunctionOptions,
-        columnOptions,
-        filter,
-        index: groupIndex,
-        collaborators,
-        lang,
-        userDepartmentIdsMap,
-        departments,
-        firstDayOfWeek,
-        readOnly
-      } = this.props;
-      const {
-        filters: subFilters,
-        filter_conjunction
-      } = filter;
+      const _this$props3 = this.props,
+        columns = _this$props3.columns,
+        conjunctionOptions = _this$props3.conjunctionOptions,
+        columnOptions = _this$props3.columnOptions,
+        filter = _this$props3.filter,
+        groupIndex = _this$props3.index,
+        collaborators = _this$props3.collaborators,
+        lang = _this$props3.lang,
+        userDepartmentIdsMap = _this$props3.userDepartmentIdsMap,
+        departments = _this$props3.departments,
+        firstDayOfWeek = _this$props3.firstDayOfWeek,
+        readOnly = _this$props3.readOnly;
+      const subFilters = filter.filters,
+        filter_conjunction = filter.filter_conjunction;
       const subFilterConjunction = _constants.SUPPORT_CONJUNCTIONS.includes(filter_conjunction) ? filter_conjunction : _dtableUtils.FILTER_CONJUNCTION_TYPE.AND;
       const subFiltersLength = Array.isArray(subFilters) ? subFilters.length : 0;
       if (subFiltersLength === 0) {
         return null;
       }
       return subFilters.map((currentFilter, subFilterIndex) => {
-        const {
-          column_key: sub_filter_column_key
-        } = currentFilter;
-        const {
-          error_message
-        } = _dtableUtils.ValidateFilter.validate(currentFilter, columns);
+        const sub_filter_column_key = currentFilter.column_key;
+        const _ValidateFilter$valid = _dtableUtils.ValidateFilter.validate(currentFilter, columns),
+          error_message = _ValidateFilter$valid.error_message;
         const filterColumn = columns.find(column => column.key === sub_filter_column_key) || {};
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_filterItem.default, {
           isInModal: this.props.isInModal,
@@ -151,11 +131,10 @@ class FilterGroup extends _react.Component {
     };
   }
   render() {
-    const {
-      level,
-      index,
-      readOnly
-    } = this.props;
+    const _this$props4 = this.props,
+      level = _this$props4.level,
+      index = _this$props4.index,
+      readOnly = _this$props4.readOnly;
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: (0, _classnames.default)('filter-item', 'filter-group', "level-".concat(level)),
       children: [!readOnly && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

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

@@ -32,21 +32,16 @@ class FilterItem extends _react.default.Component {
     super(_props);
     _this = this;
     this.initSelectOptions = props => {
-      const {
-        filter,
-        filterColumn
-      } = props;
-      let {
-        filterPredicateList,
-        filterTermModifierList
-      } = (0, _utils.getColumnOptions)(filterColumn);
+      const filter = props.filter,
+        filterColumn = props.filterColumn;
+      let _getColumnOptions = (0, _utils.getColumnOptions)(filterColumn),
+        filterPredicateList = _getColumnOptions.filterPredicateList,
+        filterTermModifierList = _getColumnOptions.filterTermModifierList;
       // The value of the calculation formula column does not exist in the shared view
       this.filterPredicateOptions = filterPredicateList ? filterPredicateList.map(predicate => {
         return _filterItemUtils.default.generatorPredicateOption(predicate);
       }).filter(item => item) : [];
-      const {
-        filter_predicate
-      } = filter;
+      const filter_predicate = filter.filter_predicate;
       if ((0, _dtableUtils.isDateColumn)(filterColumn)) {
         if (filter_predicate === _dtableUtils.FILTER_PREDICATE_TYPE.IS_WITHIN) {
           filterTermModifierList = _dtableUtils.filterTermModifierIsWithin;
@@ -58,9 +53,7 @@ class FilterItem extends _react.default.Component {
     };
     this.onDeleteFilter = event => {
       event.nativeEvent.stopImmediatePropagation();
-      const {
-        index
-      } = this.props;
+      const index = this.props.index;
       this.props.deleteFilter(index);
     };
     this.resetState = filter => {
@@ -69,22 +62,17 @@ class FilterItem extends _react.default.Component {
       });
     };
     this.onSelectConjunction = value => {
-      const {
-        filterConjunction
-      } = this.props;
+      const filterConjunction = this.props.filterConjunction;
       if (filterConjunction === value.filterConjunction) {
         return;
       }
       this.props.updateConjunction(value.filterConjunction);
     };
     this.onSelectColumn = value => {
-      const {
-        index,
-        filter
-      } = this.props;
-      const {
-        column
-      } = value;
+      const _this$props = this.props,
+        index = _this$props.index,
+        filter = _this$props.filter;
+      const column = value.column;
       if (column.key === filter.column_key) return;
       let newFilter = (0, _utils.getFilterByColumn)(column, filter);
       if (!newFilter) return;
@@ -92,14 +80,11 @@ class FilterItem extends _react.default.Component {
       this.props.updateFilter(index, newFilter);
     };
     this.onSelectPredicate = value => {
-      const {
-        index,
-        filter,
-        filterColumn
-      } = this.props;
-      const {
-        filterPredicate
-      } = value;
+      const _this$props2 = this.props,
+        index = _this$props2.index,
+        filter = _this$props2.filter,
+        filterColumn = _this$props2.filterColumn;
+      const filterPredicate = value.filterPredicate;
       if (filter.filter_predicate === filterPredicate) {
         return;
       }
@@ -108,13 +93,10 @@ class FilterItem extends _react.default.Component {
       this.props.updateFilter(index, newFilter);
     };
     this.onSelectTermModifier = value => {
-      const {
-        index,
-        filter
-      } = this.props;
-      const {
-        filterTermModifier
-      } = value;
+      const _this$props3 = this.props,
+        index = _this$props3.index,
+        filter = _this$props3.filter;
+      const filterTermModifier = value.filterTermModifier;
       const inputRangeLabel = [_dtableUtils.FILTER_TERM_MODIFIER_TYPE.EXACT_DATE, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_AGO, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.NUMBER_OF_DAYS_FROM_NOW, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.THE_NEXT_NUMBERS_OF_DAYS, _dtableUtils.FILTER_TERM_MODIFIER_TYPE.THE_PAST_NUMBERS_OF_DAYS];
       if (filter.filter_term_modifier === filterTermModifier) {
         return;
@@ -131,13 +113,10 @@ class FilterItem extends _react.default.Component {
       this.props.updateFilter(index, newFilter);
     };
     this.onSelectSingle = value => {
-      const {
-        index,
-        filter
-      } = this.props;
-      const {
-        columnOption: option
-      } = value;
+      const _this$props4 = this.props,
+        index = _this$props4.index,
+        filter = _this$props4.filter;
+      const option = value.columnOption;
       if (filter.filter_term === option.id) {
         return;
       }
@@ -146,37 +125,28 @@ class FilterItem extends _react.default.Component {
       this.props.updateFilter(index, newFilter);
     };
     this.onSelectMultiple = value => {
-      const {
-        index,
-        filter
-      } = this.props;
-      const {
-        columnOption: option
-      } = value;
+      const _this$props5 = this.props,
+        index = _this$props5.index,
+        filter = _this$props5.filter;
+      const option = value.columnOption;
       let newFilter = (0, _utils.getUpdatedFilterBySelectMultiple)(filter, option);
       this.resetState(newFilter);
       this.props.updateFilter(index, newFilter);
     };
     this.onSelectCollaborator = value => {
-      const {
-        index,
-        filter
-      } = this.props;
-      const {
-        columnOption: collaborator
-      } = value;
+      const _this$props6 = this.props,
+        index = _this$props6.index,
+        filter = _this$props6.filter;
+      const collaborator = value.columnOption;
       let newFilter = (0, _utils.getUpdatedFilterByCollaborator)(filter, collaborator);
       this.resetState(newFilter);
       this.props.updateFilter(index, newFilter);
     };
     this.onSelectCreator = value => {
-      const {
-        index,
-        filter
-      } = this.props;
-      const {
-        columnOption: collaborator
-      } = value;
+      const _this$props7 = this.props,
+        index = _this$props7.index,
+        filter = _this$props7.filter;
+      const collaborator = value.columnOption;
       let newFilter = (0, _utils.getUpdatedFilterByCreator)(filter, collaborator);
       // the predicate is 'is' or 'is not'
       if (!newFilter) {
@@ -203,13 +173,10 @@ class FilterItem extends _react.default.Component {
       this.onFilterTermChanged(value);
     };
     this.onFilterTermChanged = newFilterTerm => {
-      const {
-        index,
-        filter
-      } = this.props;
-      const {
-        filterTerm
-      } = this.state;
+      const _this$props8 = this.props,
+        index = _this$props8.index,
+        filter = _this$props8.filter;
+      const filterTerm = this.state.filterTerm;
       if (newFilterTerm !== filterTerm) {
         this.setState({
           filterTerm: newFilterTerm
@@ -234,14 +201,11 @@ class FilterItem extends _react.default.Component {
       this.onFilterTermChanged(index);
     };
     this.getInputComponent = type => {
-      const {
-        filterColumn,
-        readOnly,
-        isInModal
-      } = this.props;
-      const {
-        filterTerm
-      } = this.state;
+      const _this$props9 = this.props,
+        filterColumn = _this$props9.filterColumn,
+        readOnly = _this$props9.readOnly,
+        isInModal = _this$props9.isInModal;
+      const filterTerm = this.state.filterTerm;
       if (type === _constants.INPUT_CMP_TYPE_MAP.TEXT) {
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_DTableSearchInput.default, {
           value: filterTerm,
@@ -284,13 +248,12 @@ class FilterItem extends _react.default.Component {
       }
     };
     this.renderConjunction = () => {
-      const {
-        index,
-        filterConjunction,
-        conjunctionOptions,
-        readOnly,
-        isInModal
-      } = this.props;
+      const _this$props0 = this.props,
+        index = _this$props0.index,
+        filterConjunction = _this$props0.filterConjunction,
+        conjunctionOptions = _this$props0.conjunctionOptions,
+        readOnly = _this$props0.readOnly,
+        isInModal = _this$props0.isInModal;
       switch (index) {
         case 0:
           {
@@ -319,13 +282,10 @@ class FilterItem extends _react.default.Component {
     this.renderMultipleSelectOption = function () {
       let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       let filterTerm = arguments.length > 1 ? arguments[1] : undefined;
-      const {
-        filter,
-        readOnly
-      } = _this.props;
-      const {
-        filter_predicate
-      } = filter;
+      const _this$props1 = _this.props,
+        filter = _this$props1.filter,
+        readOnly = _this$props1.readOnly;
+      const filter_predicate = filter.filter_predicate;
       let isSupportMultipleSelect = false;
       // The first two options are used for single selection, and the last four options are used for multiple selection
       const supportMultipleSelectOptions = [_dtableUtils.FILTER_PREDICATE_TYPE.IS_ANY_OF, _dtableUtils.FILTER_PREDICATE_TYPE.IS_NONE_OF, _dtableUtils.FILTER_PREDICATE_TYPE.HAS_ANY_OF, _dtableUtils.FILTER_PREDICATE_TYPE.HAS_ALL_OF, _dtableUtils.FILTER_PREDICATE_TYPE.HAS_NONE_OF, _dtableUtils.FILTER_PREDICATE_TYPE.IS_EXACTLY];
@@ -381,24 +341,19 @@ class FilterItem extends _react.default.Component {
       });
     };
     this.renderFilterTerm = filterColumn => {
-      const {
-        index,
-        filter,
-        collaborators,
-        userDepartmentIdsMap,
-        departments,
-        lang,
-        firstDayOfWeek,
-        readOnly
-      } = this.props;
-      const {
-        type
-      } = filterColumn;
-      const {
-        filter_term,
-        filter_predicate,
-        filter_term_modifier
-      } = filter;
+      const _this$props10 = this.props,
+        index = _this$props10.index,
+        filter = _this$props10.filter,
+        collaborators = _this$props10.collaborators,
+        userDepartmentIdsMap = _this$props10.userDepartmentIdsMap,
+        departments = _this$props10.departments,
+        lang = _this$props10.lang,
+        firstDayOfWeek = _this$props10.firstDayOfWeek,
+        readOnly = _this$props10.readOnly;
+      const type = filterColumn.type;
+      const filter_term = filter.filter_term,
+        filter_predicate = filter.filter_predicate,
+        filter_term_modifier = filter.filter_term_modifier;
       // predicate is empty or not empty
       if (_constants.EMPTY_PREDICATE.includes(filter_predicate)) {
         return null;
@@ -455,9 +410,9 @@ class FilterItem extends _react.default.Component {
         case _dtableUtils.CellType.SINGLE_SELECT:
           {
             // get options
-            let {
-              options = []
-            } = filterColumn.data || {};
+            let _ref = filterColumn.data || {},
+              _ref$options = _ref.options,
+              options = _ref$options === void 0 ? [] : _ref$options;
             if ([_dtableUtils.FILTER_PREDICATE_TYPE.IS_ANY_OF, _dtableUtils.FILTER_PREDICATE_TYPE.IS_NONE_OF].includes(filter_predicate)) {
               return this.renderMultipleSelectOption(options, filter_term);
             }
@@ -497,9 +452,9 @@ class FilterItem extends _react.default.Component {
           }
         case _dtableUtils.CellType.MULTIPLE_SELECT:
           {
-            let {
-              options = []
-            } = filterColumn.data || {};
+            let _ref2 = filterColumn.data || {},
+              _ref2$options = _ref2.options,
+              options = _ref2$options === void 0 ? [] : _ref2$options;
             return this.renderMultipleSelectOption(options, filter_term);
           }
         case _dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT:
@@ -557,9 +512,8 @@ class FilterItem extends _react.default.Component {
           }
         case _dtableUtils.CellType.RATE:
           {
-            let {
-              rate_max_number
-            } = filterColumn.data || {};
+            let _ref3 = filterColumn.data || {},
+              rate_max_number = _ref3.rate_max_number;
             let rateList = [];
             for (let i = 0; i < rate_max_number; i++) {
               let rateItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_rateItem.default, {
@@ -596,19 +550,16 @@ class FilterItem extends _react.default.Component {
       }
     };
     this.renderFormulaFilterTerm = (filterPredicate, filterTerm, index, filterColumn) => {
-      const {
-        data
-      } = filterColumn || {};
-      const {
-        result_type
-      } = data || {};
+      const _ref4 = filterColumn || {},
+        data = _ref4.data;
+      const _ref5 = data || {},
+        result_type = _ref5.result_type;
       if (filterPredicate === _dtableUtils.FILTER_PREDICATE_TYPE.IS_CURRENT_USER_ID) {
         return null;
       }
       if (result_type === _dtableUtils.FORMULA_RESULT_TYPE.NUMBER) {
-        const {
-          format
-        } = filterColumn.data || {};
+        const _ref6 = filterColumn.data || {},
+          format = _ref6.format;
         if (format === _dtableUtils.CellType.DURATION) {
           return this.getInputComponent(_constants.INPUT_CMP_TYPE_MAP.DURATION, filterColumn);
         }
@@ -626,18 +577,15 @@ class FilterItem extends _react.default.Component {
       return this.renderFilterTermByArrayType(filterPredicate, filterTerm, index, filterColumn);
     };
     this.renderFilterTermByArrayType = (filterPredicate, filterTerm, index, filterColumn) => {
-      const {
-        collaborators,
-        departments,
-        readOnly
-      } = this.props;
-      const {
-        data
-      } = filterColumn || {};
-      const {
-        array_type,
-        array_data
-      } = data || {};
+      const _this$props11 = this.props,
+        collaborators = _this$props11.collaborators,
+        departments = _this$props11.departments,
+        readOnly = _this$props11.readOnly;
+      const _ref7 = filterColumn || {},
+        data = _ref7.data;
+      const _ref8 = data || {},
+        array_type = _ref8.array_type,
+        array_data = _ref8.array_data;
       if (!array_type) {
         return null;
       }
@@ -646,9 +594,9 @@ class FilterItem extends _react.default.Component {
         data: array_data
       };
       if (array_type === _dtableUtils.CellType.SINGLE_SELECT || array_type === _dtableUtils.CellType.MULTIPLE_SELECT) {
-        let {
-          options = []
-        } = array_data || {};
+        let _ref9 = array_data || {},
+          _ref9$options = _ref9.options,
+          options = _ref9$options === void 0 ? [] : _ref9$options;
         return this.renderMultipleSelectOption(options, filterTerm);
       }
       if (array_type === _dtableUtils.CellType.DEPARTMENT_SINGLE_SELECT) {
@@ -680,9 +628,7 @@ class FilterItem extends _react.default.Component {
       return this.getInputComponent(_constants.INPUT_CMP_TYPE_MAP.TEXT);
     };
     this.isRenderErrorTips = () => {
-      const {
-        errMsg
-      } = this.props;
+      const errMsg = this.props.errMsg;
       return errMsg && errMsg !== _dtableUtils.FILTER_ERR_MSG.INCOMPLETE_FILTER;
     };
     this.renderErrorMessage = () => {
@@ -712,9 +658,7 @@ class FilterItem extends _react.default.Component {
     this.initSelectOptions(_props);
   }
   UNSAFE_componentWillReceiveProps(nextProps) {
-    const {
-      filter
-    } = this.props;
+    const filter = this.props.filter;
     if (nextProps.filter !== filter) {
       this.initSelectOptions(nextProps);
       this.setState({
@@ -728,20 +672,15 @@ class FilterItem extends _react.default.Component {
     return shouldUpdated;
   }
   render() {
-    const {
-      filterPredicateOptions,
-      filterTermModifierOptions
-    } = this;
-    const {
-      filter,
-      filterColumn,
-      filterColumnOptions,
-      readOnly
-    } = this.props;
-    const {
-      filter_predicate,
-      filter_term_modifier
-    } = filter;
+    const filterPredicateOptions = this.filterPredicateOptions,
+      filterTermModifierOptions = this.filterTermModifierOptions;
+    const _this$props12 = this.props,
+      filter = _this$props12.filter,
+      filterColumn = _this$props12.filterColumn,
+      filterColumnOptions = _this$props12.filterColumnOptions,
+      readOnly = _this$props12.readOnly;
+    const filter_predicate = filter.filter_predicate,
+      filter_term_modifier = filter.filter_term_modifier;
     const activeColumn = _filterItemUtils.default.generatorColumnOption(filterColumn);
     const activePredicate = _filterItemUtils.default.generatorPredicateOption(filter_predicate, true);
     let activeTermModifier = null;
@@ -751,9 +690,7 @@ class FilterItem extends _react.default.Component {
     } else if ((0, _columnUtils.isCheckboxColumn)(filterColumn)) {
       _isCheckboxColumn = true;
     }
-    const {
-      type
-    } = filterColumn;
+    const type = filterColumn.type;
     const computedColumnTypes = [_dtableUtils.CellType.FORMULA, _dtableUtils.CellType.LINK_FORMULA, _dtableUtils.CellType.LINK];
     const isContainPredicate = [_dtableUtils.FILTER_PREDICATE_TYPE.CONTAINS, _dtableUtils.FILTER_PREDICATE_TYPE.NOT_CONTAIN].includes(filter_predicate);
     const isRenderErrorTips = this.isRenderErrorTips();