@sooloer/pages 1.0.0 → 1.0.1

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.
@@ -1,6 +1,6 @@
1
1
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
2
2
  import { EllipsisOutlined } from '@ant-design/icons';
3
- import { Button, ConfigProvider, Dropdown, Space } from 'antd';
3
+ import { Button, ConfigProvider, Dropdown, Menu, Space } from 'antd';
4
4
  import React, { useContext, useMemo } from 'react';
5
5
  import Style from "./style";
6
6
  var ProButton = function ProButton(props) {
@@ -25,35 +25,33 @@ var ProButton = function ProButton(props) {
25
25
  }, [buttons]),
26
26
  fixedSource = _useMemo.fixedSource,
27
27
  moreSource = _useMemo.moreSource;
28
- var moreMenuItems = useMemo(function () {
29
- return moreSource.map(function (button) {
30
- var _ref, _key, _button$buttonProps, _button$buttonProps2, _button$render;
31
- return {
32
- key: String((_ref = (_key = (_button$buttonProps = button.buttonProps) === null || _button$buttonProps === void 0 ? void 0 : _button$buttonProps.key) !== null && _key !== void 0 ? _key : (_button$buttonProps2 = button.buttonProps) === null || _button$buttonProps2 === void 0 ? void 0 : _button$buttonProps2.id) !== null && _ref !== void 0 ? _ref : button === null || button === void 0 ? void 0 : button.text),
33
- label: (_button$render = button.render) !== null && _button$render !== void 0 ? _button$render : /*#__PURE__*/React.createElement(Button, _extends({}, button.buttonProps, {
34
- type: "link"
35
- }), button === null || button === void 0 ? void 0 : button.text)
36
- };
37
- });
38
- }, [moreSource]);
39
28
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Style, {
40
29
  prefix: context.getPrefixCls()
41
30
  }), /*#__PURE__*/React.createElement("div", {
42
31
  className: "sooloer-button-group"
43
32
  }, /*#__PURE__*/React.createElement(Space, {
44
33
  size: 8
45
- }, fixedSource.map(function (button) {
46
- var _button$render2, _ref2, _key2, _button$buttonProps3, _button$buttonProps4;
47
- return (_button$render2 = button.render) !== null && _button$render2 !== void 0 ? _button$render2 : /*#__PURE__*/React.createElement(Button, _extends({
48
- key: String((_ref2 = (_key2 = (_button$buttonProps3 = button.buttonProps) === null || _button$buttonProps3 === void 0 ? void 0 : _button$buttonProps3.key) !== null && _key2 !== void 0 ? _key2 : (_button$buttonProps4 = button.buttonProps) === null || _button$buttonProps4 === void 0 ? void 0 : _button$buttonProps4.id) !== null && _ref2 !== void 0 ? _ref2 : button === null || button === void 0 ? void 0 : button.text),
34
+ }, fixedSource.map(function (button, index) {
35
+ var _button$render;
36
+ return (_button$render = button.render) !== null && _button$render !== void 0 ? _button$render : /*#__PURE__*/React.createElement(Button, _extends({
37
+ key: index,
49
38
  type: type || 'default'
50
39
  }, button.buttonProps), button === null || button === void 0 ? void 0 : button.text);
51
40
  }), moreSource.length > 0 && /*#__PURE__*/React.createElement(Dropdown, {
52
- menu: {
53
- items: moreMenuItems
41
+ popupRender: function popupRender() {
42
+ return /*#__PURE__*/React.createElement(Menu, null, moreSource.map(function (button, index) {
43
+ var _button$render2;
44
+ return /*#__PURE__*/React.createElement(Menu.Item, {
45
+ key: index
46
+ }, (_button$render2 = button.render) !== null && _button$render2 !== void 0 ? _button$render2 : /*#__PURE__*/React.createElement(Button, _extends({}, button.buttonProps, {
47
+ type: "link"
48
+ }), button === null || button === void 0 ? void 0 : button.text));
49
+ }));
54
50
  },
55
51
  placement: "bottom",
56
- overlayClassName: "sooloer-button-group__dropdown"
52
+ classNames: {
53
+ root: 'sooloer-button-group__dropdown'
54
+ }
57
55
  }, /*#__PURE__*/React.createElement(Button, {
58
56
  className: "sooloer-button-group-ellipsis",
59
57
  type: type || 'default',
@@ -75,9 +75,13 @@ var Field = function Field(_ref) {
75
75
  style: {
76
76
  width: '100%'
77
77
  },
78
- placeholder: placeholder || "\u8BF7\u9009\u62E9".concat(label),
79
- options: options
80
- }, argProps));
78
+ placeholder: placeholder || "\u8BF7\u9009\u62E9".concat(label)
79
+ }, argProps), options.map(function (item) {
80
+ return (optionRender === null || optionRender === void 0 ? void 0 : optionRender(item)) || /*#__PURE__*/React.createElement(Select.Option, {
81
+ key: item.value,
82
+ value: item.value
83
+ }, item.label);
84
+ }));
81
85
  break;
82
86
  case 'checkbox':
83
87
  node = /*#__PURE__*/React.createElement(ProCheckbox, {
@@ -1,10 +1,3 @@
1
1
  import React from 'react';
2
- export declare const GRADE_SOURCE: {
3
- label: string;
4
- options: {
5
- label: string;
6
- value: string;
7
- }[];
8
- }[];
9
2
  declare const _default: () => React.JSX.Element;
10
3
  export default _default;
@@ -1,54 +1,5 @@
1
1
  import { ProFilter } from "../..";
2
2
  import React from 'react';
3
- export var GRADE_SOURCE = [{
4
- label: '小学',
5
- options: [{
6
- label: '一年级',
7
- value: '1-1'
8
- }, {
9
- label: '二年级',
10
- value: '1-2'
11
- }, {
12
- label: '三年级',
13
- value: '1-3'
14
- }, {
15
- label: '四年级',
16
- value: '1-4'
17
- }, {
18
- label: '五年级',
19
- value: '1-5'
20
- }, {
21
- label: '六年级',
22
- value: '1-6'
23
- }]
24
- }, {
25
- label: '初中',
26
- options: [{
27
- label: '五四制六年级',
28
- value: '2-0'
29
- }, {
30
- label: '七年级',
31
- value: '2-1'
32
- }, {
33
- label: '八年级',
34
- value: '2-2'
35
- }, {
36
- label: '九年级',
37
- value: '2-3'
38
- }]
39
- }, {
40
- label: '高中',
41
- options: [{
42
- label: '高一',
43
- value: '3-1'
44
- }, {
45
- label: '高二',
46
- value: '3-2'
47
- }, {
48
- label: '高三',
49
- value: '3-3'
50
- }]
51
- }];
52
3
  export default (function () {
53
4
  var fields = [{
54
5
  label: '发票号码',
@@ -57,12 +8,17 @@ export default (function () {
57
8
  label: '发票代码',
58
9
  name: 'invoiceCode'
59
10
  }, {
60
- label: '选择发票类型',
11
+ label: '发票类型',
61
12
  name: 'invoiceType',
62
13
  type: 'select',
63
14
  widgetProps: {
64
- placeholder: '请选择',
65
- options: GRADE_SOURCE
15
+ options: [{
16
+ label: '电子专票',
17
+ value: 1
18
+ }, {
19
+ label: '电子普票',
20
+ value: 2
21
+ }]
66
22
  }
67
23
  }];
68
24
  var handleSearch = function handleSearch(fieldsValue) {
@@ -1,4 +1,5 @@
1
1
  import { ProFilter } from "../..";
2
+ import { Select } from 'antd';
2
3
  import React from 'react';
3
4
  export default (function () {
4
5
  var fields = [{
@@ -17,11 +18,10 @@ export default (function () {
17
18
  maxTagCount: 1,
18
19
  optionLabelProp: 'label',
19
20
  optionRender: function optionRender(option) {
20
- return /*#__PURE__*/React.createElement("div", {
21
- style: {
22
- display: 'flex',
23
- flexDirection: 'column'
24
- }
21
+ return /*#__PURE__*/React.createElement(Select.Option, {
22
+ key: option.value,
23
+ value: option.value,
24
+ label: option.label
25
25
  }, /*#__PURE__*/React.createElement("div", null, "\u7B80\u79F0\uFF1A", option.label), /*#__PURE__*/React.createElement("div", {
26
26
  style: {
27
27
  fontSize: '12px',
@@ -19,55 +19,6 @@ import { ConfigProvider } from 'antd';
19
19
  import zhCN from 'antd/lib/locale/zh_CN';
20
20
  import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
21
21
  import { columns, fetchData, total } from "./data";
22
- var GRADE_SOURCE = [{
23
- label: '小学',
24
- options: [{
25
- label: '一年级',
26
- value: '1-1'
27
- }, {
28
- label: '二年级',
29
- value: '1-2'
30
- }, {
31
- label: '三年级',
32
- value: '1-3'
33
- }, {
34
- label: '四年级',
35
- value: '1-4'
36
- }, {
37
- label: '五年级',
38
- value: '1-5'
39
- }, {
40
- label: '六年级',
41
- value: '1-6'
42
- }]
43
- }, {
44
- label: '初中',
45
- options: [{
46
- label: '五四制六年级',
47
- value: '2-0'
48
- }, {
49
- label: '七年级',
50
- value: '2-1'
51
- }, {
52
- label: '八年级',
53
- value: '2-2'
54
- }, {
55
- label: '九年级',
56
- value: '2-3'
57
- }]
58
- }, {
59
- label: '高中',
60
- options: [{
61
- label: '高一',
62
- value: '3-1'
63
- }, {
64
- label: '高二',
65
- value: '3-2'
66
- }, {
67
- label: '高三',
68
- value: '3-3'
69
- }]
70
- }];
71
22
  var initialValues = {
72
23
  invoiceNo: '001',
73
24
  invoiceCode: '002'
@@ -94,14 +45,6 @@ var fields = [{
94
45
  value: 's'
95
46
  }]
96
47
  }
97
- }, {
98
- label: '年级',
99
- name: 'grad',
100
- type: 'select',
101
- widgetProps: {
102
- allowClear: true,
103
- options: GRADE_SOURCE
104
- }
105
48
  }];
106
49
  var tabs = [{
107
50
  key: '1',
@@ -73,10 +73,9 @@ var ProPage = function ProPage(_ref) {
73
73
  });
74
74
  }
75
75
  return [];
76
- }, [fieldsValues]);
76
+ }, [fieldsValues, fields, tagItemRender, tagable]);
77
77
  var handleSearch = function handleSearch(fieldsValue) {
78
78
  var _filter$onSearch;
79
- console.log('handleSearch', fieldsValue);
80
79
  setFieldsValue(fieldsValue);
81
80
  filter === null || filter === void 0 || (_filter$onSearch = filter.onSearch) === null || _filter$onSearch === void 0 || _filter$onSearch.call(filter, fieldsValue);
82
81
  };
package/dist/tab/index.js CHANGED
@@ -1,4 +1,7 @@
1
+ var _excluded = ["key"];
1
2
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
3
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
4
+ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
2
5
  import { Badge, Space, Tabs } from 'antd';
3
6
  import React from 'react';
4
7
  import ProButton from "../button-group";
@@ -12,7 +15,9 @@ var ProTabs = function ProTabs(_ref) {
12
15
  toolbars = _ref.toolbars,
13
16
  onChange = _ref.onChange,
14
17
  settingTableRef = _ref.settingTableRef;
15
- var tabPanRender = function tabPanRender(item) {
18
+ var tabPanRender = function tabPanRender(_ref2) {
19
+ var key = _ref2.key,
20
+ item = _objectWithoutProperties(_ref2, _excluded);
16
21
  if (item.hasOwnProperty('count')) {
17
22
  return /*#__PURE__*/React.createElement(Space, _extends({
18
23
  size: 2
@@ -39,13 +44,14 @@ var ProTabs = function ProTabs(_ref) {
39
44
  }, toolbars && /*#__PURE__*/React.createElement(ProButton, toolbars), settingTableRef && /*#__PURE__*/React.createElement("div", {
40
45
  className: "sooloer-tabs-bar__config",
41
46
  ref: settingTableRef
42
- }))
43
- }, tabs.map(function (item) {
44
- return /*#__PURE__*/React.createElement(Tabs.TabPane, {
45
- className: "sooloer-tabs-tab",
46
- key: item.key,
47
- tab: tabPanRender(item)
48
- });
49
- })));
47
+ })),
48
+ items: tabs.map(function (item) {
49
+ var _item$key;
50
+ return {
51
+ key: (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : '',
52
+ label: tabPanRender(item)
53
+ };
54
+ })
55
+ }));
50
56
  };
51
57
  export default ProTabs;
@@ -59,7 +59,6 @@ export default (function () {
59
59
  height: 420,
60
60
  rowSelection: {
61
61
  fixed: true,
62
- columnWidth: 120,
63
62
  selectedRowKeys: selectedRowKeys,
64
63
  // @ts-ignore
65
64
  onChange: handleRowSelectionChange
@@ -69,19 +69,9 @@ var ProTable = function ProTable(_ref) {
69
69
  // 单行勾选
70
70
  var handleSelect = function handleSelect(record, selected) {
71
71
  if (rowSelection) {
72
- if ((rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) === 'radio') {
73
- var _rowSelection$onChang;
74
- rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 || _rowSelection$onChang.call(rowSelection, [{
75
- id: record[rowKey],
76
- record: record,
77
- expandSelectedRowKeys: [],
78
- expandUnselectedRowKeys: []
79
- }], false);
80
- return;
81
- }
82
72
  var selectedRowKeys = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [];
83
73
  if (selected) {
84
- var _rowSelection$onChang2;
74
+ var _rowSelection$onChang;
85
75
  // 非当前页勾选集合
86
76
  var notCurSelectedRows = multipleable ? selectedRowKeys.filter(function (item) {
87
77
  return !curRowKeys.includes(item.id);
@@ -97,10 +87,10 @@ var ProTable = function ProTable(_ref) {
97
87
  expandSelectedRowKeys: [],
98
88
  expandUnselectedRowKeys: []
99
89
  }]);
100
- rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang2 = rowSelection.onChange) === null || _rowSelection$onChang2 === void 0 || _rowSelection$onChang2.call(rowSelection, newSelectedRows, globalChecked);
90
+ rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 || _rowSelection$onChang.call(rowSelection, newSelectedRows, globalChecked);
101
91
  } else {
102
- var _rowSelection$onChang3;
103
- rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang3 = rowSelection.onChange) === null || _rowSelection$onChang3 === void 0 || _rowSelection$onChang3.call(rowSelection, selectedRowKeys.filter(function (row) {
92
+ var _rowSelection$onChang2;
93
+ rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang2 = rowSelection.onChange) === null || _rowSelection$onChang2 === void 0 || _rowSelection$onChang2.call(rowSelection, selectedRowKeys.filter(function (row) {
104
94
  return row.id !== record[rowKey];
105
95
  }), globalChecked);
106
96
  }
@@ -110,13 +100,13 @@ var ProTable = function ProTable(_ref) {
110
100
  // 当页全选
111
101
  var handleSelectAll = function handleSelectAll(selected) {
112
102
  if (rowSelection) {
113
- var _rowSelection$onChang4;
103
+ var _rowSelection$onChang3;
114
104
  var selectedRowKeys = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || [];
115
105
  // 非当前页勾选集合
116
106
  var notCurSelectedRows = multipleable ? selectedRowKeys.filter(function (item) {
117
107
  return !curRowKeys.includes(item.id);
118
108
  }) : [];
119
- rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang4 = rowSelection.onChange) === null || _rowSelection$onChang4 === void 0 || _rowSelection$onChang4.call(rowSelection, [].concat(_toConsumableArray(notCurSelectedRows), _toConsumableArray((selected ? dataSource : []).map(function (item) {
109
+ rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang3 = rowSelection.onChange) === null || _rowSelection$onChang3 === void 0 || _rowSelection$onChang3.call(rowSelection, [].concat(_toConsumableArray(notCurSelectedRows), _toConsumableArray((selected ? dataSource : []).map(function (item) {
120
110
  return {
121
111
  record: item,
122
112
  id: item[rowKey],
@@ -143,9 +133,8 @@ var ProTable = function ProTable(_ref) {
143
133
  otherProps.fixed = expandable ? false : otherProps.fixed;
144
134
  }
145
135
  return {
146
- rowSelection: _objectSpread(_objectSpread({
147
- columnWidth: 40
148
- }, otherProps), {}, {
136
+ rowSelection: _objectSpread(_objectSpread({}, otherProps), {}, {
137
+ columnWidth: 40,
149
138
  onSelect: handleSelect,
150
139
  selectedRowKeys: _toConsumableArray(keys),
151
140
  onSelectAll: handleSelectAll,
@@ -158,9 +147,9 @@ var ProTable = function ProTable(_ref) {
158
147
 
159
148
  // 全局勾选
160
149
  var handleGlobalCheckboxChange = function handleGlobalCheckboxChange(checked) {
161
- var _rowSelection$onChang5;
150
+ var _rowSelection$onChang4;
162
151
  setGlobalChecked(checked);
163
- rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang5 = rowSelection.onChange) === null || _rowSelection$onChang5 === void 0 || _rowSelection$onChang5.call(rowSelection, _toConsumableArray((checked ? dataSource : []).map(function (item) {
152
+ rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang4 = rowSelection.onChange) === null || _rowSelection$onChang4 === void 0 || _rowSelection$onChang4.call(rowSelection, _toConsumableArray((checked ? dataSource : []).map(function (item) {
164
153
  return {
165
154
  record: item,
166
155
  id: item[rowKey],
@@ -34,7 +34,7 @@ var ColumnHeight = function ColumnHeight(_ref) {
34
34
  return /*#__PURE__*/React.createElement(Dropdown, {
35
35
  arrow: true,
36
36
  placement: "bottom",
37
- dropdownRender: function dropdownRender() {
37
+ popupRender: function popupRender() {
38
38
  return settingMenu;
39
39
  },
40
40
  trigger: ['click']
@@ -46,7 +46,6 @@ var ElTable = function ElTable(_ref) {
46
46
  onGlobalCheckboxChange = _ref.onGlobalCheckboxChange,
47
47
  extraAction = _ref.extraAction,
48
48
  args = _objectWithoutProperties(_ref, _excluded);
49
- var headerRef = /*#__PURE__*/React.createRef();
50
49
  var _useState = useState('small'),
51
50
  _useState2 = _slicedToArray(_useState, 2),
52
51
  size = _useState2[0],
@@ -59,10 +58,6 @@ var ElTable = function ElTable(_ref) {
59
58
  _useState6 = _slicedToArray(_useState5, 2),
60
59
  sortColumns = _useState6[0],
61
60
  setSortColumns = _useState6[1];
62
- var _useState7 = useState(39),
63
- _useState8 = _slicedToArray(_useState7, 2),
64
- tableHeaderHeight = _useState8[0],
65
- setTableHeaderHeight = _useState8[1];
66
61
  var settingRootRef = useRef(null);
67
62
  var settingContainerRef = useRef(null);
68
63
  var _useContext = useContext(ConfigProvider.ConfigContext),
@@ -82,11 +77,15 @@ var ElTable = function ElTable(_ref) {
82
77
  return !(item !== null && item !== void 0 && item.hideInTable || false);
83
78
  });
84
79
  }, [sortColumns]);
85
- useEffect(function () {
86
- if (headerRef !== null && headerRef !== void 0 && headerRef.current) {
87
- setTableHeaderHeight(headerRef.current.offsetHeight);
80
+ var tableHeaderHeight = useMemo(function () {
81
+ if (size === 'large') {
82
+ return 56;
83
+ }
84
+ if (size === 'middle') {
85
+ return 48;
88
86
  }
89
- }, [headerRef]);
87
+ return 40;
88
+ }, [size]);
90
89
  var paginationConfig = useMemo(function () {
91
90
  if (pagination !== false) {
92
91
  return _objectSpread({
@@ -96,10 +95,9 @@ var ElTable = function ElTable(_ref) {
96
95
  className: 'sooloer-table-pagination',
97
96
  pageSizeOptions: [20, 50, 100, 200],
98
97
  showTotal: function showTotal(total, range) {
99
- var _args$rowSelection;
100
98
  return /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement(Col, {
101
99
  flex: "auto"
102
- }, globalCheckable && (args === null || args === void 0 ? void 0 : args.rowSelection) && (args === null || args === void 0 || (_args$rowSelection = args.rowSelection) === null || _args$rowSelection === void 0 ? void 0 : _args$rowSelection.type) !== 'radio' && /*#__PURE__*/React.createElement(Checkbox, {
100
+ }, globalCheckable && (args === null || args === void 0 ? void 0 : args.rowSelection) && /*#__PURE__*/React.createElement(Checkbox, {
103
101
  checked: globalChecked,
104
102
  onChange: handleGlobalChange,
105
103
  className: "sooloer-table-global-checkbox"
@@ -126,20 +124,17 @@ var ElTable = function ElTable(_ref) {
126
124
  }
127
125
  var getContainer = setting.getContainer,
128
126
  settingArgs = _objectWithoutProperties(setting, _excluded2);
129
- if (!getContainer) {
130
- return;
131
- }
132
127
  var node = typeof getContainer === 'string' ? document.querySelector(getContainer) : getContainer;
133
128
  if (!node || !(node instanceof Element) && !(node instanceof DocumentFragment)) {
134
129
  return;
135
130
  }
136
- var prefixCls = getPrefixCls();
137
131
  if (!settingRootRef.current || settingContainerRef.current !== node) {
138
132
  var _settingRootRef$curre;
139
133
  (_settingRootRef$curre = settingRootRef.current) === null || _settingRootRef$curre === void 0 || _settingRootRef$curre.unmount();
140
134
  settingRootRef.current = createRoot(node);
141
135
  settingContainerRef.current = node;
142
136
  }
137
+ var prefixCls = getPrefixCls();
143
138
  settingRootRef.current.render(
144
139
  /*#__PURE__*/
145
140
  // @ts-ignore
@@ -155,8 +150,7 @@ var ElTable = function ElTable(_ref) {
155
150
  onSizeChange: setSize,
156
151
  onColumnSortChange: handleColumnSortChange
157
152
  })));
158
- // eslint-disable-next-line react-hooks/exhaustive-deps
159
- }, [size, sortColumns, setting, getPrefixCls]);
153
+ }, [size, sortColumns, setting, getPrefixCls, loading]);
160
154
  useEffect(function () {
161
155
  return function () {
162
156
  var _settingRootRef$curre2;
@@ -174,7 +168,7 @@ var ElTable = function ElTable(_ref) {
174
168
  };
175
169
  if (height) {
176
170
  scrollProps = _objectSpread(_objectSpread({}, scrollProps), {}, {
177
- y: height - tableHeaderHeight - (pagination === false ? 12 : 48)
171
+ y: height - tableHeaderHeight - (pagination === false ? 0 : 48)
178
172
  });
179
173
  }
180
174
  return scrollProps;
@@ -187,15 +181,7 @@ var ElTable = function ElTable(_ref) {
187
181
  className: classnames('sooloer-table', {
188
182
  'pagination-hidden': pagination === false
189
183
  }),
190
- columns: _toConsumableArray(showColumns.map(function (row, index) {
191
- return _objectSpread(_objectSpread({}, row), !index && {
192
- onHeaderCell: function onHeaderCell() {
193
- return {
194
- ref: headerRef
195
- };
196
- }
197
- });
198
- })),
184
+ columns: showColumns,
199
185
  dataSource: dataSource,
200
186
  style: {
201
187
  height: height
@@ -1,5 +1,7 @@
1
1
  import { createGlobalStyle } from 'styled-components';
2
- var Style = createGlobalStyle([".sooloer-table{height:100%;> .", "-spin-nested-loading{height:100%;> .", "-spin-container{height:100%;}}&.pagination-hidden{.", "-table{height:100%;}}.", "-table{height:calc(100% - 48px);}.", "-table-container{height:100%;}.", "-table-body{height:100%;}.", "-table-placeholder{> td{border-bottom:none !important;}}.", "-pagination-total-text{flex:1;}.", "-table-expanded-row{> td{padding:0 !important;}.", "-table{margin-block:8px !important;margin-inline:0 !important;}}&-global-checkbox{margin-left:12px;}.sooloer-table-pagination{margin:12px 0 !important;}}"], function (props) {
2
+ var Style = createGlobalStyle([".sooloer-table{height:100%;.", "-spin,.", "-spin-nested-loading,.", "-spin-container{height:100%;}&.pagination-hidden{.", "-table{height:100%;}}.", "-table{height:calc(100% - 48px);}.", "-table-container{height:100%;}.", "-table-body{height:100%;}.", "-table-placeholder{> td{border-bottom:none !important;}}.", "-pagination-total-text{flex:1;}.", "-table-expanded-row{> td{padding:0 !important;}.", "-table{margin-block:8px !important;margin-inline:0 !important;}}&-global-checkbox{margin-left:12px;}.sooloer-table-pagination{margin:12px 0 !important;}}"], function (props) {
3
+ return props.prefix;
4
+ }, function (props) {
3
5
  return props.prefix;
4
6
  }, function (props) {
5
7
  return props.prefix;
@@ -16,7 +16,7 @@ export interface SelectedRowKeyProps {
16
16
  /**
17
17
  * @description 取表格 roeKey 字段,必传
18
18
  */
19
- id?: string | number;
19
+ id?: string;
20
20
  /**
21
21
  * @description 当前勾选行信息
22
22
  */
@@ -56,7 +56,6 @@ export type ProTableProps = TableProps<any> & {
56
56
  * @description 表格行是否可选择,配置项参考 antd.Table
57
57
  */
58
58
  rowSelection?: {
59
- type?: 'checkbox' | 'radio';
60
59
  selectedRowKeys?: SelectedRowKeyProps[];
61
60
  onChange?: (selectedRowKeys: SelectedRowKeyProps[], globalChecked: boolean) => void;
62
61
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sooloer/pages",
3
- "version": "1.0.0",
3
+ "version": "1.0.1",
4
4
  "description": "A react library developed with dumi",
5
5
  "license": "MIT",
6
6
  "module": "dist/index.js",
@@ -50,6 +50,8 @@
50
50
  "antd": "^6.3.1",
51
51
  "dayjs": "^1.11.10",
52
52
  "mockjs": "^1.1.0",
53
+ "react": "^19.1.0",
54
+ "react-dom": "^19.1.0",
53
55
  "react-sortable-hoc": "^2.0.0",
54
56
  "react-virtualized-auto-sizer": "^1.0.23",
55
57
  "styled-components": "^6.1.8"
@@ -70,8 +72,6 @@
70
72
  "prettier": "^2.7.1",
71
73
  "prettier-plugin-organize-imports": "^3.0.0",
72
74
  "prettier-plugin-packagejson": "^2.2.18",
73
- "react": "^19.1.0",
74
- "react-dom": "^19.1.0",
75
75
  "stylelint": "^14.9.1"
76
76
  },
77
77
  "peerDependencies": {