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
package/es/table/src/table.js
CHANGED
|
@@ -579,6 +579,14 @@ var table_default = (
|
|
|
579
579
|
const computeTreeOpts = computed(() => {
|
|
580
580
|
return Object.assign({}, getConfig().table.treeConfig, props.treeConfig);
|
|
581
581
|
});
|
|
582
|
+
const computeShowTreeLine = computed(() => {
|
|
583
|
+
const treeOpts = computeTreeOpts.value;
|
|
584
|
+
return getDefaultConfig(treeOpts.showLine, treeOpts.line);
|
|
585
|
+
});
|
|
586
|
+
const computeShowTreeRootLine = computed(() => {
|
|
587
|
+
const treeOpts = computeTreeOpts.value;
|
|
588
|
+
return treeOpts.showRootLine;
|
|
589
|
+
});
|
|
582
590
|
const computeEmptyOpts = computed(() => {
|
|
583
591
|
return Object.assign({}, getConfig().table.emptyRender, props.emptyRender);
|
|
584
592
|
});
|
|
@@ -612,8 +620,11 @@ var table_default = (
|
|
|
612
620
|
return "";
|
|
613
621
|
});
|
|
614
622
|
const computeTableStyle = computed(() => {
|
|
623
|
+
const { treeConfig } = props;
|
|
615
624
|
const barWidth = computeScrollYWidth.value;
|
|
616
625
|
const barHeight = computeScrollXHeight.value;
|
|
626
|
+
const treeOpts = computeTreeOpts.value;
|
|
627
|
+
const { indent, lineWidth, lineColor } = treeOpts;
|
|
617
628
|
const stys = {};
|
|
618
629
|
if (barWidth || barHeight) {
|
|
619
630
|
stys["--vxe-ui-table-view-scrollbar-width"] = toCssUnit(barWidth || barHeight);
|
|
@@ -621,6 +632,15 @@ var table_default = (
|
|
|
621
632
|
stys["--vxe-ui-table-view-scrollbar-height"] = toCssUnit(barHeight || barWidth);
|
|
622
633
|
stys["--vxe-ui-scrollbar-x-height"] = toCssUnit(barHeight || barWidth);
|
|
623
634
|
}
|
|
635
|
+
if (treeConfig) {
|
|
636
|
+
stys["--vxe-ui-table-tree-node-indent"] = toCssUnit(indent);
|
|
637
|
+
}
|
|
638
|
+
if (lineWidth) {
|
|
639
|
+
stys["--vxe-ui-table-tree-node-line-width"] = toCssUnit(lineWidth);
|
|
640
|
+
}
|
|
641
|
+
if (lineColor) {
|
|
642
|
+
stys["--vxe-ui-table-tree-node-line-color"] = toCssUnit(lineColor);
|
|
643
|
+
}
|
|
624
644
|
return stys;
|
|
625
645
|
});
|
|
626
646
|
const computeTableRowExpandedList = computed(() => {
|
|
@@ -865,6 +885,7 @@ var table_default = (
|
|
|
865
885
|
computePrintOpts,
|
|
866
886
|
computeExpandOpts,
|
|
867
887
|
computeTreeOpts,
|
|
888
|
+
computeShowTreeLine,
|
|
868
889
|
computeEmptyOpts,
|
|
869
890
|
computeLoadingOpts,
|
|
870
891
|
computeCellOffsetWidth,
|
|
@@ -2048,9 +2069,9 @@ var table_default = (
|
|
|
2048
2069
|
if (!el || !el.clientWidth) {
|
|
2049
2070
|
return;
|
|
2050
2071
|
}
|
|
2051
|
-
const treeOpts = computeTreeOpts.value;
|
|
2052
2072
|
const defaultRowHeight = computeDefaultRowHeight.value;
|
|
2053
|
-
|
|
2073
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
2074
|
+
if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && showTreeLine)) {
|
|
2054
2075
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
2055
2076
|
const rowWrapperMaps = {};
|
|
2056
2077
|
el.querySelectorAll(".vxe-cell--wrapper[rowid]").forEach((wrapperElem) => {
|
|
@@ -2111,36 +2132,174 @@ var table_default = (
|
|
|
2111
2132
|
return cellValue;
|
|
2112
2133
|
};
|
|
2113
2134
|
};
|
|
2135
|
+
function getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) {
|
|
2136
|
+
const lines = [];
|
|
2137
|
+
for (let col = 1; col <= depth; col++) {
|
|
2138
|
+
const leftVal = `var(--vxe-ui-table-tree-node-btn-width) + var(--vxe-ui-table-tree-node-indent) * ${col - 1}`;
|
|
2139
|
+
const through = (linesMask & 1 << col - 1) !== 0;
|
|
2140
|
+
if (col === 1 && !showRootLine) {
|
|
2141
|
+
continue;
|
|
2142
|
+
}
|
|
2143
|
+
if (col < depth) {
|
|
2144
|
+
if (through) {
|
|
2145
|
+
let top = "0";
|
|
2146
|
+
let height = "100%";
|
|
2147
|
+
if (isFirstRow) {
|
|
2148
|
+
top = "50%";
|
|
2149
|
+
height = "50%";
|
|
2150
|
+
} else if (isLastRow) {
|
|
2151
|
+
top = "0";
|
|
2152
|
+
height = "50%";
|
|
2153
|
+
}
|
|
2154
|
+
lines.push({
|
|
2155
|
+
type: "v",
|
|
2156
|
+
style: {
|
|
2157
|
+
left: `calc(${leftVal})`,
|
|
2158
|
+
top,
|
|
2159
|
+
height
|
|
2160
|
+
}
|
|
2161
|
+
});
|
|
2162
|
+
}
|
|
2163
|
+
} else {
|
|
2164
|
+
let vTop = "0";
|
|
2165
|
+
let vHeight = through ? "100%" : "50%";
|
|
2166
|
+
if (isFirstRow && isLastRow) {
|
|
2167
|
+
vTop = "50%";
|
|
2168
|
+
vHeight = "0px";
|
|
2169
|
+
} else if (isFirstRow) {
|
|
2170
|
+
vTop = "50%";
|
|
2171
|
+
vHeight = "50%";
|
|
2172
|
+
} else if (isLastRow) {
|
|
2173
|
+
vTop = "0";
|
|
2174
|
+
vHeight = "50%";
|
|
2175
|
+
}
|
|
2176
|
+
if (isExpandable && vHeight !== "0px") {
|
|
2177
|
+
let cutType = "v cut";
|
|
2178
|
+
if (vTop === "0" && vHeight === "50%") {
|
|
2179
|
+
cutType = "v cut-top";
|
|
2180
|
+
} else if (vTop === "50%" && vHeight === "50%") {
|
|
2181
|
+
cutType = "v cut-bottom";
|
|
2182
|
+
} else if (vHeight === "100%") {
|
|
2183
|
+
cutType = "v cut-full";
|
|
2184
|
+
}
|
|
2185
|
+
lines.push({
|
|
2186
|
+
type: cutType,
|
|
2187
|
+
style: {
|
|
2188
|
+
left: `calc(${leftVal})`,
|
|
2189
|
+
top: vTop,
|
|
2190
|
+
height: vHeight
|
|
2191
|
+
}
|
|
2192
|
+
});
|
|
2193
|
+
} else {
|
|
2194
|
+
if (vHeight !== "0px") {
|
|
2195
|
+
lines.push({
|
|
2196
|
+
type: "v",
|
|
2197
|
+
style: {
|
|
2198
|
+
left: `calc(${leftVal})`,
|
|
2199
|
+
top: vTop,
|
|
2200
|
+
height: vHeight
|
|
2201
|
+
}
|
|
2202
|
+
});
|
|
2203
|
+
}
|
|
2204
|
+
}
|
|
2205
|
+
if (isExpandable) {
|
|
2206
|
+
lines.push({
|
|
2207
|
+
type: "h",
|
|
2208
|
+
style: {
|
|
2209
|
+
left: `calc(${leftVal} + var(--vxe-ui-table-tree-node-btn-width) / 2 + 1px)`,
|
|
2210
|
+
top: "50%",
|
|
2211
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) - 0.25em)"
|
|
2212
|
+
}
|
|
2213
|
+
});
|
|
2214
|
+
} else {
|
|
2215
|
+
lines.push({
|
|
2216
|
+
type: "h",
|
|
2217
|
+
style: {
|
|
2218
|
+
left: `calc(${leftVal})`,
|
|
2219
|
+
top: "50%",
|
|
2220
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width))"
|
|
2221
|
+
}
|
|
2222
|
+
});
|
|
2223
|
+
}
|
|
2224
|
+
}
|
|
2225
|
+
}
|
|
2226
|
+
return lines;
|
|
2227
|
+
}
|
|
2114
2228
|
const updateAfterTreeIndex = () => {
|
|
2115
2229
|
const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
|
|
2116
2230
|
const treeOpts = computeTreeOpts.value;
|
|
2117
|
-
const { transform, mapChildrenField } = treeOpts;
|
|
2231
|
+
const { lazy, transform, showRootLine, mapChildrenField } = treeOpts;
|
|
2118
2232
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
2233
|
+
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
2234
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
2119
2235
|
const fullMaps = {};
|
|
2120
|
-
|
|
2236
|
+
const treeFullSize = afterTreeFullData.length;
|
|
2237
|
+
const rowNum = 0;
|
|
2121
2238
|
const { handleGetRowId } = createHandleGetRowId($xeTable);
|
|
2122
|
-
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
|
|
2127
|
-
|
|
2128
|
-
|
|
2129
|
-
|
|
2130
|
-
|
|
2131
|
-
|
|
2132
|
-
|
|
2133
|
-
|
|
2134
|
-
|
|
2135
|
-
|
|
2136
|
-
|
|
2137
|
-
|
|
2138
|
-
|
|
2139
|
-
|
|
2140
|
-
|
|
2141
|
-
|
|
2142
|
-
|
|
2143
|
-
|
|
2239
|
+
function handleTreeDFS(row, index, items, parentRow, depth, isFirstRow, isLastRow, isLastChild, stackMask, seq) {
|
|
2240
|
+
const rowid = handleGetRowId(row);
|
|
2241
|
+
let rowRest = fullAllDataRowIdData[rowid];
|
|
2242
|
+
const rowChilds = row[transform ? mapChildrenField : childrenField];
|
|
2243
|
+
if (rowRest) {
|
|
2244
|
+
rowRest.seq = seq;
|
|
2245
|
+
rowRest._seq = rowNum;
|
|
2246
|
+
rowRest.items = items;
|
|
2247
|
+
rowRest.treeIndex = index;
|
|
2248
|
+
rowRest._index = rowNum;
|
|
2249
|
+
rowRest._tIndex = rowNum;
|
|
2250
|
+
} else {
|
|
2251
|
+
rowRest = {
|
|
2252
|
+
row,
|
|
2253
|
+
rowid,
|
|
2254
|
+
_seq: rowNum,
|
|
2255
|
+
seq,
|
|
2256
|
+
index,
|
|
2257
|
+
$index: -1,
|
|
2258
|
+
_index: rowNum,
|
|
2259
|
+
treeIndex: index,
|
|
2260
|
+
_tIndex: rowNum,
|
|
2261
|
+
items,
|
|
2262
|
+
parent: parentRow,
|
|
2263
|
+
level: 0,
|
|
2264
|
+
linesMask: 0,
|
|
2265
|
+
height: 0,
|
|
2266
|
+
resizeHeight: 0,
|
|
2267
|
+
oTop: 0,
|
|
2268
|
+
expandHeight: 0
|
|
2269
|
+
};
|
|
2270
|
+
fullAllDataRowIdData[rowid] = rowRest;
|
|
2271
|
+
fullDataRowIdData[rowid] = rowRest;
|
|
2272
|
+
}
|
|
2273
|
+
let linesMask = stackMask >> 1;
|
|
2274
|
+
if (!isLastChild) {
|
|
2275
|
+
linesMask |= 1 << depth - 1;
|
|
2276
|
+
}
|
|
2277
|
+
rowRest.seq = seq;
|
|
2278
|
+
rowRest._seq = rowNum;
|
|
2279
|
+
rowRest.level = depth - 1;
|
|
2280
|
+
rowRest.linesMask = linesMask;
|
|
2281
|
+
const hasChild = rowChilds && rowChilds.length;
|
|
2282
|
+
let hasLazyChilds = false;
|
|
2283
|
+
let isLazyLoaded = false;
|
|
2284
|
+
if (lazy) {
|
|
2285
|
+
const rest = fullAllDataRowIdData[rowid];
|
|
2286
|
+
hasLazyChilds = row[hasChildField];
|
|
2287
|
+
isLazyLoaded = !!rest.treeLoaded;
|
|
2288
|
+
}
|
|
2289
|
+
const isExpandable = lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild;
|
|
2290
|
+
rowRest.treeLines = showTreeLine && treeFullSize > 1 ? getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) : [];
|
|
2291
|
+
let nextStackMask = stackMask;
|
|
2292
|
+
if (!isLastChild) {
|
|
2293
|
+
nextStackMask |= 1 << depth;
|
|
2294
|
+
}
|
|
2295
|
+
fullMaps[rowid] = row;
|
|
2296
|
+
for (let i = 0; i < rowChilds.length; i++) {
|
|
2297
|
+
handleTreeDFS(rowChilds[i], i, rowChilds, row, depth + 1, false, false, i === rowChilds.length - 1, nextStackMask, `${seq}.${i + 1}`);
|
|
2298
|
+
}
|
|
2299
|
+
}
|
|
2300
|
+
for (let i = 0; i < treeFullSize; i++) {
|
|
2301
|
+
handleTreeDFS(afterTreeFullData[i], i, afterTreeFullData, null, 1, !i, i === treeFullSize - 1, i === treeFullSize - 1, 0, "" + i);
|
|
2302
|
+
}
|
|
2144
2303
|
if (transform) {
|
|
2145
2304
|
afterFullData.forEach((row, index) => {
|
|
2146
2305
|
const rowid = handleGetRowId(row);
|
|
@@ -2166,7 +2325,25 @@ var table_default = (
|
|
|
2166
2325
|
rowRest._seq = rowNum;
|
|
2167
2326
|
rowRest._index = index;
|
|
2168
2327
|
} else {
|
|
2169
|
-
const rest = {
|
|
2328
|
+
const rest = {
|
|
2329
|
+
row,
|
|
2330
|
+
rowid,
|
|
2331
|
+
_seq: rowNum,
|
|
2332
|
+
seq,
|
|
2333
|
+
index: -1,
|
|
2334
|
+
$index: -1,
|
|
2335
|
+
_index: index,
|
|
2336
|
+
treeIndex: -1,
|
|
2337
|
+
_tIndex: -1,
|
|
2338
|
+
items: [],
|
|
2339
|
+
parent: null,
|
|
2340
|
+
level: 0,
|
|
2341
|
+
linesMask: 0,
|
|
2342
|
+
height: 0,
|
|
2343
|
+
resizeHeight: 0,
|
|
2344
|
+
oTop: 0,
|
|
2345
|
+
expandHeight: 0
|
|
2346
|
+
};
|
|
2170
2347
|
fullAllDataRowIdData[rowid] = rest;
|
|
2171
2348
|
fullDataRowIdData[rowid] = rest;
|
|
2172
2349
|
}
|
|
@@ -4848,7 +5025,25 @@ var table_default = (
|
|
|
4848
5025
|
(childRow, index, items, path, parentItem, nodes) => {
|
|
4849
5026
|
const rowid = getRowid($xeTable, childRow);
|
|
4850
5027
|
const parentRow = parentItem || parentRest.row;
|
|
4851
|
-
const rest = {
|
|
5028
|
+
const rest = {
|
|
5029
|
+
row: childRow,
|
|
5030
|
+
rowid,
|
|
5031
|
+
_seq: -1,
|
|
5032
|
+
seq: -1,
|
|
5033
|
+
index,
|
|
5034
|
+
_index: -1,
|
|
5035
|
+
$index: -1,
|
|
5036
|
+
treeIndex: -1,
|
|
5037
|
+
_tIndex: -1,
|
|
5038
|
+
items,
|
|
5039
|
+
parent: parentRow,
|
|
5040
|
+
level: parentLevel + nodes.length,
|
|
5041
|
+
linesMask: 0,
|
|
5042
|
+
height: 0,
|
|
5043
|
+
resizeHeight: 0,
|
|
5044
|
+
oTop: 0,
|
|
5045
|
+
expandHeight: 0
|
|
5046
|
+
};
|
|
4852
5047
|
fullDataRowIdData[rowid] = rest;
|
|
4853
5048
|
fullAllDataRowIdData[rowid] = rest;
|
|
4854
5049
|
},
|
|
@@ -9291,9 +9486,25 @@ var table_default = (
|
|
|
9291
9486
|
errLog("vxe.error.repeatKey", [currKeyField, rowid]);
|
|
9292
9487
|
}
|
|
9293
9488
|
if (!rowRest) {
|
|
9294
|
-
rowRest = {
|
|
9295
|
-
|
|
9296
|
-
|
|
9489
|
+
rowRest = {
|
|
9490
|
+
row,
|
|
9491
|
+
rowid,
|
|
9492
|
+
_seq: -1,
|
|
9493
|
+
seq,
|
|
9494
|
+
index: -1,
|
|
9495
|
+
_index: -1,
|
|
9496
|
+
$index: -1,
|
|
9497
|
+
treeIndex: index,
|
|
9498
|
+
_tIndex: -1,
|
|
9499
|
+
items,
|
|
9500
|
+
parent: parentRow,
|
|
9501
|
+
level,
|
|
9502
|
+
linesMask: 0,
|
|
9503
|
+
height: 0,
|
|
9504
|
+
resizeHeight: 0,
|
|
9505
|
+
oTop: 0,
|
|
9506
|
+
expandHeight: 0
|
|
9507
|
+
};
|
|
9297
9508
|
}
|
|
9298
9509
|
if (isReset || isReLoaded) {
|
|
9299
9510
|
rowRest.treeLoaded = false;
|
|
@@ -9312,7 +9523,6 @@ var table_default = (
|
|
|
9312
9523
|
if (rowExpandedMaps[rowid]) {
|
|
9313
9524
|
rowExpandedMaps[rowid] = row;
|
|
9314
9525
|
}
|
|
9315
|
-
rowNum++;
|
|
9316
9526
|
idMaps[rowid] = true;
|
|
9317
9527
|
fullDataRowIdMaps[rowid] = rowRest;
|
|
9318
9528
|
fullAllDataRowIdMaps[rowid] = rowRest;
|
|
@@ -11000,8 +11210,8 @@ var table_default = (
|
|
|
11000
11210
|
$xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
|
|
11001
11211
|
}
|
|
11002
11212
|
}
|
|
11003
|
-
if (!triggerDrag && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.
|
|
11004
|
-
$xeTable.
|
|
11213
|
+
if (!triggerDrag && hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleHeadCellAreaMouseDnEvent) {
|
|
11214
|
+
$xeTable.handleHeadCellAreaMouseDnEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
|
|
11005
11215
|
}
|
|
11006
11216
|
$xeTable.focus();
|
|
11007
11217
|
if ($xeTable.closeMenu) {
|
|
@@ -13584,7 +13794,7 @@ var table_default = (
|
|
|
13584
13794
|
const validTipConfig = computeValidTipConfig.value;
|
|
13585
13795
|
const validOpts = computeValidOpts.value;
|
|
13586
13796
|
const checkboxOpts = computeCheckboxOpts.value;
|
|
13587
|
-
const
|
|
13797
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
13588
13798
|
const rowOpts = computeRowOpts.value;
|
|
13589
13799
|
const columnOpts = computeColumnOpts.value;
|
|
13590
13800
|
const vSize = computeSize.value;
|
|
@@ -13642,7 +13852,7 @@ var table_default = (
|
|
|
13642
13852
|
"not--footer": !showFooter,
|
|
13643
13853
|
"is--group": isGroup,
|
|
13644
13854
|
"is-row-group": isRowGroupStatus,
|
|
13645
|
-
"is--tree-line": treeConfig &&
|
|
13855
|
+
"is--tree-line": treeConfig && showTreeLine,
|
|
13646
13856
|
"is--fixed-left": leftList.length,
|
|
13647
13857
|
"is--fixed-right": rightList.length,
|
|
13648
13858
|
"is--animat": !!props.animat,
|
|
@@ -14195,6 +14405,16 @@ var table_default = (
|
|
|
14195
14405
|
$xeTable.recalculate(true);
|
|
14196
14406
|
});
|
|
14197
14407
|
});
|
|
14408
|
+
const lineFlag = ref(0);
|
|
14409
|
+
watch(computeShowTreeLine, () => {
|
|
14410
|
+
lineFlag.value++;
|
|
14411
|
+
});
|
|
14412
|
+
watch(computeShowTreeRootLine, () => {
|
|
14413
|
+
lineFlag.value++;
|
|
14414
|
+
});
|
|
14415
|
+
watch(lineFlag, () => {
|
|
14416
|
+
updateAfterDataIndex();
|
|
14417
|
+
});
|
|
14198
14418
|
watch(reScrollFlag, () => {
|
|
14199
14419
|
updateScrollbar().then(() => {
|
|
14200
14420
|
updateScrollbar();
|
package/es/table/style.css
CHANGED
|
@@ -1868,26 +1868,32 @@
|
|
|
1868
1868
|
--vxe-ui-table-current-font-size: var(--vxe-ui-font-size-default);
|
|
1869
1869
|
--vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-default);
|
|
1870
1870
|
--vxe-ui-table-current-row-line-height: var(--vxe-ui-table-row-line-height);
|
|
1871
|
+
--vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-default);
|
|
1871
1872
|
}
|
|
1872
1873
|
.vxe-table.size--xlarge {
|
|
1873
1874
|
--vxe-ui-table-current-font-size: var(--vxe-ui-font-size-xlarge);
|
|
1874
1875
|
--vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-xlarge);
|
|
1876
|
+
--vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-xlarge);
|
|
1875
1877
|
}
|
|
1876
1878
|
.vxe-table.size--large {
|
|
1877
1879
|
--vxe-ui-table-current-font-size: var(--vxe-ui-font-size-large);
|
|
1878
1880
|
--vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-large);
|
|
1881
|
+
--vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-large);
|
|
1879
1882
|
}
|
|
1880
1883
|
.vxe-table.size--medium {
|
|
1881
1884
|
--vxe-ui-table-current-font-size: var(--vxe-ui-font-size-medium);
|
|
1882
1885
|
--vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-medium);
|
|
1886
|
+
--vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-medium);
|
|
1883
1887
|
}
|
|
1884
1888
|
.vxe-table.size--small {
|
|
1885
1889
|
--vxe-ui-table-current-font-size: var(--vxe-ui-font-size-small);
|
|
1886
1890
|
--vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-small);
|
|
1891
|
+
--vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-small);
|
|
1887
1892
|
}
|
|
1888
1893
|
.vxe-table.size--mini {
|
|
1889
1894
|
--vxe-ui-table-current-font-size: var(--vxe-ui-font-size-mini);
|
|
1890
1895
|
--vxe-ui-table-current-cell-padding: var(--vxe-ui-table-cell-padding-mini);
|
|
1896
|
+
--vxe-ui-table-current-row-height: var(--vxe-ui-table-row-height-mini);
|
|
1891
1897
|
}
|
|
1892
1898
|
|
|
1893
1899
|
.vxe-table-slots,
|
|
@@ -3562,21 +3568,84 @@
|
|
|
3562
3568
|
.vxe-table--render-default {
|
|
3563
3569
|
/*树形节点*/
|
|
3564
3570
|
}
|
|
3565
|
-
.vxe-table--render-default .vxe-tree--line
|
|
3566
|
-
|
|
3567
|
-
display: block;
|
|
3568
|
-
height: 0;
|
|
3571
|
+
.vxe-table--render-default .vxe-tree--line {
|
|
3572
|
+
--vxe-ui-table-current-line-gap: calc((var(--vxe-ui-table-cell-height, var(--vxe-ui-table-current-row-height)) - var(--vxe-ui-table-tree-node-btn-width)) / 2);
|
|
3569
3573
|
}
|
|
3570
3574
|
.vxe-table--render-default .vxe-tree--line {
|
|
3571
|
-
content: "";
|
|
3572
3575
|
position: absolute;
|
|
3573
|
-
bottom: -1.5em;
|
|
3574
|
-
width: 0.8em;
|
|
3575
|
-
border-width: 0 0 1px 1px;
|
|
3576
|
-
border-style: var(--vxe-ui-table-tree-node-line-style);
|
|
3577
|
-
border-color: var(--vxe-ui-table-tree-node-line-color);
|
|
3578
3576
|
pointer-events: none;
|
|
3579
3577
|
}
|
|
3578
|
+
.vxe-table--render-default .vxe-tree--line.v {
|
|
3579
|
+
width: var(--vxe-ui-table-tree-node-line-width);
|
|
3580
|
+
transform: translateX(-50%);
|
|
3581
|
+
/* 伪元素基础尺寸和位置,不含背景 */
|
|
3582
|
+
}
|
|
3583
|
+
.vxe-table--render-default .vxe-tree--line.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.v.cut-bottom::after {
|
|
3584
|
+
content: "";
|
|
3585
|
+
position: absolute;
|
|
3586
|
+
left: 0;
|
|
3587
|
+
width: var(--vxe-ui-table-tree-node-line-width);
|
|
3588
|
+
}
|
|
3589
|
+
.vxe-table--render-default .vxe-tree--line.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.v.cut-top::before {
|
|
3590
|
+
top: 0;
|
|
3591
|
+
height: var(--vxe-ui-table-current-line-gap);
|
|
3592
|
+
}
|
|
3593
|
+
.vxe-table--render-default .vxe-tree--line.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.v.cut-bottom::after {
|
|
3594
|
+
top: calc(100% - var(--vxe-ui-table-current-line-gap));
|
|
3595
|
+
height: var(--vxe-ui-table-current-line-gap);
|
|
3596
|
+
}
|
|
3597
|
+
.vxe-table--render-default .vxe-tree--line.h {
|
|
3598
|
+
height: var(--vxe-ui-table-tree-node-line-width);
|
|
3599
|
+
transform: translateY(-50%);
|
|
3600
|
+
}
|
|
3601
|
+
.vxe-table--render-default .vxe-tree--line.type--solid.v {
|
|
3602
|
+
background-color: var(--vxe-ui-table-tree-node-line-color);
|
|
3603
|
+
}
|
|
3604
|
+
.vxe-table--render-default .vxe-tree--line.type--solid.v.cut-full, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-top, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-bottom {
|
|
3605
|
+
background: none;
|
|
3606
|
+
}
|
|
3607
|
+
.vxe-table--render-default .vxe-tree--line.type--solid.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.type--solid.v.cut-bottom::after {
|
|
3608
|
+
background-color: var(--vxe-ui-table-tree-node-line-color);
|
|
3609
|
+
}
|
|
3610
|
+
.vxe-table--render-default .vxe-tree--line.type--solid.h {
|
|
3611
|
+
background-color: var(--vxe-ui-table-tree-node-line-color);
|
|
3612
|
+
}
|
|
3613
|
+
.vxe-table--render-default .vxe-tree--line.type--dashed.v {
|
|
3614
|
+
background-color: transparent;
|
|
3615
|
+
background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
|
|
3616
|
+
background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 4);
|
|
3617
|
+
}
|
|
3618
|
+
.vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-full, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-top, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-bottom {
|
|
3619
|
+
background: none;
|
|
3620
|
+
}
|
|
3621
|
+
.vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.type--dashed.v.cut-bottom::after {
|
|
3622
|
+
background-color: transparent;
|
|
3623
|
+
background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
|
|
3624
|
+
background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 4);
|
|
3625
|
+
}
|
|
3626
|
+
.vxe-table--render-default .vxe-tree--line.type--dashed.h {
|
|
3627
|
+
background-color: transparent;
|
|
3628
|
+
background-image: linear-gradient(to right, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
|
|
3629
|
+
background-size: calc(var(--vxe-ui-table-tree-node-line-width) * 4) var(--vxe-ui-table-tree-node-line-width);
|
|
3630
|
+
}
|
|
3631
|
+
.vxe-table--render-default .vxe-tree--line.type--dotted.v {
|
|
3632
|
+
background-color: transparent;
|
|
3633
|
+
background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
|
|
3634
|
+
background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 2);
|
|
3635
|
+
}
|
|
3636
|
+
.vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-full, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-top, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-bottom {
|
|
3637
|
+
background: none;
|
|
3638
|
+
}
|
|
3639
|
+
.vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-full::before, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-top::before, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-full::after, .vxe-table--render-default .vxe-tree--line.type--dotted.v.cut-bottom::after {
|
|
3640
|
+
background-color: transparent;
|
|
3641
|
+
background-image: linear-gradient(to bottom, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
|
|
3642
|
+
background-size: var(--vxe-ui-table-tree-node-line-width) calc(var(--vxe-ui-table-tree-node-line-width) * 2);
|
|
3643
|
+
}
|
|
3644
|
+
.vxe-table--render-default .vxe-tree--line.type--dotted.h {
|
|
3645
|
+
background-color: transparent;
|
|
3646
|
+
background-image: linear-gradient(to right, var(--vxe-ui-table-tree-node-line-color) 50%, transparent 50%);
|
|
3647
|
+
background-size: calc(var(--vxe-ui-table-tree-node-line-width) * 2) var(--vxe-ui-table-tree-node-line-width);
|
|
3648
|
+
}
|
|
3580
3649
|
.vxe-table--render-default .vxe-row-group--tree-node,
|
|
3581
3650
|
.vxe-table--render-default .vxe-cell--tree-node {
|
|
3582
3651
|
position: relative;
|
|
@@ -3592,14 +3661,14 @@
|
|
|
3592
3661
|
.vxe-table--render-default .vxe-row-group-cell,
|
|
3593
3662
|
.vxe-table--render-default .vxe-tree-cell {
|
|
3594
3663
|
display: block;
|
|
3595
|
-
padding-left:
|
|
3664
|
+
padding-left: var(--vxe-ui-table-tree-node-indent);
|
|
3596
3665
|
}
|
|
3597
3666
|
.vxe-table--render-default .vxe-cell--tree-btn,
|
|
3598
3667
|
.vxe-table--render-default .vxe-row-group--node-btn {
|
|
3599
3668
|
position: absolute;
|
|
3600
3669
|
top: 50%;
|
|
3601
|
-
width:
|
|
3602
|
-
height:
|
|
3670
|
+
width: var(--vxe-ui-table-tree-node-btn-width);
|
|
3671
|
+
height: var(--vxe-ui-table-tree-node-btn-width);
|
|
3603
3672
|
text-align: center;
|
|
3604
3673
|
transform: translateY(-50%);
|
|
3605
3674
|
z-index: 1;
|