linkmore-design 1.0.26 → 1.0.27

package/es/Button/index.js

@@ -22,7 +22,7 @@ var LMButton = function LMButton(props) {
   var children = props.children,
       className = props.className,
       _props$size = props.size,
-      size = _props$size === void 0 ? 'small' : _props$size,
+      size = _props$size === void 0 ? 'middle' : _props$size,
       _props$type = props.type,
       type = _props$type === void 0 ? 'default' : _props$type,
       _props$hover = props.hover,

package/es/Button/style/style.css

@@ -38,11 +38,17 @@
   max-width: 112px;
   font-size: 12px;
 }
+.ant-btn.lm-button-small.lm-button-icon-only .anticon {
+  font-size: 16px;
+}
 .ant-btn.lm-button-middle {
   height: 32px;
   padding: 6px 12px;
   max-width: 120px;
 }
+.ant-btn.lm-button-middle .anticon {
+  font-size: 16px;
+}
 .ant-btn.lm-button-default {
   border: 1px solid var(--stroke-color);
   color: var(--font-color);

package/es/Checkbox/style/style.css

@@ -13,6 +13,9 @@
 .lm-checkbox .ant-checkbox .ant-checkbox-inner {
   border-color: var(--stroke-color);
 }
+.lm-checkbox .ant-checkbox.ant-checkbox-checked .ant-checkbox-inner {
+  border-color: var(--primary-color);
+}
 .lm-checkbox .ant-checkbox:hover .ant-checkbox-inner {
   border-color: var(--primary-color);
 }
@@ -58,6 +61,9 @@
   color: var(--primary-hover-color);
   border-color: var(--primary-hover-color);
 }
+.lm-checkbox-group .ant-checkbox-button-wrapper-checked.ant-checkbox-checked .ant-checkbox-inner {
+  border-color: var(--primary-color);
+}
 .lm-checkbox-group .ant-checkbox-wrapper {
   font-size: 12px;
   line-height: 20px;
@@ -73,6 +79,9 @@
 .lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox .ant-checkbox-inner {
   border-color: var(--stroke-color);
 }
+.lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox.ant-checkbox-checked .ant-checkbox-inner {
+  border-color: var(--primary-color);
+}
 .lm-checkbox-group .ant-checkbox-wrapper .ant-checkbox:hover .ant-checkbox-inner {
   border-color: var(--primary-color);
 }

package/es/CkFilter/baseFilter/filterMenu.js

@@ -145,7 +145,7 @@ var FilterMenu = function FilterMenu(props) {
     return filterValue;
   }, [comProps, data, isFiltering, setFilterValue, type, filterValue, state.nestedFilterValues, field]); // 下拉组件渲染
 
-  var FilterControl = (0, _react.useCallback)(function () {
+  var FilterControl = function FilterControl() {
     var obj = {
       filters: data,
       getFilterValue: filterValue,
@@ -156,7 +156,8 @@ var FilterMenu = function FilterMenu(props) {
         type: type
       }, obj));
     });
-  }, [data, setFilterValue, type, filterValue]); // 清除筛选项
+  }; // 清除筛选项
+
 
   var handleClear = function handleClear(e) {
     if (isFiltering) {

package/es/CkFilter/baseFilter/index.js

@@ -45,6 +45,7 @@ var Filter = function Filter() {
       searchKey = _useStore$state$insta.searchKey,
       search = _useStore$state$insta.search,
       filter = _useStore$state$insta.filter,
+      size = _useStore$state$insta.size,
       isMore = _useStore$state.isMore,
       filterValues = _useStore$state.filterValues,
       visibleFields = _useStore$state.visibleFields,
@@ -73,7 +74,7 @@ var Filter = function Filter() {
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Input.Search, {
     ref: inputRef,
     allowClear: true,
-    size: "small",
+    size: size,
     placeholder: placeholder,
     onSearch: handleFilter
   })), filter && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, data === null || data === void 0 ? void 0 : (_data$filter = data.filter(function (v) {

package/es/CkFilter/baseFilter/moreFilters.js

@@ -143,10 +143,14 @@ var MoreFilters = function MoreFilters() {
 
     if (type === 'move') {
       var cloneArr = (0, _toConsumableArray2.default)(state.orderFields);
-      var findIndex = cloneArr.findIndex(function (v) {
-        return v === item.over;
+      var oldIndex = cloneArr.findIndex(function (v) {
+        return v === item.active;
       });
-      cloneArr.splice(findIndex, 0, item.active);
+      var newIndex = cloneArr.findIndex(function (v) {
+        return v === item.over;
+      }); // 在新位置增加数据
+
+      cloneArr.splice(newIndex, 0, cloneArr.splice(oldIndex, 1)[0]);
       dispatch({
         type: 'changeOrderFields',
         orderFields: cloneArr
@@ -183,7 +187,7 @@ var MoreFilters = function MoreFilters() {
     } // 人性化设计,位置不变无需收起
 
 
-    if (['top'].includes(type)) {
+    if (!['top', 'move'].includes(type)) {
       setVisible(false); // 收起下拉选项框
     }
   }, [dispatch, state]);
@@ -222,7 +226,7 @@ var MoreFilters = function MoreFilters() {
     className: "addonBefore"
   }), /*#__PURE__*/_react.default.createElement("span", {
     className: "checked"
-  }, "\u66F4\u591A\u67E5\u8BE2"), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+  }, "\u66F4\u591A\u7B5B\u9009"), /*#__PURE__*/_react.default.createElement(_IconFont.default, {
     type: "lmweb-down",
     className: "addonAfter"
   })))));

package/es/CkFilter/complexFilter/drawer.js

@@ -164,7 +164,12 @@ var ListItemChecked = function ListItemChecked(props) {
 
 
   var tagElem = function tagElem() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
+      className: "site-tag-plus",
+      onClick: handleAdd
+    }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+      type: "lmweb-plus-circle"
+    }), " \u65B0\u589E"), checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
         key: v.value,
         closable: true,
@@ -172,12 +177,7 @@ var ListItemChecked = function ListItemChecked(props) {
           return onTagClose(v.value);
         }
       }, v.label);
-    }), /*#__PURE__*/_react.default.createElement(_tag.default, {
-      className: "site-tag-plus",
-      onClick: handleAdd
-    }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-plus-circle"
-    }), " \u65B0\u589E"));
+    }));
   }; // 模式
 
 
@@ -225,8 +225,7 @@ var ListGroup = function ListGroup() {
     // 单项匹配数据, 根据字段名查找
     var getItem = fullData.find(function (v) {
       return v.field === field;
-    });
-    console.log('getItem', getItem); // 编辑
+    }); // 编辑
 
     dispatch({
       type: 'changeModal',

package/es/CkFilter/complexFilter/index.js

@@ -62,7 +62,7 @@ var Custom = function Custom() {
     className: "addonBefore"
   }), /*#__PURE__*/_react.default.createElement("span", {
     className: "checked"
-  }, "\u9AD8\u7EA7\u67E5\u8BE2"))), /*#__PURE__*/_react.default.createElement(_drawer.default, null));
+  }, "\u9AD8\u7EA7\u7B5B\u9009"))), /*#__PURE__*/_react.default.createElement(_drawer.default, null));
 };
 
 var _default = Custom;

package/es/CkFilter/components/DragBox/index.js

@@ -32,7 +32,6 @@ var Drag = function Drag(_ref) {
       props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
 
   var move = function move(active, over) {
-    console.log('handleMove', active, over);
     setFilterValue({
       active: active,
       over: over

package/es/CkFilter/components/DragBox/sortableItem.js

@@ -89,7 +89,11 @@ var SortableItem = function SortableItem(props) {
     }
   }), /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
     className: "pointer_move"
-  }, listeners), /*#__PURE__*/_react.default.createElement(_icons.HolderOutlined, null)), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
+  }, listeners), /*#__PURE__*/_react.default.createElement(_icons.HolderOutlined, {
+    style: {
+      color: 'var(--tip-text-color)'
+    }
+  })), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     value: virItem.field,
     className: "filter_item-content"
   }, virItem.title), /*#__PURE__*/_react.default.createElement("div", {

package/es/CkFilter/components/filterTypes.js

@@ -43,13 +43,27 @@ 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 = ["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;
@@ -59,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", {
@@ -134,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)));
 }; // 嵌套结构下拉单选过滤器
 
 
@@ -204,9 +223,7 @@ var NestedFilter = function NestedFilter(_ref4) {
     }), /*#__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)));
 }; // 自定义筛选下拉选过滤器
 
 
@@ -269,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)));
 }; // 下拉多选过滤器: 要过滤的数据, 当前选中项, 触发过滤, 过滤前的数据
 
 
@@ -398,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",
@@ -586,11 +599,14 @@ var DatePickerFilter = function DatePickerFilter(_ref13) {
     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,
@@ -691,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")));
   };
 

package/es/CkFilter/components/modal.js

@@ -25,10 +25,10 @@ var _form = _interopRequireDefault(require("antd/es/form"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 
-var _linkmoreDesign = require("linkmore-design");
-
 var _react = _interopRequireWildcard(require("react"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _context2 = require("../context");
 
 var _utils = require("../utils");
@@ -50,9 +50,8 @@ var ModalItem = function ModalItem() {
 
   var _Form$useForm = _form.default.useForm(),
       _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
-      form = _Form$useForm2[0];
+      form = _Form$useForm2[0]; // 是否编辑
 
-  console.log('customModal', customModal); // 是否编辑
 
   var isEdit = (0, _react.useMemo)(function () {
     var type = customModal.type,
@@ -77,7 +76,7 @@ var ModalItem = function ModalItem() {
 
   var onSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _yield$form$validateF, field, mode, value, filterValues, isNested, nField, nValue, _value$subValue;
+      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) {
@@ -93,17 +92,23 @@ var ModalItem = function ModalItem() {
               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); // 是否嵌套筛选
+              filterValues = customModal.type === 'complex' ? (0, _objectSpread2.default)({}, complexDrawer.data) : (0, _objectSpread2.default)({}, customDrawer.data.filterValues); // 查找当前筛选的值: 自定义筛选 & 高级筛选
+
+              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 = customModal.data.type === 'nested'; // 嵌套筛选的键值不同
+              isNested = currentItem.type === 'nested'; // 嵌套筛选的键值不同
 
-              nField = isEdit ? customModal.data.field : field;
+              nField = isEdit ? currentItem.field : field;
               nValue = value;
 
               if (isNested) {
                 // 删除原有筛选
-                delete filterValues[customModal.data.field];
-                customModal.data.data.forEach(function (element) {
+                delete filterValues[currentItem.field];
+                currentItem.data.forEach(function (element) {
                   delete filterValues[element.value];
                 }); // 存在子级嵌套时,改变键值
 
@@ -118,7 +123,7 @@ var ModalItem = function ModalItem() {
               Object.assign(filterValues, (0, _defineProperty2.default)({}, nField, {
                 mode: mode,
                 value: nValue,
-                originField: customModal.data.field
+                originField: currentItem.field
               }));
 
               if (customModal.type === 'complex') {
@@ -142,20 +147,20 @@ var ModalItem = function ModalItem() {
               }
 
               onClose();
-              _context.next = 20;
+              _context.next = 23;
               break;
 
-            case 17:
-              _context.prev = 17;
+            case 20:
+              _context.prev = 20;
               _context.t0 = _context["catch"](0);
               console.log('校验错误！', _context.t0);
 
-            case 20:
+            case 23:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 17]]);
+      }, _callee, null, [[0, 20]]);
     }));
 
     return function onSave() {
@@ -184,13 +189,14 @@ var ModalItem = function ModalItem() {
 
 
   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, {
@@ -199,7 +205,7 @@ var ModalItem = function ModalItem() {
         noStyle: true
       }, /*#__PURE__*/_react.default.createElement(_Controls.default, (0, _extends2.default)({
         visible: customModal.visible
-      }, customModal.data, {
+      }, findItem, {
         options: options
       })));
     }
@@ -208,7 +214,7 @@ 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' ? {
@@ -250,12 +256,15 @@ var ModalItem = function ModalItem() {
     name: "mode",
     label: "\u67E5\u8BE2\u65B9\u5F0F",
     noStyle: true
-  }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio, {
+  }, /*#__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("div", {
-    className: "custom_group"
+    className: "custom_group",
+    id: "area"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "custom_label"
   }, "\u9009\u62E9\u5B57\u6BB5"), /*#__PURE__*/_react.default.createElement(_form.default.Item, {
@@ -263,7 +272,10 @@ var ModalItem = function ModalItem() {
     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,

package/es/CkFilter/context.js

@@ -29,7 +29,8 @@ var initialState = {
     searchKey: 'search',
     levelGroupKey: 'levGroup',
     filter: true,
-    complex: false
+    complex: false,
+    size: 'middle'
   },
   // 初始化数据
   visibleFields: [],

package/es/CkFilter/customFilter/drawer.js

@@ -43,7 +43,7 @@ var _context2 = require("../context");
 
 var _utils = require("../utils");
 
-var _CustomModal = _interopRequireDefault(require("../components/CustomModal"));
+var _modal = _interopRequireDefault(require("../components/modal"));
 
 var _excluded = ["item"];
 
@@ -56,23 +56,68 @@ var ListItem = function ListItem(props) {
       fullData = _state$instance$fullD === void 0 ? [] : _state$instance$fullD,
       customDrawer = state.customDrawer;
   var field = props.field,
-      value = props.value; // 单项匹配数据, 根据字段名查找
+      value = props.value; // 单项匹配数据, 根据字段名查找, 嵌套筛选时查询父级
 
   var getItem = (0, _react.useMemo)(function () {
     return fullData.find(function (v) {
-      return v.field === field;
+      return [field, value.originField].includes(v.field);
     });
-  }, [field, fullData]); // 选中的数据
+  }, [props, fullData]); // 选中值的处理
+
+  var resetValue = (0, _react.useMemo)(function () {
+    if (getItem.type === 'cascader') {
+      var _value$value;
+
+      return (_value$value = value.value) === null || _value$value === void 0 ? void 0 : _value$value.map(function (v) {
+        return v[v.length - 1];
+      });
+    }
+
+    return value.value;
+  }, [props]); // 遍历树结构
+
+  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 () {
+    console.log('value', value);
     var checkedValue = value.value;
 
     if (Array.isArray(checkedValue)) {
+      if (getItem.type === 'nested') {
+        return checkedValue;
+      }
+
+      if (getItem.type === 'cascader') {
+        var arr = [];
+        deepChildren(getItem.data, arr);
+        return arr;
+      }
+
       return 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;
     });
@@ -87,6 +132,7 @@ var ListItem = function ListItem(props) {
       type: 'changeModal',
       customModal: {
         visible: true,
+        type: 'custom',
         data: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, getItem), value)
       }
     });
@@ -126,7 +172,12 @@ var ListItem = function ListItem(props) {
 
 
   var tagElem = function tagElem() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
+      className: "site-tag-plus",
+      onClick: handleAdd
+    }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
+      type: "lmweb-plus-circle"
+    }), " \u65B0\u589E"), checkedValues === null || checkedValues === void 0 ? void 0 : checkedValues.map(function (v) {
       return /*#__PURE__*/_react.default.createElement(_tag.default, {
         key: v.value,
         closable: true,
@@ -134,12 +185,7 @@ var ListItem = function ListItem(props) {
           return onTagClose(v.value);
         }
       }, v.label);
-    }), /*#__PURE__*/_react.default.createElement(_tag.default, {
-      className: "site-tag-plus",
-      onClick: handleAdd
-    }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
-      type: "lmweb-plus-circle"
-    }), " \u65B0\u589E"));
+    }));
   }; // 模式
 
 
@@ -180,7 +226,8 @@ var Index = function Index() {
 
   var filterItem = (0, _react.useMemo)(function () {
     return customDrawer.data;
-  }, [customDrawer.data]); // 过滤的内容转数组
+  }, [customDrawer.data]);
+  console.log('customDrawer', customDrawer); // 过滤的内容转数组
 
   var filterItemData = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(filterItem === null || filterItem === void 0 ? void 0 : filterItem.filterValues) ? Object.entries(filterItem.filterValues).map(function (v) {
@@ -340,7 +387,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)));
+  }))), /*#__PURE__*/_react.default.createElement(_modal.default, null)));
 };
 
 var _default = Index;

package/es/CkFilter/customFilter/index.js

@@ -34,6 +34,8 @@ var Custom = function Custom() {
       state = _useStore.state,
       dispatch = _useStore.dispatch;
 
+  var size = state.instance.size;
+
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       visible = _useState2[0],
@@ -107,7 +109,8 @@ var Custom = function Custom() {
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('filter_custom', {
-      active: visible
+      active: visible,
+      small: size === 'small'
     })
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "custom_label"

package/es/CkFilter/customFilter/radioGroup.js

@@ -24,7 +24,8 @@ var CustomGroup = function CustomGroup() {
 
   var _state$instance = state.instance,
       levelGroup = _state$instance.levelGroup,
-      levelGroupKey = _state$instance.levelGroupKey;
+      levelGroupKey = _state$instance.levelGroupKey,
+      size = _state$instance.size;
   var defaultValue = (0, _react.useMemo)(function () {
     var _levelGroup$find;
 
@@ -50,8 +51,8 @@ var CustomGroup = function CustomGroup() {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Group, {
     defaultValue: defaultValue,
     onChange: onChange,
-    size: "small"
-  }, levelGroup.map(function (v) {
+    size: size
+  }, size, levelGroup.map(function (v) {
     return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Radio.Button, {
       key: v.value,
       value: v.value