linkmore-design 1.0.24 → 1.0.27

package/lib/CkFilter/components/filterTypes.js

@@ -41,14 +41,29 @@ var _VirtualList = _interopRequireDefault(require("../../VirtualList"));
 
 var _utils = require("../utils");
 
+var _DragBox = _interopRequireDefault(require("./DragBox"));
+
+var _icon_placeholder = _interopRequireDefault(require("../icon_placeholder.png"));
+
 var _excluded = ["item"],
     _excluded2 = ["item"],
     _excluded3 = ["item"],
     _excluded4 = ["item"],
-    _excluded5 = ["item"],
-    _excluded6 = ["type"];
+    _excluded5 = ["type"];
+
+var FilterEmpty = function FilterEmpty() {
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_empty"
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: _icon_placeholder.default,
+    alt: "empty",
+    width: 81
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_empty_text"
+  }, "\u6682\u65E0\u6570\u636E"));
+}; // 输入框过滤器
+
 
-// 输入框过滤器
 var InputFilter = function InputFilter(_ref) {
   var getFilterValue = _ref.getFilterValue,
       setFilterValue = _ref.setFilterValue;
@@ -58,6 +73,13 @@ var InputFilter = function InputFilter(_ref) {
     return setFilterValue(val);
   };
 
+  (0, _react.useEffect)(function () {
+    setTimeout(function () {
+      var _inputRef$current;
+
+      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+    }, 200);
+  }, []);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_dropdown"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -133,9 +155,7 @@ var SelectFilter = function SelectFilter(_ref2) {
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_item-content"
     }, item.label));
-  }), !options.length && /*#__PURE__*/_react.default.createElement("div", {
-    className: "filter_empty"
-  }, "\u6682\u65E0\u6570\u636E")));
+  }), !options.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)));
 }; // 嵌套结构下拉单选过滤器
 
 
@@ -162,15 +182,14 @@ var NestedFilter = function NestedFilter(_ref4) {
   }; // 单选事件
 
 
-  var onChange = function onChange(e, item) {
-    e.preventDefault();
-    setFilterValue(item.value);
-  };
-
   var handleClick = function handleClick(e, item) {
-    e.preventDefault();
-    e.stopPropagation();
-    setFilterValue(item, 'children');
+    e.preventDefault(); // 是否存在嵌套
+
+    if (item === null || item === void 0 ? void 0 : item.children) {
+      setFilterValue(item, 'children');
+    } else {
+      setFilterValue(item.value);
+    }
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -199,19 +218,12 @@ var NestedFilter = function NestedFilter(_ref4) {
         checked: item.value === getFilterValue
       }),
       onClick: function onClick(e) {
-        return onChange(e, item);
+        return handleClick(e, item);
       }
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "filter_item-content"
-    }, item.label), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-gengduotianchong",
-      onClick: function onClick(e) {
-        return handleClick(e, item);
-      }
-    }));
-  }), !options.length && /*#__PURE__*/_react.default.createElement("div", {
-    className: "filter_empty"
-  }, "\u6682\u65E0\u6570\u636E")));
+    }, item.label));
+  }), !options.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)));
 }; // 自定义筛选下拉选过滤器
 
 
@@ -274,9 +286,7 @@ var CustomFilter = function CustomFilter(_ref6) {
     className: "filter_item-content"
   }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
     type: "lmweb-plus"
-  }), "\u65B0\u589E\u81EA\u5B9A\u4E49\u67E5\u8BE2")), !filters.length && /*#__PURE__*/_react.default.createElement("div", {
-    className: "filter_empty"
-  }, "\u6682\u65E0\u6570\u636E")));
+  }), "\u65B0\u589E\u81EA\u5B9A\u4E49\u67E5\u8BE2")), !filters.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)));
 }; // 下拉多选过滤器: 要过滤的数据, 当前选中项, 触发过滤, 过滤前的数据
 
 
@@ -403,9 +413,7 @@ var CheckboxFilter = function CheckboxFilter(_ref8) {
       value: item.value,
       className: "filter_item-content"
     }, item.label));
-  }), !options.length && /*#__PURE__*/_react.default.createElement("div", {
-    className: "filter_empty"
-  }, "\u6682\u65E0\u6570\u636E")), /*#__PURE__*/_react.default.createElement("div", {
+  }), !options.length && /*#__PURE__*/_react.default.createElement(FilterEmpty, null)), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
@@ -434,19 +442,12 @@ var MoreFilter = function MoreFilter(_ref12) {
   var _useState11 = (0, _react.useState)(filters || []),
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
       options = _useState12[0],
-      setOptions = _useState12[1];
+      setOptions = _useState12[1]; // 是否存在搜索, 当数据大于8时存在搜索
 
-  console.log('more'); // 是否存在搜索, 当数据大于8时存在搜索
 
   var isSearch = (0, _react.useMemo)(function () {
     return filters.length > 8;
-  }, [filters.length]); // 是否可置顶, 第一项无置顶操作, 所以这里的index > 0
-
-  var isTop = (0, _react.useCallback)(function (item) {
-    return checkedValues.includes(item.field) && filters.findIndex(function (v) {
-      return v.field === item.field;
-    }) > 0;
-  }, [checkedValues, filters]); // 是否半选
+  }, [filters.length]); // 是否半选
 
   var indeterminate = (0, _react.useMemo)(function () {
     return checkedValues.length && checkedValues.length < options.length;
@@ -486,23 +487,6 @@ var MoreFilter = function MoreFilter(_ref12) {
 
   var handleCancel = function handleCancel() {
     setFilterValue(checkedValues, 'cancel');
-  }; // 置顶操作, 防止频繁操作, 建议加上节流
-
-
-  var handleTop = function handleTop(e, item) {
-    e.stopPropagation();
-    setFilterValue(item, 'top');
-  }; // 单选事件
-
-
-  var onChange = function onChange(e, item) {
-    e.preventDefault();
-    e.stopPropagation(); // setFilterValue(item)
-
-    var nValue = checkedValues.includes(item.field) ? checkedValues.filter(function (v) {
-      return v !== item.field;
-    }) : [].concat((0, _toConsumableArray2.default)(checkedValues), [item.field]);
-    setCheckedValues(nValue);
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -525,33 +509,13 @@ var MoreFilter = function MoreFilter(_ref12) {
   }, "\u5168\u90E8")), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
     className: "filter_reset",
     onClick: handleReset
-  }, "\u91CD\u7F6E")))), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox.Group, {
-    value: checkedValues,
-    className: "filter_body"
-  }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
+  }, "\u91CD\u7F6E")))), /*#__PURE__*/_react.default.createElement(_DragBox.default, {
+    filters: filters,
     options: options,
-    className: "filter_list"
-  }, function (_ref13) {
-    var item = _ref13.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref13, _excluded5);
-    return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
-      className: "filter_item",
-      onClick: function onClick(e) {
-        return onChange(e, item);
-      }
-    }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
-      value: item.field,
-      className: "filter_item-content"
-    }, item.title), /*#__PURE__*/_react.default.createElement("div", {
-      className: "filter_item_operate"
-    }, isTop(item) && /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-vertical-align-top",
-      className: "hover_show icon_top",
-      onClick: function onClick(e) {
-        return handleTop(e, item);
-      }
-    })));
-  })), /*#__PURE__*/_react.default.createElement("div", {
+    checkedValues: checkedValues,
+    setFilterValue: setFilterValue,
+    setCheckedValues: setCheckedValues
+  }), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_footer"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "footer_clear",
@@ -564,11 +528,11 @@ var MoreFilter = function MoreFilter(_ref12) {
 }; // 日期范围选择器
 
 
-var DatePickerFilter = function DatePickerFilter(_ref14) {
-  var getFilterValue = _ref14.getFilterValue,
-      setFilterValue = _ref14.setFilterValue,
-      props = _ref14.props,
-      dateType = _ref14.dateType;
+var DatePickerFilter = function DatePickerFilter(_ref13) {
+  var getFilterValue = _ref13.getFilterValue,
+      setFilterValue = _ref13.setFilterValue,
+      props = _ref13.props,
+      dateType = _ref13.dateType;
   console.log(dateType, '--dateType'); // 对日期格式的转换, 日期组件仅接收moment格式
 
   var value = (0, _react.useMemo)(function () {
@@ -579,8 +543,7 @@ var DatePickerFilter = function DatePickerFilter(_ref14) {
     }
 
     return nValue;
-  }, [getFilterValue]);
-  console.log(value, '--value'); // 最近的时间段, 值为JSON转换后的字符串
+  }, [getFilterValue]); // 最近的时间段, 值为JSON转换后的字符串
 
   var ranges = (0, _react.useMemo)(function () {
     return Object.entries((0, _utils.getRanges)()).map(function (item, i) {
@@ -636,11 +599,14 @@ var DatePickerFilter = function DatePickerFilter(_ref14) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_datePicker.default.RangePicker, (0, _extends2.default)({
       picker: "date",
       separator: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-        type: "lmweb-swap-right"
+        type: "lmweb-swap-right",
+        style: {
+          color: 'var(--text-color)'
+        }
       }),
       placeholder: ['开始日期', '结束日期'],
       style: {
-        width: 200
+        width: 210
       }
     }, props, {
       value: value,
@@ -741,8 +707,7 @@ var CascaderFilter = function CascaderFilter(props) {
     }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       size: "small",
-      onClick: handleSure,
-      disabled: !(checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.length)
+      onClick: handleSure
     }, "\u786E\u5B9A")));
   };
 
@@ -814,7 +779,7 @@ var CascaderFilter = function CascaderFilter(props) {
 
 var FilterComp = function FilterComp(props) {
   var type = props.type,
-      resetProps = (0, _objectWithoutProperties2.default)(props, _excluded6);
+      resetProps = (0, _objectWithoutProperties2.default)(props, _excluded5);
 
   switch (type) {
     case 'input':

package/lib/CkFilter/components/modal.js

@@ -1,9 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -15,8 +15,6 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -27,18 +25,17 @@ var _form = _interopRequireDefault(require("antd/es/form"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _linkmoreDesign = require("linkmore-design");
-
 var _react = _interopRequireWildcard(require("react"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _context2 = require("../context");
 
 var _utils = require("../utils");
 
 var _Controls = _interopRequireDefault(require("./Controls"));
 
-var _excluded = ["field"];
-
+// import Modal from '../../Modal'
 // const { EditModal } = Modal
 // 第二层抽屉，弹出数据选择
 var ModalItem = function ModalItem() {
@@ -71,10 +68,15 @@ var ModalItem = function ModalItem() {
     });
     form.resetFields();
   };
+  /*
+   * customModal.data.type === 'nested' 时,处理不同
+   *
+  */
+
 
   var onSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _yield$form$validateF, field, values, filterValues;
+      var _instance$fullData, _yield$form$validateF, field, mode, value, filterValues, getFormField, findCustom, currentItem, isNested, nField, nValue, _value$subValue;
 
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
@@ -87,16 +89,45 @@ var ModalItem = function ModalItem() {
             case 3:
               _yield$form$validateF = _context.sent;
               field = _yield$form$validateF.field;
-              values = (0, _objectWithoutProperties2.default)(_yield$form$validateF, _excluded);
-              filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); // 判断是新增还是编辑
+              mode = _yield$form$validateF.mode;
+              value = _yield$form$validateF.value;
+              // 选中的筛选数据
+              filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); // 查找当前筛选的值: 自定义筛选 & 高级筛选
 
-              if (isEdit) {
-                Object.assign(filterValues, (0, _defineProperty2.default)({}, customModal.data.field, values));
-              } else {
-                Object.assign(filterValues, (0, _defineProperty2.default)({}, field, values));
-              }
+              getFormField = form.getFieldValue('field');
+              findCustom = (_instance$fullData = instance.fullData) === null || _instance$fullData === void 0 ? void 0 : _instance$fullData.find(function (v) {
+                return v.field === getFormField;
+              });
+              currentItem = customModal.type === 'complex' ? customModal.data : findCustom; // 是否嵌套筛选
+
+              isNested = currentItem.type === 'nested'; // 嵌套筛选的键值不同
+
+              nField = isEdit ? currentItem.field : field;
+              nValue = value;
+
+              if (isNested) {
+                // 删除原有筛选
+                delete filterValues[currentItem.field];
+                currentItem.data.forEach(function (element) {
+                  delete filterValues[element.value];
+                }); // 存在子级嵌套时,改变键值
+
+                if (value === null || value === void 0 ? void 0 : (_value$subValue = value.subValue) === null || _value$subValue === void 0 ? void 0 : _value$subValue.children) {
+                  nField = value.subValue.value;
+                }
+
+                nValue = (value === null || value === void 0 ? void 0 : value.value) || [];
+              } // 判断是新增还是编辑
+
+
+              Object.assign(filterValues, (0, _defineProperty2.default)({}, nField, {
+                mode: mode,
+                value: nValue,
+                originField: currentItem.field
+              }));
 
               if (customModal.type === 'complex') {
+                // 高级筛选
                 dispatch({
                   type: 'changeComplexDrawer',
                   complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, complexDrawer), {}, {
@@ -104,6 +135,7 @@ var ModalItem = function ModalItem() {
                   })
                 });
               } else {
+                // 自定义筛选
                 dispatch({
                   type: 'changeDrawer',
                   customDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customDrawer), {}, {
@@ -115,20 +147,20 @@ var ModalItem = function ModalItem() {
               }
 
               onClose();
-              _context.next = 15;
+              _context.next = 23;
               break;
 
-            case 12:
-              _context.prev = 12;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](0);
               console.log('校验错误！', _context.t0);
 
-            case 15:
+            case 23:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 12]]);
+      }, _callee, null, [[0, 20]]);
     }));
 
     return function onSave() {
@@ -137,30 +169,43 @@ var ModalItem = function ModalItem() {
   }();
 
   var onValuesChange = function onValuesChange(values) {
+    console.log('values', values);
+
     if (values.field) {
       form.setFieldsValue({
         value: []
       });
     }
+
+    if (values.value) {
+      var _values$value;
+
+      // 嵌套筛选双击触发
+      if ((values === null || values === void 0 ? void 0 : (_values$value = values.value) === null || _values$value === void 0 ? void 0 : _values$value.type) === 'dbclick') {
+        onSave();
+      }
+    }
   }; // 动态展示选择框
 
 
   var DynamicSelect = (0, _react.useCallback)(function (_ref2) {
-    var _instance$fullData, _instance$fullData$fi;
+    var _instance$fullData2;
 
     var getFieldValue = _ref2.getFieldValue;
     var field = getFieldValue('field');
-    var options = ((_instance$fullData = instance.fullData) === null || _instance$fullData === void 0 ? void 0 : (_instance$fullData$fi = _instance$fullData.find(function (v) {
+    var findItem = (_instance$fullData2 = instance.fullData) === null || _instance$fullData2 === void 0 ? void 0 : _instance$fullData2.find(function (v) {
       return v.field === field;
-    })) === null || _instance$fullData$fi === void 0 ? void 0 : _instance$fullData$fi.data) || [];
+    });
+    var options = (findItem === null || findItem === void 0 ? void 0 : findItem.data) || [];
 
     if (field) {
       return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
         name: "value",
-        label: "\u9009\u62E9\u5B57\u6BB5\u503C"
+        label: "\u9009\u62E9\u5B57\u6BB5\u503C",
+        noStyle: true
       }, /*#__PURE__*/_react.default.createElement(_Controls.default, (0, _extends2.default)({
         visible: customModal.visible
-      }, customModal.data, {
+      }, findItem, {
         options: options
       })));
     }
@@ -169,9 +214,12 @@ var ModalItem = function ModalItem() {
   }, [instance.fullData, customModal.data.type]);
   var config = {
     title: isEdit ? customModal.data.title : '新增查询项',
-    visible: customModal.type === 'complex' && customModal.visible,
+    visible: customModal.visible,
     onClose: onClose,
     className: 'lm_det_drawer',
+    bodyStyle: customModal.data.type === 'nested' ? {
+      padding: '24px 24px 0'
+    } : null,
     extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
       size: 8
     }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
@@ -191,34 +239,53 @@ var ModalItem = function ModalItem() {
       form.setFieldsValue(customModal.data);
     }
   }, [form, customModal]);
-  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
-    className: "custom_modal"
-  }, /*#__PURE__*/_react.default.createElement(_form.default, {
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement(_form.default, {
     form: form,
     initialValues: {
       mode: 'or'
     },
     onValuesChange: onValuesChange,
     layout: "vertical",
-    size: "default"
-  }, /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+    size: "default",
+    className: "custom_form"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "custom_group"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "custom_label"
+  }, "\u67E5\u8BE2\u65B9\u5F0F"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
     name: "mode",
-    label: "\u67E5\u8BE2\u65B9\u5F0F"
-  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
+    label: "\u67E5\u8BE2\u65B9\u5F0F",
+    noStyle: true
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
+    direction: "column"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
     value: "and"
   }, "\u4E14,\u67E5\u8BE2\u540C\u65F6\u6EE1\u8DB3\u6B64\u9009\u9879\u6761\u4EF6"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
     value: "or"
-  }, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6"))), !isEdit && /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+  }, "\u6216,\u67E5\u8BE2\u5305\u542B\u6B64\u9009\u9879\u6761\u4EF6")))), !isEdit && /*#__PURE__*/_react.default.createElement("div", {
+    className: "custom_group",
+    id: "area"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "custom_label"
+  }, "\u9009\u62E9\u5B57\u6BB5"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
     name: "field",
-    label: "\u9009\u62E9\u5B57\u6BB5"
+    label: "\u9009\u62E9\u5B57\u6BB5",
+    noStyle: true
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, {
-    open: true
+    size: "default",
+    getPopupContainer: function getPopupContainer() {
+      return document.getElementById('area');
+    }
   }, state.instance.fullData.map(function (v) {
     return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select.Option, {
       key: v.field,
       value: v.field
     }, v.title);
-  }))), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+  })))), /*#__PURE__*/_react.default.createElement("div", {
+    className: "custom_group custom_full"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "custom_label"
+  }, "\u9009\u62E9\u5B57\u6BB5\u503C"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
     noStyle: true,
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       return prevValues.field !== currentValues.field;

package/lib/CkFilter/context.js

@@ -29,7 +29,8 @@ var initialState = {
     searchKey: 'search',
     levelGroupKey: 'levGroup',
     filter: true,
-    complex: false
+    complex: false,
+    size: 'middle'
   },
   // 初始化数据
   visibleFields: [],
@@ -42,8 +43,8 @@ var initialState = {
   // 当前过滤的数据的键值对(二级筛选)
   customFilterValues: {},
   // 一级筛选过滤的内容
+  // 返回的高级筛选过滤的内容
   complexFilterValues: {},
-  // 高级筛选过滤的内容
   nestedFilterValues: {},
   // 嵌套结构的过滤内容 {objType: {field: 'supplier', value: 's1', label: '一号供应商'}, ...}
   customDrawer: {
@@ -57,10 +58,15 @@ var initialState = {
     type: 'custom',
     data: {}
   },
+  // 高级筛选弹窗数据结构data: { type: {mode: 'or', value: [], originField: '', ...}, ... }
   complexDrawer: {
     visible: false,
     data: {}
-  } // 高级筛选弹窗数据
+  },
+  nestedDrawer: {
+    visible: false,
+    data: {}
+  } // 嵌套过滤抽屉
 
 };
 
@@ -73,6 +79,7 @@ var reducer = function reducer(state, action) {
       customDrawer = action.customDrawer,
       customModal = action.customModal,
       complexDrawer = action.complexDrawer,
+      nestedDrawer = action.nestedDrawer,
       customFilterValues = action.customFilterValues,
       complexFilterValues = action.complexFilterValues,
       nestedFilterValues = action.nestedFilterValues;
@@ -134,6 +141,12 @@ var reducer = function reducer(state, action) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         complexFilterValues: complexFilterValues
       });
+    // 设置嵌套抽屉的数据
+
+    case 'changeNestedDrawer':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        nestedDrawer: nestedDrawer
+      });
     // 设置嵌套结构的内容
 
     case 'changeNestedFilterValues':