linkmore-design 1.0.55 → 1.0.56

package/lib/LmFilter/complexFilter/drawer.js

@@ -0,0 +1,376 @@
+"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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var _utils = require("../utils");
+
+var _valueDrawer = _interopRequireDefault(require("./valueDrawer"));
+
+var _excluded = ["item"],
+    _excluded2 = ["item"];
+
+// 选中的筛选项
+var ListItemChecked = function ListItemChecked(_ref) {
+  var instance = _ref.instance,
+      itemProps = _ref.item;
+  var state = instance.state,
+      dispatch = instance.dispatch,
+      dataSource = instance.dataSource;
+  var complexDrawer = state.complexDrawer;
+  var field = itemProps.field,
+      _itemProps$value = itemProps.value,
+      valueObj = _itemProps$value === void 0 ? {} : _itemProps$value; // 单项匹配数据, 根据字段名查找, 嵌套筛选时查询父级
+
+  var getItem = (0, _react.useMemo)(function () {
+    return dataSource.find(function (v) {
+      return [field, valueObj.originField].includes(v.field);
+    });
+  }, [field, valueObj.originField, dataSource]); // 选中值的处理
+
+  var resetValue = (0, _react.useMemo)(function () {
+    if (getItem.type === 'cascader') {
+      var _valueObj$value;
+
+      return (_valueObj$value = valueObj.value) === null || _valueObj$value === void 0 ? void 0 : _valueObj$value.map(function (v) {
+        return v[v.length - 1];
+      });
+    }
+
+    return valueObj.value;
+  }, [getItem, valueObj.value]); // 遍历树结构
+
+  var deepChildren = function deepChildren(arr, preArr) {
+    arr.forEach(function (item) {
+      var _item$children;
+
+      if (resetValue.includes(item.value)) {
+        preArr.push(item);
+      }
+
+      if ((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) {
+        deepChildren(item.children, preArr);
+      }
+    });
+  }; // 选中的数据
+
+
+  var checkedValues = (0, _react.useMemo)(function () {
+    var checkedValue = valueObj.value;
+
+    if (Array.isArray(checkedValue)) {
+      var _getItem$data;
+
+      if (getItem.type === 'nested') {
+        return checkedValue;
+      }
+
+      if (getItem.type === 'cascader') {
+        var arr = [];
+        deepChildren(getItem.data, arr);
+        return arr;
+      }
+
+      return (_getItem$data = getItem.data) === null || _getItem$data === void 0 ? void 0 : _getItem$data.filter(function (v) {
+        return checkedValue.includes(v.value);
+      });
+    }
+
+    if (getItem.type === 'input') {
+      return resetValue ? [{
+        value: resetValue,
+        label: resetValue
+      }] : [];
+    }
+
+    var filterValue = getItem.data.find(function (v) {
+      return v.value === checkedValue;
+    });
+    return filterValue ? [filterValue] : [];
+  }, [getItem, valueObj.value]); // 编辑
+
+  var handleEdit = function handleEdit() {
+    dispatch({
+      type: 'changeValueDrawer',
+      valueDrawer: {
+        visible: true,
+        data: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, getItem), valueObj)
+      }
+    });
+  }; // 删除
+
+
+  var handleDelete = function handleDelete(e) {
+    e.stopPropagation();
+    var filterValues = (0, _objectSpread3.default)({}, complexDrawer.data);
+    delete filterValues[field];
+    console.log('filterValues', filterValues);
+    dispatch({
+      type: 'changeComplexDrawer',
+      complexDrawer: {
+        visible: true,
+        data: filterValues
+      }
+    });
+  }; // 删除Tag
+
+
+  var onTagClose = function onTagClose(val) {
+    var originData = (0, _objectSpread3.default)({}, complexDrawer.data);
+    var filterValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData), {}, (0, _defineProperty2.default)({}, field, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, originData[field]), {}, {
+      value: originData[field].value.filter(function (v) {
+        return !v.includes(val);
+      })
+    })));
+    dispatch({
+      type: 'changeComplexDrawer',
+      complexDrawer: {
+        visible: true,
+        data: filterValues
+      }
+    });
+  }; // Tags显示
+
+
+  var tagElem = function tagElem() {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Tag, {
+      className: "add_tags"
+    }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+      type: "lmweb-plus"
+    }), " \u65B0\u589E"), checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
+      return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Tag, {
+        key: v.value,
+        closable: true,
+        onClose: function onClose() {
+          return onTagClose(v.value);
+        }
+      }, v.label);
+    }));
+  }; // 模式
+
+
+  var modeLabel = (0, _react.useMemo)(function () {
+    return valueObj.mode === 'and' ? '且' : '或';
+  }, [valueObj.mode]);
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "item_box",
+    onClick: handleEdit
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "item_header"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "item_header_title"
+  }, "".concat(getItem.title, "\uFF08").concat(modeLabel, "\uFF09")), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+    type: "lmweb-close1",
+    onClick: handleDelete,
+    className: "item_header_icon"
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "item_tags"
+  }, tagElem())));
+}; // 全部筛选项
+
+
+var ListGroup = function ListGroup(_ref2) {
+  var instance = _ref2.instance;
+  var state = instance.state,
+      dispatch = instance.dispatch,
+      dataSource = instance.dataSource;
+
+  var _useState = (0, _react.useState)(function () {
+    return dataSource;
+  }),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      options = _useState2[0],
+      setOptions = _useState2[1];
+
+  var handleSearch = function handleSearch(val) {
+    setOptions(dataSource.filter(function (v) {
+      var _v$title;
+
+      return ((_v$title = v.title) === null || _v$title === void 0 ? void 0 : _v$title.indexOf(val)) > -1;
+    }));
+  }; // 编辑
+
+
+  var handleEdit = function handleEdit(_ref3) {
+    var field = _ref3.field;
+    // 单项匹配数据, 根据字段名查找
+    var getItem = dataSource.find(function (v) {
+      return v.field === field;
+    }); // 编辑
+
+    dispatch({
+      type: 'changeValueDrawer',
+      valueDrawer: {
+        visible: true,
+        type: 'complex',
+        data: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, getItem), {}, {
+          value: []
+        })
+      }
+    });
+  };
+
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: "list_group"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "list_group_title"
+  }, "\u9009\u62E9\u67E5\u8BE2\u9879"), /*#__PURE__*/_react.default.createElement("div", {
+    className: "list_group_search"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input.Search, {
+    allowClear: true,
+    size: "default",
+    placeholder: "\u8BF7\u8F93\u5165",
+    onSearch: handleSearch
+  })), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.VirtualList, {
+    options: options,
+    className: "filter_drawer_group_list"
+  }, function (_ref4) {
+    var item = _ref4.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
+    return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
+      className: "filter_drawer_group_item"
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "item_box",
+      onClick: function onClick() {
+        return handleEdit(item);
+      }
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "item_header"
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "item_header_title"
+    }, item.title), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+      type: "lmweb-plus",
+      className: "item_header_icon icon_plus"
+    }))));
+  })));
+};
+
+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;
+  var isHas = (0, _react.useMemo)(function () {
+    return (0, _utils.getIsHas)(complexDrawer.data);
+  }, [complexDrawer.data]); // 过滤的内容转数组
+
+  var filterItemData = (0, _react.useMemo)(function () {
+    return isHas ? Object.entries(complexDrawer.data).map(function (v) {
+      return {
+        field: v[0],
+        value: v[1]
+      };
+    }) : [];
+  }, [complexDrawer.data, isHas]);
+
+  var onClose = function onClose() {
+    dispatch({
+      type: 'changeComplexDrawer',
+      complexDrawer: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, state.complexDrawer), {}, {
+        visible: false
+      })
+    });
+  };
+
+  var onSearch = function onSearch() {
+    dispatch({
+      type: 'changeBasicFilter',
+      basicFilter: {}
+    });
+    dispatch({
+      type: 'changeComplexFilter',
+      complexFilter: complexDrawer.data
+    });
+    onClose();
+    onChange === null || onChange === void 0 ? void 0 : onChange(null, complexDrawer.data);
+  }; // 初始化筛选
+
+
+  (0, _react.useEffect)(function () {
+    if (complexDrawer.visible) {
+      dispatch({
+        type: 'changeComplexDrawer',
+        complexDrawer: {
+          data: complexFilter,
+          visible: complexDrawer.visible
+        }
+      });
+    }
+  }, [dispatch, complexDrawer.visible]);
+
+  var Tit = function Tit() {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      onClick: function onClick() {
+        console.log('title', state);
+      }
+    }, "\u9AD8\u7EA7\u67E5\u8BE2");
+  }; // 弹窗配置项
+
+
+  var config = {
+    title: /*#__PURE__*/_react.default.createElement(Tit, null),
+    visible: state.complexDrawer.visible,
+    onClose: onClose,
+    width: 440,
+    placement: 'right',
+    destroyOnClose: true,
+    className: 'lm_filter_drawer',
+    extra: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Space, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      onClick: onClose,
+      size: "small"
+    }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(SaveModal, {
+      state: state,
+      dispatch: dispatch
+    }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      type: "primary",
+      onClick: onSearch,
+      size: "small"
+    }, "\u67E5\u8BE2"))
+  };
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Drawer, config, /*#__PURE__*/_react.default.createElement("div", {
+    className: "complex_filter_body"
+  }, isHas && /*#__PURE__*/_react.default.createElement("div", {
+    className: "checked_group"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.VirtualList, {
+    options: filterItemData,
+    className: "filter_drawer_group_list"
+  }, function (_ref6) {
+    var item = _ref6.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref6, _excluded2);
+    return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
+      className: "filter_drawer_group_item"
+    }), /*#__PURE__*/_react.default.createElement(ListItemChecked, {
+      instance: instance,
+      item: item
+    }));
+  })), /*#__PURE__*/_react.default.createElement(ListGroup, {
+    instance: instance
+  })), /*#__PURE__*/_react.default.createElement(_valueDrawer.default, {
+    instance: instance
+  })));
+};
+
+var _default = ComplexDrawer;
+exports.default = _default;

package/lib/LmFilter/complexFilter/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
 Object.defineProperty(exports, "__esModule", {
@@ -7,10 +9,55 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var _drawer = _interopRequireDefault(require("./drawer"));
+
+var _utils = require("../utils");
+
+var LmFilterComplex = function LmFilterComplex(_ref) {
+  var instance = _ref.instance;
+  var state = instance.state,
+      dispatch = instance.dispatch;
+  var expand = (0, _react.useMemo)(function () {
+    return state.complexDrawer.visible;
+  }, [state.complexDrawer.visible]);
+  var active = (0, _react.useMemo)(function () {
+    return (0, _utils.getIsHas)(state.complexFilter);
+  }, [state.complexFilter]);
+
+  var handleClick = function handleClick() {
+    dispatch({
+      type: 'changeComplexDrawer',
+      complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.complexDrawer), {}, {
+        visible: true
+      })
+    });
+  };
 
-var LmFilterComplex = function LmFilterComplex(e) {
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "LmFilterComplex");
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "lm_filter_complex"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: (0, _classnames.default)('lm_filter_basic_item lm_filter_complex_item', {
+      expand: expand,
+      active: active
+    }),
+    onClick: handleClick
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_item_icon addon_before"
+  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+    type: "lmweb-filter"
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "filter_item_label"
+  }, "\u9AD8\u7EA7\u7B5B\u9009")), /*#__PURE__*/_react.default.createElement(_drawer.default, {
+    instance: instance
+  }));
 };
 
 var _default = LmFilterComplex;

package/lib/LmFilter/complexFilter/valueDrawer.js

@@ -0,0 +1,238 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+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 _react = _interopRequireWildcard(require("react"));
+
+var _linkmoreDesign = require("linkmore-design");
+
+var _utils = require("../utils");
+
+var _Controls = _interopRequireDefault(require("../Controls"));
+
+// 第二层抽屉，弹出数据选择
+var ValueDrawer = function ValueDrawer(_ref) {
+  var instance = _ref.instance;
+  var state = instance.state,
+      dispatch = instance.dispatch,
+      dataSource = instance.dataSource;
+  var valueDrawer = state.valueDrawer,
+      complexDrawer = state.complexDrawer;
+
+  var _Form$useForm = _form.default.useForm(),
+      _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
+      form = _Form$useForm2[0];
+
+  var onClose = function onClose() {
+    dispatch({
+      type: 'changeValueDrawer',
+      valueDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, valueDrawer), {}, {
+        visible: false
+      })
+    });
+    form.resetFields();
+  };
+  /*
+   * customModal.data.type === 'nested' 时,处理不同
+   *
+  */
+
+
+  var onSave = /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+      var _yield$form$validateF, field, mode, value, filterValues, currentItem, isNested, nField, nValue, _value$subValue;
+
+      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;
+              mode = _yield$form$validateF.mode;
+              value = _yield$form$validateF.value;
+              // 选中的筛选数据
+              filterValues = (0, _objectSpread2.default)({}, complexDrawer.data); // 查找当前筛选的值
+
+              currentItem = valueDrawer.data; // 是否嵌套筛选
+
+              isNested = currentItem.type === 'nested'; // 嵌套筛选的键值不同
+
+              nField = valueDrawer.data.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
+              }));
+              dispatch({
+                type: 'changeComplexDrawer',
+                complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, complexDrawer), {}, {
+                  data: filterValues
+                })
+              });
+              onClose();
+              _context.next = 21;
+              break;
+
+            case 18:
+              _context.prev = 18;
+              _context.t0 = _context["catch"](0);
+              console.log('校验错误！', _context.t0);
+
+            case 21:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[0, 18]]);
+    }));
+
+    return function onSave() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  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 (_ref3) {
+    var getFieldValue = _ref3.getFieldValue;
+    var field = getFieldValue('field');
+    var findItem = (dataSource === null || dataSource === void 0 ? void 0 : dataSource.find(function (v) {
+      return v.field === field;
+    })) || {};
+    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",
+        noStyle: true
+      }, /*#__PURE__*/_react.default.createElement(_Controls.default, {
+        item: findItem,
+        options: options
+      }));
+    }
+
+    return false;
+  }, [dataSource]);
+  var config = {
+    title: valueDrawer.data.title,
+    visible: valueDrawer.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: "small"
+    }, "\u53D6\u6D88"), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      type: "primary",
+      key: "back",
+      onClick: onSave,
+      size: "small"
+    }, "\u786E\u5B9A"))
+  }; // 初始化重置数据
+
+  (0, _react.useEffect)(function () {
+    if (valueDrawer.visible) {
+      form.setFieldsValue(valueDrawer.data);
+    }
+  }, [form, valueDrawer]);
+  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",
+    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",
+    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")))), /*#__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;
+    }
+  }, DynamicSelect))));
+};
+
+var _default = ValueDrawer;
+exports.default = _default;

package/lib/LmFilter/components/DropdownFIlter.js

@@ -218,10 +218,9 @@ var DropdownFilter = /*#__PURE__*/_react.default.memo(function (_ref2) {
   }, item === null || item === void 0 ? void 0 : item.title, ":"), /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_item_value"
   }, getLabel(filterValue, item)), /*#__PURE__*/_react.default.createElement("div", {
-    className: "filter_item_icon"
+    className: "filter_item_icon addon_after"
   }, item.type !== 'date' || active ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
     type: active ? 'lmweb-close-circle-fill' : 'lmweb-down',
-    className: "addonAfter",
     onClick: handleClear
   }) : null)));
 });