linkmore-design 1.0.62 → 1.0.66

package/es/LmFilter/filterFns/index.js

@@ -1,36 +1,215 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.initLocalization = exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
 
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
 var _utils = require("../utils");
 
-// 核心参数集合
-var CoreOptions = function CoreOptions(_ref) {
+// 初始化查询结构
+var initLocalization = function initLocalization(props) {
+  var _globalQuery$filters, _globalQuery$filters$, _filterQuery$filters, _filterQuery$filters$;
+
+  var localization = props.localization,
+      dataSource = props.dataSource,
+      searchKey = props.searchKey,
+      customOptions = props.customOptions;
+  var globalQuery = localization.globalQuery,
+      filterQuery = localization.filterQuery;
+  var basicFilter = (localization === null || localization === void 0 ? void 0 : localization.basicFilter) || {};
+  var basicQuery = {}; // 存储查询结构
+
+  var customFilter = (customOptions === null || customOptions === void 0 ? void 0 : customOptions.find(function (v) {
+    var _localization$customF;
+
+    return (v === null || v === void 0 ? void 0 : v.value) === (localization === null || localization === void 0 ? void 0 : (_localization$customF = localization.customFilter) === null || _localization$customF === void 0 ? void 0 : _localization$customF.value);
+  })) || {};
+  var customQuery = {}; // 自定义筛选存储结构
+
+  if (globalQuery === null || globalQuery === void 0 ? void 0 : (_globalQuery$filters = globalQuery.filters) === null || _globalQuery$filters === void 0 ? void 0 : (_globalQuery$filters$ = _globalQuery$filters[0]) === null || _globalQuery$filters$ === void 0 ? void 0 : _globalQuery$filters$.conditions) {
+    var _globalQuery$filters2, _globalQuery$filters3;
+
+    var globalQueryArr = (globalQuery === null || globalQuery === void 0 ? void 0 : (_globalQuery$filters2 = globalQuery.filters) === null || _globalQuery$filters2 === void 0 ? void 0 : (_globalQuery$filters3 = _globalQuery$filters2[0]) === null || _globalQuery$filters3 === void 0 ? void 0 : _globalQuery$filters3.conditions) || [];
+    customQuery = globalQueryArr.reduce(function (pre, cur) {
+      var checkedValue = cur.value; // 选中的数据
+      // 查找该数据是否展示
+
+      if ((0, _utils.getIsHas)(checkedValue)) {
+        pre[cur.fieldName] = cur;
+      }
+
+      return pre;
+    }, {});
+  }
+
+  ;
+
+  if ((0, _utils.getIsHas)(basicFilter)) {
+    var _Object$keys;
+
+    basicQuery = (_Object$keys = Object.keys(basicFilter)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce(function (pre, cur) {
+      var item = dataSource.find(function (v) {
+        if (cur === v.field) {
+          return v.show || typeof v.show !== 'boolean';
+        }
+
+        return false;
+      });
+
+      if (cur === searchKey) {
+        item = {
+          field: searchKey,
+          operator: 'contains',
+          fieldType: 'string'
+        };
+      }
+
+      if ((0, _utils.getIsHas)(basicFilter[cur]) && !!item) {
+        var _item, _item2;
+
+        pre[cur] = {
+          fieldName: cur,
+          fieldType: ((_item = item) === null || _item === void 0 ? void 0 : _item.valueType) || 'string',
+          value: Array.isArray(basicFilter[cur]) ? basicFilter[cur] : [basicFilter[cur]],
+          operator: ((_item2 = item) === null || _item2 === void 0 ? void 0 : _item2.operator) || 'equal'
+        };
+      }
+
+      return pre;
+    }, {});
+  } else if (filterQuery === null || filterQuery === void 0 ? void 0 : (_filterQuery$filters = filterQuery.filters) === null || _filterQuery$filters === void 0 ? void 0 : (_filterQuery$filters$ = _filterQuery$filters[0]) === null || _filterQuery$filters$ === void 0 ? void 0 : _filterQuery$filters$.conditions) {
+    var _filterQuery$filters2, _filterQuery$filters3;
+
+    var filterQueryArr = (filterQuery === null || filterQuery === void 0 ? void 0 : (_filterQuery$filters2 = filterQuery.filters) === null || _filterQuery$filters2 === void 0 ? void 0 : (_filterQuery$filters3 = _filterQuery$filters2[0]) === null || _filterQuery$filters3 === void 0 ? void 0 : _filterQuery$filters3.conditions) || []; // 初始化基础查询缓存
+
+    basicFilter = filterQueryArr.reduce(function (pre, cur) {
+      var checkedValue = cur.value; // 选中的数据
+      // 是否搜索框
+
+      var isSearchInput = cur.fieldName === searchKey; // 查找该数据是否展示
+
+      var someData = dataSource.some(function (v) {
+        if (cur.fieldName === v.field) {
+          return v.show || typeof v.show !== 'boolean';
+        }
+
+        return false;
+      });
+
+      if ((0, _utils.getIsHas)(checkedValue) && someData || isSearchInput) {
+        basicQuery[cur.fieldName] = cur; // 复选/级联/日期区间
+
+        if (!['checkbox', 'cascader'].includes(cur.type) && checkedValue.length < 2) {
+          checkedValue = checkedValue[0];
+        }
+
+        pre[cur.fieldName] = checkedValue;
+      }
+
+      return pre;
+    }, {});
+  }
+
+  ;
+  return {
+    basicFilter: basicFilter,
+    basicQuery: basicQuery,
+    customFilter: customFilter,
+    customQuery: customQuery
+  };
+}; // 核心参数集合
+
+
+exports.initLocalization = initLocalization;
+
+var useCoreOptions = function useCoreOptions(_ref) {
   var state = _ref.state,
       dispatch = _ref.dispatch,
       props = _ref.props;
   var onChange = props.onChange,
       dataSource = props.dataSource,
-      searchKey = props.searchKey; // 触发查询 type  basic基础筛选 ｜ complex高级筛选
+      searchKey = props.searchKey,
+      customOptions = props.customOptions; // object => array
+
+  var tranformQuery = (0, _react.useCallback)(function (obj) {
+    var _Object$keys2;
+
+    var nArr = ((_Object$keys2 = Object.keys(obj)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.reduce(function (pre, cur) {
+      var item = dataSource.find(function (v) {
+        return cur === v.field;
+      });
+      var itemValue = obj[cur].value;
+
+      if ((0, _utils.getIsHas)(itemValue) && !!item) {
+        return [].concat((0, _toConsumableArray2.default)(pre), [{
+          fieldName: cur,
+          fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
+          type: item.type,
+          value: Array.isArray(itemValue) ? itemValue : [itemValue],
+          operator: obj[cur].mode === 'and' ? 'equal' : 'contains'
+        }]);
+      }
 
-  var onQuery = function onQuery(_ref2) {
-    var basicFilter = _ref2.basicFilter,
-        complexFilter = _ref2.complexFilter,
-        basicQuery = _ref2.basicQuery,
-        type = _ref2.type;
-    console.log('type', type);
+      return pre;
+    }, [])) || [];
+    return nArr;
+  }, [dataSource]); // 触发查询 type  basic基础筛选 ｜ complex高级筛选
+
+  var onQuery = (0, _react.useCallback)(function () {
+    var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        _ref2$basicFilter = _ref2.basicFilter,
+        basicFilter = _ref2$basicFilter === void 0 ? {} : _ref2$basicFilter,
+        _ref2$complexFilter = _ref2.complexFilter,
+        complexFilter = _ref2$complexFilter === void 0 ? {} : _ref2$complexFilter,
+        _ref2$customFilter = _ref2.customFilter,
+        customFilter = _ref2$customFilter === void 0 ? state.customFilter || {} : _ref2$customFilter,
+        _ref2$basicQuery = _ref2.basicQuery,
+        basicQuery = _ref2$basicQuery === void 0 ? {} : _ref2$basicQuery,
+        _ref2$type = _ref2.type,
+        type = _ref2$type === void 0 ? 'basic' : _ref2$type;
+
+    if (type === 'custom') {
+      var _Object$keys3;
+
+      dispatch({
+        type: 'changeCustomFilter',
+        customFilter: customFilter
+      });
+      var globalQuery = {
+        filters: [{
+          conditions: tranformQuery(customFilter === null || customFilter === void 0 ? void 0 : customFilter.data)
+        }]
+      };
+      var filterQuery = {
+        filters: [{
+          conditions: (_Object$keys3 = Object.keys(state.basicQuery)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.map(function (k) {
+            return state.basicQuery[k];
+          })
+        }]
+      };
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        basicFilter: basicFilter,
+        globalQuery: globalQuery,
+        filterQuery: filterQuery,
+        type: 'custom'
+      });
+    }
 
     if (type === 'basic') {
-      var _Object$keys;
+      var _Object$keys4;
 
       dispatch({
         type: 'changeBasicFilter',
@@ -46,24 +225,30 @@ var CoreOptions = function CoreOptions(_ref) {
       }); // 基础筛选清空高级筛选
       // 抛出给外部查询
 
-      var filterQuery = {
+      var _globalQuery = {
+        filters: [{
+          conditions: tranformQuery(customFilter.data)
+        }]
+      };
+      var _filterQuery = {
         filters: [{
-          conditions: (_Object$keys = Object.keys(basicQuery)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (k) {
+          conditions: (_Object$keys4 = Object.keys(basicQuery)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.map(function (k) {
             return basicQuery[k];
           })
         }]
       };
       onChange === null || onChange === void 0 ? void 0 : onChange({
         basicFilter: basicFilter,
-        filterQuery: filterQuery,
+        globalQuery: _globalQuery,
+        filterQuery: _filterQuery,
         type: 'basic'
       });
     }
 
     if (type === 'complex') {
-      var _Object$keys2, _Object$keys3;
+      var _Object$keys5, _Object$keys6;
 
-      var _basicQuery = (_Object$keys2 = Object.keys(complexFilter)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.reduce(function (pre, cur) {
+      var _basicQuery = (_Object$keys5 = Object.keys(complexFilter)) === null || _Object$keys5 === void 0 ? void 0 : _Object$keys5.reduce(function (pre, cur) {
         var item = dataSource.find(function (v) {
           return cur === v.field;
         });
@@ -73,6 +258,7 @@ var CoreOptions = function CoreOptions(_ref) {
           pre[cur] = {
             fieldName: cur,
             fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
+            type: item.type,
             value: Array.isArray(itemValue) ? itemValue : [itemValue],
             operator: complexFilter[cur].mode === 'and' ? 'equal' : 'contains'
           };
@@ -100,31 +286,87 @@ var CoreOptions = function CoreOptions(_ref) {
         type: 'changeBasicQuery',
         basicQuery: _basicQuery
       });
-      var _filterQuery = {
+      var _globalQuery2 = {
         filters: [{
-          conditions: (_Object$keys3 = Object.keys(_basicQuery)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.map(function (k) {
+          conditions: tranformQuery(customFilter.data)
+        }]
+      };
+      var _filterQuery2 = {
+        filters: [{
+          conditions: (_Object$keys6 = Object.keys(_basicQuery)) === null || _Object$keys6 === void 0 ? void 0 : _Object$keys6.map(function (k) {
             return _basicQuery[k];
           })
         }]
       };
       onChange === null || onChange === void 0 ? void 0 : onChange({
         complexFilter: complexFilter,
-        filterQuery: _filterQuery,
+        globalQuery: _globalQuery2,
+        filterQuery: _filterQuery2,
         type: type
       });
     }
-  }; // 根据字段查找过滤的数据, 不存在时返回默认值
-
-
-  var getFilterValue = function getFilterValue(_ref3) {
+  }, [tranformQuery, state]); // 清除事件
+
+  var onClearChange = (0, _react.useCallback)(function () {
+    var _props$onClearChange;
+
+    var params = {
+      basicFilter: {},
+      complexFilter: {},
+      basicQuery: {},
+      type: 'basic'
+    };
+    (_props$onClearChange = props.onClearChange) === null || _props$onClearChange === void 0 ? void 0 : _props$onClearChange.call(props, params);
+    onQuery(params);
+  }, [onQuery]); // 根据字段查找过滤的数据, 不存在时返回默认值
+
+  var getFilterValue = (0, _react.useCallback)(function (_ref3) {
     var field = _ref3.field,
         type = _ref3.type;
     var defaultValue = (0, _utils.getValueForType)(type);
+
+    if ((0, _utils.getIsHas)(state.basicFilter[field])) {
+      return state.basicFilter[field];
+    }
+
     return state.basicFilter[field] || defaultValue;
-  }; // 设置筛选的值 itemValue => String || Array => ['', '', ...]
+  }, [state.basicFilter]); // 获取查询结构
 
+  var getFilterQuery = (0, _react.useCallback)(function () {
+    var _Object$keys7;
 
-  var setFilterValue = function setFilterValue(itemValue, item) {
+    var originData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : dataSource;
+    var basicFilter = (0, _utils.getFilterShow)(state.basicFilter, originData);
+    var basicQuery = (0, _utils.getFilterShow)(state.basicQuery, originData);
+    dispatch({
+      type: 'changeBasicFilter',
+      basicFilter: basicFilter
+    });
+    dispatch({
+      type: 'changeBasicQuery',
+      basicQuery: basicQuery
+    });
+    var globalQuery = {
+      filters: [{
+        conditions: tranformQuery(state.customFilter.data)
+      }]
+    };
+    var filterQuery = {
+      filters: [{
+        conditions: (_Object$keys7 = Object.keys(basicQuery)) === null || _Object$keys7 === void 0 ? void 0 : _Object$keys7.map(function (k) {
+          return basicQuery[k];
+        })
+      }]
+    };
+    return {
+      basicFilter: basicFilter,
+      globalQuery: globalQuery,
+      filterQuery: filterQuery,
+      type: 'basic'
+    };
+  }, [state, dataSource]); // 设置筛选的值 itemValue => String || Array => ['', '', ...]
+
+  var setFilterValue = (0, _react.useCallback)(function (itemValue, item) {
     var field = item.field;
 
     if (field) {
@@ -134,6 +376,7 @@ var CoreOptions = function CoreOptions(_ref) {
       var basicQuery = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.basicQuery), {}, (0, _defineProperty2.default)({}, field, {
         fieldName: field,
         fieldType: item.valueType || 'string',
+        type: item.type,
         value: Array.isArray(itemValue) ? itemValue : [itemValue],
         operator: item.operator || 'equal'
       }));
@@ -150,45 +393,26 @@ var CoreOptions = function CoreOptions(_ref) {
         type: 'basic'
       });
     }
-  }; // 读取缓存
-
+  }, [state]); // 单个设置过滤字段值, 会触发onChange事件, 多个字段时使用setLocalization
 
-  var setLocalization = function setLocalization() {
-    var _Object$keys4;
+  var setFilterFieldValue = (0, _react.useCallback)(function (field, value) {
+    var item = dataSource.find(function (v) {
+      return v.fidld === field;
+    }) || {};
+    setFilterValue === null || setFilterValue === void 0 ? void 0 : setFilterValue(value, item);
+  }, [dataSource]); // 读取缓存
 
+  var setLocalization = (0, _react.useCallback)(function () {
     var localization = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : props.localization;
-    var globalQuery = localization.globalQuery,
-        basicFilter = localization.basicFilter;
-    var basicQuery = (_Object$keys4 = Object.keys(basicFilter)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.reduce(function (pre, cur) {
-      var item = dataSource.find(function (v) {
-        if (cur === v.field) {
-          return v.show || typeof v.show !== 'boolean';
-        }
-
-        return false;
-      });
-
-      if (cur === searchKey) {
-        item = {
-          field: searchKey,
-          operator: 'contains',
-          fieldType: 'string'
-        };
-      }
-
-      if ((0, _utils.getIsHas)(basicFilter[cur]) && !!item) {
-        var _item, _item2;
 
-        pre[cur] = {
-          fieldName: cur,
-          fieldType: ((_item = item) === null || _item === void 0 ? void 0 : _item.valueType) || 'string',
-          value: Array.isArray(basicFilter[cur]) ? basicFilter[cur] : [basicFilter[cur]],
-          operator: ((_item2 = item) === null || _item2 === void 0 ? void 0 : _item2.operator) || 'equal'
-        };
-      }
+    var _initLocalization = initLocalization((0, _objectSpread4.default)((0, _objectSpread4.default)({}, props), {}, {
+      localization: localization
+    })),
+        basicFilter = _initLocalization.basicFilter,
+        basicQuery = _initLocalization.basicQuery,
+        customFilter = _initLocalization.customFilter,
+        customQuery = _initLocalization.customQuery;
 
-      return pre;
-    }, {});
     dispatch({
       type: 'changeBasicFilter',
       basicFilter: basicFilter
@@ -197,18 +421,34 @@ var CoreOptions = function CoreOptions(_ref) {
       type: 'changeBasicQuery',
       basicQuery: basicQuery
     });
-  }; // 单个设置过滤字段值, 会触发onChange事件, 多个字段时使用setLocalization
-
+    dispatch({
+      type: 'changeCustomFilter',
+      customFilter: customFilter
+    });
+    dispatch({
+      type: 'changeCustomQuery',
+      customQuery: customQuery
+    });
+  }, [props]); // 自定义筛选查询
 
-  var setFilterFieldValue = function setFilterFieldValue(field, value) {
-    var item = dataSource.find(function (v) {
-      return v.fidld === field;
-    }) || {};
-    setFilterValue === null || setFilterValue === void 0 ? void 0 : setFilterValue(value, item);
-  };
+  var setCustomFilter = (0, _react.useCallback)(function (val) {
+    var customFilter = customOptions.find(function (v) {
+      return v.value === val;
+    });
+    console.log('state.basicFilter', state.basicFilter);
+    onQuery({
+      customFilter: customFilter,
+      basicFilter: state.basicFilter,
+      type: 'custom'
+    });
+  }, [customOptions, state.basicFilter]); // 组件内部使用
 
-  return {
+  var CoreMethods = {
     onQuery: onQuery,
+    setCustomFilter: setCustomFilter
+  }; // 参与Ref转发
+
+  var RefMethods = {
     getState: function getState() {
       return state;
     },
@@ -216,11 +456,17 @@ var CoreOptions = function CoreOptions(_ref) {
       return state.basicFilter;
     },
     getFilterValue: getFilterValue,
+    getFilterQuery: getFilterQuery,
     setFilterValue: setFilterValue,
     setFilterFieldValue: setFilterFieldValue,
-    setLocalization: setLocalization
+    setLocalization: setLocalization,
+    onClearChange: onClearChange
+  };
+  return {
+    CoreMethods: CoreMethods,
+    RefMethods: RefMethods
   };
 };
 
-var _default = CoreOptions;
+var _default = useCoreOptions;
 exports.default = _default;

package/es/LmFilter/style/{style.css → index.css}

@@ -5,6 +5,53 @@
   gap: 8px;
   font-size: 12px;
 }
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom {
+  display: inline-flex;
+  gap: 8px;
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select {
+  display: inline-flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 32px;
+  line-height: 1;
+  min-width: 100px;
+  max-width: 180px;
+  border: 1px solid var(--color-15);
+  border-radius: 2px;
+  color: var(--font2-color);
+  padding: 0 8px;
+  cursor: pointer;
+  transition: 0.3s;
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select.small {
+  height: 24px;
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select .lm_filter_custom_select_label span {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select .lm_filter_custom_select_icon {
+  font-size: 14px;
+  color: var(--text-color);
+  transition: 0.3s;
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select:hover {
+  border-color: var(--primary-hover-color);
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select.expand {
+  color: var(--text-color);
+  border-color: var(--primary-hover-color);
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_select.expand .lm_filter_custom_select_icon {
+  transform: rotateX(180deg);
+}
+.lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_custom .lm_filter_custom_line {
+  width: 1px;
+  height: 32px;
+  background-color: var(--background-color-hover);
+}
 .lm_filter_wrapper .lm_filter_container .lm_filter .lm_filter_search {
   max-width: 140px;
 }
@@ -125,28 +172,36 @@
   cursor: pointer;
   gap: 8px;
 }
-.ant-dropdown .filter_dropdown .filter_body .filter_item.add_more {
-  border-top: 1px solid var(--stripe-color);
+.ant-dropdown .filter_dropdown .filter_body .filter_item.last_item {
+  border-top: 1px solid var(--line-color);
 }
 .ant-dropdown .filter_dropdown .filter_body .filter_item .filter_item_content {
   flex: auto;
 }
-.ant-dropdown .filter_dropdown .filter_body .filter_item .filter_item_operate .hover_show {
+.ant-dropdown .filter_dropdown .filter_body .filter_item .filter_item_operate {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+.ant-dropdown .filter_dropdown .filter_body .filter_item .filter_item_operate .icon_hover {
   font-size: 16px;
-  color: var(--primary-color);
   transition: 0.3s;
   opacity: 0;
 }
+.ant-dropdown .filter_dropdown .filter_body .filter_item .filter_item_operate .icon_hover:hover {
+  color: var(--primary-color);
+}
 .ant-dropdown .filter_dropdown .filter_body .filter_item[disabled] {
   display: none;
 }
 .ant-dropdown .filter_dropdown .filter_body .filter_item.checked {
+  color: var(--font-color);
   background-color: var(--primary-select-color);
 }
 .ant-dropdown .filter_dropdown .filter_body .filter_item:hover {
-  background-color: var(--stripe-color);
+  background-color: var(--background-color);
 }
-.ant-dropdown .filter_dropdown .filter_body .filter_item:hover .filter_item_operate .icon_top {
+.ant-dropdown .filter_dropdown .filter_body .filter_item:hover .filter_item_operate .icon_hover {
   opacity: 1;
 }
 .ant-dropdown .filter_dropdown .filter_footer {

package/es/LmFilter/style/index.js

@@ -1,3 +1,3 @@
 "use strict";
 
-require("./style.css");
+require("./index.css");

package/es/LmFilter/utils.js

@@ -5,12 +5,16 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getFilterShow = getFilterShow;
+exports.getFilterShowQuery = getFilterShowQuery;
 exports.getFlatItem = getFlatItem;
 exports.getIsHas = getIsHas;
 exports.getRanges = getRanges;
 exports.getValueForType = getValueForType;
 exports.uniqueFunc = uniqueFunc;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/typeof"));
 
 var _dayjs = _interopRequireDefault(require("dayjs"));
@@ -117,4 +121,34 @@ function getFlatItem(filterValues, originArr) {
     }
   });
   return nArr;
+} // 返回过滤掉隐藏字段后的查询结构 () => {...}
+
+
+function getFilterShow(basicFilter, dataSource) {
+  return Object.keys(basicFilter).reduce(function (pre, cur) {
+    var value = basicFilter[cur];
+
+    if (dataSource.some(function (v) {
+      return v.field === cur && (v.show || typeof v.show !== 'boolean');
+    })) {
+      pre[cur] = value;
+    }
+
+    return pre;
+  }, {});
+} // 返回过滤掉隐藏字段后的查询结构 () => [...]
+
+
+function getFilterShowQuery(basicQuery, dataSource) {
+  return Object.keys(basicQuery).reduce(function (pre, cur) {
+    var value = basicQuery[cur];
+
+    if (dataSource.some(function (v) {
+      return v.field === cur && v.show || typeof v.show !== 'boolean';
+    })) {
+      return [].concat((0, _toConsumableArray2.default)(pre), [value]);
+    }
+
+    return pre;
+  }, []);
 }