@lemon-fe/components 0.1.131 → 0.1.133

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -94,6 +94,11 @@ function Filter(props) {
94
94
  _props$defaultCollaps = props.defaultCollapsed,
95
95
  defaultCollapsed = _props$defaultCollaps === void 0 ? true : _props$defaultCollaps;
96
96
  var prefixCls = "".concat(PREFIX_CLS, "-filter");
97
+ var emptyValue = useMemo(function () {
98
+ return Object.fromEntries(data.map(function (item) {
99
+ return [item.key, undefined];
100
+ }));
101
+ }, []);
97
102
  var defaultValue = useMemo(function () {
98
103
  return defaultValueProp || value;
99
104
  }, []);
@@ -284,8 +289,9 @@ function Filter(props) {
284
289
  var handleTabChange = function handleTabChange(index) {
285
290
  if (index !== active) {
286
291
  setActive(index);
287
- form.setFieldsValue(tabs[index].value);
288
- handleFinish(form.getFieldsValue());
292
+ var _data = _objectSpread(_objectSpread({}, emptyValue), tabs[index].value);
293
+ form.setFieldsValue(_data);
294
+ handleFinish(_data);
289
295
  }
290
296
  };
291
297
  var handleActiveKey = function handleActiveKey(key, value) {
@@ -1,8 +1,8 @@
1
1
  import { CSSProperties, Key, ReactElement } from 'react';
2
2
  import type { TableRowSelection } from 'antd/lib/table/interface';
3
- import type { FilterItemType } from '../Filter/typings';
3
+ import type { FilterProps } from '../Filter/typings';
4
4
  import type { ColumnType } from '../BaseTable/typings';
5
- interface Props<RecordType, ParamsType> {
5
+ interface Props<RecordType, ParamsType extends Record<string, any>> {
6
6
  value?: RecordType[];
7
7
  onChange?: (value: RecordType[]) => void;
8
8
  /**
@@ -37,16 +37,12 @@ interface Props<RecordType, ParamsType> {
37
37
  * @description 筛选器设置
38
38
  */
39
39
  filter?: {
40
- defaultValue?: ParamsType;
41
- onValuesChange?: (changedValues: Partial<ParamsType>, allValues: ParamsType) => void;
42
- data: FilterItemType[];
43
40
  sider?: (props: {
44
41
  value: ParamsType;
45
42
  onChange: (value: Partial<ParamsType>) => void;
46
43
  style?: CSSProperties;
47
44
  }) => ReactElement;
48
- onChange?: (value: ParamsType) => void;
49
- };
45
+ } & FilterProps<ParamsType>;
50
46
  rowSelection?: TableRowSelection<RecordType>;
51
47
  }
52
48
  export default function SelectView<RecordType extends Record<string | number, any>, ParamsType extends Record<string, any>>(props: Props<RecordType, ParamsType>): JSX.Element;
@@ -90,24 +90,18 @@ export default function SelectView(props) {
90
90
  }
91
91
  setParams(mParams);
92
92
  };
93
- var handleValuesChange = function handleValuesChange(changedValues, allValues) {
94
- var _filter$onValuesChang;
95
- filter === null || filter === void 0 ? void 0 : (_filter$onValuesChang = filter.onValuesChange) === null || _filter$onValuesChang === void 0 ? void 0 : _filter$onValuesChang.call(filter, changedValues, allValues);
96
- };
97
93
  var headerNode = null;
98
94
  var siderNode = null;
99
95
  if (filter) {
100
96
  if (filter.data) {
101
- headerNode = /*#__PURE__*/React.createElement(Filter, {
102
- simple: true,
103
- data: filter.data,
97
+ headerNode = /*#__PURE__*/React.createElement(Filter, _objectSpread(_objectSpread({
98
+ simple: true
99
+ }, filter), {}, {
104
100
  value: params,
105
- defaultValue: filter.defaultValue,
106
101
  onChange: function onChange(val) {
107
102
  return handleChangeParams(_objectSpread(_objectSpread({}, params), val));
108
- },
109
- onValuesChange: handleValuesChange
110
- });
103
+ }
104
+ }));
111
105
  }
112
106
  if (filter.sider) {
113
107
  siderNode = filter.sider({
package/es/init.js CHANGED
@@ -76,7 +76,8 @@ export default function init() {
76
76
  });
77
77
  var node = /*#__PURE__*/React.createElement(Down, {
78
78
  style: {
79
- marginRight: -1
79
+ marginRight: -1,
80
+ pointerEvents: 'none'
80
81
  }
81
82
  });
82
83
  //@ts-ignore
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lemon-fe/components",
3
- "version": "0.1.131",
3
+ "version": "0.1.133",
4
4
  "description": "> TODO: description",
5
5
  "author": "鲁盛杰 <lusj@cnlemon.net>",
6
6
  "homepage": "",
@@ -39,5 +39,5 @@
39
39
  "react": "^17.0.2",
40
40
  "react-dom": "^17.0.2"
41
41
  },
42
- "gitHead": "0343d2bace250b1ff4a7dda4c9d240b6c5b14b5e"
42
+ "gitHead": "a0a3128b6dc72afd75ec0ff0f4dd12f01b182bdc"
43
43
  }