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/lib/table/src/table.js
CHANGED
|
@@ -581,6 +581,14 @@ var table_default = (
|
|
|
581
581
|
const computeTreeOpts = (0, import_vue.computed)(() => {
|
|
582
582
|
return Object.assign({}, getConfig().table.treeConfig, props.treeConfig);
|
|
583
583
|
});
|
|
584
|
+
const computeShowTreeLine = (0, import_vue.computed)(() => {
|
|
585
|
+
const treeOpts = computeTreeOpts.value;
|
|
586
|
+
return (0, import_utils.getDefaultConfig)(treeOpts.showLine, treeOpts.line);
|
|
587
|
+
});
|
|
588
|
+
const computeShowTreeRootLine = (0, import_vue.computed)(() => {
|
|
589
|
+
const treeOpts = computeTreeOpts.value;
|
|
590
|
+
return treeOpts.showRootLine;
|
|
591
|
+
});
|
|
584
592
|
const computeEmptyOpts = (0, import_vue.computed)(() => {
|
|
585
593
|
return Object.assign({}, getConfig().table.emptyRender, props.emptyRender);
|
|
586
594
|
});
|
|
@@ -614,8 +622,11 @@ var table_default = (
|
|
|
614
622
|
return "";
|
|
615
623
|
});
|
|
616
624
|
const computeTableStyle = (0, import_vue.computed)(() => {
|
|
625
|
+
const { treeConfig } = props;
|
|
617
626
|
const barWidth = computeScrollYWidth.value;
|
|
618
627
|
const barHeight = computeScrollXHeight.value;
|
|
628
|
+
const treeOpts = computeTreeOpts.value;
|
|
629
|
+
const { indent, lineWidth, lineColor } = treeOpts;
|
|
619
630
|
const stys = {};
|
|
620
631
|
if (barWidth || barHeight) {
|
|
621
632
|
stys["--vxe-ui-table-view-scrollbar-width"] = (0, import_dom.toCssUnit)(barWidth || barHeight);
|
|
@@ -623,6 +634,15 @@ var table_default = (
|
|
|
623
634
|
stys["--vxe-ui-table-view-scrollbar-height"] = (0, import_dom.toCssUnit)(barHeight || barWidth);
|
|
624
635
|
stys["--vxe-ui-scrollbar-x-height"] = (0, import_dom.toCssUnit)(barHeight || barWidth);
|
|
625
636
|
}
|
|
637
|
+
if (treeConfig) {
|
|
638
|
+
stys["--vxe-ui-table-tree-node-indent"] = (0, import_dom.toCssUnit)(indent);
|
|
639
|
+
}
|
|
640
|
+
if (lineWidth) {
|
|
641
|
+
stys["--vxe-ui-table-tree-node-line-width"] = (0, import_dom.toCssUnit)(lineWidth);
|
|
642
|
+
}
|
|
643
|
+
if (lineColor) {
|
|
644
|
+
stys["--vxe-ui-table-tree-node-line-color"] = (0, import_dom.toCssUnit)(lineColor);
|
|
645
|
+
}
|
|
626
646
|
return stys;
|
|
627
647
|
});
|
|
628
648
|
const computeTableRowExpandedList = (0, import_vue.computed)(() => {
|
|
@@ -867,6 +887,7 @@ var table_default = (
|
|
|
867
887
|
computePrintOpts,
|
|
868
888
|
computeExpandOpts,
|
|
869
889
|
computeTreeOpts,
|
|
890
|
+
computeShowTreeLine,
|
|
870
891
|
computeEmptyOpts,
|
|
871
892
|
computeLoadingOpts,
|
|
872
893
|
computeCellOffsetWidth,
|
|
@@ -2050,9 +2071,9 @@ var table_default = (
|
|
|
2050
2071
|
if (!el || !el.clientWidth) {
|
|
2051
2072
|
return;
|
|
2052
2073
|
}
|
|
2053
|
-
const treeOpts = computeTreeOpts.value;
|
|
2054
2074
|
const defaultRowHeight = computeDefaultRowHeight.value;
|
|
2055
|
-
|
|
2075
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
2076
|
+
if (!isAllOverflow && (scrollYLoad || scrollXLoad || treeConfig && showTreeLine)) {
|
|
2056
2077
|
const { handleGetRowId } = (0, import_util.createHandleGetRowId)($xeTable);
|
|
2057
2078
|
const rowWrapperMaps = {};
|
|
2058
2079
|
el.querySelectorAll(".vxe-cell--wrapper[rowid]").forEach((wrapperElem) => {
|
|
@@ -2113,36 +2134,174 @@ var table_default = (
|
|
|
2113
2134
|
return cellValue;
|
|
2114
2135
|
};
|
|
2115
2136
|
};
|
|
2137
|
+
function getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) {
|
|
2138
|
+
const lines = [];
|
|
2139
|
+
for (let col = 1; col <= depth; col++) {
|
|
2140
|
+
const leftVal = `var(--vxe-ui-table-tree-node-btn-width) + var(--vxe-ui-table-tree-node-indent) * ${col - 1}`;
|
|
2141
|
+
const through = (linesMask & 1 << col - 1) !== 0;
|
|
2142
|
+
if (col === 1 && !showRootLine) {
|
|
2143
|
+
continue;
|
|
2144
|
+
}
|
|
2145
|
+
if (col < depth) {
|
|
2146
|
+
if (through) {
|
|
2147
|
+
let top = "0";
|
|
2148
|
+
let height = "100%";
|
|
2149
|
+
if (isFirstRow) {
|
|
2150
|
+
top = "50%";
|
|
2151
|
+
height = "50%";
|
|
2152
|
+
} else if (isLastRow) {
|
|
2153
|
+
top = "0";
|
|
2154
|
+
height = "50%";
|
|
2155
|
+
}
|
|
2156
|
+
lines.push({
|
|
2157
|
+
type: "v",
|
|
2158
|
+
style: {
|
|
2159
|
+
left: `calc(${leftVal})`,
|
|
2160
|
+
top,
|
|
2161
|
+
height
|
|
2162
|
+
}
|
|
2163
|
+
});
|
|
2164
|
+
}
|
|
2165
|
+
} else {
|
|
2166
|
+
let vTop = "0";
|
|
2167
|
+
let vHeight = through ? "100%" : "50%";
|
|
2168
|
+
if (isFirstRow && isLastRow) {
|
|
2169
|
+
vTop = "50%";
|
|
2170
|
+
vHeight = "0px";
|
|
2171
|
+
} else if (isFirstRow) {
|
|
2172
|
+
vTop = "50%";
|
|
2173
|
+
vHeight = "50%";
|
|
2174
|
+
} else if (isLastRow) {
|
|
2175
|
+
vTop = "0";
|
|
2176
|
+
vHeight = "50%";
|
|
2177
|
+
}
|
|
2178
|
+
if (isExpandable && vHeight !== "0px") {
|
|
2179
|
+
let cutType = "v cut";
|
|
2180
|
+
if (vTop === "0" && vHeight === "50%") {
|
|
2181
|
+
cutType = "v cut-top";
|
|
2182
|
+
} else if (vTop === "50%" && vHeight === "50%") {
|
|
2183
|
+
cutType = "v cut-bottom";
|
|
2184
|
+
} else if (vHeight === "100%") {
|
|
2185
|
+
cutType = "v cut-full";
|
|
2186
|
+
}
|
|
2187
|
+
lines.push({
|
|
2188
|
+
type: cutType,
|
|
2189
|
+
style: {
|
|
2190
|
+
left: `calc(${leftVal})`,
|
|
2191
|
+
top: vTop,
|
|
2192
|
+
height: vHeight
|
|
2193
|
+
}
|
|
2194
|
+
});
|
|
2195
|
+
} else {
|
|
2196
|
+
if (vHeight !== "0px") {
|
|
2197
|
+
lines.push({
|
|
2198
|
+
type: "v",
|
|
2199
|
+
style: {
|
|
2200
|
+
left: `calc(${leftVal})`,
|
|
2201
|
+
top: vTop,
|
|
2202
|
+
height: vHeight
|
|
2203
|
+
}
|
|
2204
|
+
});
|
|
2205
|
+
}
|
|
2206
|
+
}
|
|
2207
|
+
if (isExpandable) {
|
|
2208
|
+
lines.push({
|
|
2209
|
+
type: "h",
|
|
2210
|
+
style: {
|
|
2211
|
+
left: `calc(${leftVal} + var(--vxe-ui-table-tree-node-btn-width) / 2 + 1px)`,
|
|
2212
|
+
top: "50%",
|
|
2213
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width) - 0.25em)"
|
|
2214
|
+
}
|
|
2215
|
+
});
|
|
2216
|
+
} else {
|
|
2217
|
+
lines.push({
|
|
2218
|
+
type: "h",
|
|
2219
|
+
style: {
|
|
2220
|
+
left: `calc(${leftVal})`,
|
|
2221
|
+
top: "50%",
|
|
2222
|
+
width: "calc(var(--vxe-ui-table-tree-node-indent) - var(--vxe-ui-table-tree-node-btn-width))"
|
|
2223
|
+
}
|
|
2224
|
+
});
|
|
2225
|
+
}
|
|
2226
|
+
}
|
|
2227
|
+
}
|
|
2228
|
+
return lines;
|
|
2229
|
+
}
|
|
2116
2230
|
const updateAfterTreeIndex = () => {
|
|
2117
2231
|
const { fullDataRowIdData, fullAllDataRowIdData, afterFullData, afterTreeFullData } = internalData;
|
|
2118
2232
|
const treeOpts = computeTreeOpts.value;
|
|
2119
|
-
const { transform, mapChildrenField } = treeOpts;
|
|
2233
|
+
const { lazy, transform, showRootLine, mapChildrenField } = treeOpts;
|
|
2120
2234
|
const childrenField = treeOpts.children || treeOpts.childrenField;
|
|
2235
|
+
const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
|
|
2236
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
2121
2237
|
const fullMaps = {};
|
|
2122
|
-
|
|
2238
|
+
const treeFullSize = afterTreeFullData.length;
|
|
2239
|
+
const rowNum = 0;
|
|
2123
2240
|
const { handleGetRowId } = (0, import_util.createHandleGetRowId)($xeTable);
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
|
|
2127
|
-
|
|
2128
|
-
|
|
2129
|
-
|
|
2130
|
-
|
|
2131
|
-
|
|
2132
|
-
|
|
2133
|
-
|
|
2134
|
-
|
|
2135
|
-
|
|
2136
|
-
|
|
2137
|
-
|
|
2138
|
-
|
|
2139
|
-
|
|
2140
|
-
|
|
2141
|
-
|
|
2142
|
-
|
|
2143
|
-
|
|
2144
|
-
|
|
2145
|
-
|
|
2241
|
+
function handleTreeDFS(row, index, items, parentRow, depth, isFirstRow, isLastRow, isLastChild, stackMask, seq) {
|
|
2242
|
+
const rowid = handleGetRowId(row);
|
|
2243
|
+
let rowRest = fullAllDataRowIdData[rowid];
|
|
2244
|
+
const rowChilds = row[transform ? mapChildrenField : childrenField];
|
|
2245
|
+
if (rowRest) {
|
|
2246
|
+
rowRest.seq = seq;
|
|
2247
|
+
rowRest._seq = rowNum;
|
|
2248
|
+
rowRest.items = items;
|
|
2249
|
+
rowRest.treeIndex = index;
|
|
2250
|
+
rowRest._index = rowNum;
|
|
2251
|
+
rowRest._tIndex = rowNum;
|
|
2252
|
+
} else {
|
|
2253
|
+
rowRest = {
|
|
2254
|
+
row,
|
|
2255
|
+
rowid,
|
|
2256
|
+
_seq: rowNum,
|
|
2257
|
+
seq,
|
|
2258
|
+
index,
|
|
2259
|
+
$index: -1,
|
|
2260
|
+
_index: rowNum,
|
|
2261
|
+
treeIndex: index,
|
|
2262
|
+
_tIndex: rowNum,
|
|
2263
|
+
items,
|
|
2264
|
+
parent: parentRow,
|
|
2265
|
+
level: 0,
|
|
2266
|
+
linesMask: 0,
|
|
2267
|
+
height: 0,
|
|
2268
|
+
resizeHeight: 0,
|
|
2269
|
+
oTop: 0,
|
|
2270
|
+
expandHeight: 0
|
|
2271
|
+
};
|
|
2272
|
+
fullAllDataRowIdData[rowid] = rowRest;
|
|
2273
|
+
fullDataRowIdData[rowid] = rowRest;
|
|
2274
|
+
}
|
|
2275
|
+
let linesMask = stackMask >> 1;
|
|
2276
|
+
if (!isLastChild) {
|
|
2277
|
+
linesMask |= 1 << depth - 1;
|
|
2278
|
+
}
|
|
2279
|
+
rowRest.seq = seq;
|
|
2280
|
+
rowRest._seq = rowNum;
|
|
2281
|
+
rowRest.level = depth - 1;
|
|
2282
|
+
rowRest.linesMask = linesMask;
|
|
2283
|
+
const hasChild = rowChilds && rowChilds.length;
|
|
2284
|
+
let hasLazyChilds = false;
|
|
2285
|
+
let isLazyLoaded = false;
|
|
2286
|
+
if (lazy) {
|
|
2287
|
+
const rest = fullAllDataRowIdData[rowid];
|
|
2288
|
+
hasLazyChilds = row[hasChildField];
|
|
2289
|
+
isLazyLoaded = !!rest.treeLoaded;
|
|
2290
|
+
}
|
|
2291
|
+
const isExpandable = lazy ? isLazyLoaded ? hasChild : hasChild || hasLazyChilds : hasChild;
|
|
2292
|
+
rowRest.treeLines = showTreeLine && treeFullSize > 1 ? getTreeNodeLines(isExpandable, depth, linesMask, isFirstRow, isLastRow, showRootLine) : [];
|
|
2293
|
+
let nextStackMask = stackMask;
|
|
2294
|
+
if (!isLastChild) {
|
|
2295
|
+
nextStackMask |= 1 << depth;
|
|
2296
|
+
}
|
|
2297
|
+
fullMaps[rowid] = row;
|
|
2298
|
+
for (let i = 0; i < rowChilds.length; i++) {
|
|
2299
|
+
handleTreeDFS(rowChilds[i], i, rowChilds, row, depth + 1, false, false, i === rowChilds.length - 1, nextStackMask, `${seq}.${i + 1}`);
|
|
2300
|
+
}
|
|
2301
|
+
}
|
|
2302
|
+
for (let i = 0; i < treeFullSize; i++) {
|
|
2303
|
+
handleTreeDFS(afterTreeFullData[i], i, afterTreeFullData, null, 1, !i, i === treeFullSize - 1, i === treeFullSize - 1, 0, "" + i);
|
|
2304
|
+
}
|
|
2146
2305
|
if (transform) {
|
|
2147
2306
|
afterFullData.forEach((row, index) => {
|
|
2148
2307
|
const rowid = handleGetRowId(row);
|
|
@@ -2168,7 +2327,25 @@ var table_default = (
|
|
|
2168
2327
|
rowRest._seq = rowNum;
|
|
2169
2328
|
rowRest._index = index;
|
|
2170
2329
|
} else {
|
|
2171
|
-
const rest = {
|
|
2330
|
+
const rest = {
|
|
2331
|
+
row,
|
|
2332
|
+
rowid,
|
|
2333
|
+
_seq: rowNum,
|
|
2334
|
+
seq,
|
|
2335
|
+
index: -1,
|
|
2336
|
+
$index: -1,
|
|
2337
|
+
_index: index,
|
|
2338
|
+
treeIndex: -1,
|
|
2339
|
+
_tIndex: -1,
|
|
2340
|
+
items: [],
|
|
2341
|
+
parent: null,
|
|
2342
|
+
level: 0,
|
|
2343
|
+
linesMask: 0,
|
|
2344
|
+
height: 0,
|
|
2345
|
+
resizeHeight: 0,
|
|
2346
|
+
oTop: 0,
|
|
2347
|
+
expandHeight: 0
|
|
2348
|
+
};
|
|
2172
2349
|
fullAllDataRowIdData[rowid] = rest;
|
|
2173
2350
|
fullDataRowIdData[rowid] = rest;
|
|
2174
2351
|
}
|
|
@@ -4850,7 +5027,25 @@ var table_default = (
|
|
|
4850
5027
|
(childRow, index, items, path, parentItem, nodes) => {
|
|
4851
5028
|
const rowid = (0, import_util.getRowid)($xeTable, childRow);
|
|
4852
5029
|
const parentRow = parentItem || parentRest.row;
|
|
4853
|
-
const rest = {
|
|
5030
|
+
const rest = {
|
|
5031
|
+
row: childRow,
|
|
5032
|
+
rowid,
|
|
5033
|
+
_seq: -1,
|
|
5034
|
+
seq: -1,
|
|
5035
|
+
index,
|
|
5036
|
+
_index: -1,
|
|
5037
|
+
$index: -1,
|
|
5038
|
+
treeIndex: -1,
|
|
5039
|
+
_tIndex: -1,
|
|
5040
|
+
items,
|
|
5041
|
+
parent: parentRow,
|
|
5042
|
+
level: parentLevel + nodes.length,
|
|
5043
|
+
linesMask: 0,
|
|
5044
|
+
height: 0,
|
|
5045
|
+
resizeHeight: 0,
|
|
5046
|
+
oTop: 0,
|
|
5047
|
+
expandHeight: 0
|
|
5048
|
+
};
|
|
4854
5049
|
fullDataRowIdData[rowid] = rest;
|
|
4855
5050
|
fullAllDataRowIdData[rowid] = rest;
|
|
4856
5051
|
},
|
|
@@ -9293,9 +9488,25 @@ var table_default = (
|
|
|
9293
9488
|
errLog("vxe.error.repeatKey", [currKeyField, rowid]);
|
|
9294
9489
|
}
|
|
9295
9490
|
if (!rowRest) {
|
|
9296
|
-
rowRest = {
|
|
9297
|
-
|
|
9298
|
-
|
|
9491
|
+
rowRest = {
|
|
9492
|
+
row,
|
|
9493
|
+
rowid,
|
|
9494
|
+
_seq: -1,
|
|
9495
|
+
seq,
|
|
9496
|
+
index: -1,
|
|
9497
|
+
_index: -1,
|
|
9498
|
+
$index: -1,
|
|
9499
|
+
treeIndex: index,
|
|
9500
|
+
_tIndex: -1,
|
|
9501
|
+
items,
|
|
9502
|
+
parent: parentRow,
|
|
9503
|
+
level,
|
|
9504
|
+
linesMask: 0,
|
|
9505
|
+
height: 0,
|
|
9506
|
+
resizeHeight: 0,
|
|
9507
|
+
oTop: 0,
|
|
9508
|
+
expandHeight: 0
|
|
9509
|
+
};
|
|
9299
9510
|
}
|
|
9300
9511
|
if (isReset || isReLoaded) {
|
|
9301
9512
|
rowRest.treeLoaded = false;
|
|
@@ -9314,7 +9525,6 @@ var table_default = (
|
|
|
9314
9525
|
if (rowExpandedMaps[rowid]) {
|
|
9315
9526
|
rowExpandedMaps[rowid] = row;
|
|
9316
9527
|
}
|
|
9317
|
-
rowNum++;
|
|
9318
9528
|
idMaps[rowid] = true;
|
|
9319
9529
|
fullDataRowIdMaps[rowid] = rowRest;
|
|
9320
9530
|
fullAllDataRowIdMaps[rowid] = rowRest;
|
|
@@ -11002,8 +11212,8 @@ var table_default = (
|
|
|
11002
11212
|
$xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
|
|
11003
11213
|
}
|
|
11004
11214
|
}
|
|
11005
|
-
if (!triggerDrag && (0, import_utils.hasEnableConf)(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.
|
|
11006
|
-
$xeTable.
|
|
11215
|
+
if (!triggerDrag && (0, import_utils.hasEnableConf)(mouseConfig, mouseOpts) && mouseOpts.area && $xeTable.handleHeadCellAreaMouseDnEvent) {
|
|
11216
|
+
$xeTable.handleHeadCellAreaMouseDnEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
|
|
11007
11217
|
}
|
|
11008
11218
|
$xeTable.focus();
|
|
11009
11219
|
if ($xeTable.closeMenu) {
|
|
@@ -13586,7 +13796,7 @@ var table_default = (
|
|
|
13586
13796
|
const validTipConfig = computeValidTipConfig.value;
|
|
13587
13797
|
const validOpts = computeValidOpts.value;
|
|
13588
13798
|
const checkboxOpts = computeCheckboxOpts.value;
|
|
13589
|
-
const
|
|
13799
|
+
const showTreeLine = computeShowTreeLine.value;
|
|
13590
13800
|
const rowOpts = computeRowOpts.value;
|
|
13591
13801
|
const columnOpts = computeColumnOpts.value;
|
|
13592
13802
|
const vSize = computeSize.value;
|
|
@@ -13644,7 +13854,7 @@ var table_default = (
|
|
|
13644
13854
|
"not--footer": !showFooter,
|
|
13645
13855
|
"is--group": isGroup,
|
|
13646
13856
|
"is-row-group": isRowGroupStatus,
|
|
13647
|
-
"is--tree-line": treeConfig &&
|
|
13857
|
+
"is--tree-line": treeConfig && showTreeLine,
|
|
13648
13858
|
"is--fixed-left": leftList.length,
|
|
13649
13859
|
"is--fixed-right": rightList.length,
|
|
13650
13860
|
"is--animat": !!props.animat,
|
|
@@ -14197,6 +14407,16 @@ var table_default = (
|
|
|
14197
14407
|
$xeTable.recalculate(true);
|
|
14198
14408
|
});
|
|
14199
14409
|
});
|
|
14410
|
+
const lineFlag = (0, import_vue.ref)(0);
|
|
14411
|
+
(0, import_vue.watch)(computeShowTreeLine, () => {
|
|
14412
|
+
lineFlag.value++;
|
|
14413
|
+
});
|
|
14414
|
+
(0, import_vue.watch)(computeShowTreeRootLine, () => {
|
|
14415
|
+
lineFlag.value++;
|
|
14416
|
+
});
|
|
14417
|
+
(0, import_vue.watch)(lineFlag, () => {
|
|
14418
|
+
updateAfterDataIndex();
|
|
14419
|
+
});
|
|
14200
14420
|
(0, import_vue.watch)(reScrollFlag, () => {
|
|
14201
14421
|
updateScrollbar().then(() => {
|
|
14202
14422
|
updateScrollbar();
|
|
@@ -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;
|