linkmore-design 1.0.46 → 1.0.49

package/es/CardTable/LmCardTable.js

@@ -2,6 +2,8 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,7 +13,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/exten
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _TableRoot = _interopRequireDefault(require("./table/TableRoot"));
 
@@ -21,7 +23,7 @@ var _excluded = ["cellKey", "type", "height", "virtual", "components", "dataSour
 //   rows: LM_Row<TData>[];
 // }
 // 默认抛出
-var _default = function _default(_ref) {
+var LmCardTable = function LmCardTable(_ref, ref) {
   var _ref$cellKey = _ref.cellKey,
       cellKey = _ref$cellKey === void 0 ? 'id' : _ref$cellKey,
       _ref$type = _ref.type,
@@ -39,6 +41,7 @@ var _default = function _default(_ref) {
       _ref$checkboxConfig = _ref.checkboxConfig,
       checkboxConfig = _ref$checkboxConfig === void 0 ? {} : _ref$checkboxConfig,
       resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var defaultRef = (0, _react.useRef)(null);
   return /*#__PURE__*/_react.default.createElement(_TableRoot.default, (0, _extends2.default)({
     cellKey: cellKey,
     type: type,
@@ -47,8 +50,11 @@ var _default = function _default(_ref) {
     components: components,
     dataSource: dataSource,
     cellConfig: cellConfig,
-    checkboxConfig: checkboxConfig
+    checkboxConfig: checkboxConfig,
+    ref: ref || defaultRef
   }, resetProps));
 };
 
+var _default = /*#__PURE__*/(0, _react.forwardRef)(LmCardTable);
+
 exports.default = _default;

package/es/CardTable/body/TableBodyCell.js

@@ -20,7 +20,8 @@ var _PictureTextColumn = _interopRequireDefault(require("../card/PictureTextColu
 var _PictureTextRow = _interopRequireDefault(require("../card/PictureTextRow"));
 
 var LmCardTableBodyCell = function LmCardTableBodyCell(_ref) {
-  var cell = _ref.cell,
+  var index = _ref.index,
+      cell = _ref.cell,
       table = _ref.table;
   var state = table.state,
       cellConfig = table.cellConfig,
@@ -50,6 +51,7 @@ var LmCardTableBodyCell = function LmCardTableBodyCell(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('lm_card_table_body_cell', isChecked && 'cell_checked')
   }, /*#__PURE__*/_react.default.createElement(RenderCell, (0, _extends2.default)({
+    index: index,
     cell: cell,
     table: table
   }, stateConfig)));

package/es/CardTable/body/TableBodyRow.js

@@ -21,7 +21,8 @@ var LmCardTableBodyRow = /*#__PURE__*/_react.default.memo(function (_ref) {
       table = _ref.table;
   var state = table.state,
       rowConfig = table.rowConfig,
-      height = table.cellConfig.height; // 检测是否最后末行
+      height = table.cellConfig.height,
+      cellKey = table.cellKey; // 检测是否最后末行
 
   var isLastRow = (0, _react.useMemo)(function () {
     return state.rows.length === rowIndex + 1;
@@ -39,7 +40,8 @@ var LmCardTableBodyRow = /*#__PURE__*/_react.default.memo(function (_ref) {
     style: style
   }, row.map(function (cell, index) {
     return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, {
-      key: (cell === null || cell === void 0 ? void 0 : cell.id) || index,
+      key: (cell === null || cell === void 0 ? void 0 : cell[cellKey]) || index,
+      index: index,
       cell: cell,
       table: table
     });
@@ -53,7 +55,8 @@ var LmCardTableBodyRowVirtual = /*#__PURE__*/_react.default.memo(function (_ref2
       table = _ref2.table;
   var state = table.state,
       rowConfig = table.rowConfig,
-      height = table.cellConfig.height; // 检测是否最后末行
+      height = table.cellConfig.height,
+      cellKey = table.cellKey; // 检测是否最后末行
 
   var isLastRow = (0, _react.useMemo)(function () {
     return state.rows.length === rowIndex + 1;
@@ -75,7 +78,8 @@ var LmCardTableBodyRowVirtual = /*#__PURE__*/_react.default.memo(function (_ref2
     style: style
   }, row.map(function (cell, index) {
     return /*#__PURE__*/_react.default.createElement(_TableBodyCell.default, {
-      key: (cell === null || cell === void 0 ? void 0 : cell.id) || index,
+      key: (cell === null || cell === void 0 ? void 0 : cell[cellKey]) || index,
+      index: index,
       cell: cell,
       table: table
     });

package/es/CardTable/card/PictureTextColumn.js

@@ -24,12 +24,17 @@ var _linkmoreDesign = require("linkmore-design");
 var Paragraph = _typography.default.Paragraph; // 上图下文
 
 var PictureTextColumn = function PictureTextColumn(_ref) {
-  var cell = _ref.cell,
+  var index = _ref.index,
+      cell = _ref.cell,
       table = _ref.table,
       checked = _ref.checked;
-  var defaultConfig = table.defaultConfig,
-      _onDoubleClick = table.onDoubleClick,
+  var state = table.state,
+      defaultConfig = table.defaultConfig,
+      cellClick = table.cellClick,
+      cellDoubleClick = table.cellDoubleClick,
       setSelectCells = table.setSelectCells;
+  var trigger = state.checkboxConfig.trigger;
+  var clickFlag = (0, _react.useRef)(null);
   var resetDefaultConfig = (0, _objectSpread2.default)({
     checkbox: true,
     imgurl: 'imgurl',
@@ -39,24 +44,45 @@ var PictureTextColumn = function PictureTextColumn(_ref) {
     code: 'code',
     operate: null,
     extend: null
-  }, defaultConfig);
+  }, defaultConfig); // 复选框改变事件, 将复选数据保存到缓存中
 
-  var onSelctChange = function onSelctChange(e) {
-    setSelectCells(e.target.checked, cell);
+  var onSelectChange = function onSelectChange(e) {
+    setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(e.target.checked, cell, index);
+  }; // 单元格单击事件
+
+
+  var onClick = function onClick() {
+    // clearTimeout(clickFlag.current); // 清除第一个单击事件
+    // clickFlag.current = setTimeout(() => {
+    // 触发区域为单元格时仅触发复选事件
+    cellClick === null || cellClick === void 0 ? void 0 : cellClick(cell, index);
+
+    if (trigger === 'cell') {
+      setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(!checked, cell, index);
+    } // }, 200)
+
+  }; // 单元格双击事件: 双击时避免单击事件触发自己实现
+
+
+  var onDoubleClick = function onDoubleClick() {
+    // clearTimeout(clickFlag.current); // 清除第一个单击事件
+    cellDoubleClick === null || cellDoubleClick === void 0 ? void 0 : cellDoubleClick(cell, index);
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "card_PTC"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('card_PTC_container', checked && 'checked'),
-    onDoubleClick: function onDoubleClick() {
-      return _onDoubleClick === null || _onDoubleClick === void 0 ? void 0 : _onDoubleClick(cell, table);
-    }
+    onClick: onClick,
+    onDoubleClick: onDoubleClick
   }, resetDefaultConfig.checkbox && /*#__PURE__*/_react.default.createElement("div", {
-    className: "card_checkbox"
+    className: "card_checkbox",
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     checked: checked,
-    onChange: onSelctChange
+    onChange: onSelectChange
   })), resetDefaultConfig.operate ? /*#__PURE__*/_react.default.createElement("div", {
     className: "PTC_operate"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Dropdown, {

package/es/CardTable/card/PictureTextRow.js

@@ -34,12 +34,16 @@ var _linkmoreDesign = require("linkmore-design");
 var Paragraph = _typography.default.Paragraph; // 左图右文
 
 var PictureTextRow = function PictureTextRow(_ref) {
-  var cell = _ref.cell,
+  var index = _ref.index,
+      cell = _ref.cell,
       table = _ref.table,
       checked = _ref.checked;
-  var defaultConfig = table.defaultConfig,
-      _onDoubleClick = table.onDoubleClick,
+  var state = table.state,
+      defaultConfig = table.defaultConfig,
+      cellClick = table.cellClick,
+      cellDoubleClick = table.cellDoubleClick,
       setSelectCells = table.setSelectCells;
+  var trigger = state.checkboxConfig.trigger;
   var resetDefaultConfig = (0, _objectSpread2.default)({
     checkbox: true,
     imgurl: 'imgurl',
@@ -92,23 +96,39 @@ var PictureTextRow = function PictureTextRow(_ref) {
         })
       }, "\u6807\u7B7E\u4E09"));
     }
-  }, defaultConfig);
+  }, defaultConfig); // 复选框改变事件, 将复选数据保存到缓存中
 
   var onSelctChange = function onSelctChange(e) {
-    setSelectCells(e.target.checked, cell);
+    setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(e.target.checked, cell, index);
+  }; // 单元格单击事件
+
+
+  var onClick = function onClick() {
+    cellClick === null || cellClick === void 0 ? void 0 : cellClick(cell, index);
+
+    if (trigger === 'cell') {
+      setSelectCells === null || setSelectCells === void 0 ? void 0 : setSelectCells(!checked, cell, index);
+    }
+  }; // 单元格双击事件: 双击时避免单击事件触发自己实现
+
+
+  var onDoubleClick = function onDoubleClick() {
+    cellDoubleClick === null || cellDoubleClick === void 0 ? void 0 : cellDoubleClick(cell, index);
   };
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "card_PTR"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)('card_PTR_container', checked && 'checked'),
-    onDoubleClick: function onDoubleClick() {
-      return _onDoubleClick === null || _onDoubleClick === void 0 ? void 0 : _onDoubleClick(cell, table);
-    }
+    className: (0, _classnames.default)('card_PTR_container', checked && 'checked')
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "card_PTR_body"
+    className: "card_PTR_body",
+    onClick: onClick,
+    onDoubleClick: onDoubleClick
   }, resetDefaultConfig.checkbox && /*#__PURE__*/_react.default.createElement("div", {
-    className: "card_checkbox"
+    className: "card_checkbox",
+    onClick: function onClick(e) {
+      return e.stopPropagation();
+    }
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     checked: checked,
     onChange: onSelctChange

package/es/CardTable/style/style.css

@@ -129,8 +129,7 @@
 .card_PTC .card_PTC_container:hover .PTC_operate {
   opacity: 1;
 }
-.card_PTC .card_PTC_container.checked .card_checkbox,
-.card_PTC .card_PTC_container.checked .PTC_operate {
+.card_PTC .card_PTC_container.checked .card_checkbox {
   opacity: 1;
 }
 .card_PTR {

package/es/CardTable/table/TableRoot.js

@@ -21,7 +21,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _TableWrapper = _interopRequireDefault(require("./TableWrapper"));
 
-var _excluded = ["rowConfig", "cellConfig", "defaultConfig", "checkboxConfig", "checkboxClick"];
+var _excluded = ["rowConfig", "cellConfig", "defaultConfig", "checkboxChange"];
 
 var reducer = function reducer(state, action) {
   var page = action.page,
@@ -60,28 +60,35 @@ var reducer = function reducer(state, action) {
     default:
       throw new Error();
   }
-};
-
-var getInitialState = function getInitialState(_ref) {
-  var _ref$checkboxConfig$c = _ref.checkboxConfig.checkKeys,
-      checkKeys = _ref$checkboxConfig$c === void 0 ? [] : _ref$checkboxConfig$c,
-      _ref$dataSource = _ref.dataSource,
-      dataSource = _ref$dataSource === void 0 ? [] : _ref$dataSource,
-      cellKey = _ref.cellKey;
+}; // 仅在初始化时触发一次
+
+
+var getInitialState = function getInitialState(props) {
+  var _props$checkboxConfig = props.checkboxConfig,
+      _props$checkboxConfig2 = _props$checkboxConfig.checkKeys,
+      checkKeys = _props$checkboxConfig2 === void 0 ? [] : _props$checkboxConfig2,
+      _props$checkboxConfig3 = _props$checkboxConfig.trigger,
+      trigger = _props$checkboxConfig3 === void 0 ? 'default' : _props$checkboxConfig3,
+      _props$dataSource = props.dataSource,
+      dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
+      cellKey = props.cellKey;
   var checkValues = dataSource.filter(function (v) {
     return checkKeys.includes(v[cellKey]);
   }) || [];
   return {
+    // 复选框的配置
     checkboxConfig: {
       checkKeys: checkKeys,
-      checkValues: checkValues
+      checkValues: checkValues,
+      trigger: trigger
     },
-    defaultValue: [],
+    // 分页的配置
     page: {
       pageIndex: 1,
       pageSize: 20,
       total: 0
     },
+    // 容器盒子的大小
     resize: {
       widht: 0,
       height: 0
@@ -93,18 +100,17 @@ var getInitialState = function getInitialState(_ref) {
   };
 };
 
-var LmCardTableRoot = function LmCardTableRoot(_ref2) {
-  var rowConfig = _ref2.rowConfig,
-      cellConfig = _ref2.cellConfig,
-      defaultConfig = _ref2.defaultConfig,
-      checkboxConfig = _ref2.checkboxConfig,
-      checkboxClick = _ref2.checkboxClick,
-      resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+var LmCardTableRoot = function LmCardTableRoot(props, ref) {
+  var rowConfig = props.rowConfig,
+      cellConfig = props.cellConfig,
+      defaultConfig = props.defaultConfig,
+      checkboxChange = props.checkboxChange,
+      resetProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var initialState = (0, _react.useMemo)(function () {
     return getInitialState((0, _objectSpread2.default)({
-      checkboxConfig: checkboxConfig
+      checkboxChange: checkboxChange
     }, resetProps));
-  }, [checkboxConfig, resetProps]);
+  }, [checkboxChange, resetProps]);
 
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
@@ -120,14 +126,14 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
       checkKeys = _state$checkboxConfig.checkKeys,
       checkValues = _state$checkboxConfig.checkValues; // 设置选中的数据
 
-  var setSelectCells = function setSelectCells(checked, cell) {
+  var setSelectCells = function setSelectCells(checked, cell, cellIndex) {
     var nKeys = checked ? [].concat((0, _toConsumableArray2.default)(checkKeys), [cell[resetProps.cellKey]]) : checkKeys.filter(function (v) {
       return v !== cell[resetProps.cellKey];
     });
     var nValues = checked ? [].concat((0, _toConsumableArray2.default)(checkValues), [cell]) : checkValues.filter(function (v) {
       return v[resetProps.cellKey] !== cell[resetProps.cellKey];
     });
-    checkboxClick(nValues);
+    checkboxChange === null || checkboxChange === void 0 ? void 0 : checkboxChange(checked, cell, cellIndex);
     dispatch({
       type: 'changeCheckboxConfig',
       checkboxConfig: {
@@ -135,6 +141,20 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
         checkValues: nValues
       }
     });
+  }; // 外部设置选中的值
+
+
+  var setCheckboxKeys = function setCheckboxKeys(checkKeys) {
+    var checkValues = resetProps.dataSource.filter(function (v) {
+      return checkKeys.includes(v[resetProps.cellKey]);
+    }) || [];
+    dispatch({
+      type: 'changeCheckboxConfig',
+      checkboxConfig: {
+        checkKeys: checkKeys,
+        checkValues: checkValues
+      }
+    });
   }; // 配置对象收集
 
 
@@ -155,11 +175,21 @@ var LmCardTableRoot = function LmCardTableRoot(_ref2) {
     dispatch: dispatch
   }, config), resetProps), {}, {
     setSelectCells: setSelectCells
+  }); // 向外暴露出的方法
+
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      getCheckboxRecords: function getCheckboxRecords() {
+        return state.checkboxConfig.checkValues;
+      },
+      setCheckboxKeys: setCheckboxKeys
+    };
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, !isFullScreen && /*#__PURE__*/_react.default.createElement(_TableWrapper.default, {
     table: table
   }));
 };
 
-var _default = LmCardTableRoot;
+var _default = /*#__PURE__*/(0, _react.forwardRef)(LmCardTableRoot);
+
 exports.default = _default;

package/es/CkFilter/baseFilter/filterMenu.js

@@ -96,6 +96,10 @@ var FilterMenu = function FilterMenu(props) {
     }); // 触发外部查询, 单击时不关闭菜单
 
     (_state$instance$onCha = (_state$instance = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance, nValue, state.customFilterValues);
+    dispatch({
+      type: 'changeComplexFilterValues',
+      complexFilterValues: {}
+    });
     !filterType && setVisible(false);
   }, [dispatch, field, state.filterValues, state.instance]); // 展示的内容
 

package/es/CkFilter/baseFilter/index.js

@@ -11,8 +11,6 @@ exports.default = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/extends"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 
 var _linkmoreDesign = require("linkmore-design");
@@ -54,14 +52,8 @@ var Filter = function Filter() {
       filterValues = state.filterValues,
       visibleFields = state.visibleFields,
       orderFields = state.orderFields,
-      customFilterValues = state.customFilterValues;
-  var hasClear = (0, _react.useMemo)(function () {
-    var _Object$keys;
-
-    var obj = (0, _objectSpread2.default)({}, filterValues);
-    delete obj[searchKey];
-    return ((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) || false;
-  }, [filterValues]);
+      customFilterValues = state.customFilterValues,
+      complexFilterValues = state.complexFilterValues;
 
   var handleFilter = function handleFilter(val) {
     var nValue = (0, _objectSpread2.default)({}, filterValues);
@@ -77,23 +69,6 @@ var Filter = function Filter() {
     });
     onChange === null || onChange === void 0 ? void 0 : onChange(nValue, customFilterValues);
     return false;
-  }; // 一键清空 清空筛选，保留模糊查询
-
-
-  var handleClear = function handleClear() {
-    var _inputRef$current;
-
-    console.log('inputRef.current', inputRef.current.input.value);
-
-    if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
-      inputRef.current.input.value = '';
-    }
-
-    dispatch({
-      type: 'changeFilterValues',
-      filterValues: (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey])
-    });
-    onChange === null || onChange === void 0 ? void 0 : onChange((0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]), customFilterValues);
   };
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, search && /*#__PURE__*/_react.default.createElement("div", {
@@ -112,10 +87,7 @@ var Filter = function Filter() {
     return /*#__PURE__*/_react.default.createElement(_filterMenu.default, (0, _extends2.default)({
       key: v.field
     }, v));
-  }), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
-    type: "link",
-    onClick: handleClear
-  }, "\u4E00\u952E\u6E05\u7A7A")), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
+  })), /*#__PURE__*/_react.default.createElement(_NestedFilter.default, null));
 };
 
 var _default = Filter;

package/es/CkFilter/complexFilter/drawer.js

@@ -169,7 +169,7 @@ var ListItemChecked = function ListItemChecked(props) {
 
   var tagElem = function tagElem() {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_tag.default, {
-      className: "site-tag-plus",
+      className: "add_tags",
       onClick: handleAdd
     }, /*#__PURE__*/_react.default.createElement(_IconFont.default, {
       type: "lmweb-plus"
@@ -294,9 +294,11 @@ var Index = function Index() {
       dispatch = _useStore3.dispatch;
 
   var instance = state.instance,
+      filterValues = state.filterValues,
       _state$complexDrawer = state.complexDrawer,
       visible = _state$complexDrawer.visible,
       data = _state$complexDrawer.data,
+      customFilterValues = state.customFilterValues,
       complexFilterValues = state.complexFilterValues;
   var isHas = (0, _react.useMemo)(function () {
     return (0, _utils.getIsHas)(data);
@@ -323,11 +325,17 @@ var Index = function Index() {
 
   var onSearch = function onSearch() {
     console.log('complexDrawer:', data);
+    var baseFilter = filterValues[instance.searchKey] ? (0, _defineProperty2.default)({}, instance.searchKey, filterValues[instance.searchKey]) : {};
+    dispatch({
+      type: 'changeFilterValues',
+      filterValues: baseFilter
+    });
     dispatch({
       type: 'changeComplexFilterValues',
       complexFilterValues: data
     });
     onClose();
+    instance.onChange(baseFilter, customFilterValues, data);
   };
 
   (0, _react.useEffect)(function () {
@@ -363,7 +371,8 @@ var Index = function Index() {
       onClick: onClose,
       size: "small"
     }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/_react.default.createElement(_saveModal.default, {
-      state: state
+      state: state,
+      dispatch: dispatch
     }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
       type: "primary",
       onClick: onSearch,
@@ -377,9 +386,9 @@ var Index = function Index() {
   }, /*#__PURE__*/_react.default.createElement(_VirtualList.default, {
     options: filterItemData,
     className: "filter_drawer_group_list"
-  }, function (_ref4) {
-    var item = _ref4.item,
-        resetProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded2);
+  }, function (_ref5) {
+    var item = _ref5.item,
+        resetProps = (0, _objectWithoutProperties2.default)(_ref5, _excluded2);
     return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, resetProps, {
       className: "filter_drawer_group_item"
     }), /*#__PURE__*/_react.default.createElement(ListItemChecked, item));

package/es/CkFilter/complexFilter/saveModal.js

@@ -22,7 +22,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _linkmoreDesign = require("linkmore-design");
 
 var Save = function Save(_ref) {
-  var state = _ref.state;
+  var state = _ref.state,
+      dispatch = _ref.dispatch;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -63,20 +64,26 @@ var Save = function Save(_ref) {
 
               console.log('保存数据！', nValue);
               onClose();
-              _context.next = 13;
+              dispatch({
+                type: 'changeComplexDrawer',
+                complexDrawer: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.complexDrawer), {}, {
+                  visible: false
+                })
+              });
+              _context.next = 14;
               break;
 
-            case 10:
-              _context.prev = 10;
+            case 11:
+              _context.prev = 11;
               _context.t0 = _context["catch"](0);
               console.log('error:', _context.t0);
 
-            case 13:
+            case 14:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 10]]);
+      }, _callee, null, [[0, 11]]);
     }));
 
     return function onSave() {
@@ -105,6 +112,9 @@ var Save = function Save(_ref) {
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Form, {
     form: form,
     layout: "vertical",
+    initialValues: {
+      default: false
+    },
     size: "default"
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_drawer_group"

package/es/CkFilter/filter.js

@@ -17,6 +17,8 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _linkmoreDesign = require("linkmore-design");
+
 var _baseFilter = _interopRequireDefault(require("./baseFilter"));
 
 var _complexFilter = _interopRequireDefault(require("./complexFilter"));
@@ -42,9 +44,14 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       dispatch = _useContent2[1];
 
   var _state$instance = state.instance,
+      onChange = _state$instance.onChange,
       custom = _state$instance.custom,
       levelGroup = _state$instance.levelGroup,
-      complex = _state$instance.complex; // 初始化
+      complex = _state$instance.complex,
+      searchKey = _state$instance.searchKey,
+      filterValues = state.filterValues,
+      complexFilterValues = state.complexFilterValues,
+      customFilterValues = state.customFilterValues; // 初始化
 
   var setOptions = (0, _react.useCallback)(function () {
     var trigger = props.trigger,
@@ -97,7 +104,7 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
 
   (0, _react.useEffect)(function () {
     setOptions();
-  }, [props]);
+  }, [props.data, props.fullData]);
   (0, _react.useEffect)(function () {
     dispatch({
       type: 'initInstance',
@@ -135,6 +142,29 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     (_state$instance$onCha = (_state$instance2 = state.instance).onChange) === null || _state$instance$onCha === void 0 ? void 0 : _state$instance$onCha.call(_state$instance2, nValue, state.customFilterValues);
   };
 
+  var hasClear = (0, _react.useMemo)(function () {
+    var _Object$keys, _Object$keys2;
+
+    var obj = (0, _objectSpread2.default)({}, filterValues);
+    delete obj[searchKey];
+    var hasBaseFilter = !!((_Object$keys = Object.keys(obj)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length);
+    var hasComplexFilter = !!((_Object$keys2 = Object.keys(complexFilterValues)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length);
+    return hasBaseFilter || hasComplexFilter;
+  }, [filterValues, complexFilterValues]); // 一键清空 清空筛选，保留模糊查询
+
+  var handleClear = function handleClear() {
+    var baseFilter = filterValues[searchKey] ? (0, _defineProperty2.default)({}, searchKey, filterValues[searchKey]) : {};
+    dispatch({
+      type: 'changeFilterValues',
+      filterValues: baseFilter
+    });
+    dispatch({
+      type: 'changeComplexFilterValues',
+      complexFilterValues: {}
+    });
+    onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
+  };
+
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setOptions: setOptions,
@@ -150,7 +180,10 @@ var Filter = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     className: "lm_filter_base"
   }, custom && /*#__PURE__*/_react.default.createElement(_customFilter.default, null), levelGroup && /*#__PURE__*/_react.default.createElement(_radioGroup.default, null), (custom || levelGroup) && /*#__PURE__*/_react.default.createElement("div", {
     className: "line"
-  }), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null)));
+  }), /*#__PURE__*/_react.default.createElement(_baseFilter.default, null), complex && /*#__PURE__*/_react.default.createElement(_complexFilter.default, null), hasClear && /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+    type: "link",
+    onClick: handleClear
+  }, "\u4E00\u952E\u6E05\u7A7A")));
 });
 var _default = Filter;
 exports.default = _default;