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.
- package/README.md +2 -0
- package/dist/all.esm.js +649 -366
- package/dist/all.esm.min.js +3 -3
- package/dist/style.css +85 -13
- package/dist/style.mini.css +1 -1
- package/es/components.d.ts +1 -3
- package/es/components.js +1 -2
- package/es/style.css +85 -13
- package/es/style.mini.css +1 -1
- package/es/table/module/custom/panel.js +2 -2
- package/es/table/module/edit/hook.js +97 -9
- package/es/table/module/export/export-panel.js +5 -5
- package/es/table/module/export/hook.js +8 -10
- package/es/table/module/export/import-panel.js +5 -5
- package/es/table/src/body.d.ts +2 -2
- package/es/table/src/body.js +26 -49
- package/es/table/src/table.js +256 -36
- package/es/table/style.css +82 -13
- package/es/table/style.mini.css +1 -1
- package/es/ui/abandon.d.ts +82 -0
- package/es/ui/abandon.js +90 -0
- package/es/ui/index.d.ts +2 -82
- package/es/ui/index.js +7 -91
- package/es/ui/src/log.js +1 -1
- package/es/vxe-table/style.css +82 -13
- package/es/vxe-table/style.mini.css +1 -1
- package/lib/components.d.ts +1 -3
- package/lib/components.js +1 -2
- package/lib/index.umd.js +648 -363
- package/lib/index.umd.min.js +3 -3
- package/lib/style.css +85 -13
- package/lib/style.mini.css +1 -1
- package/lib/table/module/custom/panel.js +2 -2
- package/lib/table/module/edit/hook.js +97 -9
- package/lib/table/module/export/export-panel.js +5 -5
- package/lib/table/module/export/hook.js +8 -10
- package/lib/table/module/export/import-panel.js +5 -5
- package/lib/table/src/body.d.ts +2 -2
- package/lib/table/src/body.js +26 -49
- package/lib/table/src/table.js +256 -36
- package/lib/table/style/style.css +82 -13
- package/lib/table/style/style.mini.css +1 -1
- package/lib/ui/abandon.d.ts +82 -0
- package/lib/ui/abandon.js +110 -0
- package/lib/ui/index.d.ts +2 -82
- package/lib/ui/index.js +8 -91
- package/lib/ui/src/log.js +1 -1
- package/lib/vxe-table/style/style.css +82 -13
- package/lib/vxe-table/style/style.mini.css +1 -1
- package/package.json +2 -2
- package/packages/components.ts +2 -5
- package/packages/table/module/custom/panel.ts +2 -2
- package/packages/table/module/edit/hook.ts +97 -10
- package/packages/table/module/export/export-panel.ts +5 -5
- package/packages/table/module/export/hook.ts +8 -10
- package/packages/table/module/export/import-panel.ts +5 -5
- package/packages/table/src/body.ts +28 -50
- package/packages/table/src/table.ts +292 -35
- package/packages/ui/abandon.ts +136 -0
- package/packages/ui/index.ts +13 -119
- package/styles/components/table.scss +141 -87
- package/styles/theme/base.scss +3 -0
- /package/dist/{iconfont.1794366305845.ttf → iconfont.1794558570397.ttf} +0 -0
- /package/dist/{iconfont.1794366305845.woff → iconfont.1794558570397.woff} +0 -0
- /package/dist/{iconfont.1794366305845.woff2 → iconfont.1794558570397.woff2} +0 -0
- /package/es/{iconfont.1794366305845.ttf → iconfont.1794558570397.ttf} +0 -0
- /package/es/{iconfont.1794366305845.woff → iconfont.1794558570397.woff} +0 -0
- /package/es/{iconfont.1794366305845.woff2 → iconfont.1794558570397.woff2} +0 -0
- /package/lib/{iconfont.1794366305845.ttf → iconfont.1794558570397.ttf} +0 -0
- /package/lib/{iconfont.1794366305845.woff → iconfont.1794558570397.woff} +0 -0
- /package/lib/{iconfont.1794366305845.woff2 → iconfont.1794558570397.woff2} +0 -0
|
@@ -377,8 +377,8 @@ var panel_default = (
|
|
|
377
377
|
const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData;
|
|
378
378
|
const dragOffsetIndex = prevDragPos === "bottom" ? 1 : 0;
|
|
379
379
|
if (prevDragGroupField || prevDragAggFnColid) {
|
|
380
|
-
if ($xeTable.
|
|
381
|
-
$xeTable.
|
|
380
|
+
if ($xeTable.handlePivotTableAggPanelDgedEvent) {
|
|
381
|
+
$xeTable.handlePivotTableAggPanelDgedEvent(evnt);
|
|
382
382
|
}
|
|
383
383
|
} else if (prevDragCol && dragCol) {
|
|
384
384
|
if (prevDragCol !== dragCol) {
|
|
@@ -66,8 +66,6 @@ hooks.add("tableEditModule", {
|
|
|
66
66
|
const { refElem } = $xeTable.getRefMaps();
|
|
67
67
|
const { computeMouseOpts, computeEditOpts, computeCheckboxOpts, computeTreeOpts, computeValidOpts, computeRendererOpts } = $xeTable.getComputeMaps();
|
|
68
68
|
const browseObj = import_xe_utils.default.browse();
|
|
69
|
-
let editMethods = {};
|
|
70
|
-
let editPrivateMethods = {};
|
|
71
69
|
const getEditColumnModel = (row, column) => {
|
|
72
70
|
const { model, editRender } = column;
|
|
73
71
|
if (editRender) {
|
|
@@ -129,7 +127,25 @@ hooks.add("tableEditModule", {
|
|
|
129
127
|
}
|
|
130
128
|
pChilds[funcName](item);
|
|
131
129
|
pMapChilds[funcName](item);
|
|
132
|
-
const rest = {
|
|
130
|
+
const rest = {
|
|
131
|
+
row: item,
|
|
132
|
+
rowid,
|
|
133
|
+
_seq: -1,
|
|
134
|
+
seq: -1,
|
|
135
|
+
index: -1,
|
|
136
|
+
_index: -1,
|
|
137
|
+
$index: -1,
|
|
138
|
+
treeIndex: -1,
|
|
139
|
+
_tIndex: -1,
|
|
140
|
+
items: pChilds,
|
|
141
|
+
parent: parentRow,
|
|
142
|
+
level: parentLevel + 1,
|
|
143
|
+
linesMask: 0,
|
|
144
|
+
height: 0,
|
|
145
|
+
resizeHeight: 0,
|
|
146
|
+
oTop: 0,
|
|
147
|
+
expandHeight: 0
|
|
148
|
+
};
|
|
133
149
|
fullDataRowIdData[rowid] = rest;
|
|
134
150
|
fullAllDataRowIdData[rowid] = rest;
|
|
135
151
|
} else {
|
|
@@ -138,7 +154,25 @@ hooks.add("tableEditModule", {
|
|
|
138
154
|
}
|
|
139
155
|
afterFullData[funcName](item);
|
|
140
156
|
tableFullTreeData[funcName](item);
|
|
141
|
-
const rest = {
|
|
157
|
+
const rest = {
|
|
158
|
+
row: item,
|
|
159
|
+
rowid,
|
|
160
|
+
_seq: -1,
|
|
161
|
+
seq: -1,
|
|
162
|
+
index: -1,
|
|
163
|
+
_index: -1,
|
|
164
|
+
$index: -1,
|
|
165
|
+
treeIndex: -1,
|
|
166
|
+
_tIndex: -1,
|
|
167
|
+
items: tableFullTreeData,
|
|
168
|
+
parent: null,
|
|
169
|
+
level: 0,
|
|
170
|
+
linesMask: 0,
|
|
171
|
+
height: 0,
|
|
172
|
+
resizeHeight: 0,
|
|
173
|
+
oTop: 0,
|
|
174
|
+
expandHeight: 0
|
|
175
|
+
};
|
|
142
176
|
fullDataRowIdData[rowid] = rest;
|
|
143
177
|
fullAllDataRowIdData[rowid] = rest;
|
|
144
178
|
}
|
|
@@ -181,7 +215,25 @@ hooks.add("tableEditModule", {
|
|
|
181
215
|
} else {
|
|
182
216
|
newRecords.forEach((item) => {
|
|
183
217
|
const rowid = (0, import_util.getRowid)($xeTable, item);
|
|
184
|
-
const rest = {
|
|
218
|
+
const rest = {
|
|
219
|
+
row: item,
|
|
220
|
+
rowid,
|
|
221
|
+
_seq: -1,
|
|
222
|
+
seq: -1,
|
|
223
|
+
index: -1,
|
|
224
|
+
_index: -1,
|
|
225
|
+
$index: -1,
|
|
226
|
+
treeIndex: -1,
|
|
227
|
+
_tIndex: -1,
|
|
228
|
+
items: afterFullData,
|
|
229
|
+
parent: null,
|
|
230
|
+
level: 0,
|
|
231
|
+
linesMask: 0,
|
|
232
|
+
height: 0,
|
|
233
|
+
resizeHeight: 0,
|
|
234
|
+
oTop: 0,
|
|
235
|
+
expandHeight: 0
|
|
236
|
+
};
|
|
185
237
|
fullDataRowIdData[rowid] = rest;
|
|
186
238
|
fullAllDataRowIdData[rowid] = rest;
|
|
187
239
|
afterFullData.unshift(item);
|
|
@@ -206,7 +258,25 @@ hooks.add("tableEditModule", {
|
|
|
206
258
|
} else {
|
|
207
259
|
newRecords.forEach((item) => {
|
|
208
260
|
const rowid = (0, import_util.getRowid)($xeTable, item);
|
|
209
|
-
const rest = {
|
|
261
|
+
const rest = {
|
|
262
|
+
row: item,
|
|
263
|
+
rowid,
|
|
264
|
+
_seq: -1,
|
|
265
|
+
seq: -1,
|
|
266
|
+
index: -1,
|
|
267
|
+
_index: -1,
|
|
268
|
+
treeIndex: -1,
|
|
269
|
+
_tIndex: -1,
|
|
270
|
+
$index: -1,
|
|
271
|
+
items: afterFullData,
|
|
272
|
+
parent: null,
|
|
273
|
+
level: 0,
|
|
274
|
+
linesMask: 0,
|
|
275
|
+
height: 0,
|
|
276
|
+
resizeHeight: 0,
|
|
277
|
+
oTop: 0,
|
|
278
|
+
expandHeight: 0
|
|
279
|
+
};
|
|
210
280
|
fullDataRowIdData[rowid] = rest;
|
|
211
281
|
fullAllDataRowIdData[rowid] = rest;
|
|
212
282
|
afterFullData.push(item);
|
|
@@ -245,7 +315,25 @@ hooks.add("tableEditModule", {
|
|
|
245
315
|
treeRecords,
|
|
246
316
|
(item) => {
|
|
247
317
|
const rowid = (0, import_util.getRowid)($xeTable, item);
|
|
248
|
-
const rest = {
|
|
318
|
+
const rest = {
|
|
319
|
+
row: item,
|
|
320
|
+
rowid,
|
|
321
|
+
_seq: -1,
|
|
322
|
+
seq: -1,
|
|
323
|
+
index: -1,
|
|
324
|
+
_index: -1,
|
|
325
|
+
$index: -1,
|
|
326
|
+
treeIndex: -1,
|
|
327
|
+
_tIndex: -1,
|
|
328
|
+
items: parentMapChilds,
|
|
329
|
+
parent: parentRow,
|
|
330
|
+
level: parentLevel + 1,
|
|
331
|
+
linesMask: 0,
|
|
332
|
+
height: 0,
|
|
333
|
+
resizeHeight: 0,
|
|
334
|
+
oTop: 0,
|
|
335
|
+
expandHeight: 0
|
|
336
|
+
};
|
|
249
337
|
if (item[childrenField]) {
|
|
250
338
|
item[mapChildrenField] = item[childrenField];
|
|
251
339
|
}
|
|
@@ -565,7 +653,7 @@ hooks.add("tableEditModule", {
|
|
|
565
653
|
}
|
|
566
654
|
return (0, import_vue.nextTick)();
|
|
567
655
|
};
|
|
568
|
-
editMethods = {
|
|
656
|
+
const editMethods = {
|
|
569
657
|
/**
|
|
570
658
|
* 往表格中插入临时数据
|
|
571
659
|
*
|
|
@@ -1013,7 +1101,7 @@ hooks.add("tableEditModule", {
|
|
|
1013
1101
|
}
|
|
1014
1102
|
return null;
|
|
1015
1103
|
};
|
|
1016
|
-
editPrivateMethods = {
|
|
1104
|
+
const editPrivateMethods = {
|
|
1017
1105
|
/**
|
|
1018
1106
|
* 处理激活编辑
|
|
1019
1107
|
*/
|
|
@@ -259,17 +259,17 @@ var export_panel_default = (
|
|
|
259
259
|
{
|
|
260
260
|
id: "VXE_EXPORT_MODAL",
|
|
261
261
|
modelValue: storeData.visible,
|
|
262
|
-
title: modelOptions.title
|
|
263
|
-
className: "vxe-table-export-popup-wrapper",
|
|
262
|
+
title: (0, import_utils.getDefaultConfig)(modelOptions.title, getI18n(isPrint ? "vxe.export.printTitle" : "vxe.export.expTitle")),
|
|
263
|
+
className: "vxe-table-export-popup-wrapper" + (modelOptions.className ? ` ${modelOptions.className}` : ""),
|
|
264
264
|
width: modelOptions.width || 660,
|
|
265
265
|
height: modelOptions.height,
|
|
266
266
|
minWidth: modelOptions.minWidth || 500,
|
|
267
267
|
minHeight: modelOptions.minHeight || 400,
|
|
268
268
|
mask: (0, import_utils.getDefaultConfig)(modelOptions.mask, true),
|
|
269
269
|
lockView: (0, import_utils.getDefaultConfig)(modelOptions.lockView, true),
|
|
270
|
-
showFooter: true,
|
|
271
|
-
escClosable: true,
|
|
272
|
-
maskClosable: true,
|
|
270
|
+
showFooter: (0, import_utils.getDefaultConfig)(modelOptions.showFooter, true),
|
|
271
|
+
escClosable: (0, import_utils.getDefaultConfig)(modelOptions.escClosable, true),
|
|
272
|
+
maskClosable: (0, import_utils.getDefaultConfig)(modelOptions.maskClosable, true),
|
|
273
273
|
position: modelOptions.position,
|
|
274
274
|
fullscreen: modelOptions.fullscreen,
|
|
275
275
|
remember: modelOptions.remember,
|
|
@@ -1095,9 +1095,11 @@ hooks.add("tableExportModule", {
|
|
|
1095
1095
|
}
|
|
1096
1096
|
});
|
|
1097
1097
|
});
|
|
1098
|
-
} else
|
|
1099
|
-
if (
|
|
1100
|
-
import_core.VxeUI.modal
|
|
1098
|
+
} else {
|
|
1099
|
+
if (opts.message !== false) {
|
|
1100
|
+
if (import_core.VxeUI.modal) {
|
|
1101
|
+
import_core.VxeUI.modal.message({ content: getI18n("vxe.error.impFields"), status: "error" });
|
|
1102
|
+
}
|
|
1101
1103
|
}
|
|
1102
1104
|
if (_importReject) {
|
|
1103
1105
|
_importReject({ status: false, msg: "field mismatching" });
|
|
@@ -1314,13 +1316,9 @@ hooks.add("tableExportModule", {
|
|
|
1314
1316
|
exportStore.isPrint = !!isPrint;
|
|
1315
1317
|
exportStore.hasColgroup = isGroup;
|
|
1316
1318
|
exportStore.visible = true;
|
|
1317
|
-
Object.assign(
|
|
1318
|
-
|
|
1319
|
-
|
|
1320
|
-
mode: selectRecords.length ? "selected" : "current"
|
|
1321
|
-
},
|
|
1322
|
-
defOpts
|
|
1323
|
-
);
|
|
1319
|
+
Object.assign(exportParams, {
|
|
1320
|
+
mode: selectRecords.length ? "selected" : "current"
|
|
1321
|
+
}, defOpts);
|
|
1324
1322
|
const { filename, sheetName, mode, type } = exportParams;
|
|
1325
1323
|
if (filename) {
|
|
1326
1324
|
if (import_xe_utils.default.isFunction(filename)) {
|
|
@@ -139,17 +139,17 @@ var import_panel_default = (
|
|
|
139
139
|
{
|
|
140
140
|
id: "VXE_IMPORT_MODAL",
|
|
141
141
|
modelValue: storeData.visible,
|
|
142
|
-
title: modelOptions.title
|
|
143
|
-
className: "vxe-table-
|
|
142
|
+
title: (0, import_utils.getDefaultConfig)(modelOptions.title, getI18n("vxe.import.impTitle")),
|
|
143
|
+
className: "vxe-table-import-popup-wrapper" + (modelOptions.className ? ` ${modelOptions.className}` : ""),
|
|
144
144
|
width: modelOptions.width || 540,
|
|
145
145
|
height: modelOptions.height,
|
|
146
146
|
minWidth: modelOptions.minWidth || 360,
|
|
147
147
|
minHeight: modelOptions.minHeight || 240,
|
|
148
148
|
mask: (0, import_utils.getDefaultConfig)(modelOptions.mask, true),
|
|
149
149
|
lockView: (0, import_utils.getDefaultConfig)(modelOptions.lockView, true),
|
|
150
|
-
showFooter: true,
|
|
151
|
-
escClosable: true,
|
|
152
|
-
maskClosable: true,
|
|
150
|
+
showFooter: (0, import_utils.getDefaultConfig)(modelOptions.showFooter, true),
|
|
151
|
+
escClosable: (0, import_utils.getDefaultConfig)(modelOptions.escClosable, true),
|
|
152
|
+
maskClosable: (0, import_utils.getDefaultConfig)(modelOptions.maskClosable, true),
|
|
153
153
|
position: modelOptions.position,
|
|
154
154
|
fullscreen: modelOptions.fullscreen,
|
|
155
155
|
remember: modelOptions.remember,
|
package/lib/table/src/body.d.ts
CHANGED
|
@@ -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
|
-
}, () =>
|
|
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[]>;
|
package/lib/table/src/body.js
CHANGED
|
@@ -79,7 +79,8 @@ var body_default = (
|
|
|
79
79
|
computeVirtualXOpts,
|
|
80
80
|
computeVirtualYOpts,
|
|
81
81
|
computeIsBodyRenderOptimize,
|
|
82
|
-
computeRendererOpts
|
|
82
|
+
computeRendererOpts,
|
|
83
|
+
computeShowTreeLine
|
|
83
84
|
} = $xeTable.getComputeMaps();
|
|
84
85
|
const refElem = (0, import_vue.ref)();
|
|
85
86
|
const refBodyScroll = (0, import_vue.ref)();
|
|
@@ -95,60 +96,33 @@ var body_default = (
|
|
|
95
96
|
const { lastSTime } = tableInternalData;
|
|
96
97
|
return !!(isDragResize || lastSTime && Date.now() < lastSTime + delayHover);
|
|
97
98
|
};
|
|
98
|
-
const renderLine = (rowid, params
|
|
99
|
+
const renderLine = (rowid, params) => {
|
|
99
100
|
const { column } = params;
|
|
100
101
|
const { treeConfig } = tableProps;
|
|
101
|
-
const cellOpts = computeCellOpts.value;
|
|
102
|
-
const rowOpts = computeRowOpts.value;
|
|
103
|
-
const defaultRowHeight = computeDefaultRowHeight.value;
|
|
104
|
-
const treeOpts = computeTreeOpts.value;
|
|
105
102
|
const { slots, treeNode } = column;
|
|
106
|
-
const
|
|
107
|
-
if (treeConfig && treeNode
|
|
103
|
+
const lineVNs = [];
|
|
104
|
+
if (treeConfig && treeNode) {
|
|
108
105
|
if (slots && slots.line) {
|
|
109
106
|
return $xeTable.callSlot(slots.line, params);
|
|
110
107
|
}
|
|
108
|
+
const treeOpts = computeTreeOpts.value;
|
|
109
|
+
const { fullAllDataRowIdData } = tableInternalData;
|
|
110
|
+
const { lineType } = treeOpts;
|
|
111
111
|
const rowRest = fullAllDataRowIdData[rowid];
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
}
|
|
121
|
-
if (!rLevel && !treeOpts.showRootLine) {
|
|
122
|
-
return [];
|
|
123
|
-
}
|
|
124
|
-
if (prevRow) {
|
|
125
|
-
const prevRowRest = fullAllDataRowIdData[(0, import_util.getRowid)($xeTable, prevRow)] || {};
|
|
126
|
-
lineHeight = `${prevRowRest.lineHeight || 0}px`;
|
|
127
|
-
} else if (rLevel && parentRow) {
|
|
128
|
-
const parentRowRest = fullAllDataRowIdData[(0, import_util.getRowid)($xeTable, parentRow)] || {};
|
|
129
|
-
lineHeight = `calc(-1em + ${Math.floor(cellHeight / 2 + (0, import_util.getCellRestHeight)(parentRowRest, cellOpts, rowOpts, defaultRowHeight) / 2)}px)`;
|
|
130
|
-
}
|
|
131
|
-
return [
|
|
132
|
-
(0, import_vue.h)(
|
|
133
|
-
"div",
|
|
134
|
-
{
|
|
135
|
-
key: "tl",
|
|
136
|
-
class: "vxe-tree--line-wrapper"
|
|
137
|
-
},
|
|
138
|
-
[
|
|
139
|
-
(0, import_vue.h)("div", {
|
|
140
|
-
class: "vxe-tree--line",
|
|
141
|
-
style: {
|
|
142
|
-
height: lineHeight,
|
|
143
|
-
bottom: `-${Math.floor(cellHeight / 2)}px`,
|
|
144
|
-
left: `calc(${rLevel * treeOpts.indent}px + 1em)`
|
|
145
|
-
}
|
|
112
|
+
const treeLines = rowRest.treeLines;
|
|
113
|
+
if (treeLines) {
|
|
114
|
+
treeLines.forEach((item, i) => {
|
|
115
|
+
lineVNs.push(
|
|
116
|
+
(0, import_vue.h)("span", {
|
|
117
|
+
key: "le" + i,
|
|
118
|
+
class: ["vxe-tree--line", `type--${lineType || "dashed"}`, item.type],
|
|
119
|
+
style: item.style
|
|
146
120
|
})
|
|
147
|
-
|
|
148
|
-
)
|
|
149
|
-
|
|
121
|
+
);
|
|
122
|
+
});
|
|
123
|
+
}
|
|
150
124
|
}
|
|
151
|
-
return
|
|
125
|
+
return lineVNs;
|
|
152
126
|
};
|
|
153
127
|
const renderTdColumn = (seq, rowid, fixedType, isOptimizeMode, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
|
|
154
128
|
const $xeGrid = $xeTable.xeGrid;
|
|
@@ -156,6 +130,7 @@ var body_default = (
|
|
|
156
130
|
const { columnKey, resizable: allResizable, showOverflow: allShowOverflow, border, height, treeConfig, cellClassName: allCellClassName, cellStyle, align: allAlign, spanMethod, mouseConfig, editConfig, editRules, tooltipConfig, padding: allPadding } = tableProps;
|
|
157
131
|
const { tableData, tableColumn, dragRow, overflowX, overflowY, scrollXLoad, scrollYLoad, mergeBodyFlag, calcCellHeightFlag, resizeHeightFlag, resizeWidthFlag, editStore, isAllOverflow, validErrorMaps, currColFlag } = tableReactData;
|
|
158
132
|
const { fullAllDataRowIdData, fullColumnIdData, mergeBodyCellMaps, visibleColumn, afterFullData, mergeBodyList, scrollXStore, scrollYStore, keepUpdateFieldMaps, currentCol } = tableInternalData;
|
|
133
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
159
134
|
const cellOpts = computeCellOpts.value;
|
|
160
135
|
const validOpts = computeValidOpts.value;
|
|
161
136
|
const checkboxOpts = computeCheckboxOpts.value;
|
|
@@ -349,6 +324,7 @@ var body_default = (
|
|
|
349
324
|
}
|
|
350
325
|
}
|
|
351
326
|
}
|
|
327
|
+
const tdStyle = {};
|
|
352
328
|
const tcStyle = {};
|
|
353
329
|
if (maxHeight) {
|
|
354
330
|
tcStyle.maxHeight = maxHeight + "px";
|
|
@@ -367,6 +343,7 @@ var body_default = (
|
|
|
367
343
|
}
|
|
368
344
|
if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
|
|
369
345
|
tcStyle.height = cellHeight + "px";
|
|
346
|
+
tdStyle["--vxe-ui-table-cell-height"] = cellHeight + "px";
|
|
370
347
|
} else {
|
|
371
348
|
tcStyle.minHeight = cellHeight + "px";
|
|
372
349
|
}
|
|
@@ -390,8 +367,8 @@ var body_default = (
|
|
|
390
367
|
})
|
|
391
368
|
);
|
|
392
369
|
} else {
|
|
393
|
-
if (treeConfig) {
|
|
394
|
-
tdVNs.push(...renderLine(rowid, cellParams
|
|
370
|
+
if (treeConfig && showTreeLine) {
|
|
371
|
+
tdVNs.push(...renderLine(rowid, cellParams));
|
|
395
372
|
}
|
|
396
373
|
const clVNs = [];
|
|
397
374
|
if (!isVNPreEmptyStatus) {
|
|
@@ -532,7 +509,7 @@ var body_default = (
|
|
|
532
509
|
],
|
|
533
510
|
key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex,
|
|
534
511
|
...tdAttrs,
|
|
535
|
-
style: Object.assign(
|
|
512
|
+
style: Object.assign(tdStyle, import_xe_utils.default.isFunction(compCellStyle) ? compCellStyle(cellParams) : compCellStyle, import_xe_utils.default.isFunction(cellStyle) ? cellStyle(cellParams) : cellStyle),
|
|
536
513
|
...tdOns
|
|
537
514
|
},
|
|
538
515
|
isOptimizeMode && fixedHiddenColumn ? [] : tdVNs
|