linkmore-design 1.0.76 → 1.0.79

package/lib/LmFilter/complexFilter/valueDrawer.js

@@ -54,7 +54,7 @@ var ValueDrawer = function ValueDrawer(_ref) {
     form.resetFields();
   };
   /*
-   * customModal.data.type === 'nested' 时,处理不同
+   * customModal.data.type === 'nested' 时,处理不同(未增加)
    *
   */
 

package/lib/LmFilter/customFilter/index.js

@@ -25,7 +25,7 @@ var _drawer = _interopRequireDefault(require("./drawer"));
 
 var _saveModal = _interopRequireDefault(require("./saveModal"));
 
-var LmFilterCustom = function LmFilterCustom(_ref) {
+var CustomDiy = function CustomDiy(_ref) {
   var instance = _ref.instance;
   var state = instance.state,
       dispatch = instance.dispatch,
@@ -82,9 +82,7 @@ var LmFilterCustom = function LmFilterCustom(_ref) {
     visible: visible,
     setVisible: setVisible
   };
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_filter_custom"
-  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Dropdown, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Dropdown, {
     trigger: ['click'],
     visible: visible,
     placement: "bottomLeft",
@@ -111,14 +109,28 @@ var LmFilterCustom = function LmFilterCustom(_ref) {
     className: "lm_filter_custom_select_icon addon_after"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
     type: "lmweb-down"
-  })))), /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_filter_custom_line"
-  }), /*#__PURE__*/_react.default.createElement(_drawer.default, {
+  })))), /*#__PURE__*/_react.default.createElement(_drawer.default, {
     instance: instance
   }), /*#__PURE__*/_react.default.createElement(_saveModal.default, {
     instance: instance
   }));
 };
 
+var LmFilterCustom = function LmFilterCustom(_ref2) {
+  var instance = _ref2.instance;
+  var customRender = instance.customRender,
+      enableCustom = instance.enableCustom;
+  if (!customRender && !enableCustom) return null;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "lm_filter_custom"
+  }, enableCustom && /*#__PURE__*/_react.default.createElement(CustomDiy, {
+    instance: instance
+  }), customRender === null || customRender === void 0 ? void 0 : customRender({
+    instance: instance
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "lm_filter_custom_line"
+  }));
+};
+
 var _default = LmFilterCustom;
 exports.default = _default;

package/lib/LmFilter/filterFns/index.js

@@ -11,33 +11,41 @@ exports.initLocalization = exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _utils = require("../utils");
 
 // 初始化查询结构
 var initLocalization = function initLocalization(props) {
-  var _globalQuery$filters, _globalQuery$filters$, _filterQuery$filters, _filterQuery$filters$;
+  var _globalQuery$filters, _globalQuery$filters$, _fuzzyQuery$filters, _fuzzyQuery$filters$, _filterQuery$filters, _filterQuery$filters$;
 
   var localization = props.localization,
       dataSource = props.dataSource,
       searchKey = props.searchKey,
+      searchConfig = props.searchConfig,
       customOptions = props.customOptions;
   var globalQuery = localization.globalQuery,
-      filterQuery = localization.filterQuery;
+      filterQuery = localization.filterQuery,
+      fuzzyQuery = localization.fuzzyQuery;
   var basicFilter = (localization === null || localization === void 0 ? void 0 : localization.basicFilter) || {};
   var basicQuery = {}; // 存储查询结构
 
+  var isFuzzy = Array.isArray(searchKey); // 数组时为模糊搜索结构
+
+  var searchFilter = (localization === null || localization === void 0 ? void 0 : localization.fuzzyFilter) || {};
+  var searchQuery = {}; // 模糊查询结构
+
   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;
@@ -53,12 +61,44 @@ var initLocalization = function initLocalization(props) {
 
       return pre;
     }, {});
-  }
+  } // 模糊查询
 
-  if ((0, _utils.getIsHas)(basicFilter)) {
+
+  if ((0, _utils.getIsHas)(searchFilter)) {
     var _Object$keys;
 
-    basicQuery = (_Object$keys = Object.keys(basicFilter)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce(function (pre, cur) {
+    searchQuery = (_Object$keys = Object.keys(searchFilter)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce(function (pre, cur) {
+      if ((0, _utils.getIsHas)(searchFilter[cur])) {
+        pre[cur] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, searchConfig), {}, {
+          fieldName: cur,
+          value: [searchFilter[cur]]
+        });
+      }
+
+      return pre;
+    }, {});
+  } else if (fuzzyQuery === null || fuzzyQuery === void 0 ? void 0 : (_fuzzyQuery$filters = fuzzyQuery.filters) === null || _fuzzyQuery$filters === void 0 ? void 0 : (_fuzzyQuery$filters$ = _fuzzyQuery$filters[0]) === null || _fuzzyQuery$filters$ === void 0 ? void 0 : _fuzzyQuery$filters$.conditions) {
+    var _fuzzyQuery$filters2, _fuzzyQuery$filters2$;
+
+    var fuzzyQueryArr = (fuzzyQuery === null || fuzzyQuery === void 0 ? void 0 : (_fuzzyQuery$filters2 = fuzzyQuery.filters) === null || _fuzzyQuery$filters2 === void 0 ? void 0 : (_fuzzyQuery$filters2$ = _fuzzyQuery$filters2[0]) === null || _fuzzyQuery$filters2$ === void 0 ? void 0 : _fuzzyQuery$filters2$.conditions) || []; // 初始化基础查询缓存
+
+    searchFilter = fuzzyQueryArr.reduce(function (pre, cur) {
+      var checkedValue = cur.value; // 选中的数据
+
+      if ((0, _utils.getIsHas)(checkedValue)) {
+        searchQuery[cur.fieldName] = cur;
+        pre[cur.fieldName] = checkedValue[0];
+      }
+
+      return pre;
+    }, {});
+  } // 二级查询
+
+
+  if ((0, _utils.getIsHas)(basicFilter)) {
+    var _Object$keys2;
+
+    basicQuery = (_Object$keys2 = Object.keys(basicFilter)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.reduce(function (pre, cur) {
       var item = dataSource.find(function (v) {
         if (cur === v.field) {
           return v.show || typeof v.show !== 'boolean';
@@ -67,7 +107,7 @@ var initLocalization = function initLocalization(props) {
         return false;
       });
 
-      if (cur === searchKey) {
+      if (!isFuzzy && cur === searchKey) {
         item = {
           field: searchKey,
           operator: 'contains',
@@ -122,6 +162,8 @@ var initLocalization = function initLocalization(props) {
   }
 
   return {
+    searchFilter: searchFilter,
+    searchQuery: searchQuery,
     basicFilter: basicFilter,
     basicQuery: basicQuery,
     customFilter: customFilter,
@@ -139,12 +181,13 @@ var useCoreOptions = function useCoreOptions(_ref) {
   var onChange = props.onChange,
       dataSource = props.dataSource,
       searchKey = props.searchKey,
-      customOptions = props.customOptions; // object => array
+      searchConfig = props.searchConfig,
+      customOptions = props.customOptions; // 转换一级查询结构 object => array
 
-  var tranformQuery = (0, _react.useCallback)(function (obj) {
-    var _Object$keys2;
+  var tranformGlobalQuery = (0, _react.useCallback)(function (obj) {
+    var _Object$keys3;
 
-    var nArr = ((_Object$keys2 = Object.keys(obj)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.reduce(function (pre, cur) {
+    var nArr = ((_Object$keys3 = Object.keys(obj)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.reduce(function (pre, cur) {
       var item = dataSource.find(function (v) {
         return cur === v.field;
       });
@@ -163,41 +206,78 @@ var useCoreOptions = function useCoreOptions(_ref) {
       return pre;
     }, [])) || [];
     return nArr;
-  }, [dataSource]); // 触发查询 type  basic基础筛选 ｜ complex高级筛选
+  }, [dataSource]); // 转行查询结构
 
-  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,
+  var tranformQuery = (0, _react.useCallback)(function (_ref2) {
+    var _Object$keys4, _Object$keys5;
+
+    var _ref2$customFilter = _ref2.customFilter,
+        customFilter = _ref2$customFilter === void 0 ? {} : _ref2$customFilter,
+        _ref2$searchQuery = _ref2.searchQuery,
+        searchQuery = _ref2$searchQuery === void 0 ? {} : _ref2$searchQuery,
         _ref2$basicQuery = _ref2.basicQuery,
-        basicQuery = _ref2$basicQuery === void 0 ? {} : _ref2$basicQuery,
-        _ref2$type = _ref2.type,
-        type = _ref2$type === void 0 ? 'basic' : _ref2$type;
+        basicQuery = _ref2$basicQuery === void 0 ? {} : _ref2$basicQuery;
+    var globalQuery = {
+      filters: [{
+        conditions: tranformGlobalQuery(customFilter === null || customFilter === void 0 ? void 0 : customFilter.data)
+      }]
+    };
+    var fuzzyQuery = {
+      filters: [{
+        conditions: (_Object$keys4 = Object.keys(searchQuery)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.map(function (k) {
+          return searchQuery[k];
+        })
+      }]
+    };
+    var filterQuery = {
+      filters: [{
+        conditions: (_Object$keys5 = Object.keys(basicQuery)) === null || _Object$keys5 === void 0 ? void 0 : _Object$keys5.map(function (k) {
+          return basicQuery[k];
+        })
+      }]
+    };
+    return {
+      globalQuery: globalQuery,
+      fuzzyQuery: fuzzyQuery,
+      filterQuery: filterQuery
+    };
+  }, [tranformGlobalQuery]); // 触发查询 type  basic基础筛选 ｜ complex高级筛选
 
-    if (type === 'custom') {
-      var _Object$keys3;
+  var onQuery = (0, _react.useCallback)(function () {
+    var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+        _ref3$complexFilter = _ref3.complexFilter,
+        complexFilter = _ref3$complexFilter === void 0 ? {} : _ref3$complexFilter,
+        _ref3$type = _ref3.type,
+        type = _ref3$type === void 0 ? 'basic' : _ref3$type,
+        _ref3$basicFilter = _ref3.basicFilter,
+        basicFilter = _ref3$basicFilter === void 0 ? state.basicFilter || {} : _ref3$basicFilter,
+        _ref3$basicQuery = _ref3.basicQuery,
+        basicQuery = _ref3$basicQuery === void 0 ? state.basicQuery || {} : _ref3$basicQuery,
+        _ref3$searchFilter = _ref3.searchFilter,
+        searchFilter = _ref3$searchFilter === void 0 ? state.searchFilter || {} : _ref3$searchFilter,
+        _ref3$searchQuery = _ref3.searchQuery,
+        searchQuery = _ref3$searchQuery === void 0 ? state.searchQuery || {} : _ref3$searchQuery,
+        _ref3$customFilter = _ref3.customFilter,
+        customFilter = _ref3$customFilter === void 0 ? state.customFilter || {} : _ref3$customFilter;
 
+    if (type === 'custom') {
       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];
-          })
-        }]
-      };
+
+      var _tranformQuery = tranformQuery({
+        customFilter: customFilter,
+        searchQuery: searchQuery,
+        basicQuery: basicQuery
+      }),
+          globalQuery = _tranformQuery.globalQuery,
+          fuzzyQuery = _tranformQuery.fuzzyQuery,
+          filterQuery = _tranformQuery.filterQuery;
+
       onChange === null || onChange === void 0 ? void 0 : onChange({
+        fuzzyFilter: searchFilter,
+        fuzzyQuery: fuzzyQuery,
         basicFilter: basicFilter,
         globalQuery: globalQuery,
         filterQuery: filterQuery,
@@ -205,9 +285,41 @@ var useCoreOptions = function useCoreOptions(_ref) {
       });
     }
 
-    if (type === 'basic') {
-      var _Object$keys4;
+    if (type === 'search') {
+      dispatch({
+        type: 'changeSearchFilter',
+        searchFilter: searchFilter
+      });
+      dispatch({
+        type: 'changeSearchQuery',
+        searchQuery: searchQuery
+      });
+      dispatch({
+        type: 'changeComplexFilter',
+        complexFilter: {}
+      }); // 基础筛选清空高级筛选
+      // 抛出给外部查询
+
+      var _tranformQuery2 = tranformQuery({
+        customFilter: customFilter,
+        searchQuery: searchQuery,
+        basicQuery: basicQuery
+      }),
+          _globalQuery = _tranformQuery2.globalQuery,
+          _fuzzyQuery = _tranformQuery2.fuzzyQuery,
+          _filterQuery = _tranformQuery2.filterQuery;
+
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        fuzzyFilter: searchFilter,
+        basicFilter: basicFilter,
+        fuzzyQuery: _fuzzyQuery,
+        globalQuery: _globalQuery,
+        filterQuery: _filterQuery,
+        type: 'search'
+      });
+    }
 
+    if (type === 'basic') {
       dispatch({
         type: 'changeBasicFilter',
         basicFilter: basicFilter
@@ -222,31 +334,30 @@ var useCoreOptions = function useCoreOptions(_ref) {
       }); // 基础筛选清空高级筛选
       // 抛出给外部查询
 
-      var _globalQuery = {
-        filters: [{
-          conditions: tranformQuery(customFilter.data)
-        }]
-      };
-      var _filterQuery = {
-        filters: [{
-          conditions: (_Object$keys4 = Object.keys(basicQuery)) === null || _Object$keys4 === void 0 ? void 0 : _Object$keys4.map(function (k) {
-            return basicQuery[k];
-          })
-        }]
-      };
+      var _tranformQuery3 = tranformQuery({
+        customFilter: customFilter,
+        searchQuery: searchQuery,
+        basicQuery: basicQuery
+      }),
+          _globalQuery2 = _tranformQuery3.globalQuery,
+          _fuzzyQuery2 = _tranformQuery3.fuzzyQuery,
+          _filterQuery2 = _tranformQuery3.filterQuery;
+
       onChange === null || onChange === void 0 ? void 0 : onChange({
+        fuzzyFilter: searchFilter,
         basicFilter: basicFilter,
-        globalQuery: _globalQuery,
-        filterQuery: _filterQuery,
+        fuzzyQuery: _fuzzyQuery2,
+        globalQuery: _globalQuery2,
+        filterQuery: _filterQuery2,
         type: 'basic'
       });
     }
 
     if (type === 'complex') {
-      var _Object$keys5, _Object$keys6;
+      var _Object$keys6;
 
       // eslint-disable-next-line no-shadow
-      var _basicQuery = (_Object$keys5 = Object.keys(complexFilter)) === null || _Object$keys5 === void 0 ? void 0 : _Object$keys5.reduce(function (pre, cur) {
+      var _basicQuery = (_Object$keys6 = Object.keys(complexFilter)) === null || _Object$keys6 === void 0 ? void 0 : _Object$keys6.reduce(function (pre, cur) {
         var item = dataSource.find(function (v) {
           return cur === v.field;
         });
@@ -266,6 +377,14 @@ var useCoreOptions = function useCoreOptions(_ref) {
         return pre;
       }, {});
 
+      dispatch({
+        type: 'changeSearchFilter',
+        searchFilter: {}
+      });
+      dispatch({
+        type: 'changeSearchQuery',
+        searchQuery: {}
+      });
       dispatch({
         type: 'changeBasicFilter',
         basicFilter: {}
@@ -285,43 +404,65 @@ var useCoreOptions = function useCoreOptions(_ref) {
         type: 'changeBasicQuery',
         basicQuery: _basicQuery
       });
-      var _globalQuery2 = {
-        filters: [{
-          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];
-          })
-        }]
-      };
+
+      var _tranformQuery4 = tranformQuery({
+        customFilter: customFilter,
+        basicQuery: _basicQuery
+      }),
+          _globalQuery3 = _tranformQuery4.globalQuery,
+          _filterQuery3 = _tranformQuery4.filterQuery;
+
       onChange === null || onChange === void 0 ? void 0 : onChange({
         complexFilter: complexFilter,
-        globalQuery: _globalQuery2,
-        filterQuery: _filterQuery2,
+        globalQuery: _globalQuery3,
+        filterQuery: _filterQuery3,
         type: type
       });
     }
+
+    if (type === 'clear') {
+      dispatch({
+        type: 'reset'
+      });
+
+      var _tranformQuery5 = tranformQuery({
+        customFilter: customFilter,
+        searchQuery: searchQuery,
+        basicQuery: basicQuery
+      }),
+          _globalQuery4 = _tranformQuery5.globalQuery,
+          _fuzzyQuery3 = _tranformQuery5.fuzzyQuery,
+          _filterQuery4 = _tranformQuery5.filterQuery;
+
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        fuzzyFilter: searchFilter,
+        basicFilter: basicFilter,
+        fuzzyQuery: _fuzzyQuery3,
+        globalQuery: _globalQuery4,
+        filterQuery: _filterQuery4,
+        type: 'clear'
+      });
+    }
   }, [tranformQuery, state]); // 清除事件
 
   var onClearChange = (0, _react.useCallback)(function () {
     var _props$onClearChange;
 
     var params = {
+      searchFilter: {},
+      searchQuery: {},
       basicFilter: {},
       complexFilter: {},
       basicQuery: {},
-      type: 'basic'
+      type: 'clear'
     };
     (_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 getFilterValue = (0, _react.useCallback)(function (_ref4) {
+    var field = _ref4.field,
+        type = _ref4.type;
 
     if ((0, _utils.getIsHas)(state.basicFilter[field])) {
       return state.basicFilter[field];
@@ -332,8 +473,6 @@ var useCoreOptions = function useCoreOptions(_ref) {
   }, [state.basicFilter]); // 获取查询结构
 
   var getFilterQuery = (0, _react.useCallback)(function () {
-    var _Object$keys7;
-
     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);
@@ -345,20 +484,20 @@ var useCoreOptions = function useCoreOptions(_ref) {
       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];
-        })
-      }]
-    };
+
+    var _tranformQuery6 = tranformQuery({
+      customFilter: state.customFilter,
+      searchQuery: state.searchQuery,
+      basicQuery: basicQuery
+    }),
+        globalQuery = _tranformQuery6.globalQuery,
+        fuzzyQuery = _tranformQuery6.fuzzyQuery,
+        filterQuery = _tranformQuery6.filterQuery;
+
     return {
+      fuzzyFilter: state.searchFilter,
       basicFilter: basicFilter,
+      fuzzyQuery: fuzzyQuery,
       globalQuery: globalQuery,
       filterQuery: filterQuery,
       type: 'basic'
@@ -378,7 +517,7 @@ var useCoreOptions = function useCoreOptions(_ref) {
         type: item.type,
         value: Array.isArray(itemValue) ? itemValue : [itemValue],
         operator: item.operator || 'equal'
-      })); // 数据清楚时不返回结构体
+      })); // 数据清除时不返回结构体
 
       if (!(0, _utils.getIsHas)(itemValue)) {
         delete basicFilter[field];
@@ -407,11 +546,21 @@ var useCoreOptions = function useCoreOptions(_ref) {
     var _initLocalization = initLocalization((0, _objectSpread4.default)((0, _objectSpread4.default)({}, props), {}, {
       localization: localization
     })),
+        searchFilter = _initLocalization.searchFilter,
+        searchQuery = _initLocalization.searchQuery,
         basicFilter = _initLocalization.basicFilter,
         basicQuery = _initLocalization.basicQuery,
         customFilter = _initLocalization.customFilter,
         customQuery = _initLocalization.customQuery;
 
+    dispatch({
+      type: 'changeSearchFilter',
+      searchFilter: searchFilter
+    });
+    dispatch({
+      type: 'changeSearchQuery',
+      searchQuery: searchQuery
+    });
     dispatch({
       type: 'changeBasicFilter',
       basicFilter: basicFilter
@@ -428,7 +577,32 @@ var useCoreOptions = function useCoreOptions(_ref) {
       type: 'changeCustomQuery',
       customQuery: customQuery
     });
-  }, [props]); // 自定义筛选查询
+  }, [props]); // 模糊查询结构
+
+  var setSearchFilter = (0, _react.useCallback)(function (itemValue, item) {
+    var searchFilter = searchKey === null || searchKey === void 0 ? void 0 : searchKey.reduce(function (pre, cur) {
+      pre[cur] = itemValue;
+      return pre;
+    }, (0, _objectSpread4.default)({}, state.searchFilter));
+    var searchQuery = searchKey === null || searchKey === void 0 ? void 0 : searchKey.reduce(function (pre, cur) {
+      pre[cur] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, searchConfig), {}, {
+        fieldName: cur,
+        value: [itemValue]
+      });
+      return pre;
+    }, (0, _objectSpread4.default)({}, state.searchQuery)); // 数据清除时不返回结构体
+
+    if (!(0, _utils.getIsHas)(itemValue)) {
+      searchFilter = {};
+      searchQuery = {};
+    }
+
+    onQuery({
+      searchFilter: searchFilter,
+      searchQuery: searchQuery,
+      type: 'search'
+    });
+  }, [searchKey, state]); // 自定义筛选查询
 
   var setCustomFilter = (0, _react.useCallback)(function (val) {
     var customFilter = customOptions.find(function (v) {
@@ -436,14 +610,14 @@ var useCoreOptions = function useCoreOptions(_ref) {
     });
     onQuery({
       customFilter: customFilter,
-      basicFilter: state.basicFilter,
       type: 'custom'
     });
   }, [customOptions, state.basicFilter]); // 组件内部使用
 
   var CoreMethods = {
     onQuery: onQuery,
-    setCustomFilter: setCustomFilter
+    setCustomFilter: setCustomFilter,
+    setSearchFilter: setSearchFilter
   }; // 参与Ref转发
 
   var RefMethods = {

package/lib/LmFilter/wrapper/Filter.js

@@ -26,7 +26,7 @@ var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
       enableClear = instance.enableClear;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter"
-  }, enableCustom && /*#__PURE__*/_react.default.createElement(_customFilter.default, {
+  }, /*#__PURE__*/_react.default.createElement(_customFilter.default, {
     instance: instance
   }), enableBaisc && /*#__PURE__*/_react.default.createElement(_baseFilter.default, {
     instance: instance

package/lib/LmFilter/wrapper/FilterRoot.js

@@ -21,7 +21,9 @@ var _filterFns = _interopRequireWildcard(require("../filterFns"));
 
 // 根文件 => 参数聚合
 var reducer = function reducer(state, action) {
-  var basicFilter = action.basicFilter,
+  var searchFilter = action.searchFilter,
+      searchQuery = action.searchQuery,
+      basicFilter = action.basicFilter,
       basicQuery = action.basicQuery,
       customFilter = action.customFilter,
       customQuery = action.customQuery,
@@ -34,6 +36,18 @@ var reducer = function reducer(state, action) {
       saveModal = action.saveModal;
 
   switch (action.type) {
+    case 'changeSearchFilter':
+      // 模糊查询
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        searchFilter: searchFilter
+      });
+
+    case 'changeSearchQuery':
+      // 模糊查询
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        searchQuery: searchQuery
+      });
+
     case 'changeBasicFilter':
       // 基础筛选数据改变
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
@@ -98,6 +112,8 @@ var reducer = function reducer(state, action) {
     case 'reset':
       // 一键清空
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        searchFilter: {},
+        searchQuery: {},
         basicFilter: {},
         basicQuery: {},
         complexFilter: {}
@@ -111,12 +127,18 @@ var reducer = function reducer(state, action) {
 
 var getInitialState = function getInitialState(props) {
   var _initLocalization = (0, _filterFns.initLocalization)(props),
+      searchFilter = _initLocalization.searchFilter,
+      searchQuery = _initLocalization.searchQuery,
       basicFilter = _initLocalization.basicFilter,
       basicQuery = _initLocalization.basicQuery,
       customQuery = _initLocalization.customQuery,
-      customFilter = _initLocalization.customFilter;
+      customFilter = _initLocalization.customFilter; // 字段对应关系 basicQuery => filterQuery; customQuery => globalQuery; searchQuery => fuzzyQuery 
+
 
   return {
+    searchFilter: searchFilter,
+    searchQuery: searchQuery,
+    // 模糊查询
     basicFilter: basicFilter,
     basicQuery: basicQuery,
     customFilter: (0, _objectSpread2.default)({