linkmore-design 1.0.15 → 1.0.16

package/lib/CkFilter/components/filterTypes.js

@@ -9,6 +9,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+require("antd/es/cascader/style");
+
+var _cascader = _interopRequireDefault(require("antd/es/cascader"));
+
 require("antd/es/date-picker/style");
 
 var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
@@ -602,12 +606,157 @@ var DatePickerFilter = function DatePickerFilter(_ref14) {
     bordered: false,
     size: "small"
   }));
+}; // 级联选择器
+
+
+var CascaderFilter = function CascaderFilter(props) {
+  var title = props.title,
+      filters = props.filters,
+      getFilterValue = props.getFilterValue,
+      setFilterValue = props.setFilterValue,
+      _props$itemProps = props.itemProps,
+      itemProps = _props$itemProps === void 0 ? {} : _props$itemProps,
+      isFiltering = props.isFiltering;
+
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+      visible = _useState10[0],
+      setVisible = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(filters),
+      _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+      options = _useState12[0],
+      setOptions = _useState12[1];
+
+  var _useState13 = (0, _react.useState)('全部'),
+      _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+      text = _useState14[0],
+      setText = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(getFilterValue || itemProps.multiple ? [] : ''),
+      _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+      checkedValues = _useState16[0],
+      setCheckedValues = _useState16[1];
+
+  var isSearch = (0, _react.useMemo)(function () {
+    return filters.length > 8;
+  }, [filters.length]);
+
+  var handleFilter = function handleFilter(val) {
+    setOptions(filters.filter(function (v) {
+      return v.label.indexOf(val) > -1;
+    }));
+  };
+
+  var dropdownRender = function dropdownRender(menus) {
+    var inputRef = (0, _react.useRef)(null); // 确定
+
+    var handleSure = function handleSure() {
+      setFilterValue(checkedValues);
+    }; // 清空
+
+
+    var handleReset = function handleReset() {
+      inputRef.current.input.value = '';
+      setFilterValue(undefined);
+    };
+
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "filter_cascader_container filter_dropdown"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "filter_header"
+    }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input.Search, {
+      ref: inputRef,
+      allowClear: true,
+      size: "small",
+      placeholder: "\u8BF7\u8F93\u5165",
+      onSearch: handleFilter,
+      onChange: (0, _lodash.debounce)(function (e) {
+        return handleFilter(e.target.value);
+      }, 500)
+    })), menus, isSearch && /*#__PURE__*/_react.default.createElement("div", {
+      className: "filter_footer"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "footer_clear",
+      onClick: handleReset
+    }, "\u6E05\u7A7A"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      type: "primary",
+      size: "small",
+      onClick: handleSure
+    }, "\u786E\u5B9A")));
+  };
+
+  var onChange = function onChange(item, selectedOptions) {
+    if (!item.length) {
+      setText('全部');
+      setCheckedValues(itemProps.multiple ? [] : '');
+      setFilterValue(undefined);
+      return;
+    }
+
+    if (itemProps.multiple) {
+      var arr = [];
+      selectedOptions.map(function (vals) {
+        return vals.length > 1 ? arr.push(vals.map(function (v) {
+          return v.label;
+        }).join('/')) : vals[0].children.map(function (v) {
+          return arr.push("".concat(vals[0].label, "/").concat(v.label));
+        });
+      });
+      var showLabel = arr.length < 3 ? arr.join('、') : "".concat(arr[0], "\u3001+").concat(arr.length);
+      setText(showLabel);
+      setFilterValue(item.map(function (v) {
+        return v[v.length - 1];
+      }));
+      setCheckedValues(item);
+    } else {
+      setText(selectedOptions.map(function (v) {
+        return v.label;
+      }).join('/'));
+      setFilterValue(item);
+      setCheckedValues(item);
+    }
+  };
+
+  var handleClear = function handleClear(e) {
+    if (isFiltering) {
+      e.stopPropagation();
+      setText('全部');
+      setCheckedValues(itemProps.multiple ? [] : '');
+      setFilterValue(undefined);
+    }
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_cascader.default, (0, _extends2.default)({}, itemProps, {
+    options: options,
+    value: checkedValues,
+    onChange: onChange,
+    showCheckedStrategy: "Cascader.SHOW_CHILD",
+    dropdownRender: dropdownRender,
+    onDropdownVisibleChange: function onDropdownVisibleChange(v) {
+      return setVisible(v);
+    }
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)('filter_item', {
+      isfiltering: isFiltering,
+      active: !isFiltering && visible
+    })
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_item_label"
+  }, title, ":"), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_item_value"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "checked"
+  }, text), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+    type: isFiltering ? 'lmweb-close-circle-fill' : 'lmweb-down',
+    className: "addonAfter",
+    onClick: handleClear
+  })))));
 };
 
 var FilterComp = function FilterComp(props) {
   var type = props.type,
       resetProps = (0, _objectWithoutProperties2.default)(props, _excluded6);
-  console.log(props, '--props');
 
   switch (type) {
     case 'input':
@@ -631,6 +780,9 @@ var FilterComp = function FilterComp(props) {
     case 'nested':
       return /*#__PURE__*/_react.default.createElement(NestedFilter, resetProps);
 
+    case 'cascader':
+      return /*#__PURE__*/_react.default.createElement(CascaderFilter, resetProps);
+
     default:
       return /*#__PURE__*/_react.default.createElement(CheckboxFilter, resetProps);
   }

package/lib/CkFilter/components/modal.js

@@ -11,6 +11,8 @@ exports.default = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -25,10 +27,6 @@ var _form = _interopRequireDefault(require("antd/es/form"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
 var _linkmoreDesign = require("linkmore-design");
 
 var _react = _interopRequireWildcard(require("react"));
@@ -37,40 +35,12 @@ var _context2 = require("../context");
 
 var _utils = require("../utils");
 
+var _Controls = _interopRequireDefault(require("./Controls"));
+
 var _excluded = ["field"];
 
 // const { EditModal } = Modal
-var ButtonTags = function ButtonTags(_ref) {
-  var value = _ref.value,
-      onChange = _ref.onChange,
-      options = _ref.options;
-
-  var handleClick = function handleClick(item) {
-    var oriValue = value || [];
-    var has = oriValue === null || oriValue === void 0 ? void 0 : oriValue.includes(item.value);
-    var nValue = has ? oriValue.filter(function (v) {
-      return v !== item.value;
-    }) : [].concat((0, _toConsumableArray2.default)(oriValue), [item.value]);
-    onChange === null || onChange === void 0 ? void 0 : onChange(nValue);
-  };
-
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
-    size: 8,
-    wrap: true,
-    className: "auto_height"
-  }, options === null || options === void 0 ? void 0 : options.map(function (v) {
-    return /*#__PURE__*/_react.default.createElement("div", {
-      key: v.value,
-      className: (0, _classnames.default)('checkbox_tag', {
-        active: value === null || value === void 0 ? void 0 : value.includes(v.value)
-      }),
-      onClick: function onClick() {
-        return handleClick(v);
-      }
-    }, v.label);
-  })));
-};
-
+// 第二层抽屉，弹出数据选择
 var ModalItem = function ModalItem() {
   var _useStore = (0, _context2.useStore)(),
       state = _useStore.state,
@@ -103,7 +73,7 @@ var ModalItem = function ModalItem() {
   };
 
   var onSave = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var _yield$form$validateF, field, values, filterValues;
 
       return _regenerator.default.wrap(function _callee$(_context) {
@@ -162,7 +132,7 @@ var ModalItem = function ModalItem() {
     }));
 
     return function onSave() {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
@@ -175,12 +145,12 @@ var ModalItem = function ModalItem() {
   }; // 动态展示选择框
 
 
-  var DynamicSelect = (0, _react.useCallback)(function (_ref3) {
-    var _instance$fullData$fi;
+  var DynamicSelect = (0, _react.useCallback)(function (_ref2) {
+    var _instance$fullData, _instance$fullData$fi;
 
-    var getFieldValue = _ref3.getFieldValue;
+    var getFieldValue = _ref2.getFieldValue;
     var field = getFieldValue('field');
-    var options = ((_instance$fullData$fi = instance.fullData.find(function (v) {
+    var options = ((_instance$fullData = instance.fullData) === null || _instance$fullData === void 0 ? void 0 : (_instance$fullData$fi = _instance$fullData.find(function (v) {
       return v.field === field;
     })) === null || _instance$fullData$fi === void 0 ? void 0 : _instance$fullData$fi.data) || [];
 
@@ -188,31 +158,32 @@ var ModalItem = function ModalItem() {
       return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
         name: "value",
         label: "\u9009\u62E9\u5B57\u6BB5\u503C"
-      }, /*#__PURE__*/_react.default.createElement(ButtonTags, {
+      }, /*#__PURE__*/_react.default.createElement(_Controls.default, (0, _extends2.default)({
+        visible: customModal.visible
+      }, customModal.data, {
         options: options
-      }));
+      })));
     }
 
     return false;
-  }, [instance.fullData]);
+  }, [instance.fullData, customModal.data.type]);
   var config = {
-    title: isEdit ? '编辑' : '新增查询项',
-    visible: customModal.visible,
-    onCancel: onClose,
-    bodyStyle: {
-      padding: 24
-    },
-    // zIndex: 2001,
-    footer: [/*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    title: isEdit ? customModal.data.title : '新增查询项',
+    visible: customModal.type === 'complex' && customModal.visible,
+    onClose: onClose,
+    className: 'lm_det_drawer',
+    extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
+      size: 8
+    }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       key: "cancel",
       onClick: onClose,
-      size: "middle"
+      size: "small"
     }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       key: "back",
       onClick: onSave,
-      size: "middle"
-    }, "\u786E\u5B9A")]
+      size: "small"
+    }, "\u786E\u5B9A"))
   }; // 初始化重置数据
 
   (0, _react.useEffect)(function () {
@@ -220,7 +191,7 @@ var ModalItem = function ModalItem() {
       form.setFieldsValue(customModal.data);
     }
   }, [form, customModal]);
-  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Modal, config, /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
     className: "custom_modal"
   }, /*#__PURE__*/_react.default.createElement(_form.default, {
     form: form,
@@ -230,7 +201,14 @@ var ModalItem = function ModalItem() {
     onValuesChange: onValuesChange,
     layout: "vertical",
     size: "default"
-  }, !isEdit && /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+  }, /*#__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, {
+    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, {
     name: "field",
     label: "\u9009\u62E9\u5B57\u6BB5"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, {
@@ -245,16 +223,7 @@ var ModalItem = function ModalItem() {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       return prevValues.field !== currentValues.field;
     }
-  }, DynamicSelect), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
-    name: "mode",
-    label: "\u67E5\u8BE2\u65B9\u5F0F"
-  }, /*#__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"))))));
+  }, DynamicSelect))));
 };
 
 var _default = ModalItem;

package/lib/CkFilter/components/modalBack.js

@@ -0,0 +1,261 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+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"));
+
+require("antd/es/form/style");
+
+var _form = _interopRequireDefault(require("antd/es/form"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _context2 = require("../context");
+
+var _utils = require("../utils");
+
+var _excluded = ["field"];
+
+// const { EditModal } = Modal
+var ButtonTags = function ButtonTags(_ref) {
+  var value = _ref.value,
+      onChange = _ref.onChange,
+      options = _ref.options;
+
+  var handleClick = function handleClick(item) {
+    var oriValue = value || [];
+    var has = oriValue === null || oriValue === void 0 ? void 0 : oriValue.includes(item.value);
+    var nValue = has ? oriValue.filter(function (v) {
+      return v !== item.value;
+    }) : [].concat((0, _toConsumableArray2.default)(oriValue), [item.value]);
+    onChange === null || onChange === void 0 ? void 0 : onChange(nValue);
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, {
+    size: 8,
+    wrap: true,
+    className: "auto_height"
+  }, options === null || options === void 0 ? void 0 : options.map(function (v) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      key: v.value,
+      className: (0, _classnames.default)('checkbox_tag', {
+        active: value === null || value === void 0 ? void 0 : value.includes(v.value)
+      }),
+      onClick: function onClick() {
+        return handleClick(v);
+      }
+    }, v.label);
+  })));
+};
+
+var ModalItem = function ModalItem() {
+  var _useStore = (0, _context2.useStore)(),
+      state = _useStore.state,
+      dispatch = _useStore.dispatch;
+
+  var customModal = state.customModal,
+      customDrawer = state.customDrawer,
+      complexDrawer = state.complexDrawer,
+      instance = state.instance;
+
+  var _Form$useForm = _form.default.useForm(),
+      _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
+      form = _Form$useForm2[0]; // 是否编辑
+
+
+  var isEdit = (0, _react.useMemo)(function () {
+    var type = customModal.type,
+        data = customModal.data;
+    return type === 'complex' || (0, _utils.getIsHas)(data);
+  }, [customModal]);
+
+  var onClose = function onClose() {
+    dispatch({
+      type: 'changeModal',
+      customModal: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customModal), {}, {
+        visible: false
+      })
+    });
+    form.resetFields();
+  };
+
+  var onSave = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _yield$form$validateF, field, values, filterValues;
+
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 3;
+              return form.validateFields();
+
+            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); // 判断是新增还是编辑
+
+              if (isEdit) {
+                Object.assign(filterValues, (0, _defineProperty2.default)({}, customModal.data.field, values));
+              } else {
+                Object.assign(filterValues, (0, _defineProperty2.default)({}, field, values));
+              }
+
+              if (customModal.type === 'complex') {
+                dispatch({
+                  type: 'changeComplexDrawer',
+                  complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, complexDrawer), {}, {
+                    data: filterValues
+                  })
+                });
+              } else {
+                dispatch({
+                  type: 'changeDrawer',
+                  customDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customDrawer), {}, {
+                    data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, customDrawer.data), {}, {
+                      filterValues: filterValues
+                    })
+                  })
+                });
+              }
+
+              onClose();
+              _context.next = 15;
+              break;
+
+            case 12:
+              _context.prev = 12;
+              _context.t0 = _context["catch"](0);
+              console.log('校验错误！', _context.t0);
+
+            case 15:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[0, 12]]);
+    }));
+
+    return function onSave() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  var onValuesChange = function onValuesChange(values) {
+    if (values.field) {
+      form.setFieldsValue({
+        value: []
+      });
+    }
+  }; // 动态展示选择框
+
+
+  var DynamicSelect = (0, _react.useCallback)(function (_ref3) {
+    var _instance$fullData$fi;
+
+    var getFieldValue = _ref3.getFieldValue;
+    var field = getFieldValue('field');
+    var options = ((_instance$fullData$fi = instance.fullData.find(function (v) {
+      return v.field === field;
+    })) === null || _instance$fullData$fi === void 0 ? void 0 : _instance$fullData$fi.data) || [];
+
+    if (field) {
+      return /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+        name: "value",
+        label: "\u9009\u62E9\u5B57\u6BB5\u503C"
+      }, /*#__PURE__*/_react.default.createElement(ButtonTags, {
+        options: options
+      }));
+    }
+
+    return false;
+  }, [instance.fullData]);
+  var config = {
+    title: isEdit ? '编辑' : '新增查询项',
+    visible: customModal.visible,
+    onCancel: onClose,
+    bodyStyle: {
+      padding: 24
+    },
+    // zIndex: 2001,
+    footer: [/*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      key: "cancel",
+      onClick: onClose,
+      size: "middle"
+    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      type: "primary",
+      key: "back",
+      onClick: onSave,
+      size: "middle"
+    }, "\u786E\u5B9A")]
+  }; // 初始化重置数据
+
+  (0, _react.useEffect)(function () {
+    if (customModal.visible) {
+      form.setFieldsValue(customModal.data);
+    }
+  }, [form, customModal]);
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Modal, config, /*#__PURE__*/_react.default.createElement("div", {
+    className: "custom_modal"
+  }, /*#__PURE__*/_react.default.createElement(_form.default, {
+    form: form,
+    initialValues: {
+      mode: 'or'
+    },
+    onValuesChange: onValuesChange,
+    layout: "vertical",
+    size: "default"
+  }, !isEdit && /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+    name: "field",
+    label: "\u9009\u62E9\u5B57\u6BB5"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Select, {
+    open: true
+  }, 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, {
+    noStyle: true,
+    shouldUpdate: function shouldUpdate(prevValues, currentValues) {
+      return prevValues.field !== currentValues.field;
+    }
+  }, DynamicSelect), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+    name: "mode",
+    label: "\u67E5\u8BE2\u65B9\u5F0F"
+  }, /*#__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"))))));
+};
+
+var _default = ModalItem;
+exports.default = _default;

package/lib/CkFilter/context.js

@@ -51,12 +51,12 @@ var initialState = {
     data: {}
   },
   // 抽屉数据
+  // 弹窗数据, 二层抽屉, custom: 'custom' | 'complex'
   customModal: {
     visible: false,
     type: 'custom',
     data: {}
   },
-  // 弹窗数据
   complexDrawer: {
     visible: false,
     data: {}

package/lib/CkFilter/customFilter/drawer.js

@@ -43,6 +43,8 @@ var _context2 = require("../context");
 
 var _utils = require("../utils");
 
+var _CustomModal = _interopRequireDefault(require("../components/CustomModal"));
+
 var _excluded = ["item"];
 
 var ListItem = function ListItem(props) {
@@ -210,6 +212,7 @@ var Index = function Index() {
       type: 'changeModal',
       customModal: {
         visible: true,
+        type: 'custom',
         data: {}
       }
     });
@@ -338,7 +341,7 @@ var Index = function Index() {
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement(ListItem, item));
-  })))));
+  }))), /*#__PURE__*/_react.default.createElement(_CustomModal.default, null)));
 };
 
 var _default = Index;