@hw-component/table 0.0.3-beta-v17 → 0.0.4-beta-v1

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.
Files changed (8) hide show
  1. package/es/HTableBody/index.js +1 -1
  2. package/es/Table.js +25 -16
  3. package/lib/HTableBody/index.js +1 -1
  4. package/lib/Table.js +24 -15
  5. package/package.json +1 -1
  6. package/src/components/HTableBody/index.tsx +1 -1
  7. package/src/components/Table.tsx +17 -15
  8. package/src/pages/Table/index.tsx +1 -0
package/es/HTableBody/index.js CHANGED
@@ -108,7 +108,7 @@ var Body = (function (_ref) {
108
108
  tableStyle: {
109
109
  paddingBottom: 0
110
110
  },
111
- rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
111
+ rowSelection: rowSelection === false ? rowSelection : _objectSpread(_objectSpread({}, rowSelection), {}, {
112
112
  selectedRowKeys: _keysInstanceProperty(selectedRowData),
113
113
  onChange: change
114
114
  }),
package/es/Table.js CHANGED
@@ -9,13 +9,14 @@ import _Object$defineProperties from '@babel/runtime-corejs3/core-js/object/defi
9
9
  import _Object$defineProperty from '@babel/runtime-corejs3/core-js/object/define-property';
10
10
  import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
11
11
  import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
12
- import { jsxs, jsx } from 'react/jsx-runtime';
12
+ import { jsx, jsxs } from 'react/jsx-runtime';
13
13
  import Header from './HTableHeader/index.js';
14
14
  import Body from './HTableBody/index.js';
15
15
  import useCurrentTable from './hooks/useCurrentTable.js';
16
16
  import Footer from './HTableFooter/index.js';
17
17
  import useRowObj from './hooks/useRowObj.js';
18
18
  import { HTableContext } from './context.js';
19
+ import { Space } from 'antd';
19
20
  import useReq from './hooks/useReq.js';
20
21
  import useDispatch from './hooks/useDispatch.js';
21
22
 
@@ -37,8 +38,9 @@ var Table = (function (_ref) {
37
38
  _ref$tableStyle = _ref.tableStyle,
38
39
  tableStyle = _ref$tableStyle === void 0 ? {} : _ref$tableStyle,
39
40
  _ref$action = _ref.action,
40
- action = _ref$action === void 0 ? {} : _ref$action;
41
- _ref.spaceSize;
41
+ action = _ref$action === void 0 ? {} : _ref$action,
42
+ _ref$spaceSize = _ref.spaceSize,
43
+ spaceSize = _ref$spaceSize === void 0 ? 15 : _ref$spaceSize;
42
44
  _ref.className;
43
45
  var paginationStyle = _ref.paginationStyle,
44
46
  footerBtnRender = _ref.footerBtnRender,
@@ -73,7 +75,7 @@ var Table = (function (_ref) {
73
75
  return saveParams.old;
74
76
  }
75
77
  });
76
- return jsxs(HTableContext.Provider, {
78
+ return jsx(HTableContext.Provider, {
77
79
  value: {
78
80
  tableInstance: tableInstance,
79
81
  selectedRowData: selectedRowData,
@@ -90,18 +92,25 @@ var Table = (function (_ref) {
90
92
  },
91
93
  onPageChange: tableInstance.table.reloadWithParams
92
94
  },
93
- children: [!hideHeader && jsx(Header, {
94
- searchSpan: searchSpan,
95
- headerStyle: headerStyle
96
- }), jsx(Body, _objectSpread({
97
- tableStyle: tableStyle,
98
- paginationStyle: paginationStyle
99
- }, props)), footerRender !== false && jsx(Footer, {
100
- actionRender: actionRender,
101
- footerRender: footerRender,
102
- footerStyle: footerStyle,
103
- footerBtnRender: footerBtnRender
104
- })]
95
+ children: jsxs(Space, {
96
+ direction: "vertical",
97
+ size: spaceSize,
98
+ style: {
99
+ width: '100%'
100
+ },
101
+ children: [!hideHeader && jsx(Header, {
102
+ searchSpan: searchSpan,
103
+ headerStyle: headerStyle
104
+ }), jsx(Body, _objectSpread({
105
+ tableStyle: tableStyle,
106
+ paginationStyle: paginationStyle
107
+ }, props)), footerRender !== false && jsx(Footer, {
108
+ actionRender: actionRender,
109
+ footerRender: footerRender,
110
+ footerStyle: footerStyle,
111
+ footerBtnRender: footerBtnRender
112
+ })]
113
+ })
105
114
  });
106
115
  });
107
116
 
package/lib/HTableBody/index.js CHANGED
@@ -111,7 +111,7 @@ var Body = (function (_ref) {
111
111
  tableStyle: {
112
112
  paddingBottom: 0
113
113
  },
114
- rowSelection: _objectSpread(_objectSpread({}, rowSelection), {}, {
114
+ rowSelection: rowSelection === false ? rowSelection : _objectSpread(_objectSpread({}, rowSelection), {}, {
115
115
  selectedRowKeys: _keysInstanceProperty(selectedRowData),
116
116
  onChange: change
117
117
  }),
package/lib/Table.js CHANGED
@@ -19,6 +19,7 @@ var useCurrentTable = require('./hooks/useCurrentTable.js');
19
19
  var index$2 = require('./HTableFooter/index.js');
20
20
  var useRowObj = require('./hooks/useRowObj.js');
21
21
  var context = require('./context.js');
22
+ var antd = require('antd');
22
23
  var useReq = require('./hooks/useReq.js');
23
24
  var useDispatch = require('./hooks/useDispatch.js');
24
25
 
@@ -40,8 +41,9 @@ var Table = (function (_ref) {
40
41
  _ref$tableStyle = _ref.tableStyle,
41
42
  tableStyle = _ref$tableStyle === void 0 ? {} : _ref$tableStyle,
42
43
  _ref$action = _ref.action,
43
- action = _ref$action === void 0 ? {} : _ref$action;
44
- _ref.spaceSize;
44
+ action = _ref$action === void 0 ? {} : _ref$action,
45
+ _ref$spaceSize = _ref.spaceSize,
46
+ spaceSize = _ref$spaceSize === void 0 ? 15 : _ref$spaceSize;
45
47
  _ref.className;
46
48
  var paginationStyle = _ref.paginationStyle,
47
49
  footerBtnRender = _ref.footerBtnRender,
@@ -76,7 +78,7 @@ var Table = (function (_ref) {
76
78
  return saveParams.old;
77
79
  }
78
80
  });
79
- return jsxRuntime.jsxs(context.HTableContext.Provider, {
81
+ return jsxRuntime.jsx(context.HTableContext.Provider, {
80
82
  value: {
81
83
  tableInstance: tableInstance,
82
84
  selectedRowData: selectedRowData,
@@ -93,18 +95,25 @@ var Table = (function (_ref) {
93
95
  },
94
96
  onPageChange: tableInstance.table.reloadWithParams
95
97
  },
96
- children: [!hideHeader && jsxRuntime.jsx(index.default, {
97
- searchSpan: searchSpan,
98
- headerStyle: headerStyle
99
- }), jsxRuntime.jsx(index$1.default, _objectSpread({
100
- tableStyle: tableStyle,
101
- paginationStyle: paginationStyle
102
- }, props)), footerRender !== false && jsxRuntime.jsx(index$2.default, {
103
- actionRender: actionRender,
104
- footerRender: footerRender,
105
- footerStyle: footerStyle,
106
- footerBtnRender: footerBtnRender
107
- })]
98
+ children: jsxRuntime.jsxs(antd.Space, {
99
+ direction: "vertical",
100
+ size: spaceSize,
101
+ style: {
102
+ width: '100%'
103
+ },
104
+ children: [!hideHeader && jsxRuntime.jsx(index.default, {
105
+ searchSpan: searchSpan,
106
+ headerStyle: headerStyle
107
+ }), jsxRuntime.jsx(index$1.default, _objectSpread({
108
+ tableStyle: tableStyle,
109
+ paginationStyle: paginationStyle
110
+ }, props)), footerRender !== false && jsxRuntime.jsx(index$2.default, {
111
+ actionRender: actionRender,
112
+ footerRender: footerRender,
113
+ footerStyle: footerStyle,
114
+ footerBtnRender: footerBtnRender
115
+ })]
116
+ })
108
117
  });
109
118
  });
110
119
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/table",
3
- "version": "0.0.3-beta-v17",
3
+ "version": "0.0.4-beta-v1",
4
4
  "description": "基于antd二次开发table组件",
5
5
  "keywords": [
6
6
  "table"
package/src/components/HTableBody/index.tsx CHANGED
@@ -88,7 +88,7 @@ export default ({
88
88
  tableStyle={{
89
89
  paddingBottom: 0,
90
90
  }}
91
- rowSelection={{
91
+ rowSelection={rowSelection===false?rowSelection:{
92
92
  ...rowSelection,
93
93
  selectedRowKeys: selectedRowData.keys,
94
94
  onChange: change,
package/src/components/Table.tsx CHANGED
@@ -64,22 +64,24 @@ export default ({
64
64
  onPageChange: tableInstance.table.reloadWithParams,
65
65
  }}
66
66
  >
67
- {!hideHeader && (
68
- <Header searchSpan={searchSpan} headerStyle={headerStyle} />
69
- )}
70
- <Body
71
- tableStyle={tableStyle}
72
- paginationStyle={paginationStyle}
73
- {...props}
74
- />
75
- {footerRender !== false && (
76
- <Footer
77
- actionRender={actionRender}
78
- footerRender={footerRender}
79
- footerStyle={footerStyle}
80
- footerBtnRender={footerBtnRender}
67
+ <Space direction={"vertical"} size={spaceSize} style={{width:'100%'}}>
68
+ {!hideHeader && (
69
+ <Header searchSpan={searchSpan} headerStyle={headerStyle} />
70
+ )}
71
+ <Body
72
+ tableStyle={tableStyle}
73
+ paginationStyle={paginationStyle}
74
+ {...props}
81
75
  />
82
- )}
76
+ {footerRender !== false && (
77
+ <Footer
78
+ actionRender={actionRender}
79
+ footerRender={footerRender}
80
+ footerStyle={footerStyle}
81
+ footerBtnRender={footerBtnRender}
82
+ />
83
+ )}
84
+ </Space>
83
85
  </HTableContext.Provider>
84
86
  );
85
87
  };
package/src/pages/Table/index.tsx CHANGED
@@ -36,6 +36,7 @@ export default () => {
36
36
  rowKey={"id"}
37
37
  table={hTable}
38
38
  scroll={{x:1000,y:100}}
39
+ rowSelection={false}
39
40
  headerTitle={<Test name="321321"/>}
40
41
  actionRender={(allCheck, selectedRowKeys, xjTable) => {
41
42
  console.log(allCheck, selectedRowKeys, xjTable);