vxe-table 4.23.18 → 4.24.0-beta.0

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 (71) hide show
  1. package/README.md +2 -0
  2. package/dist/all.esm.js +649 -366
  3. package/dist/all.esm.min.js +3 -3
  4. package/dist/style.css +85 -13
  5. package/dist/style.mini.css +1 -1
  6. package/es/components.d.ts +1 -3
  7. package/es/components.js +1 -2
  8. package/es/style.css +85 -13
  9. package/es/style.mini.css +1 -1
  10. package/es/table/module/custom/panel.js +2 -2
  11. package/es/table/module/edit/hook.js +97 -9
  12. package/es/table/module/export/export-panel.js +5 -5
  13. package/es/table/module/export/hook.js +8 -10
  14. package/es/table/module/export/import-panel.js +5 -5
  15. package/es/table/src/body.d.ts +2 -2
  16. package/es/table/src/body.js +26 -49
  17. package/es/table/src/table.js +256 -36
  18. package/es/table/style.css +82 -13
  19. package/es/table/style.mini.css +1 -1
  20. package/es/ui/abandon.d.ts +82 -0
  21. package/es/ui/abandon.js +90 -0
  22. package/es/ui/index.d.ts +2 -82
  23. package/es/ui/index.js +7 -91
  24. package/es/ui/src/log.js +1 -1
  25. package/es/vxe-table/style.css +82 -13
  26. package/es/vxe-table/style.mini.css +1 -1
  27. package/lib/components.d.ts +1 -3
  28. package/lib/components.js +1 -2
  29. package/lib/index.umd.js +648 -363
  30. package/lib/index.umd.min.js +3 -3
  31. package/lib/style.css +85 -13
  32. package/lib/style.mini.css +1 -1
  33. package/lib/table/module/custom/panel.js +2 -2
  34. package/lib/table/module/edit/hook.js +97 -9
  35. package/lib/table/module/export/export-panel.js +5 -5
  36. package/lib/table/module/export/hook.js +8 -10
  37. package/lib/table/module/export/import-panel.js +5 -5
  38. package/lib/table/src/body.d.ts +2 -2
  39. package/lib/table/src/body.js +26 -49
  40. package/lib/table/src/table.js +256 -36
  41. package/lib/table/style/style.css +82 -13
  42. package/lib/table/style/style.mini.css +1 -1
  43. package/lib/ui/abandon.d.ts +82 -0
  44. package/lib/ui/abandon.js +110 -0
  45. package/lib/ui/index.d.ts +2 -82
  46. package/lib/ui/index.js +8 -91
  47. package/lib/ui/src/log.js +1 -1
  48. package/lib/vxe-table/style/style.css +82 -13
  49. package/lib/vxe-table/style/style.mini.css +1 -1
  50. package/package.json +2 -2
  51. package/packages/components.ts +2 -5
  52. package/packages/table/module/custom/panel.ts +2 -2
  53. package/packages/table/module/edit/hook.ts +97 -10
  54. package/packages/table/module/export/export-panel.ts +5 -5
  55. package/packages/table/module/export/hook.ts +8 -10
  56. package/packages/table/module/export/import-panel.ts +5 -5
  57. package/packages/table/src/body.ts +28 -50
  58. package/packages/table/src/table.ts +292 -35
  59. package/packages/ui/abandon.ts +136 -0
  60. package/packages/ui/index.ts +13 -119
  61. package/styles/components/table.scss +141 -87
  62. package/styles/theme/base.scss +3 -0
  63. /package/dist/{iconfont.1794366305845.ttf → iconfont.1794558570397.ttf} +0 -0
  64. /package/dist/{iconfont.1794366305845.woff → iconfont.1794558570397.woff} +0 -0
  65. /package/dist/{iconfont.1794366305845.woff2 → iconfont.1794558570397.woff2} +0 -0
  66. /package/es/{iconfont.1794366305845.ttf → iconfont.1794558570397.ttf} +0 -0
  67. /package/es/{iconfont.1794366305845.woff → iconfont.1794558570397.woff} +0 -0
  68. /package/es/{iconfont.1794366305845.woff2 → iconfont.1794558570397.woff2} +0 -0
  69. /package/lib/{iconfont.1794366305845.ttf → iconfont.1794558570397.ttf} +0 -0
  70. /package/lib/{iconfont.1794366305845.woff → iconfont.1794558570397.woff} +0 -0
  71. /package/lib/{iconfont.1794366305845.woff2 → iconfont.1794558570397.woff2} +0 -0
@@ -343,8 +343,8 @@ var panel_default = (
343
343
  const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData;
344
344
  const dragOffsetIndex = prevDragPos === "bottom" ? 1 : 0;
345
345
  if (prevDragGroupField || prevDragAggFnColid) {
346
- if ($xeTable.handlePivotTableAggPanelDragendEvent) {
347
- $xeTable.handlePivotTableAggPanelDragendEvent(evnt);
346
+ if ($xeTable.handlePivotTableAggPanelDgedEvent) {
347
+ $xeTable.handlePivotTableAggPanelDgedEvent(evnt);
348
348
  }
349
349
  } else if (prevDragCol && dragCol) {
350
350
  if (prevDragCol !== dragCol) {
@@ -43,8 +43,6 @@ hooks.add("tableEditModule", {
43
43
  const { refElem } = $xeTable.getRefMaps();
44
44
  const { computeMouseOpts, computeEditOpts, computeCheckboxOpts, computeTreeOpts, computeValidOpts, computeRendererOpts } = $xeTable.getComputeMaps();
45
45
  const browseObj = XEUtils.browse();
46
- let editMethods = {};
47
- let editPrivateMethods = {};
48
46
  const getEditColumnModel = (row, column) => {
49
47
  const { model, editRender } = column;
50
48
  if (editRender) {
@@ -106,7 +104,25 @@ hooks.add("tableEditModule", {
106
104
  }
107
105
  pChilds[funcName](item);
108
106
  pMapChilds[funcName](item);
109
- const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: pChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
107
+ const rest = {
108
+ row: item,
109
+ rowid,
110
+ _seq: -1,
111
+ seq: -1,
112
+ index: -1,
113
+ _index: -1,
114
+ $index: -1,
115
+ treeIndex: -1,
116
+ _tIndex: -1,
117
+ items: pChilds,
118
+ parent: parentRow,
119
+ level: parentLevel + 1,
120
+ linesMask: 0,
121
+ height: 0,
122
+ resizeHeight: 0,
123
+ oTop: 0,
124
+ expandHeight: 0
125
+ };
110
126
  fullDataRowIdData[rowid] = rest;
111
127
  fullAllDataRowIdData[rowid] = rest;
112
128
  } else {
@@ -115,7 +131,25 @@ hooks.add("tableEditModule", {
115
131
  }
116
132
  afterFullData[funcName](item);
117
133
  tableFullTreeData[funcName](item);
118
- const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: tableFullTreeData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
134
+ const rest = {
135
+ row: item,
136
+ rowid,
137
+ _seq: -1,
138
+ seq: -1,
139
+ index: -1,
140
+ _index: -1,
141
+ $index: -1,
142
+ treeIndex: -1,
143
+ _tIndex: -1,
144
+ items: tableFullTreeData,
145
+ parent: null,
146
+ level: 0,
147
+ linesMask: 0,
148
+ height: 0,
149
+ resizeHeight: 0,
150
+ oTop: 0,
151
+ expandHeight: 0
152
+ };
119
153
  fullDataRowIdData[rowid] = rest;
120
154
  fullAllDataRowIdData[rowid] = rest;
121
155
  }
@@ -158,7 +192,25 @@ hooks.add("tableEditModule", {
158
192
  } else {
159
193
  newRecords.forEach((item) => {
160
194
  const rowid = getRowid($xeTable, item);
161
- const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
195
+ const rest = {
196
+ row: item,
197
+ rowid,
198
+ _seq: -1,
199
+ seq: -1,
200
+ index: -1,
201
+ _index: -1,
202
+ $index: -1,
203
+ treeIndex: -1,
204
+ _tIndex: -1,
205
+ items: afterFullData,
206
+ parent: null,
207
+ level: 0,
208
+ linesMask: 0,
209
+ height: 0,
210
+ resizeHeight: 0,
211
+ oTop: 0,
212
+ expandHeight: 0
213
+ };
162
214
  fullDataRowIdData[rowid] = rest;
163
215
  fullAllDataRowIdData[rowid] = rest;
164
216
  afterFullData.unshift(item);
@@ -183,7 +235,25 @@ hooks.add("tableEditModule", {
183
235
  } else {
184
236
  newRecords.forEach((item) => {
185
237
  const rowid = getRowid($xeTable, item);
186
- const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, treeIndex: -1, _tIndex: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
238
+ const rest = {
239
+ row: item,
240
+ rowid,
241
+ _seq: -1,
242
+ seq: -1,
243
+ index: -1,
244
+ _index: -1,
245
+ treeIndex: -1,
246
+ _tIndex: -1,
247
+ $index: -1,
248
+ items: afterFullData,
249
+ parent: null,
250
+ level: 0,
251
+ linesMask: 0,
252
+ height: 0,
253
+ resizeHeight: 0,
254
+ oTop: 0,
255
+ expandHeight: 0
256
+ };
187
257
  fullDataRowIdData[rowid] = rest;
188
258
  fullAllDataRowIdData[rowid] = rest;
189
259
  afterFullData.push(item);
@@ -222,7 +292,25 @@ hooks.add("tableEditModule", {
222
292
  treeRecords,
223
293
  (item) => {
224
294
  const rowid = getRowid($xeTable, item);
225
- const rest = { row: item, rowid, _seq: -1, seq: -1, index: -1, _index: -1, $index: -1, treeIndex: -1, _tIndex: -1, items: parentMapChilds, parent: parentRow, level: parentLevel + 1, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
295
+ const rest = {
296
+ row: item,
297
+ rowid,
298
+ _seq: -1,
299
+ seq: -1,
300
+ index: -1,
301
+ _index: -1,
302
+ $index: -1,
303
+ treeIndex: -1,
304
+ _tIndex: -1,
305
+ items: parentMapChilds,
306
+ parent: parentRow,
307
+ level: parentLevel + 1,
308
+ linesMask: 0,
309
+ height: 0,
310
+ resizeHeight: 0,
311
+ oTop: 0,
312
+ expandHeight: 0
313
+ };
226
314
  if (item[childrenField]) {
227
315
  item[mapChildrenField] = item[childrenField];
228
316
  }
@@ -542,7 +630,7 @@ hooks.add("tableEditModule", {
542
630
  }
543
631
  return nextTick();
544
632
  };
545
- editMethods = {
633
+ const editMethods = {
546
634
  /**
547
635
  * 往表格中插入临时数据
548
636
  *
@@ -990,7 +1078,7 @@ hooks.add("tableEditModule", {
990
1078
  }
991
1079
  return null;
992
1080
  };
993
- editPrivateMethods = {
1081
+ const editPrivateMethods = {
994
1082
  /**
995
1083
  * 处理激活编辑
996
1084
  */
@@ -226,17 +226,17 @@ var export_panel_default = (
226
226
  {
227
227
  id: "VXE_EXPORT_MODAL",
228
228
  modelValue: storeData.visible,
229
- title: modelOptions.title || getI18n(isPrint ? "vxe.export.printTitle" : "vxe.export.expTitle"),
230
- className: "vxe-table-export-popup-wrapper",
229
+ title: getDefaultConfig(modelOptions.title, getI18n(isPrint ? "vxe.export.printTitle" : "vxe.export.expTitle")),
230
+ className: "vxe-table-export-popup-wrapper" + (modelOptions.className ? ` ${modelOptions.className}` : ""),
231
231
  width: modelOptions.width || 660,
232
232
  height: modelOptions.height,
233
233
  minWidth: modelOptions.minWidth || 500,
234
234
  minHeight: modelOptions.minHeight || 400,
235
235
  mask: getDefaultConfig(modelOptions.mask, true),
236
236
  lockView: getDefaultConfig(modelOptions.lockView, true),
237
- showFooter: true,
238
- escClosable: true,
239
- maskClosable: true,
237
+ showFooter: getDefaultConfig(modelOptions.showFooter, true),
238
+ escClosable: getDefaultConfig(modelOptions.escClosable, true),
239
+ maskClosable: getDefaultConfig(modelOptions.maskClosable, true),
240
240
  position: modelOptions.position,
241
241
  fullscreen: modelOptions.fullscreen,
242
242
  remember: modelOptions.remember,
@@ -1072,9 +1072,11 @@ hooks.add("tableExportModule", {
1072
1072
  }
1073
1073
  });
1074
1074
  });
1075
- } else if (opts.message !== false) {
1076
- if (VxeUI.modal) {
1077
- VxeUI.modal.message({ content: getI18n("vxe.error.impFields"), status: "error" });
1075
+ } else {
1076
+ if (opts.message !== false) {
1077
+ if (VxeUI.modal) {
1078
+ VxeUI.modal.message({ content: getI18n("vxe.error.impFields"), status: "error" });
1079
+ }
1078
1080
  }
1079
1081
  if (_importReject) {
1080
1082
  _importReject({ status: false, msg: "field mismatching" });
@@ -1291,13 +1293,9 @@ hooks.add("tableExportModule", {
1291
1293
  exportStore.isPrint = !!isPrint;
1292
1294
  exportStore.hasColgroup = isGroup;
1293
1295
  exportStore.visible = true;
1294
- Object.assign(
1295
- exportParams,
1296
- {
1297
- mode: selectRecords.length ? "selected" : "current"
1298
- },
1299
- defOpts
1300
- );
1296
+ Object.assign(exportParams, {
1297
+ mode: selectRecords.length ? "selected" : "current"
1298
+ }, defOpts);
1301
1299
  const { filename, sheetName, mode, type } = exportParams;
1302
1300
  if (filename) {
1303
1301
  if (XEUtils.isFunction(filename)) {
@@ -106,17 +106,17 @@ var import_panel_default = (
106
106
  {
107
107
  id: "VXE_IMPORT_MODAL",
108
108
  modelValue: storeData.visible,
109
- title: modelOptions.title || getI18n("vxe.import.impTitle"),
110
- className: "vxe-table-export-popup-wrapper",
109
+ title: getDefaultConfig(modelOptions.title, getI18n("vxe.import.impTitle")),
110
+ className: "vxe-table-import-popup-wrapper" + (modelOptions.className ? ` ${modelOptions.className}` : ""),
111
111
  width: modelOptions.width || 540,
112
112
  height: modelOptions.height,
113
113
  minWidth: modelOptions.minWidth || 360,
114
114
  minHeight: modelOptions.minHeight || 240,
115
115
  mask: getDefaultConfig(modelOptions.mask, true),
116
116
  lockView: getDefaultConfig(modelOptions.lockView, true),
117
- showFooter: true,
118
- escClosable: true,
119
- maskClosable: true,
117
+ showFooter: getDefaultConfig(modelOptions.showFooter, true),
118
+ escClosable: getDefaultConfig(modelOptions.escClosable, true),
119
+ maskClosable: getDefaultConfig(modelOptions.maskClosable, true),
120
120
  position: modelOptions.position,
121
121
  fullscreen: modelOptions.fullscreen,
122
122
  remember: modelOptions.remember,
@@ -1,4 +1,4 @@
1
- import { PropType } from 'vue';
1
+ import { PropType, VNode } from 'vue';
2
2
  import type { VxeTableDefines } from '../../../types';
3
3
  declare const _default: import("vue").DefineComponent<{
4
4
  tableData: PropType<any[]>;
@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
8
8
  type: PropType<"right" | "left" | "">;
9
9
  default: string;
10
10
  };
11
- }, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
11
+ }, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
12
12
  [key: string]: any;
13
13
  }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
14
14
  tableData: PropType<any[]>;
@@ -46,7 +46,8 @@ var body_default = (
46
46
  computeVirtualXOpts,
47
47
  computeVirtualYOpts,
48
48
  computeIsBodyRenderOptimize,
49
- computeRendererOpts
49
+ computeRendererOpts,
50
+ computeShowTreeLine
50
51
  } = $xeTable.getComputeMaps();
51
52
  const refElem = ref();
52
53
  const refBodyScroll = ref();
@@ -62,60 +63,33 @@ var body_default = (
62
63
  const { lastSTime } = tableInternalData;
63
64
  return !!(isDragResize || lastSTime && Date.now() < lastSTime + delayHover);
64
65
  };
65
- const renderLine = (rowid, params, cellHeight) => {
66
+ const renderLine = (rowid, params) => {
66
67
  const { column } = params;
67
68
  const { treeConfig } = tableProps;
68
- const cellOpts = computeCellOpts.value;
69
- const rowOpts = computeRowOpts.value;
70
- const defaultRowHeight = computeDefaultRowHeight.value;
71
- const treeOpts = computeTreeOpts.value;
72
69
  const { slots, treeNode } = column;
73
- const { fullAllDataRowIdData } = tableInternalData;
74
- if (treeConfig && treeNode && (treeOpts.showLine || treeOpts.line)) {
70
+ const lineVNs = [];
71
+ if (treeConfig && treeNode) {
75
72
  if (slots && slots.line) {
76
73
  return $xeTable.callSlot(slots.line, params);
77
74
  }
75
+ const treeOpts = computeTreeOpts.value;
76
+ const { fullAllDataRowIdData } = tableInternalData;
77
+ const { lineType } = treeOpts;
78
78
  const rowRest = fullAllDataRowIdData[rowid];
79
- let rLevel = 0;
80
- let prevRow = null;
81
- let parentRow = null;
82
- let lineHeight = "";
83
- if (rowRest) {
84
- rLevel = rowRest.level;
85
- prevRow = rowRest.items[rowRest.treeIndex - 1];
86
- parentRow = rowRest.parent;
87
- }
88
- if (!rLevel && !treeOpts.showRootLine) {
89
- return [];
90
- }
91
- if (prevRow) {
92
- const prevRowRest = fullAllDataRowIdData[getRowid($xeTable, prevRow)] || {};
93
- lineHeight = `${prevRowRest.lineHeight || 0}px`;
94
- } else if (rLevel && parentRow) {
95
- const parentRowRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)] || {};
96
- lineHeight = `calc(-1em + ${Math.floor(cellHeight / 2 + getCellRestHeight(parentRowRest, cellOpts, rowOpts, defaultRowHeight) / 2)}px)`;
97
- }
98
- return [
99
- h(
100
- "div",
101
- {
102
- key: "tl",
103
- class: "vxe-tree--line-wrapper"
104
- },
105
- [
106
- h("div", {
107
- class: "vxe-tree--line",
108
- style: {
109
- height: lineHeight,
110
- bottom: `-${Math.floor(cellHeight / 2)}px`,
111
- left: `calc(${rLevel * treeOpts.indent}px + 1em)`
112
- }
79
+ const treeLines = rowRest.treeLines;
80
+ if (treeLines) {
81
+ treeLines.forEach((item, i) => {
82
+ lineVNs.push(
83
+ h("span", {
84
+ key: "le" + i,
85
+ class: ["vxe-tree--line", `type--${lineType || "dashed"}`, item.type],
86
+ style: item.style
113
87
  })
114
- ]
115
- )
116
- ];
88
+ );
89
+ });
90
+ }
117
91
  }
118
- return [];
92
+ return lineVNs;
119
93
  };
120
94
  const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
121
95
  const $xeGrid = $xeTable.xeGrid;
@@ -123,6 +97,7 @@ var body_default = (
123
97
  const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
124
98
  const { tableData, tableColumn, dragRow, overflowX, overflowY, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps, currColFlag } = tableReactData;
125
99
  const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore, keepUpdateFieldMaps, currentCol } = tableInternalData;
100
+ const showTreeLine = computeShowTreeLine.value;
126
101
  const cellOpts = computeCellOpts.value;
127
102
  const validOpts = computeValidOpts.value;
128
103
  const checkboxOpts = computeCheckboxOpts.value;
@@ -316,6 +291,7 @@ var body_default = (
316
291
  }
317
292
  }
318
293
  }
294
+ const tdStyle = {};
319
295
  const tcStyle = {};
320
296
  if (maxHeight) {
321
297
  tcStyle.maxHeight = maxHeight + "px";
@@ -334,6 +310,7 @@ var body_default = (
334
310
  }
335
311
  if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
336
312
  tcStyle.height = cellHeight + "px";
313
+ tdStyle["--vxe-ui-table-cell-height"] = cellHeight + "px";
337
314
  } else {
338
315
  tcStyle.minHeight = cellHeight + "px";
339
316
  }
@@ -357,8 +334,8 @@ var body_default = (
357
334
  })
358
335
  );
359
336
  } else {
360
- if (treeConfig) {
361
- tdVNs.push(...renderLine(rowid, cellParams, cellHeight));
337
+ if (treeConfig && showTreeLine) {
338
+ tdVNs.push(...renderLine(rowid, cellParams));
362
339
  }
363
340
  const clVNs = [];
364
341
  if (!isVNPreEmptyStatus) {
@@ -499,7 +476,7 @@ var body_default = (
499
476
  ],
500
477
  key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex,
501
478
  ...tdAttrs,
502
- style: Object.assign({}, XEUtils.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle),
479
+ style: Object.assign(tdStyle, XEUtils.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, XEUtils.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle),
503
480
  ...tdOns
504
481
  },
505
482
  isOptimizeMode && fixedHiddenColumn ? [] : tdVNs