@hw-component/table 1.7.6 → 1.7.8

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 (11) hide show
  1. package/es/DialogTable/DwTable.d.ts +1 -1
  2. package/es/DialogTable/DwTable.js +9 -2
  3. package/es/DialogTable/ModalTable.d.ts +1 -1
  4. package/es/DialogTable/ModalTable.js +4 -1
  5. package/lib/DialogTable/DwTable.d.ts +1 -1
  6. package/lib/DialogTable/DwTable.js +9 -2
  7. package/lib/DialogTable/ModalTable.d.ts +1 -1
  8. package/lib/DialogTable/ModalTable.js +4 -1
  9. package/package.json +1 -1
  10. package/src/components/DialogTable/DwTable.tsx +8 -1
  11. package/src/components/DialogTable/ModalTable.tsx +2 -0
package/es/DialogTable/DwTable.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import type { DwTableProps } from "../modal";
2
- declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, ...props }: DwTableProps) => JSX.Element;
2
+ declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, footer, ...props }: DwTableProps) => JSX.Element;
3
3
  export default _default;
package/es/DialogTable/DwTable.js CHANGED
@@ -16,7 +16,7 @@ import Content from './Content.js';
16
16
  import { CloseOutlined } from '@ant-design/icons';
17
17
  import { useClassName } from '../hooks/index.js';
18
18
 
19
- var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width"];
19
+ var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width", "footer"];
20
20
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
21
21
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
22
22
  var DwTable = (function (_ref) {
@@ -34,6 +34,8 @@ var DwTable = (function (_ref) {
34
34
  contentRender = _ref.contentRender,
35
35
  _ref$width = _ref.width,
36
36
  width = _ref$width === void 0 ? 888 : _ref$width,
37
+ _ref$footer = _ref.footer,
38
+ footer = _ref$footer === void 0 ? null : _ref$footer,
37
39
  props = _objectWithoutProperties(_ref, _excluded);
38
40
  var _useVisible = useVisible(visible),
39
41
  modalVisible = _useVisible.modalVisible,
@@ -85,6 +87,7 @@ var DwTable = (function (_ref) {
85
87
  return request(_objectSpread(_objectSpread({}, params), reqParams));
86
88
  } : undefined;
87
89
  return jsx(Drawer, _objectSpread(_objectSpread({}, props), {}, {
90
+ footer: footer,
88
91
  visible: modalVisible,
89
92
  onClose: function onClose(e) {
90
93
  setModalVisible(false);
@@ -94,7 +97,11 @@ var DwTable = (function (_ref) {
94
97
  title: title,
95
98
  closable: false,
96
99
  extra: jsx(CloseOutlined, {
97
- className: className
100
+ className: className,
101
+ onClick: function onClick(e) {
102
+ setModalVisible(false);
103
+ _onClose === null || _onClose === void 0 || _onClose(e);
104
+ }
98
105
  }),
99
106
  width: width,
100
107
  bodyStyle: _objectSpread({
package/es/DialogTable/ModalTable.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import type { ModalTableProps } from "../modal";
2
- declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, onCancel, bodyStyle, afterClose, contentRender, width, ...props }: ModalTableProps) => JSX.Element;
2
+ declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, onCancel, bodyStyle, afterClose, contentRender, width, footer, ...props }: ModalTableProps) => JSX.Element;
3
3
  export default _default;
package/es/DialogTable/ModalTable.js CHANGED
@@ -14,7 +14,7 @@ import { Modal } from 'antd';
14
14
  import { useVisible, useTableProps, useCurrentTable } from './hooks.js';
15
15
  import Content from './Content.js';
16
16
 
17
- var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "onCancel", "bodyStyle", "afterClose", "contentRender", "width"];
17
+ var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "onCancel", "bodyStyle", "afterClose", "contentRender", "width", "footer"];
18
18
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
19
19
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
20
20
  var ModalTable = (function (_ref) {
@@ -32,6 +32,8 @@ var ModalTable = (function (_ref) {
32
32
  contentRender = _ref.contentRender,
33
33
  _ref$width = _ref.width,
34
34
  width = _ref$width === void 0 ? 666 : _ref$width,
35
+ _ref$footer = _ref.footer,
36
+ footer = _ref$footer === void 0 ? null : _ref$footer,
35
37
  props = _objectWithoutProperties(_ref, _excluded);
36
38
  var _useVisible = useVisible(visible),
37
39
  modalVisible = _useVisible.modalVisible,
@@ -82,6 +84,7 @@ var ModalTable = (function (_ref) {
82
84
  return request(_objectSpread(_objectSpread({}, params), reqParams));
83
85
  } : undefined;
84
86
  return jsx(Modal, _objectSpread(_objectSpread({}, props), {}, {
87
+ footer: footer,
85
88
  visible: modalVisible,
86
89
  onCancel: function onCancel(e) {
87
90
  setModalVisible(false);
package/lib/DialogTable/DwTable.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import type { DwTableProps } from "../modal";
2
- declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, ...props }: DwTableProps) => JSX.Element;
2
+ declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, bodyStyle, onClose, afterVisibleChange, contentRender, width, footer, ...props }: DwTableProps) => JSX.Element;
3
3
  export default _default;
package/lib/DialogTable/DwTable.js CHANGED
@@ -19,7 +19,7 @@ var Content = require('./Content.js');
19
19
  var icons = require('@ant-design/icons');
20
20
  var index = require('../hooks/index.js');
21
21
 
22
- var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width"];
22
+ var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "bodyStyle", "onClose", "afterVisibleChange", "contentRender", "width", "footer"];
23
23
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
24
24
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
25
25
  var DwTable = (function (_ref) {
@@ -37,6 +37,8 @@ var DwTable = (function (_ref) {
37
37
  contentRender = _ref.contentRender,
38
38
  _ref$width = _ref.width,
39
39
  width = _ref$width === void 0 ? 888 : _ref$width,
40
+ _ref$footer = _ref.footer,
41
+ footer = _ref$footer === void 0 ? null : _ref$footer,
40
42
  props = _objectWithoutProperties(_ref, _excluded);
41
43
  var _useVisible = hooks.useVisible(visible),
42
44
  modalVisible = _useVisible.modalVisible,
@@ -88,6 +90,7 @@ var DwTable = (function (_ref) {
88
90
  return request(_objectSpread(_objectSpread({}, params), reqParams));
89
91
  } : undefined;
90
92
  return jsxRuntime.jsx(antd.Drawer, _objectSpread(_objectSpread({}, props), {}, {
93
+ footer: footer,
91
94
  visible: modalVisible,
92
95
  onClose: function onClose(e) {
93
96
  setModalVisible(false);
@@ -97,7 +100,11 @@ var DwTable = (function (_ref) {
97
100
  title: title,
98
101
  closable: false,
99
102
  extra: jsxRuntime.jsx(icons.CloseOutlined, {
100
- className: className
103
+ className: className,
104
+ onClick: function onClick(e) {
105
+ setModalVisible(false);
106
+ _onClose === null || _onClose === void 0 || _onClose(e);
107
+ }
101
108
  }),
102
109
  width: width,
103
110
  bodyStyle: _objectSpread({
package/lib/DialogTable/ModalTable.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import type { ModalTableProps } from "../modal";
2
- declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, onCancel, bodyStyle, afterClose, contentRender, width, ...props }: ModalTableProps) => JSX.Element;
2
+ declare const _default: ({ configData: configDataProps, request: requestProps, tableProps, dialogTable, visible, onCancel, bodyStyle, afterClose, contentRender, width, footer, ...props }: ModalTableProps) => JSX.Element;
3
3
  export default _default;
package/lib/DialogTable/ModalTable.js CHANGED
@@ -17,7 +17,7 @@ var antd = require('antd');
17
17
  var hooks = require('./hooks.js');
18
18
  var Content = require('./Content.js');
19
19
 
20
- var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "onCancel", "bodyStyle", "afterClose", "contentRender", "width"];
20
+ var _excluded = ["configData", "request", "tableProps", "dialogTable", "visible", "onCancel", "bodyStyle", "afterClose", "contentRender", "width", "footer"];
21
21
  function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
22
22
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
23
23
  var ModalTable = (function (_ref) {
@@ -35,6 +35,8 @@ var ModalTable = (function (_ref) {
35
35
  contentRender = _ref.contentRender,
36
36
  _ref$width = _ref.width,
37
37
  width = _ref$width === void 0 ? 666 : _ref$width,
38
+ _ref$footer = _ref.footer,
39
+ footer = _ref$footer === void 0 ? null : _ref$footer,
38
40
  props = _objectWithoutProperties(_ref, _excluded);
39
41
  var _useVisible = hooks.useVisible(visible),
40
42
  modalVisible = _useVisible.modalVisible,
@@ -85,6 +87,7 @@ var ModalTable = (function (_ref) {
85
87
  return request(_objectSpread(_objectSpread({}, params), reqParams));
86
88
  } : undefined;
87
89
  return jsxRuntime.jsx(antd.Modal, _objectSpread(_objectSpread({}, props), {}, {
90
+ footer: footer,
88
91
  visible: modalVisible,
89
92
  onCancel: function onCancel(e) {
90
93
  setModalVisible(false);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/table",
3
- "version": "1.7.6",
3
+ "version": "1.7.8",
4
4
  "description": "基于antd二次开发table组件",
5
5
  "keywords": [
6
6
  "table"
package/src/components/DialogTable/DwTable.tsx CHANGED
@@ -15,6 +15,7 @@ export default ({
15
15
  afterVisibleChange,
16
16
  contentRender,
17
17
  width = 888,
18
+ footer=null,
18
19
  ...props
19
20
  }: DwTableProps) => {
20
21
  const { modalVisible, setModalVisible } = useVisible(visible);
@@ -60,6 +61,7 @@ export default ({
60
61
  return (
61
62
  <Drawer
62
63
  {...props}
64
+ footer={footer}
63
65
  visible={modalVisible}
64
66
  onClose={(e) => {
65
67
  setModalVisible(false);
@@ -68,7 +70,12 @@ export default ({
68
70
  destroyOnClose
69
71
  title={title}
70
72
  closable={false}
71
- extra={<CloseOutlined className={className} />}
73
+ extra={<CloseOutlined className={className}
74
+ onClick={(e)=>{
75
+ setModalVisible(false);
76
+ onClose?.((e as any));
77
+ }}
78
+ />}
72
79
  width={width}
73
80
  bodyStyle={{ padding: 0, paddingBottom: 12, ...bodyStyle }}
74
81
  afterVisibleChange={(changeVisible) => {
package/src/components/DialogTable/ModalTable.tsx CHANGED
@@ -13,6 +13,7 @@ export default ({
13
13
  afterClose,
14
14
  contentRender,
15
15
  width = 666,
16
+ footer=null,
16
17
  ...props
17
18
  }: ModalTableProps) => {
18
19
  const { modalVisible, setModalVisible } = useVisible(visible);
@@ -58,6 +59,7 @@ export default ({
58
59
  return (
59
60
  <Modal
60
61
  {...props}
62
+ footer={footer}
61
63
  visible={modalVisible}
62
64
  onCancel={(e) => {
63
65
  setModalVisible(false);