vxe-table 3.18.8 → 3.18.9
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/es/style.css +1 -1
- package/es/table/src/methods.js +10 -1
- package/es/ui/index.js +1 -4
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +15 -6
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/src/methods.js +13 -1
- package/lib/table/src/methods.min.js +1 -1
- package/lib/ui/index.js +1 -4
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/src/methods.ts +10 -1
- package/packages/ui/index.ts +0 -3
- /package/es/{iconfont.1757293907433.ttf → iconfont.1757392711661.ttf} +0 -0
- /package/es/{iconfont.1757293907433.woff → iconfont.1757392711661.woff} +0 -0
- /package/es/{iconfont.1757293907433.woff2 → iconfont.1757392711661.woff2} +0 -0
- /package/lib/{iconfont.1757293907433.ttf → iconfont.1757392711661.ttf} +0 -0
- /package/lib/{iconfont.1757293907433.woff → iconfont.1757392711661.woff} +0 -0
- /package/lib/{iconfont.1757293907433.woff2 → iconfont.1757392711661.woff2} +0 -0
package/lib/table/src/methods.js
CHANGED
|
@@ -326,6 +326,10 @@ function cacheColumnMap($xeTable) {
|
|
|
326
326
|
const props = $xeTable;
|
|
327
327
|
const reactData = $xeTable;
|
|
328
328
|
const internalData = $xeTable;
|
|
329
|
+
const {
|
|
330
|
+
treeConfig,
|
|
331
|
+
showOverflow
|
|
332
|
+
} = props;
|
|
329
333
|
const {
|
|
330
334
|
tableFullColumn,
|
|
331
335
|
collectColumn
|
|
@@ -336,17 +340,19 @@ function cacheColumnMap($xeTable) {
|
|
|
336
340
|
const expandOpts = $xeTable.computeExpandOpts;
|
|
337
341
|
const columnOpts = $xeTable.computeColumnOpts;
|
|
338
342
|
const columnDragOpts = $xeTable.computeColumnDragOpts;
|
|
343
|
+
const virtualYOpts = $xeTable.computeVirtualYOpts;
|
|
339
344
|
const {
|
|
340
345
|
isCrossDrag,
|
|
341
346
|
isSelfToChildDrag
|
|
342
347
|
} = columnDragOpts;
|
|
343
348
|
const customOpts = $xeTable.computeCustomOpts;
|
|
349
|
+
const treeOpts = $xeTable.computeTreeOpts;
|
|
344
350
|
const {
|
|
345
351
|
storage
|
|
346
352
|
} = customOpts;
|
|
347
353
|
const rowOpts = $xeTable.computeRowOpts;
|
|
348
354
|
const isGroup = collectColumn.some(_utils.hasChildrenList);
|
|
349
|
-
let isAllOverflow = !!
|
|
355
|
+
let isAllOverflow = !!showOverflow;
|
|
350
356
|
let rowGroupColumn;
|
|
351
357
|
let expandColumn;
|
|
352
358
|
let treeNodeColumn;
|
|
@@ -448,9 +454,15 @@ function cacheColumnMap($xeTable) {
|
|
|
448
454
|
} else {
|
|
449
455
|
tableFullColumn.forEach(handleFunc);
|
|
450
456
|
}
|
|
457
|
+
if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
|
|
458
|
+
(0, _log.warnLog)('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
|
|
459
|
+
}
|
|
451
460
|
if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
|
|
452
461
|
(0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
|
|
453
462
|
}
|
|
463
|
+
if (expandColumn && expandOpts.mode !== 'inside' && treeConfig && !treeOpts.transform) {
|
|
464
|
+
(0, _log.errLog)('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
|
|
465
|
+
}
|
|
454
466
|
if (htmlColumn) {
|
|
455
467
|
if (!columnOpts.useKey) {
|
|
456
468
|
(0, _log.errLog)('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
|