@lemon-fe/components 0.1.132 → 0.1.134

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.
@@ -16,6 +16,9 @@ import moment from 'moment';
16
16
  import { PREFIX_CLS } from '../constants';
17
17
  import Down from '../Icons/Down';
18
18
  var defaultOptions = [{
19
+ label: '自定义时段',
20
+ value: null
21
+ }, {
19
22
  label: '今天',
20
23
  value: function value() {
21
24
  return [moment().startOf('day'), moment().endOf('day')];
@@ -25,11 +28,6 @@ var defaultOptions = [{
25
28
  value: function value() {
26
29
  return [moment().add(-1, 'days').startOf('day'), moment().add(-1, 'days').endOf('day')];
27
30
  }
28
- }, {
29
- label: '最近3日',
30
- value: function value() {
31
- return [moment().add(-2, 'days'), moment()];
32
- }
33
31
  }, {
34
32
  label: '本周',
35
33
  value: function value() {
@@ -40,11 +38,6 @@ var defaultOptions = [{
40
38
  value: function value() {
41
39
  return [moment().startOf('isoWeek').add(-1, 'week'), moment().endOf('isoWeek').add(-1, 'week')];
42
40
  }
43
- }, {
44
- label: '最近7日',
45
- value: function value() {
46
- return [moment().add(-6, 'days'), moment()];
47
- }
48
41
  }, {
49
42
  label: '本月',
50
43
  value: function value() {
@@ -60,34 +53,6 @@ var defaultOptions = [{
60
53
  value: function value() {
61
54
  return [moment().add(-29, 'days').startOf('day'), moment().endOf('day')];
62
55
  }
63
- }, {
64
- label: '本季',
65
- value: function value() {
66
- return [moment().startOf('quarter'), moment().endOf('quarter')];
67
- }
68
- }, {
69
- label: '上季',
70
- value: function value() {
71
- return [moment().add(-1, 'quarters').startOf('quarter'), moment().add(-1, 'quarters').endOf('quarter')];
72
- }
73
- }, {
74
- label: '最近90日',
75
- value: function value() {
76
- return [moment().add(-89, 'days').startOf('day'), moment().endOf('day')];
77
- }
78
- }, {
79
- label: '最近120日',
80
- value: function value() {
81
- return [moment().add(-119, 'days').startOf('day'), moment().endOf('day')];
82
- }
83
- }, {
84
- label: '今年',
85
- value: function value() {
86
- return [moment().startOf('year'), moment().endOf('year')];
87
- }
88
- }, {
89
- label: '自定义时段',
90
- value: null
91
56
  }];
92
57
  export default function DurationPicker(props) {
93
58
  var _result$type, _result$option, _result$option2;
@@ -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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lemon-fe/components",
3
- "version": "0.1.132",
3
+ "version": "0.1.134",
4
4
  "description": "> TODO: description",
5
5
  "author": "鲁盛杰 <lusj@cnlemon.net>",
6
6
  "homepage": "",