linkmore-design 1.0.58 → 1.0.62

package/lib/LmFilter/LmFilter.js

@@ -19,7 +19,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
-var _localization = require("./localization.tsx");
+var _localization = require("./localization");
 
 var _excluded = ["localization"];
 
@@ -28,10 +28,28 @@ var LmFilter = function LmFilter(_ref, ref) {
       localization = _ref$localization === void 0 ? {} : _ref$localization,
       resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var defaultRef = (0, _react.useRef)(null);
-  return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
-    ref: ref || defaultRef,
+  var defaultProps = {
+    dataSource: [],
+    // 数据源
+    enableSearch: true,
+    // 是否启用模糊查询
+    enableBaisc: true,
+    // 是否启用基础筛选
+    enableComplex: false,
+    // 是否启用高级筛选
+    enableCustom: false,
+    // 是否启用自定义筛选
+    size: 'middle',
+    // 尺寸
+    searchKey: 'search',
+    // 搜索的key值
+    placeholder: '请输入',
+    // 搜索占位符
     localization: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _localization.DefaultLocalization), localization)
-  }, resetProps));
+  };
+  return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
+    ref: ref || defaultRef
+  }, defaultProps, resetProps));
 };
 
 var _default = /*#__PURE__*/(0, _react.forwardRef)(LmFilter);

package/lib/LmFilter/baseFilter/fuzzySearch.js

@@ -29,7 +29,12 @@ var FuzzySearch = function FuzzySearch(_ref) {
   }, [state.basicFilter]);
 
   var onSearch = function onSearch(val) {
-    setFilterValue(val, searchKey);
+    var item = {
+      field: searchKey,
+      operator: 'contains',
+      fieldType: 'string'
+    };
+    setFilterValue(val, item);
   };
 
   (0, _react.useEffect)(function () {

package/lib/LmFilter/baseFilter/index.js

@@ -17,12 +17,11 @@ var _components = _interopRequireDefault(require("../components"));
 var LmFilterBase = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
   var dataSource = instance.dataSource;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "lm_filter_basic"
-  }, /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_fuzzySearch.default, {
     instance: instance
   }), dataSource.map(function (v, index) {
-    return /*#__PURE__*/_react.default.createElement(_components.default, {
+    var isHidden = !v.show && typeof v.show === 'boolean';
+    return isHidden ? null : /*#__PURE__*/_react.default.createElement(_components.default, {
       key: (v === null || v === void 0 ? void 0 : v.field) || index,
       instance: instance,
       item: v

package/lib/LmFilter/complexFilter/drawer.js

@@ -70,7 +70,9 @@ var ListItemChecked = function ListItemChecked(_ref) {
       }
 
       if (getItem.type === 'cascader') {
-        return (0, _utils.getFlatItem)(checkedValue, getItem.data, 'parent');
+        var _getItem$props;
+
+        return (0, _utils.getFlatItem)((getItem === null || getItem === void 0 ? void 0 : (_getItem$props = getItem.props) === null || _getItem$props === void 0 ? void 0 : _getItem$props.multiple) ? checkedValue : [checkedValue], getItem.data, 'parent');
       }
 
       return (_getItem$data = getItem.data) === null || _getItem$data === void 0 ? void 0 : _getItem$data.filter(function (v) {
@@ -119,9 +121,22 @@ var ListItemChecked = function ListItemChecked(_ref) {
 
   var onTagClose = function onTagClose(val) {
     var originData = (0, _objectSpread3.default)({}, complexDrawer.data);
-    var nValue = Array.isArray(originData[field].value) ? originData[field].value.filter(function (v) {
-      return !v.includes(val);
-    }) : '';
+    var nValue = '';
+
+    if (['select', 'checkbox'].includes(getItem.type)) {
+      nValue = originData[field].value.filter(function (v) {
+        return !v.includes(val);
+      });
+    }
+
+    if (['input'].includes(getItem.type)) {
+      nValue = '';
+    }
+
+    if (['cascader'].includes(getItem.type)) {
+      nValue = [];
+    }
+
     var filterValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData), {}, (0, _defineProperty2.default)({}, field, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData[field]), {}, {
       value: nValue
     })));
@@ -252,9 +267,9 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
   var instance = _ref5.instance;
   var state = instance.state,
       dispatch = instance.dispatch,
-      onChange = instance.onChange;
-  var complexDrawer = state.complexDrawer,
-      complexFilter = state.complexFilter;
+      onQuery = instance.onQuery,
+      dataSource = instance.dataSource;
+  var complexDrawer = state.complexDrawer;
   var isHas = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(complexDrawer.data);
   }, [complexDrawer.data]); // 过滤的内容转数组
@@ -278,17 +293,9 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
   };
 
   var onSearch = function onSearch() {
-    dispatch({
-      type: 'changeBasicFilter',
-      basicFilter: {}
-    });
-    dispatch({
-      type: 'changeComplexFilter',
-      complexFilter: complexDrawer.data
-    });
-    onClose();
-    onChange === null || onChange === void 0 ? void 0 : onChange({
-      complexFilter: complexDrawer.data,
+    var complexFilter = complexDrawer.data;
+    onQuery === null || onQuery === void 0 ? void 0 : onQuery({
+      complexFilter: complexFilter,
       type: 'complex'
     });
   }; // 初始化筛选
@@ -299,7 +306,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
       dispatch({
         type: 'changeComplexDrawer',
         complexDrawer: {
-          data: complexFilter,
+          data: state.complexFilter,
           visible: complexDrawer.visible
         }
       });
@@ -317,7 +324,7 @@ var ComplexDrawer = function ComplexDrawer(_ref5) {
 
   var config = {
     title: /*#__PURE__*/_react.default.createElement(Tit, null),
-    visible: state.complexDrawer.visible,
+    visible: complexDrawer.visible,
     onClose: onClose,
     width: 440,
     placement: 'right',

package/lib/LmFilter/components/CascaderFilter.js

@@ -13,6 +13,8 @@ require("antd/es/cascader/style");
 
 var _cascader = _interopRequireDefault(require("antd/es/cascader"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -39,6 +41,11 @@ var DropdownRender = function DropdownRender(_ref) {
       filters = _item$data === void 0 ? [] : _item$data;
   var inputRef = (0, _react.useRef)(null);
   var delayedFn = (0, _hooks.useDelayedFn)();
+  var isShowFoot = (0, _react.useMemo)(function () {
+    var _item$props;
+
+    return item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.multiple;
+  }, [item]);
 
   var handleFilter = function handleFilter(val) {
     var serachValues = filters.filter(function (v) {
@@ -77,7 +84,7 @@ var DropdownRender = function DropdownRender(_ref) {
     ref: inputRef,
     onSearch: handleFilter,
     onChange: handleFilter
-  })), dom, /*#__PURE__*/_react.default.createElement("div", {
+  })), dom, isShowFoot && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
@@ -117,11 +124,17 @@ var CascaderFilter = function CascaderFilter(_ref2) {
   }, [filterValue]);
 
   var onChange = function onChange(item, selectedOptions) {
+    var _itemProps$props;
+
+    console.log('item', item);
     setCheckedValues(item);
+
+    if (!(itemProps === null || itemProps === void 0 ? void 0 : (_itemProps$props = itemProps.props) === null || _itemProps$props === void 0 ? void 0 : _itemProps$props.multiple)) {
+      setFilterValue(item);
+    }
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, {
-    multiple: true,
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, (0, _extends2.default)({}, itemProps.props, {
     options: options,
     onChange: onChange,
     defaultValue: defaultValue,
@@ -139,7 +152,7 @@ var CascaderFilter = function CascaderFilter(_ref2) {
         setOptions: setOptions
       });
     }
-  }, children));
+  }), children));
 };
 
 var _default = CascaderFilter;

package/lib/LmFilter/components/DateFilter.js

@@ -9,10 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-require("antd/es/date-picker/style");
-
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
-
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
 var _react = _interopRequireWildcard(require("react"));
@@ -73,7 +69,7 @@ var RangePicker = function RangePicker(_ref) {
       className: "filter_picker_header"
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_picker_header_tip"
-    }, filterValue && "".concat(filterValue[0], " - ").concat(filterValue[1])), /*#__PURE__*/_react.default.createElement("div", {
+    }, defaultValue && "".concat(filterValue[0], " - ").concat(filterValue[1])), /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_picker_header_operate"
     }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
       value: activeValue,
@@ -87,7 +83,7 @@ var RangePicker = function RangePicker(_ref) {
     })))), panelNode));
   };
 
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_datePicker.default.RangePicker, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.DatePicker.RangePicker, (0, _extends2.default)({
     picker: "date",
     separator: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
       type: "lmweb-swap-right",
@@ -148,7 +144,7 @@ var DatePickerFilter = function DatePickerFilter(_ref2) {
     });
   }
 
-  return /*#__PURE__*/_react.default.createElement(_datePicker.default, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.DatePicker, (0, _extends2.default)({
     placeholder: "\u9009\u62E9\u65F6\u95F4"
   }, props, {
     defaultValue: defaultValue,

package/lib/LmFilter/components/DropdownFIlter.js

@@ -112,7 +112,9 @@ var getLabel = function getLabel(filterValue, item) {
 
 
   if (['cascader'].includes(type)) {
-    var nArr = (0, _utils.getFlatItem)(filterValue, data);
+    var _item$props;
+
+    var nArr = (0, _utils.getFlatItem)((item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.multiple) ? filterValue : [filterValue], data);
     var labels = nArr.map(function (v) {
       return v.label;
     });
@@ -150,6 +152,12 @@ var getLabel = function getLabel(filterValue, item) {
       return v.label;
     });
 
+    if (!_labels.length) {
+      _labels = filterValue;
+    }
+
+    ; // 受控模式未查找到显示的内容时展示
+
     switch (_labels.length) {
       case 1:
         return _labels[0];
@@ -165,12 +173,12 @@ var getLabel = function getLabel(filterValue, item) {
 
   if (['input', 'date'].includes(type)) {
     return filterValue;
-  } // 单选框
+  } // 单选框 受控模式未查找到显示的内容时展示filterValue
 
 
-  var label = (_data$find = data.find(function (v) {
+  var label = ((_data$find = data.find(function (v) {
     return v.value === filterValue;
-  })) === null || _data$find === void 0 ? void 0 : _data$find.label;
+  })) === null || _data$find === void 0 ? void 0 : _data$find.label) || filterValue;
   return label;
 };
 /*

package/lib/LmFilter/components/index.js

@@ -71,7 +71,7 @@ var FilterControl = /*#__PURE__*/_react.default.memo(function (props) {
   var resetInstance = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetInstanceProps), {}, {
     filterValue: (getFilterValue === null || getFilterValue === void 0 ? void 0 : getFilterValue(resetItem)) || transformFilterValue,
     setFilterValue: function setFilterValue(val) {
-      return (_setFilterValue || handleChange)(val, resetItem.field);
+      return (_setFilterValue || handleChange)(val, resetItem);
     }
   });
   return /*#__PURE__*/_react.default.createElement(_DropdownFIlter.default, {

package/lib/LmFilter/customFilter/index.js

@@ -9,8 +9,9 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var LmFilterCustom = function LmFilterCustom(e) {
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "LmFilterCustom");
+var LmFilterCustom = function LmFilterCustom(_ref) {
+  var instance = _ref.instance;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
 };
 
 var _default = LmFilterCustom;

package/lib/LmFilter/filterFns/index.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var _utils = require("../utils");
 
@@ -18,54 +18,207 @@ var CoreOptions = function CoreOptions(_ref) {
   var state = _ref.state,
       dispatch = _ref.dispatch,
       props = _ref.props;
-  var onChange = props.onChange; // 设置筛选的值 item => Object || Array => [{label: '',  value: ''}, ...]
+  var onChange = props.onChange,
+      dataSource = props.dataSource,
+      searchKey = props.searchKey; // 触发查询 type  basic基础筛选 ｜ complex高级筛选
+
+  var onQuery = function onQuery(_ref2) {
+    var basicFilter = _ref2.basicFilter,
+        complexFilter = _ref2.complexFilter,
+        basicQuery = _ref2.basicQuery,
+        type = _ref2.type;
+    console.log('type', type);
+
+    if (type === 'basic') {
+      var _Object$keys;
+
+      dispatch({
+        type: 'changeBasicFilter',
+        basicFilter: basicFilter
+      });
+      dispatch({
+        type: 'changeBasicQuery',
+        basicQuery: basicQuery
+      });
+      dispatch({
+        type: 'changeComplexFilter',
+        complexFilter: {}
+      }); // 基础筛选清空高级筛选
+      // 抛出给外部查询
+
+      var filterQuery = {
+        filters: [{
+          conditions: (_Object$keys = Object.keys(basicQuery)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (k) {
+            return basicQuery[k];
+          })
+        }]
+      };
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        basicFilter: basicFilter,
+        filterQuery: filterQuery,
+        type: 'basic'
+      });
+    }
 
-  var setFilterValue = function setFilterValue(item, field) {
-    var _Object$entries;
+    if (type === 'complex') {
+      var _Object$keys2, _Object$keys3;
+
+      var _basicQuery = (_Object$keys2 = Object.keys(complexFilter)) === 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 = complexFilter[cur].value;
+
+        if ((0, _utils.getIsHas)(itemValue) && !!item) {
+          pre[cur] = {
+            fieldName: cur,
+            fieldType: (item === null || item === void 0 ? void 0 : item.valueType) || 'string',
+            value: Array.isArray(itemValue) ? itemValue : [itemValue],
+            operator: complexFilter[cur].mode === 'and' ? 'equal' : 'contains'
+          };
+        }
+
+        return pre;
+      }, {});
+
+      dispatch({
+        type: 'changeBasicFilter',
+        basicFilter: {}
+      });
+      dispatch({
+        type: 'changeComplexFilter',
+        complexFilter: complexFilter
+      });
+      dispatch({
+        type: 'changeComplexDrawer',
+        complexDrawer: {
+          data: {},
+          visible: false
+        }
+      });
+      dispatch({
+        type: 'changeBasicQuery',
+        basicQuery: _basicQuery
+      });
+      var _filterQuery = {
+        filters: [{
+          conditions: (_Object$keys3 = Object.keys(_basicQuery)) === null || _Object$keys3 === void 0 ? void 0 : _Object$keys3.map(function (k) {
+            return _basicQuery[k];
+          })
+        }]
+      };
+      onChange === null || onChange === void 0 ? void 0 : onChange({
+        complexFilter: complexFilter,
+        filterQuery: _filterQuery,
+        type: type
+      });
+    }
+  }; // 根据字段查找过滤的数据, 不存在时返回默认值
 
-    var basicFilter = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, state.basicFilter), {}, (0, _defineProperty2.default)({}, field, item));
 
-    if (!(0, _utils.getIsHas)(item)) {
-      delete basicFilter[field];
-    }
+  var getFilterValue = function getFilterValue(_ref3) {
+    var field = _ref3.field,
+        type = _ref3.type;
+    var defaultValue = (0, _utils.getValueForType)(type);
+    return state.basicFilter[field] || defaultValue;
+  }; // 设置筛选的值 itemValue => String || Array => ['', '', ...]
+
+
+  var setFilterValue = function setFilterValue(itemValue, item) {
+    var field = item.field;
 
-    ;
+    if (field) {
+      // 基础查询数据(受控数据)
+      var basicFilter = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.basicFilter), {}, (0, _defineProperty2.default)({}, field, itemValue)); // 外部查询数据结构
+
+      var basicQuery = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.basicQuery), {}, (0, _defineProperty2.default)({}, field, {
+        fieldName: field,
+        fieldType: item.valueType || 'string',
+        value: Array.isArray(itemValue) ? itemValue : [itemValue],
+        operator: item.operator || 'equal'
+      }));
+
+      if (!(0, _utils.getIsHas)(itemValue)) {
+        delete basicFilter[field];
+      }
+
+      ; // 触发外部事件
+
+      onQuery === null || onQuery === void 0 ? void 0 : onQuery({
+        basicFilter: basicFilter,
+        basicQuery: basicQuery,
+        type: 'basic'
+      });
+    }
+  }; // 读取缓存
+
+
+  var setLocalization = function setLocalization() {
+    var _Object$keys4;
+
+    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'
+        };
+      }
+
+      return pre;
+    }, {});
     dispatch({
       type: 'changeBasicFilter',
       basicFilter: basicFilter
     });
     dispatch({
-      type: 'changeComplexFilter',
-      complexFilter: {}
-    }); // 基础筛选清空高级筛选
-    // 抛出给外部存储
-
-    var filterQuery = (_Object$entries = Object.entries(basicFilter)) === null || _Object$entries === void 0 ? void 0 : _Object$entries.map(function (v) {
-      return {
-        fieldName: v[0],
-        value: v[1],
-        operator: 0
-      };
-    }); // 触发外部事件
-
-    onChange === null || onChange === void 0 ? void 0 : onChange({
-      basicFilter: basicFilter,
-      filterQuery: filterQuery,
-      type: 'basic'
+      type: 'changeBasicQuery',
+      basicQuery: basicQuery
     });
-  }; // 根据字段查找过滤的数据, 不存在时返回默认值
+  }; // 单个设置过滤字段值, 会触发onChange事件, 多个字段时使用setLocalization
 
 
-  var getFilterValue = function getFilterValue(_ref2) {
-    var field = _ref2.field,
-        type = _ref2.type;
-    var defaultValue = (0, _utils.getValueForType)(type);
-    return state.basicFilter[field] || defaultValue;
+  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);
   };
 
   return {
+    onQuery: onQuery,
+    getState: function getState() {
+      return state;
+    },
+    getBasicFilter: function getBasicFilter() {
+      return state.basicFilter;
+    },
+    getFilterValue: getFilterValue,
     setFilterValue: setFilterValue,
-    getFilterValue: getFilterValue
+    setFilterFieldValue: setFilterFieldValue,
+    setLocalization: setLocalization
   };
 };
 

package/lib/LmFilter/localization.d.ts

@@ -1,8 +1,14 @@
 export declare const DefaultLocalization: {
+    customFilter: {};
+    basicFilter: {};
     globalQuery: {
-        filter: any[];
+        filter: {
+            conditions: any[];
+        }[];
     };
     filterQuery: {
-        filter: any[];
+        filter: {
+            conditions: any[];
+        }[];
     };
 };

package/lib/LmFilter/localization.js

@@ -9,11 +9,29 @@ exports.DefaultLocalization = void 0;
 //   operator: number,
 // }
 var DefaultLocalization = {
+  customFilter: {},
+  basicFilter: {},
+  // 一级筛选
   globalQuery: {
-    filter: []
+    filter: [{
+      // relation: 'and',
+      conditions: []
+    }]
   },
+  // 二级筛选
   filterQuery: {
-    filter: []
+    filter: [{
+      // relation: 'and',
+      conditions: [// {
+        //   relation: 'antd', // 查询间的关系
+        //   fieldName: '', // 查询字段
+        //   fieldType: 'string', // 字段类型
+        //   // 查询值的关系 "integer", "double", "string", "date", "datetime", and "boolean".
+        //   operator: '',
+        //   value: [], // 值的集合
+        // }
+      ]
+    }]
   }
 };
 exports.DefaultLocalization = DefaultLocalization;

package/lib/LmFilter/style/style.css

@@ -1,6 +1,4 @@
-.lm_filter_wrapper .lm_filter_container,
-.lm_filter_wrapper .lm_filter,
-.lm_filter_wrapper .lm_filter_basic {
+.lm_filter_wrapper .lm_filter_container .lm_filter {
   display: flex;
   flex-wrap: wrap;
   align-items: center;

package/lib/LmFilter/wrapper/Filter.js

@@ -15,16 +15,23 @@ var _customFilter = _interopRequireDefault(require("../customFilter"));
 
 var _complexFilter = _interopRequireDefault(require("../complexFilter"));
 
+var _clearFilter = _interopRequireDefault(require("../clearFilter"));
+
 // 筛选组合
 var LmFilter = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
+  var enableBaisc = instance.enableBaisc,
+      enableComplex = instance.enableComplex,
+      enableCustom = instance.enableCustom;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_filter"
-  }, /*#__PURE__*/_react.default.createElement(_customFilter.default, {
+  }, enableCustom && /*#__PURE__*/_react.default.createElement(_customFilter.default, {
+    instance: instance
+  }), enableBaisc && /*#__PURE__*/_react.default.createElement(_baseFilter.default, {
     instance: instance
-  }), /*#__PURE__*/_react.default.createElement(_baseFilter.default, {
+  }), enableComplex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, {
     instance: instance
-  }), /*#__PURE__*/_react.default.createElement(_complexFilter.default, {
+  }), /*#__PURE__*/_react.default.createElement(_clearFilter.default, {
     instance: instance
   }));
 });

package/lib/LmFilter/wrapper/FilterContainer.js

@@ -11,8 +11,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _Filter = _interopRequireDefault(require("./Filter"));
 
-var _clearFilter = _interopRequireDefault(require("../clearFilter"));
-
 // 过滤组件主体区域
 var LmFilterContainer = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
@@ -20,8 +18,6 @@ var LmFilterContainer = /*#__PURE__*/_react.default.memo(function (_ref) {
     className: "lm_filter_container"
   }, /*#__PURE__*/_react.default.createElement(_Filter.default, {
     instance: instance
-  }), /*#__PURE__*/_react.default.createElement(_clearFilter.default, {
-    instance: instance
   }));
 });