linkmore-design 1.0.60 → 1.0.64

package/lib/LmEditTable/EditTable.js

@@ -15,10 +15,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-require("antd/es/form/style");
-
-var _form = _interopRequireDefault(require("antd/es/form"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
 var _icons = require("@ant-design/icons");
@@ -39,8 +35,12 @@ var _DndContainer = _interopRequireDefault(require("./DndContainer"));
 
 var _sortableBox = _interopRequireDefault(require("./sortableBox"));
 
+var _sortableBoxCol = _interopRequireDefault(require("./sortableBoxCol"));
+
 var _sortableItem = _interopRequireDefault(require("./sortableItem"));
 
+var _sortableItemCol = _interopRequireDefault(require("./sortableItemCol"));
+
 var _DragHandle = _interopRequireDefault(require("./DragHandle"));
 
 var _UploadOss = _interopRequireDefault(require("../UploadOss"));
@@ -101,11 +101,11 @@ var EditableRow = function EditableRow(_a) {
   var index = _a.index,
       props = __rest(_a, ["index"]);
 
-  var _Form$useForm = _form.default.useForm(),
+  var _Form$useForm = _linkmoreDesign.Form.useForm(),
       _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
-  return /*#__PURE__*/_react.default.createElement(_form.default, {
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
     component: false
   }, /*#__PURE__*/_react.default.createElement(EditableContext.Provider, {
@@ -117,11 +117,11 @@ var EditableSortRow = function EditableSortRow(_a) {
   var index = _a.index,
       props = __rest(_a, ["index"]);
 
-  var _Form$useForm3 = _form.default.useForm(),
+  var _Form$useForm3 = _linkmoreDesign.Form.useForm(),
       _Form$useForm4 = (0, _slicedToArray2.default)(_Form$useForm3, 1),
       form = _Form$useForm4[0];
 
-  return /*#__PURE__*/_react.default.createElement(_form.default, {
+  return /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
     component: false
   }, /*#__PURE__*/_react.default.createElement(EditableContext.Provider, {
@@ -209,8 +209,16 @@ var Opetate = function Opetate(_ref) {
   var record = _ref.record,
       rowKey = _ref.rowKey,
       handleAdd = _ref.handleAdd,
-      handleDelete = _ref.handleDelete;
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      handleDelete = _ref.handleDelete,
+      _ref$options = _ref.options,
+      options = _ref$options === void 0 ? ['add', 'delete'] : _ref$options;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center'
+    }
+  }, options.includes('add') && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
@@ -222,7 +230,7 @@ var Opetate = function Opetate(_ref) {
     onClick: function onClick() {
       return handleDelete(record[rowKey]);
     }
-  }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  }), options.includes('delete') && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
@@ -280,7 +288,8 @@ var EditableCell = function EditableCell(props) {
       clearProps = __rest(restProps, ["onMouseEnter", "onMouseLeave"]);
 
   var _col$componentProps = col.componentProps,
-      componentProps = _col$componentProps === void 0 ? {} : _col$componentProps; // const checkCellRef = useRef(null)
+      componentProps = _col$componentProps === void 0 ? {} : _col$componentProps,
+      dataIndex = col.dataIndex; // const checkCellRef = useRef(null)
   // const focusCapturedRef = useRef(false);
   // const curValue = useMemo(() => {
   //   return record?.dataIndex
@@ -311,35 +320,51 @@ var EditableCell = function EditableCell(props) {
 
             case 6:
               values = _context.t0;
-              console.log(Object.assign(Object.assign({
-                record: record
-              }, values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])), 'vvvv');
-              console.time('testForEach');
-              handleSave(Object.assign(Object.assign(Object.assign({}, record), values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])));
-              console.timeEnd('testForEach');
-              _context.next = 13;
+
+              // console.time('testForEach');
+
+              /** 如果属于中有唯一性，并且当前的值与唯一值不一致，则改变其他的 */
+              if (componentProps.isOnlyValue !== undefined && values[dataIndex] !== record[dataIndex] && ![undefined, null].includes(values[dataIndex])) {
+                handleSave(Object.assign(Object.assign(Object.assign({}, record), values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])), {
+                  only: {
+                    key: dataIndex,
+                    value: componentProps.isOnlyValue
+                  }
+                });
+              } else {
+                handleSave(Object.assign(Object.assign(Object.assign({}, record), values), (0, _defineProperty2.default)({}, rowKey, record === null || record === void 0 ? void 0 : record[rowKey])));
+              } // console.timeEnd('testForEach');
+
+
+              _context.next = 10;
               return form.validateFields();
 
-            case 13:
-              _context.next = 17;
+            case 10:
+              _context.next = 14;
               break;
 
-            case 15:
-              _context.prev = 15;
+            case 12:
+              _context.prev = 12;
               _context.t1 = _context["catch"](0);
 
-            case 17:
+            case 14:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 15]]);
+      }, _callee, null, [[0, 12]]);
     }));
   }; // 触发保存
 
 
   var handleFormItemChange = function handleFormItemChange(e) {
-    save === null || save === void 0 ? void 0 : save();
+    save === null || save === void 0 ? void 0 : save(); // const { dataIndex } = col
+    // if (componentProps.isOnlyValue !== undefined) {
+    //   console.log(777)
+    //   handleCopy?.(dataIndex, componentProps.isOnlyValue)
+    // } else {
+    //   save?.()
+    // }
   };
   /** 快捷刷子，把当前的所有列的值，刷成当前的选中的列 */
 
@@ -360,13 +385,13 @@ var EditableCell = function EditableCell(props) {
           // ref={checkCellRef}
           placeholder: "\u8BF7\u8F93\u5165"
         }, componentProps, {
-          addonBefore: componentProps.addonBefore ? /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+          addonBefore: componentProps.addonBefore ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
             name: [col.dataIndex, 'addonBeforeValue'],
             noStyle: true
           }, /*#__PURE__*/_react.default.cloneElement(componentProps.addonBefore, {
             onChange: handleFormItemChange
           })) : null,
-          addonAfter: componentProps.addonAfter ? /*#__PURE__*/_react.default.createElement(_form.default.Item, {
+          addonAfter: componentProps.addonAfter ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, {
             name: [col.dataIndex, 'addonAfterValue'],
             noStyle: true
           }, /*#__PURE__*/_react.default.cloneElement(componentProps.addonAfter, {
@@ -487,7 +512,9 @@ var EditableCell = function EditableCell(props) {
     var childNode = children;
 
     if (isEdit && editable) {
-      childNode = /*#__PURE__*/_react.default.createElement(_form.default.Item, Object.assign({
+      childNode = /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+        errorPlacement: "right",
+        valuePropName: editable === 'switch' ? 'checked' : 'value',
         style: {
           margin: 0
         }
@@ -496,7 +523,8 @@ var EditableCell = function EditableCell(props) {
       }), Control(editable));
 
       if (editable === 'input' && ((componentProps === null || componentProps === void 0 ? void 0 : componentProps.addonBefore) || (componentProps === null || componentProps === void 0 ? void 0 : componentProps.addonAfter))) {
-        childNode = /*#__PURE__*/_react.default.createElement(_form.default.Item, Object.assign({
+        childNode = /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form.Item, Object.assign({
+          errorPlacement: "right",
           style: {
             margin: 0
           }
@@ -515,9 +543,17 @@ var EditableCell = function EditableCell(props) {
     var editable = col.editable,
         dataIndex = col.dataIndex;
 
-    if (isEdit && editable && record[dataIndex] || isHoverEdit && editable && record[dataIndex]) {
+    if (isEdit && editable) {
       form.setFieldsValue((0, _defineProperty2.default)({}, dataIndex, editable === 'date' ? (0, _moment.default)(record[dataIndex]) : record[dataIndex]));
-    }
+    } // if (
+    //   (isEdit && editable && record[dataIndex]) ||
+    //   (isHoverEdit && editable && record[dataIndex])
+    // ) {
+    //   form.setFieldsValue({
+    //     [dataIndex]: editable === 'date' ? moment(record[dataIndex]) : record[dataIndex],
+    //   })
+    // }
+
   }, [record]); // const isOpenEdit = (isEdit && focusCapturedRef.current) || (isHoverEdit && focusCapturedRef.current);
   // const classNames = cx({
   //   'lm_base_editTable_cell': true,
@@ -568,9 +604,11 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       useQuickOpetate = props.useQuickOpetate,
       rowSelection = props.rowSelection,
       sortOpen = props.sortOpen,
+      colSortOpen = props.colSortOpen,
+      filterChange = props.filterChange,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
-      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "rowSelection", "sortOpen", "size"]);
+      resetProps = __rest(props, ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "rowSelection", "sortOpen", "colSortOpen", "filterChange", "size"]);
 
   var _useState = (0, _react.useState)([]),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -610,6 +648,22 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     } else {
       setDataSource((0, _sortable.arrayMove)(cloneArr, oldIndex, newIndex));
     }
+  };
+
+  var onColSortEnd = function onColSortEnd(active, over) {
+    console.log(active, over, 2223);
+    var oldIndex = columns.findIndex(function (item) {
+      return item.dataIndex === active;
+    });
+    var newIndex = columns.findIndex(function (item) {
+      return item.dataIndex === over;
+    });
+    console.log((0, _sortable.arrayMove)(columns, oldIndex, newIndex), 222);
+    filterChange === null || filterChange === void 0 ? void 0 : filterChange((0, _sortable.arrayMove)(columns, oldIndex, newIndex).map(function (item, index) {
+      return Object.assign(Object.assign({}, item), {
+        order: index
+      });
+    }));
   }; // 删除
 
 
@@ -668,26 +722,36 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     (_a = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.onChange) === null || _a === void 0 ? void 0 : _a.call(rowSelection, selectRows);
   };
 
-  var handleSave = function handleSave(row) {
+  var handleSave = function handleSave(row, options) {
     var res = (0, _immer.produce)(dataSourceRef.current, function (draft) {
-      var index = draft.findIndex(function (item) {
-        return row[_rowKey] === item[_rowKey];
-      });
+      if (options === null || options === void 0 ? void 0 : options.only) {
+        var _ref2 = options === null || options === void 0 ? void 0 : options.only,
+            key = _ref2.key,
+            value = _ref2.value;
+
+        draft.forEach(function (item, index) {
+          if (row[_rowKey] === item[_rowKey]) {
+            draft[index] = row;
+          } else {
+            draft[index][key] = value;
+          }
+        });
+      } else {
+        var index = draft.findIndex(function (item) {
+          return row[_rowKey] === item[_rowKey];
+        });
 
-      if (index !== -1) {
-        draft[index] = row;
+        if (index !== -1) {
+          draft[index] = row;
+        }
       }
     });
-    console.time('b');
-    console.log(res, 'rrrr');
 
     if (onChange) {
       onChange === null || onChange === void 0 ? void 0 : onChange(res);
     } else {
       setDataSource(res);
     }
-
-    console.timeEnd('b');
   };
 
   var reWriteOriginSource = function reWriteOriginSource(rowKey, rowValue, dataIndex, nextValue) {
@@ -787,7 +851,10 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       dataIndex: 'lm_edit_opetate',
       width: 68,
       fixed: 'right',
-      editable: 'lm_edit_opetate'
+      editable: 'lm_edit_opetate',
+      componentProps: {
+        options: Array.isArray(useQuickOpetate) ? useQuickOpetate : ['add', 'delete']
+      }
     } : null]).filter(function (item) {
       return item;
     });
@@ -826,6 +893,12 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
           return record[dataIndex] === prevRecord[dataIndex] ? false : true;
         },
+        // render: (text: string, record: Record<string, any>, index: number) => {
+        //   const { editable, render } = record
+        //   if (!editable && render) {
+        //     return render?.(text, record ,index)
+        //   }
+        // },
         onCell: function onCell(record) {
           return {
             getLength: function getLength() {
@@ -853,6 +926,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       });
     });
+    console.log(res, '---res');
     return res;
   }, [columns, isAdd, sortOpen, useQuickOpetate, sortEditTable]);
   var DraggableContainer = (0, _react.useCallback)(function (_a) {
@@ -866,10 +940,39 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       items: (_b = dataSourceRef.current) === null || _b === void 0 ? void 0 : _b.map(function (item) {
         return item[_rowKey];
       })
-    }, /*#__PURE__*/_react.default.createElement("tbody", Object.assign({}, props)))) // <tbody {...props} />
-    ;
+    }, /*#__PURE__*/_react.default.createElement("tbody", Object.assign({}, props))));
   }, [sortEditTable]);
+  var colDraggableContainer = (0, _react.useCallback)(function (_a) {
+    var props = __rest(_a, []);
+
+    return /*#__PURE__*/_react.default.createElement("tr", null, _react.default.Children.map(props.children, function (child) {
+      var _a, _b;
+
+      if ((_b = (_a = child === null || child === void 0 ? void 0 : child.props) === null || _a === void 0 ? void 0 : _a.column) === null || _b === void 0 ? void 0 : _b.fixed) {
+        return child;
+      }
+
+      return /*#__PURE__*/_react.default.createElement(_sortableItemCol.default, {
+        id: child.key
+      }, child);
+    }));
+  }, [columns]);
   var config = (0, _react.useMemo)(function () {
+    var component = {
+      body: Object.assign({
+        row: sortOpen ? EditableSortRow : EditableRow,
+        cell: EditableCell
+      }, sortOpen ? {
+        wrapper: DraggableContainer
+      } : {})
+    };
+
+    if (colSortOpen) {
+      component['header'] = {
+        row: colDraggableContainer
+      };
+    }
+
     return Object.assign({
       pagination: false,
       tableLayout: 'fixed',
@@ -879,17 +982,9 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       rowKey: function rowKey(record) {
         return record[_rowKey] || record.index || Math.random();
       },
-      components: {
-        body: Object.assign({
-          row: sortOpen ? EditableSortRow : EditableRow,
-          cell: EditableCell // wrapper: DraggableContainer
-
-        }, sortOpen ? {
-          wrapper: DraggableContainer
-        } : {})
-      }
+      components: component
     }, resetProps);
-  }, [resultColumns, dataSource, sortOpen, size]);
+  }, [resultColumns, dataSource, sortOpen, colSortOpen, size]);
   (0, _react.useEffect)(function () {
     setDataSource(defaultData === null || defaultData === void 0 ? void 0 : defaultData.map(function (v, idx) {
       return Object.assign(Object.assign({}, v), (0, _defineProperty2.default)({}, _rowKey, v[_rowKey] || "v".concat(idx + 1)));
@@ -905,7 +1000,48 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
   var isShowAddAction = (0, _react.useMemo)(function () {
     return isEdit && isAdd || isHoverEdit && isAdd;
-  }, [isEdit, isAdd, isHoverEdit]); // @ts-ignore
+  }, [isEdit, isAdd, isHoverEdit]);
+
+  if (colSortOpen) {
+    return /*#__PURE__*/_react.default.createElement("div", {
+      className: "lm_editTable_warpper"
+    }, /*#__PURE__*/_react.default.createElement(_DndContainer.default, {
+      move: onColSortEnd
+    }, /*#__PURE__*/_react.default.createElement(_sortableBoxCol.default, {
+      items: columns.reduce(function (acc, item) {
+        return [].concat((0, _toConsumableArray2.default)(acc), [item.dataIndex]);
+      }, [])
+    }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Table, Object.assign({}, config, {
+      size: size || 'small',
+      columns: resultColumns,
+      rowClassName: "editable-row",
+      bordered: true,
+      pagination: false,
+      // components={tableComponents}
+      rowSelection: !rowSelection ? undefined : {
+        fixed: true,
+        type: 'checkbox',
+        columnWidth: 36,
+        selectedRowKeys: localRowSelectList.map(function (v) {
+          return v[_rowKey];
+        }),
+        onChange: function onChange(selectedRowKeys, selectedRows) {
+          editTableRowChange(selectedRows);
+        }
+      },
+      dataSource: dataSource
+    })))), isShowAddAction && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+      className: "lm_editTable_add_bar",
+      type: "dashed",
+      onClick: handleAdd,
+      style: {
+        marginTop: 8
+      }
+    }, /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, {
+      className: "lmweb-plus"
+    }), "\u65B0\u589E"));
+  } // @ts-ignore
+
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "lm_editTable_warpper"

package/lib/LmEditTable/sortableBoxCol.d.ts

@@ -0,0 +1,5 @@
+declare const SortableBox: ({ items, children }: {
+    items: any;
+    children: any;
+}) => JSX.Element;
+export default SortableBox;

package/lib/LmEditTable/sortableBoxCol.js

@@ -0,0 +1,24 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _sortable = require("@dnd-kit/sortable");
+
+var SortableBox = function SortableBox(_ref) {
+  var items = _ref.items,
+      children = _ref.children;
+  return /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
+    items: items,
+    strategy: _sortable.horizontalListSortingStrategy
+  }, children);
+};
+
+var _default = SortableBox;
+exports.default = _default;

package/lib/LmEditTable/sortableItemCol.d.ts

@@ -0,0 +1 @@
+export default function SortableItem(props: any): JSX.Element;

package/lib/LmEditTable/sortableItemCol.js

@@ -0,0 +1,61 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = SortableItem;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _sortable = require("@dnd-kit/sortable");
+
+var _utilities = require("@dnd-kit/utilities");
+
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var Item = /*#__PURE__*/(0, _react.forwardRef)(function (_a, ref) {
+  var children = _a.children,
+      props = __rest(_a, ["children"]);
+
+  return /*#__PURE__*/_react.default.createElement("th", Object.assign({}, props, {
+    ref: ref
+  }), children);
+});
+
+function SortableItem(props) {
+  var _useSortable = (0, _sortable.useSortable)({
+    id: props.id
+  }),
+      attributes = _useSortable.attributes,
+      listeners = _useSortable.listeners,
+      setNodeRef = _useSortable.setNodeRef,
+      transform = _useSortable.transform,
+      transition = _useSortable.transition;
+
+  var style = {
+    position: 'relative',
+    transform: _utilities.CSS.Translate.toString(transform),
+    transition: transition,
+    padding: 0,
+    touchAction: 'none',
+    height: '40px',
+    cursor: 'move'
+  };
+  return /*#__PURE__*/_react.default.createElement(Item, Object.assign({
+    ref: setNodeRef,
+    style: style
+  }, attributes, listeners, props));
+}

package/lib/LmFilter/LmFilter.js

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

package/lib/LmFilter/baseFilter/fuzzySearch.js

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

package/lib/LmFilter/baseFilter/index.js

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

package/lib/LmFilter/clearFilter/index.js

@@ -14,13 +14,11 @@ var _linkmoreDesign = require("linkmore-design");
 var LmFilterClear = /*#__PURE__*/_react.default.memo(function (_ref) {
   var instance = _ref.instance;
   var state = instance.state,
-      dispatch = instance.dispatch;
+      dispatch = instance.dispatch,
+      onClearChange = instance.onClearChange;
 
   var handleClear = function handleClear() {
-    console.log('state', state);
-    dispatch({
-      type: 'reset'
-    });
+    onClearChange();
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {