linkmore-design 1.0.47 → 1.0.48

package/dist/CkFilter/complexFilter/saveModal.d.ts

@@ -1,4 +1,5 @@
 export default Save;
-declare function Save({ state }: {
+declare function Save({ state, dispatch }: {
     state: any;
+    dispatch: any;
 }): JSX.Element;

package/dist/index.umd.js

@@ -31036,16 +31036,6 @@
 	      orderFields = state.orderFields,
 	      customFilterValues = state.customFilterValues,
 	      complexFilterValues = state.complexFilterValues;
-	  var hasClear = React.useMemo(function () {
-	    var _Object$keys, _Object$keys2;
-
-	    var obj = _objectSpread({}, 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 handleFilter = function handleFilter(val) {
 	    var nValue = _objectSpread({}, filterValues);
@@ -31061,26 +31051,6 @@
 	    });
 	    onChange === null || onChange === void 0 ? void 0 : onChange(nValue, customFilterValues);
 	    return false;
-	  }; // 一键清空 清空筛选，保留模糊查询
-
-
-	  var handleClear = function handleClear() {
-	    var _inputRef$current;
-
-	    if ((_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.input) {
-	      inputRef.current.input.value = '';
-	    }
-
-	    var baseFilter = filterValues[searchKey] ? _defineProperty({}, searchKey, filterValues[searchKey]) : {};
-	    dispatch({
-	      type: 'changeFilterValues',
-	      filterValues: baseFilter
-	    });
-	    dispatch({
-	      type: 'changeComplexFilterValues',
-	      complexFilterValues: {}
-	    });
-	    onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
 	  };
 
 	  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, search && /*#__PURE__*/React__default['default'].createElement("div", {
@@ -31099,10 +31069,7 @@
 	    return /*#__PURE__*/React__default['default'].createElement(FilterMenu, _extends({
 	      key: v.field
 	    }, v));
-	  })), /*#__PURE__*/React__default['default'].createElement(NestedFilter$1, null), hasClear && /*#__PURE__*/React__default['default'].createElement(LMButton, {
-	    type: "link",
-	    onClick: handleClear
-	  }, "\u4E00\u952E\u6E05\u7A7A"));
+	  })), /*#__PURE__*/React__default['default'].createElement(NestedFilter$1, null));
 	};
 
 	var asyncToGenerator = createCommonjsModule(function (module) {
@@ -32008,7 +31975,8 @@
 	};
 
 	var Save = function Save(_ref) {
-	  var state = _ref.state;
+	  var state = _ref.state,
+	      dispatch = _ref.dispatch;
 
 	  var _useState = React.useState(false),
 	      _useState2 = _slicedToArray(_useState, 2),
@@ -32049,20 +32017,26 @@
 
 	              console.log('保存数据！', nValue);
 	              onClose();
-	              _context.next = 13;
+	              dispatch({
+	                type: 'changeComplexDrawer',
+	                complexDrawer: _objectSpread(_objectSpread({}, 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() {
@@ -32091,6 +32065,9 @@
 	  }, /*#__PURE__*/React__default['default'].createElement(Form$1, {
 	    form: form,
 	    layout: "vertical",
+	    initialValues: {
+	      default: false
+	    },
 	    size: "default"
 	  }, /*#__PURE__*/React__default['default'].createElement("div", {
 	    className: "filter_drawer_group"
@@ -32254,7 +32231,7 @@
 
 	  var tagElem = function tagElem() {
 	    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(_Tag__default['default'], {
-	      className: "site-tag-plus",
+	      className: "add_tags",
 	      onClick: handleAdd
 	    }, /*#__PURE__*/React__default['default'].createElement(IconFont, {
 	      type: "lmweb-plus"
@@ -32457,7 +32434,8 @@
 	      onClick: onClose,
 	      size: "small"
 	    }, "\u53D6\u6D88"), !!instance.custom && /*#__PURE__*/React__default['default'].createElement(Save, {
-	      state: state
+	      state: state,
+	      dispatch: dispatch
 	    }), /*#__PURE__*/React__default['default'].createElement(LMButton, {
 	      type: "primary",
 	      onClick: onSearch,
@@ -33027,9 +33005,14 @@
 	      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 = React.useCallback(function () {
 	    var trigger = props.trigger,
@@ -33121,6 +33104,30 @@
 	    (_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 = React.useMemo(function () {
+	    var _Object$keys, _Object$keys2;
+
+	    var obj = _objectSpread({}, 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] ? _defineProperty({}, searchKey, filterValues[searchKey]) : {};
+	    dispatch({
+	      type: 'changeFilterValues',
+	      filterValues: baseFilter
+	    });
+	    dispatch({
+	      type: 'changeComplexFilterValues',
+	      complexFilterValues: {}
+	    });
+	    onChange === null || onChange === void 0 ? void 0 : onChange(baseFilter, customFilterValues);
+	  };
+
 	  React.useImperativeHandle(ref, function () {
 	    return {
 	      setOptions: setOptions,
@@ -33136,7 +33143,10 @@
 	    className: "lm_filter_base"
 	  }, custom && /*#__PURE__*/React__default['default'].createElement(Custom$1, null), levelGroup && /*#__PURE__*/React__default['default'].createElement(CustomGroup, null), (custom || levelGroup) && /*#__PURE__*/React__default['default'].createElement("div", {
 	    className: "line"
-	  }), /*#__PURE__*/React__default['default'].createElement(Filter, null), complex && /*#__PURE__*/React__default['default'].createElement(Custom, null)));
+	  }), /*#__PURE__*/React__default['default'].createElement(Filter, null), complex && /*#__PURE__*/React__default['default'].createElement(Custom, null), hasClear && /*#__PURE__*/React__default['default'].createElement(LMButton, {
+	    type: "link",
+	    onClick: handleClear
+	  }, "\u4E00\u952E\u6E05\u7A7A")));
 	});
 
 	var question01 = "9f788f660abc173c.png";
@@ -78438,10 +78448,11 @@
 	        setSelectedRows({
 	          selectedRows: selectedRows
 	        });
+	        rowClick === null || rowClick === void 0 ? void 0 : rowClick(selectedRows);
 	      }
+	    } else {
+	      rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
 	    }
-
-	    rowClick === null || rowClick === void 0 ? void 0 : rowClick(record);
 	  }; // 重写表格，增加虚拟滚动
 	  // const vComponents = useMemo(() => {
 	  //   return VList({
@@ -78487,6 +78498,11 @@
 	        showTotal: function showTotal(total) {
 	          return "\u5171 ".concat(total, " \u6761");
 	        },
+	        locale: {
+	          items_per_page: '/条',
+	          jump_to: '前往',
+	          page: '页'
+	        },
 	        size: 'small'
 	      }, pagination),
 	      rowSelection: rowSelection === false ? undefined : _objectSpread({
@@ -84297,7 +84313,7 @@
 	            obj[item.dataIndex]['order'] = item.order;
 	          }
 
-	          if (![undefined, null].includes(item.order)) {
+	          if (![undefined, null].includes(item.show)) {
 	            obj[item.dataIndex]['show'] = item.show;
 	          }
 
@@ -84557,7 +84573,7 @@
 	            obj[item.field]['order'] = item.order;
 	          }
 
-	          if (![undefined, null].includes(item.order)) {
+	          if (![undefined, null].includes(item.show)) {
 	            obj[item.field]['show'] = item.show;
 	          }
 	        });