ztxkui 4.2.23-3 → 4.2.23-30

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 (82) hide show
  1. package/dist/DemoCom/FormDemo.js +5 -1
  2. package/dist/DemoCom/PrintContainerDemo.js +223 -70
  3. package/dist/TableDemo/EditableTable.d.ts +1 -0
  4. package/dist/TableDemo/EditableTable.js +80 -37
  5. package/dist/TableDemo/ModalTable.js +28 -31
  6. package/dist/TableDemo/data.d.ts +14 -1
  7. package/dist/TableDemo/data.js +21 -2
  8. package/dist/UI/Basic/index.d.ts +2 -0
  9. package/dist/UI/Basic/index.js +27 -0
  10. package/dist/UI/Form/index.js +8 -1
  11. package/dist/UI/Modal/hooks.d.ts +15 -0
  12. package/dist/UI/Modal/hooks.js +172 -0
  13. package/dist/UI/Modal/index.d.ts +3 -0
  14. package/dist/UI/Modal/index.js +46 -0
  15. package/dist/UI/Table/DefaultTable.js +2 -2
  16. package/dist/UI/Table/EditTable.js +100 -10
  17. package/dist/UI/Table/data.d.ts +5 -0
  18. package/dist/UI/Table/data.js +2 -1
  19. package/dist/UI/index.js +9 -1
  20. package/dist/components/EnhanceSelect/index.js +4 -0
  21. package/dist/components/Input/input.js +38 -13
  22. package/dist/components/PrintContainer/print-container.js +79 -35
  23. package/dist/components/PrintContainer/service.js +6 -2
  24. package/dist/components/ProForm/index.js +41 -3
  25. package/dist/components/ProForm/interface.d.ts +8 -0
  26. package/dist/components/ProForm/items.js +24 -6
  27. package/dist/components/ProFormList/index.d.ts +12 -0
  28. package/dist/components/ProFormList/index.js +34 -0
  29. package/dist/components/ProModal/ModalForm.d.ts +8 -0
  30. package/dist/components/ProModal/ModalForm.js +32 -0
  31. package/dist/components/ProModal/ModalTable.d.ts +8 -0
  32. package/dist/components/ProModal/ModalTable.js +32 -0
  33. package/dist/components/ProModal/hooks.d.ts +33 -0
  34. package/dist/components/ProModal/hooks.js +193 -0
  35. package/dist/components/ProModal/index.d.ts +17 -0
  36. package/dist/components/ProModal/index.js +80 -0
  37. package/dist/components/ProModal/interface.d.ts +47 -0
  38. package/dist/components/ProTable/hooks.d.ts +13 -3
  39. package/dist/components/ProTable/hooks.js +120 -26
  40. package/dist/components/ProTable/index.js +16 -6
  41. package/dist/components/ProTable/interface.d.ts +24 -4
  42. package/dist/components/Table/constants.d.ts +2 -0
  43. package/dist/components/Table/constants.js +2 -0
  44. package/dist/components/Table/hooks/useColumns.d.ts +8 -4
  45. package/dist/components/Table/hooks/useColumns.js +265 -170
  46. package/dist/components/Table/hooks/useInnerPagination.js +1 -0
  47. package/dist/components/Table/table-adddel-column.d.ts +2 -1
  48. package/dist/components/Table/table-adddel-column.js +5 -3
  49. package/dist/components/Table/table-enhance-cell.d.ts +6 -3
  50. package/dist/components/Table/table-enhance-cell.js +162 -109
  51. package/dist/components/Table/table-enhance-row.d.ts +3 -4
  52. package/dist/components/Table/table-enhance-row.js +6 -10
  53. package/dist/components/Table/table-resizable-title.d.ts +4 -5
  54. package/dist/components/Table/table-resizable-title.js +31 -6
  55. package/dist/components/Table/table.d.ts +1 -0
  56. package/dist/components/Table/table.js +208 -154
  57. package/dist/components/Table/utils/shallowEqual.d.ts +2 -0
  58. package/dist/components/Table/utils/shallowEqual.js +34 -0
  59. package/dist/components/Table/utils/validate.js +0 -3
  60. package/dist/components/Tabs/DraggableTabNode.d.ts +7 -0
  61. package/dist/components/Tabs/DraggableTabNode.js +33 -0
  62. package/dist/components/Tabs/hooks.d.ts +3 -0
  63. package/dist/components/Tabs/hooks.js +59 -0
  64. package/dist/components/Tabs/tabs.d.ts +3 -0
  65. package/dist/components/Tabs/tabs.js +8 -2
  66. package/dist/components/business/Footer/index.d.ts +1 -0
  67. package/dist/components/business/Footer/index.js +18 -4
  68. package/dist/components/business/Signatures/components/QunjSeal.js +3 -2
  69. package/dist/components/business/Signatures/index.js +13 -14
  70. package/dist/constants.d.ts +1 -1
  71. package/dist/constants.js +1 -1
  72. package/dist/index.css +18 -2
  73. package/dist/index.css.map +1 -1
  74. package/dist/index.d.ts +2 -0
  75. package/dist/index.js +2 -0
  76. package/package.json +3 -3
  77. package/dist/UI/Table/ProEditTable/hooks.d.ts +0 -18
  78. package/dist/UI/Table/ProEditTable/hooks.js +0 -178
  79. package/dist/UI/Table/ProEditTable/index.d.ts +0 -8
  80. package/dist/UI/Table/ProEditTable/index.js +0 -67
  81. package/dist/UI/Table/ProEditTable/interface.d.ts +0 -31
  82. /package/dist/{UI/Table/ProEditTable → components/ProModal}/interface.js +0 -0
package/dist/DemoCom/FormDemo.js CHANGED
@@ -54,7 +54,11 @@ var getCustomDom = function () {
54
54
  React.createElement(SearchItem, { name: "type8", width: "half", label: "\u4F60\u597D811" },
55
55
  React.createElement(Select, null)),
56
56
  React.createElement(SearchItem, { name: "type5", width: "all", label: "\u4F60\u597D" },
57
- React.createElement(Input.TextArea, { showCount: true, rows: 3, handleSize: true }))));
57
+ React.createElement(Input.TextArea, { showCount: true, rows: 3, handleSize: true })),
58
+ React.createElement(SearchItem, { name: "type6", width: "all", label: "\u4F60\u597D" },
59
+ React.createElement(Input.TextArea, { showCount: {
60
+ formatter: function () { return '111'; },
61
+ }, maxLength: 10 }))));
58
62
  };
59
63
  var FormDemo = function () {
60
64
  var form = Form.useForm()[0];
package/dist/DemoCom/PrintContainerDemo.js CHANGED
@@ -27,7 +27,7 @@ var __rest = (this && this.__rest) || function (s, e) {
27
27
  import React, { useEffect, useState } from 'react';
28
28
  // redux
29
29
  // ztxkui公共组件
30
- import { PrintContainer } from '../index';
30
+ import { PrintContainer, Row, Col } from '../index';
31
31
  // import Table, { ColumnsType } from 'components/Table';
32
32
  // 路由配置
33
33
  // store
@@ -38,7 +38,34 @@ import water from '../assets/img/water.png';
38
38
  import { createDownloadUrl } from 'ztxkutils/dist/fileOperation';
39
39
  import './print.scss';
40
40
  import { token } from '../constants';
41
- import imgSrc from '../assets/img/logo012.jpg';
41
+ import imgSrc from '../assets/img/logo001.jpg';
42
+ // import imgSrc1 from './seal/49.png';
43
+ // function test() {
44
+ // const image = new Image();
45
+ // image.setAttribute('crossOrigin', 'anonymous');
46
+ // image.src = imgSrc1;
47
+ // image.onload = () => {
48
+ // const canvas = document.createElement('canvas');
49
+ // canvas.width = image.width;
50
+ // canvas.height = image.height;
51
+ // const ctx = canvas.getContext('2d');
52
+ // ctx?.drawImage(image, 0, 0, image.width, image.height);
53
+ // const dataURL = canvas.toDataURL('image/png');
54
+ // const imgDom = document.createElement('img');
55
+ // imgDom.src = dataURL;
56
+ // imgDom.style.width = '156px';
57
+ // imgDom.style.height = '156px';
58
+ // imgDom.style.bottom = `20px`;
59
+ // imgDom.style.right = `${1 * 156 + 166}px`;
60
+ // imgDom.classList.add('seal-img-position');
61
+ // const allDom = document.getElementsByClassName(
62
+ // 'html2canvas-container-page'
63
+ // )[0];
64
+ // const copyDom = imgDom.cloneNode(true);
65
+ // allDom.appendChild(copyDom);
66
+ // };
67
+ // }
68
+ // test();
42
69
  function request(options) {
43
70
  var headers = options.headers, restOptions = __rest(options, ["headers"]);
44
71
  return axios(__assign({ baseURL: options.baseURL ? options.baseURL : 'http://192.168.0.83:8000', url: options.url, headers: __assign({ 'Zmdms-Auth': "bearer " + token }, options.headers), method: options.method, data: options.data, params: options.params }, restOptions));
@@ -112,7 +139,7 @@ var PrintContainerDemo = function () {
112
139
  React.createElement("img", { src: imgSrc, alt: "" }),
113
140
  React.createElement("h3", { className: "print-title" },
114
141
  "\u63D0\u8D27\u5355",
115
- React.createElement("p", { className: "info" }, "\uFF08\u540C\u4E00\u63D0\u8D27\u5355\u53F7\u4EC5\u80FD\u63D0\u8D27\u4E00\u6B21\uFF09")),
142
+ React.createElement("p", { className: "info" }, "\uFF08\u540C\u4E00\u63D0\u8D27\u5355\u53F7\u4EC5\u80FD\u63D0\u8D27\u4E00\u6B21\uFF09 ")),
116
143
  React.createElement("div", { className: "right-info" },
117
144
  React.createElement("div", { className: "info-item" },
118
145
  React.createElement("span", null, "\u63D0\u8D27\u5355\u53F7\uFF1A"),
@@ -128,97 +155,223 @@ var PrintContainerDemo = function () {
128
155
  React.createElement("table", null,
129
156
  React.createElement("tbody", null,
130
157
  React.createElement("tr", null,
131
- React.createElement("td", null, "\u63D0\u8D27\u5355\u4F4D"),
132
- React.createElement("td", { colSpan: 3 }),
133
- React.createElement("td", null, "\u5F00\u6237\u94F6\u884C\u53CA\u8D26\u53F7"),
134
- React.createElement("td", { colSpan: 3 }),
135
- React.createElement("td", { width: "100px" }, "\u7269\u6D41\u6307\u4EE4\u5355\u53F7"),
136
- React.createElement("td", { colSpan: 3 })),
158
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u5355\u4F4D"),
159
+ React.createElement("td", { colSpan: 6 }),
160
+ React.createElement("td", { colSpan: 2 }, "\u5F00\u6237\u94F6\u884C\u53CA\u8D26\u53F7"),
161
+ React.createElement("td", { colSpan: 8 }),
162
+ React.createElement("td", { colSpan: 2 }, "\u7269\u6D41\u6307\u4EE4\u5355\u53F7"),
163
+ React.createElement("td", { colSpan: 4 })),
137
164
  React.createElement("tr", null,
138
- React.createElement("td", null, "\u7A0E\u53F7"),
139
- React.createElement("td", { colSpan: 3 }),
140
- React.createElement("td", null, "\u5730\u5740\u53CA\u7535\u8BDD"),
141
- React.createElement("td", { colSpan: 3 }),
142
- React.createElement("td", { width: "100px" }, "\u9500\u552E\u5408\u540C\u53F7"),
143
- React.createElement("td", { colSpan: 3 })),
165
+ React.createElement("td", { colSpan: 2 }, "\u7A0E\u53F7"),
166
+ React.createElement("td", { colSpan: 6 }),
167
+ React.createElement("td", { colSpan: 2 }, "\u5730\u5740\u53CA\u7535\u8BDD"),
168
+ React.createElement("td", { colSpan: 8 }),
169
+ React.createElement("td", { colSpan: 2 }, "\u9500\u552E\u5408\u540C\u53F7"),
170
+ React.createElement("td", { colSpan: 4 })),
144
171
  React.createElement("tr", null,
145
- React.createElement("td", null, "\u63D0\u8D27\u4ED3\u5E93"),
172
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u4ED3\u5E93"),
173
+ React.createElement("td", { colSpan: 4 }),
174
+ React.createElement("td", { colSpan: 2 }, "\u4ED3\u5E93\u8054\u7CFB\u4EBA"),
146
175
  React.createElement("td", { colSpan: 2 }),
147
- React.createElement("td", null, "\u4ED3\u5E93\u5730\u5740"),
148
- React.createElement("td", { colSpan: 2 }),
149
- React.createElement("td", null, "\u4ED3\u5E93\u8054\u7CFB\u4EBA"),
150
- React.createElement("td", { colSpan: 2 }),
151
- React.createElement("td", null, "\u4ED3\u5E93\u7535\u8BDD"),
152
- React.createElement("td", { colSpan: 2 })),
176
+ React.createElement("td", { colSpan: 2 }, "\u4ED3\u5E93\u5730\u5740"),
177
+ React.createElement("td", { colSpan: 6 }),
178
+ React.createElement("td", { colSpan: 2 }, "\u4ED3\u5E93\u7535\u8BDD"),
179
+ React.createElement("td", { colSpan: 4 })),
153
180
  React.createElement("tr", null,
154
- React.createElement("td", { rowSpan: 2, colSpan: 4 }, "\u5546\u54C1\u540D\u79F0"),
155
- React.createElement("td", { width: "100px", rowSpan: 2 }, "\u6279\u6B21\u53F7"),
156
- React.createElement("td", { colSpan: 2, width: "150px" }, "\u5F00\u5355\u6570\u91CF"),
157
- React.createElement("td", { colSpan: 2, width: "150px" }, "\u5B9E\u53D1\u6570\u91CF"),
158
- React.createElement("td", { rowSpan: 2 }, "\u5355\u4EF7(\u542B\u7A0E)"),
159
- React.createElement("td", { width: "56px", rowSpan: 2 }, "\u662F\u5426\u542B\u8FD0\u8F93\u8D39"),
160
- React.createElement("td", { width: "56px", rowSpan: 2 }, "\u662F\u5426\u542B\u51FA\u5E93\u8D39")),
181
+ React.createElement("td", { rowSpan: 2, colSpan: 8 }, "\u5546\u54C1\u540D\u79F0"),
182
+ React.createElement("td", { rowSpan: 2, colSpan: 2 }, "\u6279\u6B21\u53F7"),
183
+ React.createElement("td", { colSpan: 5 }, "\u5F00\u5355\u6570\u91CF"),
184
+ React.createElement("td", { colSpan: 5 }, "\u5B9E\u53D1\u6570\u91CF"),
185
+ React.createElement("td", { rowSpan: 2, colSpan: 2 }, "\u5355\u4EF7(\u542B\u7A0E)"),
186
+ React.createElement("td", { rowSpan: 2, colSpan: 1 }, "\u662F\u5426\u542B\u8FD0\u8F93\u8D39"),
187
+ React.createElement("td", { rowSpan: 2, colSpan: 1 }, "\u662F\u5426\u542B\u51FA\u5E93\u8D39")),
161
188
  React.createElement("tr", null,
162
- React.createElement("td", { width: "50px" }, "\u4EF6"),
163
- React.createElement("td", { width: "100px" }, "\u91CD\u91CF(\u5428)"),
164
- React.createElement("td", { width: "50px" }, "\u4EF6"),
165
- React.createElement("td", { width: "100px" }, "\u91CD\u91CF(\u5428)")),
189
+ React.createElement("td", { colSpan: 2 }, "\u4EF6\u6570"),
190
+ React.createElement("td", { colSpan: 2 }, "\u6570\u91CF"),
191
+ React.createElement("td", null, "\u5355\u4F4D"),
192
+ React.createElement("td", { colSpan: 2 }, "\u4EF6\u6570"),
193
+ React.createElement("td", { colSpan: 2 }, "\u6570\u91CF"),
194
+ React.createElement("td", null, "\u5355\u4F4D")),
166
195
  React.createElement("tr", null,
167
- React.createElement("td", { colSpan: 4, style: { height: '23px' } }),
168
- React.createElement("td", null),
169
- React.createElement("td", null),
170
- React.createElement("td", null),
171
- React.createElement("td", null),
172
- React.createElement("td", null),
196
+ React.createElement("td", { colSpan: 8, style: { height: '25px' } }),
197
+ React.createElement("td", { colSpan: 2 }),
198
+ React.createElement("td", { colSpan: 2 }),
199
+ React.createElement("td", { colSpan: 2 }),
173
200
  React.createElement("td", null),
201
+ React.createElement("td", { colSpan: 2 }),
202
+ React.createElement("td", { colSpan: 2 }),
174
203
  React.createElement("td", null),
175
- React.createElement("td", null)),
204
+ React.createElement("td", { colSpan: 2 }),
205
+ React.createElement("td", { colSpan: 1 }),
206
+ React.createElement("td", { colSpan: 1 })),
176
207
  React.createElement("tr", null,
177
- React.createElement("td", { colSpan: 4, align: "left", style: { padding: '0px 30px' } }, "\u5408\u8BA1"),
178
- React.createElement("td", null),
179
- React.createElement("td", null),
180
- React.createElement("td", null),
181
- React.createElement("td", null),
182
- React.createElement("td", null),
208
+ React.createElement("td", { colSpan: 8, align: "left", style: { padding: '0 30px' } }, "\u5408\u8BA1"),
209
+ React.createElement("td", { colSpan: 2 }),
210
+ React.createElement("td", { colSpan: 2 }),
211
+ React.createElement("td", { colSpan: 2 }),
183
212
  React.createElement("td", null),
213
+ React.createElement("td", { colSpan: 2 }),
214
+ React.createElement("td", { colSpan: 2 }),
184
215
  React.createElement("td", null),
185
- React.createElement("td", null)),
216
+ React.createElement("td", { colSpan: 2 }),
217
+ React.createElement("td", { colSpan: 1 }),
218
+ React.createElement("td", { colSpan: 1 })),
219
+ React.createElement("tr", null,
220
+ React.createElement("td", { colSpan: 2 }, "\u5907\u6CE8"),
221
+ React.createElement("td", { colSpan: 10 }),
222
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u5355\u6709\u6548\u671F"),
223
+ React.createElement("td", { colSpan: 4 }),
224
+ React.createElement("td", { colSpan: 2 }, "\u51FA\u5E93\u65B9\u5F0F"),
225
+ React.createElement("td", { colSpan: 4 })),
226
+ React.createElement("tr", null,
227
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u4EBA"),
228
+ React.createElement("td", { colSpan: 4 }),
229
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u8F66\u724C"),
230
+ React.createElement("td", { colSpan: 4 }),
231
+ React.createElement("td", { colSpan: 2 }, "\u6253\u5370\u6B21\u6570"),
232
+ React.createElement("td", { colSpan: 4 }),
233
+ React.createElement("td", { colSpan: 2 }, "\u5B58\u8D27\u5355\u4F4D"),
234
+ React.createElement("td", { colSpan: 4 })),
235
+ React.createElement("tr", null,
236
+ React.createElement("td", { colSpan: 2 }, "\u53D1\u8D27\u4EBA"),
237
+ React.createElement("td", { colSpan: 4 }),
238
+ React.createElement("td", { colSpan: 2 }, "\u5236\u5355\u4EBA"),
239
+ React.createElement("td", { colSpan: 4 }),
240
+ React.createElement("td", { colSpan: 2 }, "\u90E8\u95E8"),
241
+ React.createElement("td", { colSpan: 4 }),
242
+ React.createElement("td", { colSpan: 2 }, "\u4E1A\u52A1\u4EE3\u8868"),
243
+ React.createElement("td", { colSpan: 4 }))))),
244
+ React.createElement("div", { className: "pt_bottom" },
245
+ React.createElement(Row, null,
246
+ React.createElement(Col, { span: 17, style: { paddingLeft: 0 } },
247
+ React.createElement(Row, null, "1\u3001\u672C\u63D0\u5355\u5728\u4E0A\u8FF0\u6709\u6548\u671F\u5185\u6709\u6548\uFF0C\u8FC7\u671F\u4F5C\u5E9F\uFF1B"),
248
+ React.createElement(Row, null, "2\u3001\u672C\u63D0\u8D27\u5355\u4F4D\u7ECF\u8D22\u52A1\u6536\u6B3E\u76D6\u7AE0\u540E\u63D0\u8D27\uFF1B\u6B64\u63D0\u8D27\u5355\u9057\u5931\uFF0C\u63D0\u8D27\u5355\u4F4D\u8D23\u4EFB\u81EA\u8D1F\uFF1B\u51ED\u6B64\u63D0\u8D27\u5355\u4EA4\u4ED8\u8D27\u7269\u540E\uFF0C\u8D27\u7269\u6240\u6709\u98CE\u9669\u8F6C\u79FB\u5230\u63D0\u8D27\u5355\u4F4D\u3002"),
249
+ React.createElement(Row, null)),
250
+ React.createElement(Col, { span: 7, style: { paddingRight: 0 } },
251
+ React.createElement(Row, { style: { justifyContent: 'flex-end' } },
252
+ React.createElement("span", null, "\u6253\u5370\u65F6\u95F4\uFF1A"),
253
+ React.createElement("span", { style: { display: 'inline-block', width: '100px' } })),
254
+ React.createElement(Row, { style: { justifyContent: 'flex-end' } },
255
+ React.createElement("span", null, "\u6253\u5370\u4EBA\uFF1A"),
256
+ React.createElement("span", { style: { display: 'inline-block', width: '100px' } }))))))),
257
+ React.createElement("div", { className: "html2canvas-container-page simple-print", style: { paddingTop: 0, paddingLeft: 0 } },
258
+ React.createElement("div", { className: "print-header" },
259
+ React.createElement("img", { src: imgSrc, alt: "" }),
260
+ React.createElement("h3", { className: "print-title" },
261
+ "\u63D0\u8D27\u535511",
262
+ React.createElement("p", { className: "info" }, "\uFF08\u540C\u4E00\u63D0\u8D27\u5355\u53F7\u4EC5\u80FD\u63D0\u8D27\u4E00\u6B21\uFF09 ")),
263
+ React.createElement("div", { className: "right-info" },
264
+ React.createElement("div", { className: "info-item" },
265
+ React.createElement("span", null, "\u63D0\u8D27\u5355\u53F7\uFF1A"),
266
+ React.createElement("span", { style: { display: 'inline-block', width: '100px' } })),
267
+ React.createElement("div", { className: "info-item" },
268
+ React.createElement("span", null, "\u5F00\u5355\u65F6\u95F4\uFF1A"),
269
+ React.createElement("span", { style: { display: 'inline-block', width: '100px' } })),
270
+ React.createElement("div", { className: "info-item" },
271
+ React.createElement("span", null, "\u5BA1\u6838\u65F6\u95F4\uFF1A"),
272
+ React.createElement("span", { style: { display: 'inline-block', width: '100px' } })))),
273
+ React.createElement("div", { className: "purchaseIn-print-box" },
274
+ React.createElement("div", { className: "pt10" },
275
+ React.createElement("table", null,
276
+ React.createElement("tbody", null,
277
+ React.createElement("tr", null,
278
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u5355\u4F4D"),
279
+ React.createElement("td", { colSpan: 6 }),
280
+ React.createElement("td", { colSpan: 2 }, "\u5F00\u6237\u94F6\u884C\u53CA\u8D26\u53F7"),
281
+ React.createElement("td", { colSpan: 8 }),
282
+ React.createElement("td", { colSpan: 2 }, "\u7269\u6D41\u6307\u4EE4\u5355\u53F7"),
283
+ React.createElement("td", { colSpan: 4 })),
186
284
  React.createElement("tr", null,
187
- React.createElement("td", null, "\u5907\u6CE8"),
188
- React.createElement("td", { colSpan: 5 }),
189
- React.createElement("td", null, "\u63D0\u5355\u6709\u6548\u671F"),
285
+ React.createElement("td", { colSpan: 2 }, "\u7A0E\u53F7"),
286
+ React.createElement("td", { colSpan: 6 }),
287
+ React.createElement("td", { colSpan: 2 }, "\u5730\u5740\u53CA\u7535\u8BDD"),
288
+ React.createElement("td", { colSpan: 8 }),
289
+ React.createElement("td", { colSpan: 2 }, "\u9500\u552E\u5408\u540C\u53F7"),
290
+ React.createElement("td", { colSpan: 4 })),
291
+ React.createElement("tr", null,
292
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u4ED3\u5E93"),
293
+ React.createElement("td", { colSpan: 4 }),
294
+ React.createElement("td", { colSpan: 2 }, "\u4ED3\u5E93\u8054\u7CFB\u4EBA"),
190
295
  React.createElement("td", { colSpan: 2 }),
191
- React.createElement("td", null, "\u51FA\u5E93\u65B9\u5F0F"),
192
- React.createElement("td", { colSpan: 2 })),
296
+ React.createElement("td", { colSpan: 2 }, "\u4ED3\u5E93\u5730\u5740"),
297
+ React.createElement("td", { colSpan: 6 }),
298
+ React.createElement("td", { colSpan: 2 }, "\u4ED3\u5E93\u7535\u8BDD"),
299
+ React.createElement("td", { colSpan: 4 })),
300
+ React.createElement("tr", null,
301
+ React.createElement("td", { rowSpan: 2, colSpan: 8 }, "\u5546\u54C1\u540D\u79F0"),
302
+ React.createElement("td", { rowSpan: 2, colSpan: 2 }, "\u6279\u6B21\u53F7"),
303
+ React.createElement("td", { colSpan: 5 }, "\u5F00\u5355\u6570\u91CF"),
304
+ React.createElement("td", { colSpan: 5 }, "\u5B9E\u53D1\u6570\u91CF"),
305
+ React.createElement("td", { rowSpan: 2, colSpan: 2 }, "\u5355\u4EF7(\u542B\u7A0E)"),
306
+ React.createElement("td", { rowSpan: 2, colSpan: 1 }, "\u662F\u5426\u542B\u8FD0\u8F93\u8D39"),
307
+ React.createElement("td", { rowSpan: 2, colSpan: 1 }, "\u662F\u5426\u542B\u51FA\u5E93\u8D39")),
193
308
  React.createElement("tr", null,
194
- React.createElement("td", null, "\u63D0\u8D27\u4EBA"),
309
+ React.createElement("td", { colSpan: 2 }, "\u4EF6\u6570"),
310
+ React.createElement("td", { colSpan: 2 }, "\u6570\u91CF"),
311
+ React.createElement("td", null, "\u5355\u4F4D"),
312
+ React.createElement("td", { colSpan: 2 }, "\u4EF6\u6570"),
313
+ React.createElement("td", { colSpan: 2 }, "\u6570\u91CF"),
314
+ React.createElement("td", null, "\u5355\u4F4D")),
315
+ React.createElement("tr", null,
316
+ React.createElement("td", { colSpan: 8, style: { height: '25px' } }),
317
+ React.createElement("td", { colSpan: 2 }),
195
318
  React.createElement("td", { colSpan: 2 }),
196
- React.createElement("td", null, "\u63D0\u8D27\u8F66\u724C"),
197
319
  React.createElement("td", { colSpan: 2 }),
198
- React.createElement("td", null, "\u6253\u5370\u6B21\u6570"),
320
+ React.createElement("td", null),
321
+ React.createElement("td", { colSpan: 2 }),
322
+ React.createElement("td", { colSpan: 2 }),
323
+ React.createElement("td", null),
199
324
  React.createElement("td", { colSpan: 2 }),
200
- React.createElement("td", null, "\u5B58\u8D27\u5355\u4F4D"),
201
- React.createElement("td", { colSpan: 2 })),
325
+ React.createElement("td", { colSpan: 1 }),
326
+ React.createElement("td", { colSpan: 1 })),
202
327
  React.createElement("tr", null,
203
- React.createElement("td", null, "\u53D1\u8D27\u4EBA"),
328
+ React.createElement("td", { colSpan: 8, align: "left", style: { padding: '0 30px' } }, "\u5408\u8BA1"),
204
329
  React.createElement("td", { colSpan: 2 }),
205
- React.createElement("td", null, "\u5236\u5355\u4EBA"),
206
330
  React.createElement("td", { colSpan: 2 }),
207
- React.createElement("td", null, "\u90E8\u95E8"),
208
331
  React.createElement("td", { colSpan: 2 }),
209
- React.createElement("td", null, "\u4E1A\u52A1\u4EE3\u8868"),
210
- React.createElement("td", { colSpan: 2 }))))),
332
+ React.createElement("td", null),
333
+ React.createElement("td", { colSpan: 2 }),
334
+ React.createElement("td", { colSpan: 2 }),
335
+ React.createElement("td", null),
336
+ React.createElement("td", { colSpan: 2 }),
337
+ React.createElement("td", { colSpan: 1 }),
338
+ React.createElement("td", { colSpan: 1 })),
339
+ React.createElement("tr", null,
340
+ React.createElement("td", { colSpan: 2 }, "\u5907\u6CE8"),
341
+ React.createElement("td", { colSpan: 10 }),
342
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u5355\u6709\u6548\u671F"),
343
+ React.createElement("td", { colSpan: 4 }),
344
+ React.createElement("td", { colSpan: 2 }, "\u51FA\u5E93\u65B9\u5F0F"),
345
+ React.createElement("td", { colSpan: 4 })),
346
+ React.createElement("tr", null,
347
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u4EBA"),
348
+ React.createElement("td", { colSpan: 4 }),
349
+ React.createElement("td", { colSpan: 2 }, "\u63D0\u8D27\u8F66\u724C"),
350
+ React.createElement("td", { colSpan: 4 }),
351
+ React.createElement("td", { colSpan: 2 }, "\u6253\u5370\u6B21\u6570"),
352
+ React.createElement("td", { colSpan: 4 }),
353
+ React.createElement("td", { colSpan: 2 }, "\u5B58\u8D27\u5355\u4F4D"),
354
+ React.createElement("td", { colSpan: 4 })),
355
+ React.createElement("tr", null,
356
+ React.createElement("td", { colSpan: 2 }, "\u53D1\u8D27\u4EBA"),
357
+ React.createElement("td", { colSpan: 4 }),
358
+ React.createElement("td", { colSpan: 2 }, "\u5236\u5355\u4EBA"),
359
+ React.createElement("td", { colSpan: 4 }),
360
+ React.createElement("td", { colSpan: 2 }, "\u90E8\u95E8"),
361
+ React.createElement("td", { colSpan: 4 }),
362
+ React.createElement("td", { colSpan: 2 }, "\u4E1A\u52A1\u4EE3\u8868"),
363
+ React.createElement("td", { colSpan: 4 }))))),
211
364
  React.createElement("div", { className: "pt_bottom" },
212
- React.createElement("div", { className: "ant-row", style: { rowGap: '0px' } },
213
- React.createElement("div", { className: "ant-col ant-col-17", style: { paddingLeft: 0 } },
214
- React.createElement("div", { className: "ant-row", style: { rowGap: '0px' } }, "1\u3001\u672C\u63D0\u5355\u5728\u4E0A\u8FF0\u6709\u6548\u671F\u5185\u6709\u6548\uFF0C\u8FC7\u671F\u4F5C\u5E9F\uFF1B"),
215
- React.createElement("div", { className: "ant-row", style: { rowGap: '0px' } }, "2\u3001\u672C\u63D0\u8D27\u5355\u4F4D\u7ECF\u8D22\u52A1\u6536\u6B3E\u76D6\u7AE0\u540E\u63D0\u8D27\uFF1B\u6B64\u63D0\u8D27\u5355\u9057\u5931\uFF0C\u63D0\u8D27\u5355\u4F4D\u8D23\u4EFB\u81EA\u8D1F\uFF1B\u51ED\u6B64\u63D0\u8D27\u5355\u4EA4\u4ED8\u8D27\u7269\u540E\uFF0C\u8D27\u7269\u6240\u6709\u98CE\u9669\u8F6C\u79FB\u5230\u63D0\u8D27\u5355\u4F4D\u3002"),
216
- React.createElement("div", { className: "ant-row", style: { rowGap: '0px' } })),
217
- React.createElement("div", { className: "ant-col ant-col-7", style: { paddingRight: 0 } },
218
- React.createElement("div", { className: "ant-row", style: { justifyContent: 'flex-end', rowGap: '0px' } },
365
+ React.createElement(Row, null,
366
+ React.createElement(Col, { span: 17, style: { paddingLeft: 0 } },
367
+ React.createElement(Row, null, "1\u3001\u672C\u63D0\u5355\u5728\u4E0A\u8FF0\u6709\u6548\u671F\u5185\u6709\u6548\uFF0C\u8FC7\u671F\u4F5C\u5E9F\uFF1B"),
368
+ React.createElement(Row, null, "2\u3001\u672C\u63D0\u8D27\u5355\u4F4D\u7ECF\u8D22\u52A1\u6536\u6B3E\u76D6\u7AE0\u540E\u63D0\u8D27\uFF1B\u6B64\u63D0\u8D27\u5355\u9057\u5931\uFF0C\u63D0\u8D27\u5355\u4F4D\u8D23\u4EFB\u81EA\u8D1F\uFF1B\u51ED\u6B64\u63D0\u8D27\u5355\u4EA4\u4ED8\u8D27\u7269\u540E\uFF0C\u8D27\u7269\u6240\u6709\u98CE\u9669\u8F6C\u79FB\u5230\u63D0\u8D27\u5355\u4F4D\u3002"),
369
+ React.createElement(Row, null)),
370
+ React.createElement(Col, { span: 7, style: { paddingRight: 0 } },
371
+ React.createElement(Row, { style: { justifyContent: 'flex-end' } },
219
372
  React.createElement("span", null, "\u6253\u5370\u65F6\u95F4\uFF1A"),
220
373
  React.createElement("span", { style: { display: 'inline-block', width: '100px' } })),
221
- React.createElement("div", { className: "ant-row", style: { justifyContent: 'flex-end', rowGap: '0px' } },
374
+ React.createElement(Row, { style: { justifyContent: 'flex-end' } },
222
375
  React.createElement("span", null, "\u6253\u5370\u4EBA\uFF1A"),
223
376
  React.createElement("span", { style: { display: 'inline-block', width: '100px' } })))))))));
224
377
  };
package/dist/TableDemo/EditableTable.d.ts CHANGED
@@ -17,5 +17,6 @@ export declare function minus(num1: numType, num2: numType, ...others: numType[]
17
17
  */
18
18
  export declare function times(num1: numType, num2: numType, ...others: numType[]): number;
19
19
  export declare function divide(num1: numType, num2: numType, ...others: numType[]): number;
20
+ export declare function objIsEqual(newObj: any, oldObj: any): boolean;
20
21
  declare const EditableTable: React.FC;
21
22
  export default EditableTable;
package/dist/TableDemo/EditableTable.js CHANGED
@@ -62,9 +62,12 @@ import { Table, EnhanceSelect, Button, message } from '../index';
62
62
  // store
63
63
  // 自定义组件
64
64
  // 其他文件
65
- import { times as _times, exactRound, toThousand, plus as _plus, minus as _minus, divide as _divide, } from 'ztxkutils/dist/tools';
65
+ import { times as _times,
66
+ // exactRound,
67
+ // toThousand,
68
+ plus as _plus, minus as _minus, divide as _divide, } from 'ztxkutils/dist/tools';
66
69
  import update from 'immutability-helper';
67
- import { dataSource, list1 } from './data';
70
+ import { dataSource, dataSource2, list1 } from './data';
68
71
  /**
69
72
  * 精确加法
70
73
  */
@@ -146,11 +149,30 @@ export function divide(num1, num2) {
146
149
  return 0;
147
150
  }
148
151
  }
152
+ export function objIsEqual(newObj, oldObj) {
153
+ try {
154
+ var keys = Object.keys(newObj);
155
+ var oldKeys = Object.keys(oldObj);
156
+ if (keys.length !== oldKeys.length) {
157
+ return false;
158
+ }
159
+ for (var i = 0; i < keys.length; i++) {
160
+ var key = keys[i];
161
+ if (oldObj[key] !== newObj[key]) {
162
+ return false;
163
+ }
164
+ }
165
+ return true;
166
+ }
167
+ catch (err) {
168
+ return false;
169
+ }
170
+ }
149
171
  var EditableTable = function () {
150
172
  var _a = useState(dataSource), records = _a[0], setRecords = _a[1];
151
173
  var recordsRef = useRef([]);
152
174
  // 初始化渲染，针对配置了editable、editableConfig的列配置
153
- var _b = useState(false), firstRender = _b[0], setFirstRender = _b[1];
175
+ var _b = useState(true), firstRender = _b[0], setFirstRender = _b[1];
154
176
  // 新增删除行改变
155
177
  var _c = useState(false), lengthChange = _c[0], setLengthChange = _c[1];
156
178
  // 表格行拖拽改变
@@ -212,10 +234,9 @@ var EditableTable = function () {
212
234
  editable: true,
213
235
  editableConfig: {
214
236
  type: 'inputNumber',
215
- placeholder: '输入',
216
- min: 0,
217
- precision: 2,
218
237
  formatterType: 'currency',
238
+ min: 0,
239
+ precision: 0,
219
240
  },
220
241
  validate: {},
221
242
  shouldCellUpdate: function (record, preRecord) {
@@ -244,26 +265,26 @@ var EditableTable = function () {
244
265
  type: 'inputNumber',
245
266
  placeholder: '输入',
246
267
  min: 0,
247
- precision: 2,
268
+ precision: 3,
248
269
  formatterType: 'currency',
249
270
  },
250
271
  required: true,
251
272
  showCopy: true,
252
273
  align: 'left',
253
- validate: {
254
- validate: function (value, record, index, title) {
255
- if (value === 102) {
256
- return Promise.reject({
257
- errorFields: [
258
- {
259
- errors: "\u6D4B\u8BD5-\u660E\u7EC6\u8868 \u7B2C" + index + "\u884C \u6D4B\u8BD52 \u4E0D\u80FD\u5C0F\u4E8E102\uFF01",
260
- },
261
- ],
262
- });
263
- }
264
- return Promise.resolve();
265
- },
266
- },
274
+ // validate: {
275
+ // validate: (value, record, index, title) => {
276
+ // if (value === 102) {
277
+ // return Promise.reject({
278
+ // errorFields: [
279
+ // {
280
+ // errors: `测试-明细表 第${index}行 测试2 不能小于102！`,
281
+ // },
282
+ // ],
283
+ // });
284
+ // }
285
+ // return Promise.resolve();
286
+ // },
287
+ // },
267
288
  shouldCellUpdate: function (record, preRecord) {
268
289
  if (firstRender) {
269
290
  setFirstRender(false);
@@ -281,12 +302,19 @@ var EditableTable = function () {
281
302
  },
282
303
  },
283
304
  {
284
- title: "\u91D1\u989D(\u542B\u7A0E)",
305
+ title: "\u91D1\u989D(\u542B\u7A0E)test2222",
285
306
  width: 130,
286
307
  dataIndex: 'test2222',
287
308
  key: 'test2222',
288
309
  align: 'center',
289
- editable: false,
310
+ editable: true,
311
+ editableConfig: {
312
+ type: 'inputNumber',
313
+ placeholder: '输入',
314
+ min: 0,
315
+ precision: 2,
316
+ formatterType: 'currency',
317
+ },
290
318
  shouldCellUpdate: function (record, preRecord) {
291
319
  if (lengthChange) {
292
320
  setLengthChange(false);
@@ -296,16 +324,16 @@ var EditableTable = function () {
296
324
  setMoveChange(false);
297
325
  return true;
298
326
  }
299
- return (record.test111 !== preRecord.test111 ||
300
- record.test2 !== preRecord.test2);
301
- },
302
- render: function (text, record, index) {
303
- // const value =
304
- // Number(record?.orderPurchasePrice) * Number(record?.orderQuantity);
305
- var value = divide((record === null || record === void 0 ? void 0 : record.test2) || 0, (record === null || record === void 0 ? void 0 : record.test111) || 0);
306
- console.log(record === null || record === void 0 ? void 0 : record.test111, record === null || record === void 0 ? void 0 : record.test2, value);
307
- return React.createElement("div", null, toThousand(exactRound(value || 0, 2)));
327
+ return record.test2222 !== preRecord.test2222;
308
328
  },
329
+ // render: (text, record, index) => {
330
+ // // const value =
331
+ // // Number(record?.orderPurchasePrice) * Number(record?.orderQuantity);
332
+ // // const value = divide(record?.test2 || 0, record?.test111 || 0);
333
+ // // console.log(record?.test111, record?.test2, value);
334
+ // // return <div>{toThousand(exactRound(value || 0, 2))}</div>;
335
+ // return record.test111 + record.test2;
336
+ // },
309
337
  },
310
338
  {
311
339
  title: '测试3',
@@ -396,7 +424,7 @@ var EditableTable = function () {
396
424
  ];
397
425
  // 初始化渲染，针对配置了editable、editableConfig的列配置
398
426
  useEffect(function () {
399
- setFirstRender(true);
427
+ // setFirstRender(true);
400
428
  }, []);
401
429
  // 将表格最新数据赋值给ref引用
402
430
  useEffect(function () {
@@ -406,11 +434,16 @@ var EditableTable = function () {
406
434
  var onEditableSaveHandle = useCallback(function (record, index, _dataIndex) {
407
435
  var _a;
408
436
  if (_dataIndex === void 0) { _dataIndex = ''; }
437
+ console.log(record);
409
438
  if (typeof index === 'number') {
410
439
  var newRecords = recordsRef.current.slice();
411
440
  var item = newRecords[index];
412
441
  newRecords.splice(index, 1, _dataIndex
413
442
  ? __assign(__assign(__assign({}, record), item), (_a = {}, _a[_dataIndex] = record[_dataIndex], _a)) : __assign(__assign({}, item), record));
443
+ if (_dataIndex === 'test111' || _dataIndex === 'test2') {
444
+ newRecords[index].test2222 =
445
+ (record.test111 || 0) + (record.test2 || 0);
446
+ }
414
447
  setRecords(newRecords);
415
448
  }
416
449
  }, [setRecords]);
@@ -527,6 +560,11 @@ var EditableTable = function () {
527
560
  console.log(records);
528
561
  console.log(tableHandleRef.current.getColumns());
529
562
  } }, "\u83B7\u53D6\u6570\u636E"),
563
+ React.createElement(Button, { onClick: function () {
564
+ console.log(records);
565
+ console.log(tableHandleRef.current.getColumns());
566
+ setRecords(dataSource2);
567
+ } }, "\u8BBE\u7F6E"),
530
568
  React.createElement(Table, { dataSource: records, columns: columns, rowKey: "id",
531
569
  // 表格项可输入
532
570
  onEditableSave: onEditableSaveHandle,
@@ -537,10 +575,11 @@ var EditableTable = function () {
537
575
  // tableValidate
538
576
  tableHandleRef: tableHandleRef, tableName: "\u6211\u662F\u4E00\u4E2A\u8868\u683C",
539
577
  // 显隐配置
540
- configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011", onTableChange: onTableChange, showInnerPagination: true, expandable: {
541
- expandedRowRender: function (record) { return React.createElement("p", { style: { margin: 0 } }, "111"); },
542
- rowExpandable: function (record) { return true; },
543
- },
578
+ configInfo: tableConfig, showColumnDynamic: true, showColumnDynamicKey: "test-o-0011", onTableChange: onTableChange, showInnerPagination: true,
579
+ // expandable={{
580
+ // // expandedRowRender: (record) => <p style={{ margin: 0 }}>111</p>,
581
+ // rowExpandable: (record) => true,
582
+ // }}
544
583
  // scroll={{ x: 1000, y: 200 }}
545
584
  showDelAllBtn: true, delAllChange: onDelAllChange, rowSelection: {
546
585
  type: 'checkbox',
@@ -560,6 +599,10 @@ var EditableTable = function () {
560
599
  key: 'test5-002',
561
600
  toFixedNum: 2,
562
601
  },
602
+ {
603
+ key: 'test111',
604
+ toFixedNum: 0,
605
+ },
563
606
  ],
564
607
  },
565
608
  {