@teamix/pro 1.5.41 → 1.5.42

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. package/dist/pro.js +408 -443
  2. package/dist/pro.min.js +1 -1
  3. package/es/index.d.ts +1 -1
  4. package/es/index.js +1 -1
  5. package/es/table/components/Filter/index.js +15 -13
  6. package/es/table/typing.d.ts +2 -0
  7. package/es/table/utils/useTableSelection.js +7 -5
  8. package/lib/index.d.ts +1 -1
  9. package/lib/index.js +1 -1
  10. package/lib/table/components/Filter/index.js +15 -13
  11. package/lib/table/typing.d.ts +2 -0
  12. package/lib/table/utils/useTableSelection.js +7 -5
  13. package/package.json +1 -1
package/es/index.d.ts CHANGED
@@ -30,5 +30,5 @@ export * from './sidebar';
30
30
  export * from './utils';
31
31
  export * from './timeline';
32
32
  export * from './image';
33
- declare const version = "1.5.41";
33
+ declare const version = "1.5.42";
34
34
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };
package/es/index.js CHANGED
@@ -37,7 +37,7 @@ export * from './sidebar';
37
37
  export * from './utils';
38
38
  export * from './timeline';
39
39
  export * from './image';
40
- var version = '1.5.41';
40
+ var version = '1.5.42';
41
41
  // By TeamixTest
42
42
  window.postMessage({
43
43
  source: 'teamix-test-devtools',
package/es/table/components/Filter/index.js CHANGED
@@ -23,20 +23,22 @@ var CheckboxItem = Menu.CheckboxItem;
23
23
  var cls = usePrefixCls('teamix-pro-table-toolbar-filter');
24
24
  var RadioItem = Menu.RadioItem;
25
25
  var Filter = function Filter(props) {
26
- var _urlState$split, _urlState, _urlState$split2;
26
+ var _ref3, _urlState$split, _urlState, _urlState$split2;
27
27
  var column = props.column,
28
28
  actionRef = props.actionRef,
29
29
  switchCardView = props.switchCardView,
30
30
  bindUrlProps = props.bindUrlProps,
31
31
  bindUrl = props.bindUrl;
32
32
  var _column$filtersWidth = column.filtersWidth,
33
- filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth;
33
+ filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth,
34
+ _column$defaultFilter = column.defaultFilterSelectedKeys,
35
+ defaultFilterSelectedKeys = _column$defaultFilter === void 0 ? [] : _column$defaultFilter;
34
36
  var _ref = bindUrl ? useUrlState() : [],
35
37
  _ref2 = _slicedToArray(_ref, 2),
36
38
  urlState = _ref2[0],
37
39
  setUrlState = _ref2[1];
38
40
  // 选中过滤项
39
- var _useState = useState((_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : []),
41
+ var _useState = useState((_ref3 = (_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : defaultFilterSelectedKeys) !== null && _ref3 !== void 0 ? _ref3 : []),
40
42
  _useState2 = _slicedToArray(_useState, 2),
41
43
  selected = _useState2[0],
42
44
  setSelected = _useState2[1];
@@ -61,11 +63,11 @@ var Filter = function Filter(props) {
61
63
  var filters = column.dataSource;
62
64
  // 转换 valueEnum 为 options
63
65
  if (!Array.isArray(column.dataSource)) {
64
- filters = Object.entries(column.dataSource).map(function (_ref3) {
66
+ filters = Object.entries(column.dataSource).map(function (_ref4) {
65
67
  var _nv$label, _nv$color;
66
- var _ref4 = _slicedToArray(_ref3, 2),
67
- k = _ref4[0],
68
- v = _ref4[1];
68
+ var _ref5 = _slicedToArray(_ref4, 2),
69
+ k = _ref5[0],
70
+ v = _ref5[1];
69
71
  var nv = v;
70
72
  return _objectSpread(_objectSpread({
71
73
  value: k
@@ -145,10 +147,10 @@ var Filter = function Filter(props) {
145
147
  };
146
148
  // 渲染单选
147
149
  var renderSingle = function renderSingle() {
148
- return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref5) {
150
+ return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
149
151
  var _value$toString;
150
- var label = _ref5.label,
151
- value = _ref5.value;
152
+ var label = _ref6.label,
153
+ value = _ref6.value;
152
154
  var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
153
155
  return /*#__PURE__*/React.createElement(RadioItem, {
154
156
  id: valueStr,
@@ -168,10 +170,10 @@ var Filter = function Filter(props) {
168
170
  };
169
171
  // 渲染多选
170
172
  var renderMultiple = function renderMultiple() {
171
- return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
173
+ return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref7) {
172
174
  var _value$toString2;
173
- var label = _ref6.label,
174
- value = _ref6.value;
175
+ var label = _ref7.label,
176
+ value = _ref7.value;
175
177
  var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
176
178
  return /*#__PURE__*/React.createElement(CheckboxItem, {
177
179
  key: valueStr,
package/es/table/typing.d.ts CHANGED
@@ -56,6 +56,8 @@ export declare type ProTableColumnProps = {
56
56
  filters?: boolean | ProTableColumnsFilterItemProps[];
57
57
  /** 表头的过滤菜单项过滤方式 single 单选 multiple 多选 */
58
58
  filtersMode?: 'single' | 'multiple';
59
+ /** 表头的过滤菜单项默认值 */
60
+ defaultFilterSelectedKeys?: string[];
59
61
  /** 表头的过滤菜单项在搜索之前的参数操作 */
60
62
  beforeFilter?: (rules: string[]) => string;
61
63
  /** 表头的过滤菜单宽度 */
package/es/table/utils/useTableSelection.js CHANGED
@@ -42,8 +42,9 @@ function useTableSelection() {
42
42
  var _config$selectedRowKe;
43
43
  setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
44
44
  }, [config.selectedRowKeys]);
45
- function _onChange(value, records) {
45
+ function _onChange(value, records, checked, record) {
46
46
  if (primaryKey) {
47
+ var _config$onSelect;
47
48
  var newValue = value.filter(function (v) {
48
49
  return !selectedRowKeys.includes(v);
49
50
  });
@@ -69,8 +70,11 @@ function useTableSelection() {
69
70
  });
70
71
  }
71
72
  setSelectedRecords(nextSelectedRecords);
73
+ config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, nextSelectedRecords);
72
74
  } else {
75
+ var _config$onSelect2;
73
76
  setSelectedRecords(records);
77
+ config === null || config === void 0 ? void 0 : (_config$onSelect2 = config.onSelect) === null || _config$onSelect2 === void 0 ? void 0 : _config$onSelect2.call(config, checked, record, records);
74
78
  }
75
79
  setSelectedRowKeys(value);
76
80
  if (config.onChange) {
@@ -84,14 +88,12 @@ function useTableSelection() {
84
88
  return /*#__PURE__*/React.createElement(Checkbox, _objectSpread({
85
89
  checked: selectedRowKeys.includes(primaryKey),
86
90
  onChange: function onChange(checked) {
87
- var _config$onSelect;
88
- config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, records);
89
91
  if (checked) {
90
- _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record]);
92
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record], checked, record);
91
93
  } else {
92
94
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
93
95
  return item !== primaryKey;
94
- }), [record]);
96
+ }), [record], checked, record);
95
97
  }
96
98
  }
97
99
  }, others));
package/lib/index.d.ts CHANGED
@@ -30,5 +30,5 @@ export * from './sidebar';
30
30
  export * from './utils';
31
31
  export * from './timeline';
32
32
  export * from './image';
33
- declare const version = "1.5.41";
33
+ declare const version = "1.5.42";
34
34
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };
package/lib/index.js CHANGED
@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
299
299
  if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
300
300
  _icon.default.setConfig(_utils.default.getTeamixIconConfig());
301
301
  }
302
- var version = '1.5.41';
302
+ var version = '1.5.42';
303
303
  // By TeamixTest
304
304
  exports.version = version;
305
305
  window.postMessage({
package/lib/table/components/Filter/index.js CHANGED
@@ -32,20 +32,22 @@ var CheckboxItem = _components.Menu.CheckboxItem;
32
32
  var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-filter');
33
33
  var RadioItem = _components.Menu.RadioItem;
34
34
  var Filter = function Filter(props) {
35
- var _urlState$split, _urlState, _urlState$split2;
35
+ var _ref3, _urlState$split, _urlState, _urlState$split2;
36
36
  var column = props.column,
37
37
  actionRef = props.actionRef,
38
38
  switchCardView = props.switchCardView,
39
39
  bindUrlProps = props.bindUrlProps,
40
40
  bindUrl = props.bindUrl;
41
41
  var _column$filtersWidth = column.filtersWidth,
42
- filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth;
42
+ filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth,
43
+ _column$defaultFilter = column.defaultFilterSelectedKeys,
44
+ defaultFilterSelectedKeys = _column$defaultFilter === void 0 ? [] : _column$defaultFilter;
43
45
  var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
44
46
  _ref2 = _slicedToArray(_ref, 2),
45
47
  urlState = _ref2[0],
46
48
  setUrlState = _ref2[1];
47
49
  // 选中过滤项
48
- var _useState = (0, _react.useState)((_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : []),
50
+ var _useState = (0, _react.useState)((_ref3 = (_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : defaultFilterSelectedKeys) !== null && _ref3 !== void 0 ? _ref3 : []),
49
51
  _useState2 = _slicedToArray(_useState, 2),
50
52
  selected = _useState2[0],
51
53
  setSelected = _useState2[1];
@@ -70,11 +72,11 @@ var Filter = function Filter(props) {
70
72
  var filters = column.dataSource;
71
73
  // 转换 valueEnum 为 options
72
74
  if (!Array.isArray(column.dataSource)) {
73
- filters = Object.entries(column.dataSource).map(function (_ref3) {
75
+ filters = Object.entries(column.dataSource).map(function (_ref4) {
74
76
  var _nv$label, _nv$color;
75
- var _ref4 = _slicedToArray(_ref3, 2),
76
- k = _ref4[0],
77
- v = _ref4[1];
77
+ var _ref5 = _slicedToArray(_ref4, 2),
78
+ k = _ref5[0],
79
+ v = _ref5[1];
78
80
  var nv = v;
79
81
  return _objectSpread(_objectSpread({
80
82
  value: k
@@ -154,10 +156,10 @@ var Filter = function Filter(props) {
154
156
  };
155
157
  // 渲染单选
156
158
  var renderSingle = function renderSingle() {
157
- return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref5) {
159
+ return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
158
160
  var _value$toString;
159
- var label = _ref5.label,
160
- value = _ref5.value;
161
+ var label = _ref6.label,
162
+ value = _ref6.value;
161
163
  var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
162
164
  return /*#__PURE__*/_react.default.createElement(RadioItem, {
163
165
  id: valueStr,
@@ -177,10 +179,10 @@ var Filter = function Filter(props) {
177
179
  };
178
180
  // 渲染多选
179
181
  var renderMultiple = function renderMultiple() {
180
- return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
182
+ return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref7) {
181
183
  var _value$toString2;
182
- var label = _ref6.label,
183
- value = _ref6.value;
184
+ var label = _ref7.label,
185
+ value = _ref7.value;
184
186
  var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
185
187
  return /*#__PURE__*/_react.default.createElement(CheckboxItem, {
186
188
  key: valueStr,
package/lib/table/typing.d.ts CHANGED
@@ -56,6 +56,8 @@ export declare type ProTableColumnProps = {
56
56
  filters?: boolean | ProTableColumnsFilterItemProps[];
57
57
  /** 表头的过滤菜单项过滤方式 single 单选 multiple 多选 */
58
58
  filtersMode?: 'single' | 'multiple';
59
+ /** 表头的过滤菜单项默认值 */
60
+ defaultFilterSelectedKeys?: string[];
59
61
  /** 表头的过滤菜单项在搜索之前的参数操作 */
60
62
  beforeFilter?: (rules: string[]) => string;
61
63
  /** 表头的过滤菜单宽度 */
package/lib/table/utils/useTableSelection.js CHANGED
@@ -47,8 +47,9 @@ function useTableSelection() {
47
47
  var _config$selectedRowKe;
48
48
  setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
49
49
  }, [config.selectedRowKeys]);
50
- function _onChange(value, records) {
50
+ function _onChange(value, records, checked, record) {
51
51
  if (primaryKey) {
52
+ var _config$onSelect;
52
53
  var newValue = value.filter(function (v) {
53
54
  return !selectedRowKeys.includes(v);
54
55
  });
@@ -74,8 +75,11 @@ function useTableSelection() {
74
75
  });
75
76
  }
76
77
  setSelectedRecords(nextSelectedRecords);
78
+ config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, nextSelectedRecords);
77
79
  } else {
80
+ var _config$onSelect2;
78
81
  setSelectedRecords(records);
82
+ config === null || config === void 0 ? void 0 : (_config$onSelect2 = config.onSelect) === null || _config$onSelect2 === void 0 ? void 0 : _config$onSelect2.call(config, checked, record, records);
79
83
  }
80
84
  setSelectedRowKeys(value);
81
85
  if (config.onChange) {
@@ -89,14 +93,12 @@ function useTableSelection() {
89
93
  return /*#__PURE__*/_react.default.createElement(_components.Checkbox, _objectSpread({
90
94
  checked: selectedRowKeys.includes(primaryKey),
91
95
  onChange: function onChange(checked) {
92
- var _config$onSelect;
93
- config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, records);
94
96
  if (checked) {
95
- _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record]);
97
+ _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record], checked, record);
96
98
  } else {
97
99
  _onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
98
100
  return item !== primaryKey;
99
- }), [record]);
101
+ }), [record], checked, record);
100
102
  }
101
103
  }
102
104
  }, others));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamix/pro",
3
- "version": "1.5.41",
3
+ "version": "1.5.42",
4
4
  "description": "TeamixPro大包",
5
5
  "keywords": [
6
6
  "aliyun",