vxe-table 4.2.8 → 4.3.0-beta.2
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/button/src/button.js +14 -14
- package/es/button/style.css +1 -58
- package/es/checkbox/src/checkbox.js +7 -4
- package/es/checkbox/style.css +37 -58
- package/es/edit/src/hook.js +29 -13
- package/es/export/src/export-panel.js +10 -20
- package/es/export/src/hook.js +45 -45
- package/es/export/src/import-panel.js +2 -2
- package/es/export/src/util.js +7 -7
- package/es/export/style.css +27 -82
- package/es/filter/src/hook.js +5 -5
- package/es/filter/src/panel.js +9 -17
- package/es/filter/style.css +27 -79
- package/es/footer/src/footer.js +15 -15
- package/es/form/src/form-config-item.js +8 -7
- package/es/form/src/form-item.js +8 -7
- package/es/form/src/form.js +8 -6
- package/es/form/style.css +0 -3
- package/es/grid/src/grid.js +18 -13
- package/es/grid/style.css +1 -1
- package/es/header/src/header.js +18 -18
- package/es/header/style.css +0 -95
- package/es/icon/style.css +379 -0
- package/es/input/src/input.js +26 -26
- package/es/input/style.css +13 -4
- package/es/keyboard/src/hook.js +7 -7
- package/es/list/src/list.js +5 -5
- package/es/loading/src/loading.js +1 -1
- package/es/menu/src/hooks.js +9 -9
- package/es/menu/src/panel.js +2 -2
- package/es/modal/src/modal.js +52 -51
- package/es/modal/style.css +2 -3
- package/es/pager/src/pager.js +3 -3
- package/es/pager/style.css +4 -2
- package/es/pulldown/src/pulldown.js +7 -7
- package/es/radio/src/button.js +1 -1
- package/es/radio/src/radio.js +5 -4
- package/es/radio/style.css +32 -55
- package/es/select/src/select.js +13 -12
- package/es/select/style.css +1 -0
- package/es/style.css +1 -1
- package/es/style.min.css +1 -1
- package/es/switch/src/switch.js +1 -1
- package/es/table/src/body.js +38 -34
- package/es/table/src/cell.js +16 -28
- package/es/table/src/columnInfo.js +4 -4
- package/es/table/src/table.js +65 -60
- package/es/table/src/util.js +2 -2
- package/es/table/style.css +160 -139
- package/es/textarea/src/textarea.js +5 -5
- package/es/toolbar/src/toolbar.js +17 -24
- package/es/toolbar/style.css +28 -80
- package/es/tools/dom.js +2 -2
- package/es/tools/log.js +1 -1
- package/es/tools/vn.js +7 -0
- package/es/tooltip/src/tooltip.js +22 -10
- package/es/v-x-e-table/index.js +1 -1
- package/es/v-x-e-table/src/conf.js +43 -38
- package/es/v-x-e-table/src/interceptor.js +1 -1
- package/es/v-x-e-table/src/renderer.js +19 -15
- package/es/v-x-e-table/style.css +405 -2
- package/lib/button/src/button.js +10 -10
- package/lib/button/src/button.min.js +1 -1
- package/lib/button/style/style.css +1 -58
- package/lib/button/style/style.min.css +1 -1
- package/lib/checkbox/src/checkbox.js +5 -3
- package/lib/checkbox/src/checkbox.min.js +1 -1
- package/lib/checkbox/style/style.css +37 -58
- package/lib/checkbox/style/style.min.css +1 -1
- package/lib/edit/src/hook.js +14 -13
- package/lib/edit/src/hook.min.js +1 -1
- package/lib/export/src/export-panel.js +11 -17
- package/lib/export/src/export-panel.min.js +1 -1
- package/lib/export/src/hook.js +50 -50
- package/lib/export/src/hook.min.js +1 -1
- package/lib/export/src/import-panel.js +3 -3
- package/lib/export/src/import-panel.min.js +1 -1
- package/lib/export/src/util.js +4 -4
- package/lib/export/src/util.min.js +1 -1
- package/lib/export/style/style.css +27 -82
- package/lib/export/style/style.min.css +1 -1
- package/lib/filter/src/hook.js +5 -5
- package/lib/filter/src/hook.min.js +1 -1
- package/lib/filter/src/panel.js +11 -15
- package/lib/filter/src/panel.min.js +1 -1
- package/lib/filter/style/style.css +27 -79
- package/lib/filter/style/style.min.css +1 -1
- package/lib/footer/src/footer.js +14 -14
- package/lib/footer/src/footer.min.js +1 -1
- package/lib/form/src/form-config-item.js +9 -7
- package/lib/form/src/form-config-item.min.js +1 -1
- package/lib/form/src/form-item.js +9 -7
- package/lib/form/src/form-item.min.js +1 -1
- package/lib/form/src/form.js +9 -6
- package/lib/form/src/form.min.js +1 -1
- package/lib/form/style/style.css +0 -3
- package/lib/form/style/style.min.css +1 -1
- package/lib/grid/src/grid.js +17 -13
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/grid/style/style.css +1 -1
- package/lib/grid/style/style.min.css +1 -1
- package/lib/header/src/header.js +17 -17
- package/lib/header/src/header.min.js +1 -1
- package/lib/header/style/style.css +0 -95
- package/lib/header/style/style.min.css +0 -1
- package/lib/icon/style/style.css +379 -0
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.umd.js +163 -159
- package/lib/index.umd.min.js +1 -1
- package/lib/input/src/input.js +23 -23
- package/lib/input/src/input.min.js +1 -1
- package/lib/input/style/style.css +13 -4
- package/lib/input/style/style.min.css +1 -1
- package/lib/keyboard/src/hook.js +7 -7
- package/lib/keyboard/src/hook.min.js +1 -1
- package/lib/list/src/list.js +5 -5
- package/lib/list/src/list.min.js +1 -1
- package/lib/loading/src/loading.js +1 -1
- package/lib/loading/src/loading.min.js +1 -1
- package/lib/menu/src/hooks.js +9 -9
- package/lib/menu/src/hooks.min.js +1 -1
- package/lib/menu/src/panel.js +2 -2
- package/lib/menu/src/panel.min.js +1 -1
- package/lib/modal/src/modal.js +55 -53
- package/lib/modal/src/modal.min.js +1 -1
- package/lib/modal/style/style.css +2 -3
- package/lib/modal/style/style.min.css +1 -1
- package/lib/pager/src/pager.js +2 -2
- package/lib/pager/src/pager.min.js +1 -1
- package/lib/pager/style/style.css +4 -2
- package/lib/pager/style/style.min.css +1 -1
- package/lib/pulldown/src/pulldown.js +7 -7
- package/lib/pulldown/src/pulldown.min.js +1 -1
- package/lib/radio/src/button.js +1 -1
- package/lib/radio/src/button.min.js +1 -1
- package/lib/radio/src/radio.js +4 -4
- package/lib/radio/src/radio.min.js +1 -1
- package/lib/radio/style/style.css +32 -55
- package/lib/radio/style/style.min.css +1 -1
- package/lib/select/src/select.js +14 -12
- package/lib/select/src/select.min.js +1 -1
- package/lib/select/style/style.css +1 -0
- package/lib/select/style/style.min.css +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/switch/src/switch.js +1 -1
- package/lib/switch/src/switch.min.js +1 -1
- package/lib/table/src/body.js +36 -34
- package/lib/table/src/body.min.js +1 -1
- package/lib/table/src/cell.js +21 -29
- package/lib/table/src/cell.min.js +1 -1
- package/lib/table/src/columnInfo.js +4 -4
- package/lib/table/src/columnInfo.min.js +1 -1
- package/lib/table/src/table.js +65 -61
- package/lib/table/src/table.min.js +1 -1
- package/lib/table/src/util.js +2 -2
- package/lib/table/src/util.min.js +1 -1
- package/lib/table/style/style.css +160 -139
- package/lib/table/style/style.min.css +1 -1
- package/lib/textarea/src/textarea.js +6 -6
- package/lib/textarea/src/textarea.min.js +1 -1
- package/lib/toolbar/src/toolbar.js +20 -22
- package/lib/toolbar/src/toolbar.min.js +1 -1
- package/lib/toolbar/style/style.css +28 -80
- package/lib/toolbar/style/style.min.css +1 -1
- package/lib/tools/dom.js +2 -2
- package/lib/tools/dom.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/tools/vn.js +13 -0
- package/lib/tools/vn.min.js +1 -1
- package/lib/tooltip/src/tooltip.js +22 -8
- package/lib/tooltip/src/tooltip.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/v-x-e-table/src/conf.js +43 -38
- package/lib/v-x-e-table/src/conf.min.js +1 -1
- package/lib/v-x-e-table/src/interceptor.js +1 -1
- package/lib/v-x-e-table/src/interceptor.min.js +1 -1
- package/lib/v-x-e-table/src/renderer.js +18 -16
- package/lib/v-x-e-table/src/renderer.min.js +1 -1
- package/lib/v-x-e-table/style/style.css +405 -2
- package/lib/v-x-e-table/style/style.min.css +1 -1
- package/package.json +6 -6
- package/packages/checkbox/src/checkbox.ts +7 -4
- package/packages/edit/src/hook.ts +18 -6
- package/packages/export/src/export-panel.ts +9 -19
- package/packages/filter/src/panel.ts +8 -16
- package/packages/form/src/form-config-item.ts +4 -3
- package/packages/form/src/form-item.ts +4 -3
- package/packages/form/src/form.ts +6 -4
- package/packages/grid/src/grid.ts +2 -1
- package/packages/input/src/input.ts +3 -3
- package/packages/modal/src/modal.ts +5 -4
- package/packages/radio/src/radio.ts +4 -3
- package/packages/select/src/select.ts +2 -1
- package/packages/table/src/cell.ts +18 -35
- package/packages/table/src/table.ts +11 -10
- package/packages/toolbar/src/toolbar.ts +14 -21
- package/packages/tools/vn.ts +10 -0
- package/packages/tooltip/src/tooltip.ts +8 -4
- package/packages/v-x-e-table/src/conf.ts +43 -38
- package/styles/base/checked.scss +44 -148
- package/styles/button.scss +1 -43
- package/styles/checkbox.scss +6 -65
- package/styles/export.scss +2 -9
- package/styles/filter.scss +2 -6
- package/styles/form.scss +0 -3
- package/styles/header.scss +0 -134
- package/styles/icon.scss +509 -713
- package/styles/input.scss +8 -0
- package/styles/modal.scss +0 -1
- package/styles/old-icon.scss +713 -0
- package/styles/pager.scss +2 -0
- package/styles/radio.scss +9 -77
- package/styles/select.scss +1 -0
- package/styles/table.scss +144 -21
- package/styles/toolbar.scss +2 -6
- package/styles/variable.scss +5 -5
- package/types/all.d.ts +6 -0
- package/types/column.d.ts +11 -11
- package/types/component.d.ts +3 -1
- package/types/form-item.d.ts +1 -0
- package/types/form.d.ts +6 -2
- package/types/grid.d.ts +4 -4
- package/types/table.d.ts +2 -2
- package/types/v-x-e-table/renderer.d.ts +3 -2
package/es/table/src/table.js
CHANGED
|
@@ -9,10 +9,14 @@ var __assign = (this && this.__assign) || function () {
|
|
|
9
9
|
};
|
|
10
10
|
return __assign.apply(this, arguments);
|
|
11
11
|
};
|
|
12
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
13
|
-
for (var i = 0,
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
13
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
14
|
+
if (ar || !(i in from)) {
|
|
15
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
16
|
+
ar[i] = from[i];
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
16
20
|
};
|
|
17
21
|
import { defineComponent, getCurrentInstance, h, createCommentVNode, resolveComponent, reactive, ref, provide, inject, nextTick, onActivated, onDeactivated, onBeforeUnmount, onUnmounted, watch, computed, onMounted } from 'vue';
|
|
18
22
|
import XEUtils from 'xe-utils';
|
|
@@ -31,6 +35,7 @@ import tableProps from './props';
|
|
|
31
35
|
import tableEmits from './emits';
|
|
32
36
|
import VxeLoading from '../../loading/index';
|
|
33
37
|
import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, restoreScrollListener } from './util';
|
|
38
|
+
import { getSlotVNs } from '../../tools/vn';
|
|
34
39
|
var isWebkit = browse['-webkit'] && !browse.edge;
|
|
35
40
|
var resizableStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_WIDTH';
|
|
36
41
|
var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
|
|
@@ -1299,8 +1304,8 @@ export default defineComponent({
|
|
|
1299
1304
|
var bodyWrapperRef = elemStore['main-body-wrapper'];
|
|
1300
1305
|
var bodyWrapperElem = bodyWrapperRef ? bodyWrapperRef.value : null;
|
|
1301
1306
|
if (emptyPlaceholderElem) {
|
|
1302
|
-
emptyPlaceholderElem.style.top = headerHeight
|
|
1303
|
-
emptyPlaceholderElem.style.height = bodyWrapperElem ? bodyWrapperElem.offsetHeight - scrollbarHeight
|
|
1307
|
+
emptyPlaceholderElem.style.top = "".concat(headerHeight, "px");
|
|
1308
|
+
emptyPlaceholderElem.style.height = bodyWrapperElem ? "".concat(bodyWrapperElem.offsetHeight - scrollbarHeight, "px") : '';
|
|
1304
1309
|
}
|
|
1305
1310
|
if (customHeight > 0) {
|
|
1306
1311
|
if (showFooter) {
|
|
@@ -1318,9 +1323,9 @@ export default defineComponent({
|
|
|
1318
1323
|
fixedWrapperElem = isFixedLeft ? refLeftContainer.value : refRightContainer.value;
|
|
1319
1324
|
}
|
|
1320
1325
|
layoutList.forEach(function (layout) {
|
|
1321
|
-
var wrapperRef = elemStore[name
|
|
1326
|
+
var wrapperRef = elemStore["".concat(name, "-").concat(layout, "-wrapper")];
|
|
1322
1327
|
var wrapperElem = wrapperRef ? wrapperRef.value : null;
|
|
1323
|
-
var tableRef = elemStore[name
|
|
1328
|
+
var tableRef = elemStore["".concat(name, "-").concat(layout, "-table")];
|
|
1324
1329
|
var tableElem = tableRef ? tableRef.value : null;
|
|
1325
1330
|
if (layout === 'header') {
|
|
1326
1331
|
// 表头体样式处理
|
|
@@ -1340,20 +1345,20 @@ export default defineComponent({
|
|
|
1340
1345
|
}
|
|
1341
1346
|
tWidth = tableColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
|
|
1342
1347
|
if (tableElem) {
|
|
1343
|
-
tableElem.style.width = tWidth ? tWidth + scrollbarWidth
|
|
1348
|
+
tableElem.style.width = tWidth ? "".concat(tWidth + scrollbarWidth, "px") : '';
|
|
1344
1349
|
// 修复 IE 中高度无法自适应问题
|
|
1345
1350
|
if (browse.msie) {
|
|
1346
1351
|
XEUtils.arrayEach(tableElem.querySelectorAll('.vxe-resizable'), function (resizeElem) {
|
|
1347
|
-
resizeElem.style.height = resizeElem.parentNode.offsetHeight
|
|
1352
|
+
resizeElem.style.height = "".concat(resizeElem.parentNode.offsetHeight, "px");
|
|
1348
1353
|
});
|
|
1349
1354
|
}
|
|
1350
1355
|
}
|
|
1351
|
-
var repairRef = elemStore[name
|
|
1356
|
+
var repairRef = elemStore["".concat(name, "-").concat(layout, "-repair")];
|
|
1352
1357
|
var repairElem = repairRef ? repairRef.value : null;
|
|
1353
1358
|
if (repairElem) {
|
|
1354
|
-
repairElem.style.width = tableWidth
|
|
1359
|
+
repairElem.style.width = "".concat(tableWidth, "px");
|
|
1355
1360
|
}
|
|
1356
|
-
var listRef = elemStore[name
|
|
1361
|
+
var listRef = elemStore["".concat(name, "-").concat(layout, "-list")];
|
|
1357
1362
|
var listElem = listRef ? listRef.value : null;
|
|
1358
1363
|
if (isGroup && listElem) {
|
|
1359
1364
|
XEUtils.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
|
|
@@ -1376,21 +1381,21 @@ export default defineComponent({
|
|
|
1376
1381
|
childWidth_1 += item.renderWidth;
|
|
1377
1382
|
}, { children: 'children' });
|
|
1378
1383
|
}
|
|
1379
|
-
thElem.style.width = hasEllipsis ? childWidth_1 - countChild_1 - (border ? 2 : 0)
|
|
1384
|
+
thElem.style.width = hasEllipsis ? "".concat(childWidth_1 - countChild_1 - (border ? 2 : 0), "px") : '';
|
|
1380
1385
|
}
|
|
1381
1386
|
});
|
|
1382
1387
|
}
|
|
1383
1388
|
}
|
|
1384
1389
|
else if (layout === 'body') {
|
|
1385
|
-
var emptyBlockRef = elemStore[name
|
|
1390
|
+
var emptyBlockRef = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
|
|
1386
1391
|
var emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null;
|
|
1387
1392
|
if (isNodeElement(wrapperElem)) {
|
|
1388
1393
|
if (customMaxHeight) {
|
|
1389
|
-
wrapperElem.style.maxHeight = (fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight
|
|
1394
|
+
wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight, "px");
|
|
1390
1395
|
}
|
|
1391
1396
|
else {
|
|
1392
1397
|
if (customHeight > 0) {
|
|
1393
|
-
wrapperElem.style.height = (fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight
|
|
1398
|
+
wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
|
|
1394
1399
|
}
|
|
1395
1400
|
else {
|
|
1396
1401
|
wrapperElem.style.height = '';
|
|
@@ -1400,10 +1405,10 @@ export default defineComponent({
|
|
|
1400
1405
|
// 如果是固定列
|
|
1401
1406
|
if (fixedWrapperElem) {
|
|
1402
1407
|
if (isNodeElement(wrapperElem)) {
|
|
1403
|
-
wrapperElem.style.top = headerHeight
|
|
1408
|
+
wrapperElem.style.top = "".concat(headerHeight, "px");
|
|
1404
1409
|
}
|
|
1405
|
-
fixedWrapperElem.style.height = (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollbarHeight * (showFooter ? 2 : 1)
|
|
1406
|
-
fixedWrapperElem.style.width = fixedColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, isFixedLeft ? 0 : scrollbarWidth)
|
|
1410
|
+
fixedWrapperElem.style.height = "".concat((customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollbarHeight * (showFooter ? 2 : 1), "px");
|
|
1411
|
+
fixedWrapperElem.style.width = "".concat(fixedColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, isFixedLeft ? 0 : scrollbarWidth), "px");
|
|
1407
1412
|
}
|
|
1408
1413
|
var tWidth = tableWidth;
|
|
1409
1414
|
// 如果是使用优化模式
|
|
@@ -1422,12 +1427,12 @@ export default defineComponent({
|
|
|
1422
1427
|
}
|
|
1423
1428
|
tWidth = tableColumn.reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
|
|
1424
1429
|
if (tableElem) {
|
|
1425
|
-
tableElem.style.width = tWidth ? tWidth
|
|
1430
|
+
tableElem.style.width = tWidth ? "".concat(tWidth, "px") : '';
|
|
1426
1431
|
// 兼容性处理
|
|
1427
|
-
tableElem.style.paddingRight = scrollbarWidth && fixedType && (browse['-moz'] || browse.safari) ? scrollbarWidth
|
|
1432
|
+
tableElem.style.paddingRight = scrollbarWidth && fixedType && (browse['-moz'] || browse.safari) ? "".concat(scrollbarWidth, "px") : '';
|
|
1428
1433
|
}
|
|
1429
1434
|
if (emptyBlockElem) {
|
|
1430
|
-
emptyBlockElem.style.width = tWidth ? tWidth
|
|
1435
|
+
emptyBlockElem.style.width = tWidth ? "".concat(tWidth, "px") : '';
|
|
1431
1436
|
}
|
|
1432
1437
|
}
|
|
1433
1438
|
else if (layout === 'footer') {
|
|
@@ -1450,27 +1455,27 @@ export default defineComponent({
|
|
|
1450
1455
|
if (isNodeElement(wrapperElem)) {
|
|
1451
1456
|
// 如果是固定列
|
|
1452
1457
|
if (fixedWrapperElem) {
|
|
1453
|
-
wrapperElem.style.top = (customHeight > 0 ? customHeight - footerHeight : tableHeight + headerHeight
|
|
1458
|
+
wrapperElem.style.top = "".concat(customHeight > 0 ? customHeight - footerHeight : tableHeight + headerHeight, "px");
|
|
1454
1459
|
}
|
|
1455
|
-
wrapperElem.style.marginTop = -Math.max(1, scrollbarHeight)
|
|
1460
|
+
wrapperElem.style.marginTop = "".concat(-Math.max(1, scrollbarHeight), "px");
|
|
1456
1461
|
}
|
|
1457
1462
|
if (tableElem) {
|
|
1458
|
-
tableElem.style.width = tWidth ? tWidth + scrollbarWidth
|
|
1463
|
+
tableElem.style.width = tWidth ? "".concat(tWidth + scrollbarWidth, "px") : '';
|
|
1459
1464
|
}
|
|
1460
1465
|
}
|
|
1461
|
-
var colgroupRef = elemStore[name
|
|
1466
|
+
var colgroupRef = elemStore["".concat(name, "-").concat(layout, "-colgroup")];
|
|
1462
1467
|
var colgroupElem = colgroupRef ? colgroupRef.value : null;
|
|
1463
1468
|
if (colgroupElem) {
|
|
1464
1469
|
XEUtils.arrayEach(colgroupElem.children, function (colElem) {
|
|
1465
1470
|
var colid = colElem.getAttribute('name');
|
|
1466
1471
|
if (colid === 'col_gutter') {
|
|
1467
|
-
colElem.style.width = scrollbarWidth
|
|
1472
|
+
colElem.style.width = "".concat(scrollbarWidth, "px");
|
|
1468
1473
|
}
|
|
1469
1474
|
if (fullColumnIdData[colid]) {
|
|
1470
1475
|
var column_2 = fullColumnIdData[colid].column;
|
|
1471
1476
|
var showHeaderOverflow = column_2.showHeaderOverflow, showFooterOverflow = column_2.showFooterOverflow, showOverflow = column_2.showOverflow;
|
|
1472
1477
|
var cellOverflow = void 0;
|
|
1473
|
-
colElem.style.width = column_2.renderWidth
|
|
1478
|
+
colElem.style.width = "".concat(column_2.renderWidth, "px");
|
|
1474
1479
|
if (layout === 'header') {
|
|
1475
1480
|
cellOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
|
|
1476
1481
|
}
|
|
@@ -1484,14 +1489,14 @@ export default defineComponent({
|
|
|
1484
1489
|
var showTitle = cellOverflow === 'title';
|
|
1485
1490
|
var showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
|
|
1486
1491
|
var hasEllipsis_1 = showTitle || showTooltip || showEllipsis;
|
|
1487
|
-
var listRef = elemStore[name
|
|
1492
|
+
var listRef = elemStore["".concat(name, "-").concat(layout, "-list")];
|
|
1488
1493
|
var listElem = listRef ? listRef.value : null;
|
|
1489
1494
|
// 纵向虚拟滚动不支持动态行高
|
|
1490
1495
|
if (scrollYLoad && !hasEllipsis_1) {
|
|
1491
1496
|
hasEllipsis_1 = true;
|
|
1492
1497
|
}
|
|
1493
1498
|
if (listElem) {
|
|
1494
|
-
XEUtils.arrayEach(listElem.querySelectorAll("."
|
|
1499
|
+
XEUtils.arrayEach(listElem.querySelectorAll(".".concat(column_2.id)), function (elem) {
|
|
1495
1500
|
var colspan = parseInt(elem.getAttribute('colspan') || 1);
|
|
1496
1501
|
var cellElem = elem.querySelector('.vxe-cell');
|
|
1497
1502
|
var colWidth = column_2.renderWidth;
|
|
@@ -1505,7 +1510,7 @@ export default defineComponent({
|
|
|
1505
1510
|
}
|
|
1506
1511
|
}
|
|
1507
1512
|
}
|
|
1508
|
-
cellElem.style.width = hasEllipsis_1 ? colWidth - (cellOffsetWidth * colspan)
|
|
1513
|
+
cellElem.style.width = hasEllipsis_1 ? "".concat(colWidth - (cellOffsetWidth * colspan), "px") : '';
|
|
1509
1514
|
}
|
|
1510
1515
|
});
|
|
1511
1516
|
}
|
|
@@ -1895,7 +1900,7 @@ export default defineComponent({
|
|
|
1895
1900
|
}
|
|
1896
1901
|
fullData.forEach(function (row) {
|
|
1897
1902
|
if (row[treeOpts.children] && row[treeOpts.children].length) {
|
|
1898
|
-
warnLog('vxe.error.errConflicts', ['tree-config.transform', "row."
|
|
1903
|
+
warnLog('vxe.error.errConflicts', ['tree-config.transform', "row.".concat(treeOpts.children)]);
|
|
1899
1904
|
}
|
|
1900
1905
|
});
|
|
1901
1906
|
}
|
|
@@ -2569,7 +2574,7 @@ export default defineComponent({
|
|
|
2569
2574
|
createData: function (records) {
|
|
2570
2575
|
var treeConfig = props.treeConfig;
|
|
2571
2576
|
var treeOpts = computeTreeOpts.value;
|
|
2572
|
-
var handleRrecord = function (record) { return reactive(tablePrivateMethods.defineField(
|
|
2577
|
+
var handleRrecord = function (record) { return reactive(tablePrivateMethods.defineField(record || {})); };
|
|
2573
2578
|
var rows = treeConfig ? XEUtils.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
|
|
2574
2579
|
return nextTick().then(function () { return rows; });
|
|
2575
2580
|
},
|
|
@@ -3267,7 +3272,7 @@ export default defineComponent({
|
|
|
3267
3272
|
reactData.currentRow = row;
|
|
3268
3273
|
if (rowOpts.isCurrent || props.highlightCurrentRow) {
|
|
3269
3274
|
if (el) {
|
|
3270
|
-
XEUtils.arrayEach(el.querySelectorAll("[rowid=\""
|
|
3275
|
+
XEUtils.arrayEach(el.querySelectorAll("[rowid=\"".concat(getRowid($xetable, row), "\"]")), function (elem) { return addClass(elem, 'row--current'); });
|
|
3271
3276
|
}
|
|
3272
3277
|
}
|
|
3273
3278
|
return nextTick();
|
|
@@ -4072,7 +4077,7 @@ export default defineComponent({
|
|
|
4072
4077
|
if (isClear ||
|
|
4073
4078
|
// 如果点击了当前表格之外
|
|
4074
4079
|
!getEventTargetNode(evnt, el).flag) {
|
|
4075
|
-
setTimeout(function () { return $xetable.
|
|
4080
|
+
setTimeout(function () { return $xetable.clearEdit(evnt); });
|
|
4076
4081
|
}
|
|
4077
4082
|
});
|
|
4078
4083
|
}
|
|
@@ -4147,7 +4152,7 @@ export default defineComponent({
|
|
|
4147
4152
|
// 如果是激活编辑状态,则取消编辑
|
|
4148
4153
|
if (actived.row) {
|
|
4149
4154
|
var params_1 = actived.args;
|
|
4150
|
-
$xetable.
|
|
4155
|
+
$xetable.clearEdit(evnt);
|
|
4151
4156
|
// 如果配置了选中功能,则为选中状态
|
|
4152
4157
|
if (mouseOpts.selected) {
|
|
4153
4158
|
nextTick(function () { return $xetable.handleSelected(params_1, evnt); });
|
|
@@ -4222,7 +4227,7 @@ export default defineComponent({
|
|
|
4222
4227
|
// 如果是激活编辑状态,则取消编辑
|
|
4223
4228
|
if (actived.row) {
|
|
4224
4229
|
var params_2 = actived.args;
|
|
4225
|
-
$xetable.
|
|
4230
|
+
$xetable.clearEdit(evnt);
|
|
4226
4231
|
// 如果配置了选中功能,则为选中状态
|
|
4227
4232
|
if (mouseOpts.selected) {
|
|
4228
4233
|
nextTick(function () { return $xetable.handleSelected(params_2, evnt); });
|
|
@@ -4263,7 +4268,7 @@ export default defineComponent({
|
|
|
4263
4268
|
// 如果是激活编辑状态,则取消编辑
|
|
4264
4269
|
if (actived.row) {
|
|
4265
4270
|
params = actived.args;
|
|
4266
|
-
$xetable.
|
|
4271
|
+
$xetable.clearEdit(evnt);
|
|
4267
4272
|
// 如果配置了选中功能,则为选中状态
|
|
4268
4273
|
if (mouseOpts.selected) {
|
|
4269
4274
|
nextTick(function () { return $xetable.handleSelected(params, evnt); });
|
|
@@ -4529,7 +4534,7 @@ export default defineComponent({
|
|
|
4529
4534
|
return $xegrid.callSlot(slotFunc, params);
|
|
4530
4535
|
}
|
|
4531
4536
|
if (XEUtils.isFunction(slotFunc)) {
|
|
4532
|
-
return slotFunc(params);
|
|
4537
|
+
return getSlotVNs(slotFunc(params));
|
|
4533
4538
|
}
|
|
4534
4539
|
}
|
|
4535
4540
|
return [];
|
|
@@ -4579,7 +4584,7 @@ export default defineComponent({
|
|
|
4579
4584
|
var rowkey = getRowkey($xetable);
|
|
4580
4585
|
internalData.tableFullColumn.forEach(function (column) {
|
|
4581
4586
|
var field = column.field, editRender = column.editRender;
|
|
4582
|
-
if (field && !XEUtils.has(record, field)) {
|
|
4587
|
+
if (field && !XEUtils.has(record, field) && !record[field]) {
|
|
4583
4588
|
var cellValue = null;
|
|
4584
4589
|
if (editRender) {
|
|
4585
4590
|
var defaultValue = editRender.defaultValue;
|
|
@@ -4886,7 +4891,7 @@ export default defineComponent({
|
|
|
4886
4891
|
XEUtils.eachTree([row], function (item) {
|
|
4887
4892
|
if ($xetable.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
|
|
4888
4893
|
XEUtils.set(item, checkField, value);
|
|
4889
|
-
XEUtils.remove(treeIndeterminates, function (half) { return half
|
|
4894
|
+
XEUtils.remove(treeIndeterminates, function (half) { return $xetable.eqRow(half, item); });
|
|
4890
4895
|
handleCheckboxReserveRow(row, value);
|
|
4891
4896
|
}
|
|
4892
4897
|
}, treeOpts);
|
|
@@ -4930,9 +4935,9 @@ export default defineComponent({
|
|
|
4930
4935
|
selection.push(item);
|
|
4931
4936
|
}
|
|
4932
4937
|
else {
|
|
4933
|
-
XEUtils.remove(selection, function (select) { return select
|
|
4938
|
+
XEUtils.remove(selection, function (select) { return $xetable.eqRow(select, item); });
|
|
4934
4939
|
}
|
|
4935
|
-
XEUtils.remove(treeIndeterminates, function (half) { return half
|
|
4940
|
+
XEUtils.remove(treeIndeterminates, function (half) { return $xetable.eqRow(half, item); });
|
|
4936
4941
|
handleCheckboxReserveRow(row, value);
|
|
4937
4942
|
}
|
|
4938
4943
|
}, treeOpts);
|
|
@@ -5375,7 +5380,7 @@ export default defineComponent({
|
|
|
5375
5380
|
var leftSpaceWidth = visibleColumn.slice(0, scrollXStore.startIndex).reduce(function (previous, column) { return previous + column.renderWidth; }, 0);
|
|
5376
5381
|
var marginLeft = '';
|
|
5377
5382
|
if (scrollXLoad) {
|
|
5378
|
-
marginLeft = leftSpaceWidth
|
|
5383
|
+
marginLeft = "".concat(leftSpaceWidth, "px");
|
|
5379
5384
|
}
|
|
5380
5385
|
if (headerElem) {
|
|
5381
5386
|
headerElem.style.marginLeft = marginLeft;
|
|
@@ -5388,10 +5393,10 @@ export default defineComponent({
|
|
|
5388
5393
|
containerList.forEach(function (name) {
|
|
5389
5394
|
var layoutList = ['header', 'body', 'footer'];
|
|
5390
5395
|
layoutList.forEach(function (layout) {
|
|
5391
|
-
var xSpaceRef = elemStore[name
|
|
5396
|
+
var xSpaceRef = elemStore["".concat(name, "-").concat(layout, "-xSpace")];
|
|
5392
5397
|
var xSpaceElem = xSpaceRef ? xSpaceRef.value : null;
|
|
5393
5398
|
if (xSpaceElem) {
|
|
5394
|
-
xSpaceElem.style.width = scrollXLoad ? tableWidth + (layout === 'header' ? scrollbarWidth : 0)
|
|
5399
|
+
xSpaceElem.style.width = scrollXLoad ? "".concat(tableWidth + (layout === 'header' ? scrollbarWidth : 0), "px") : '';
|
|
5395
5400
|
}
|
|
5396
5401
|
});
|
|
5397
5402
|
});
|
|
@@ -5409,18 +5414,18 @@ export default defineComponent({
|
|
|
5409
5414
|
var marginTop = '';
|
|
5410
5415
|
var ySpaceHeight = '';
|
|
5411
5416
|
if (scrollYLoad) {
|
|
5412
|
-
marginTop = topSpaceHeight
|
|
5413
|
-
ySpaceHeight = bodyHeight
|
|
5417
|
+
marginTop = "".concat(topSpaceHeight, "px");
|
|
5418
|
+
ySpaceHeight = "".concat(bodyHeight, "px");
|
|
5414
5419
|
}
|
|
5415
5420
|
containerList.forEach(function (name) {
|
|
5416
5421
|
var layoutList = ['header', 'body', 'footer'];
|
|
5417
|
-
var tableRef = elemStore[name
|
|
5422
|
+
var tableRef = elemStore["".concat(name, "-body-table")];
|
|
5418
5423
|
var tableElem = tableRef ? tableRef.value : null;
|
|
5419
5424
|
if (tableElem) {
|
|
5420
5425
|
tableElem.style.marginTop = marginTop;
|
|
5421
5426
|
}
|
|
5422
5427
|
layoutList.forEach(function (layout) {
|
|
5423
|
-
var ySpaceRef = elemStore[name
|
|
5428
|
+
var ySpaceRef = elemStore["".concat(name, "-").concat(layout, "-ySpace")];
|
|
5424
5429
|
var ySpaceElem = ySpaceRef ? ySpaceRef.value : null;
|
|
5425
5430
|
if (ySpaceElem) {
|
|
5426
5431
|
ySpaceElem.style.height = ySpaceHeight;
|
|
@@ -5497,7 +5502,7 @@ export default defineComponent({
|
|
|
5497
5502
|
var el = refElem.value;
|
|
5498
5503
|
tablePrivateMethods.clearHoverRow();
|
|
5499
5504
|
if (el) {
|
|
5500
|
-
XEUtils.arrayEach(el.querySelectorAll("[rowid=\""
|
|
5505
|
+
XEUtils.arrayEach(el.querySelectorAll("[rowid=\"".concat(rowid, "\"]")), function (elem) { return addClass(elem, 'row--hover'); });
|
|
5501
5506
|
}
|
|
5502
5507
|
internalData.hoverRow = row;
|
|
5503
5508
|
},
|
|
@@ -5530,7 +5535,7 @@ export default defineComponent({
|
|
|
5530
5535
|
bodyElem = tableBody.$el;
|
|
5531
5536
|
}
|
|
5532
5537
|
if (bodyElem) {
|
|
5533
|
-
return bodyElem.querySelector(".vxe-body--row[rowid=\""
|
|
5538
|
+
return bodyElem.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
|
|
5534
5539
|
}
|
|
5535
5540
|
return null;
|
|
5536
5541
|
},
|
|
@@ -5562,7 +5567,7 @@ export default defineComponent({
|
|
|
5562
5567
|
}
|
|
5563
5568
|
else if (XEUtils.isArray(formatter)) {
|
|
5564
5569
|
var globalFunc = VXETable.formats.get(formatter[0]);
|
|
5565
|
-
cellLabel = globalFunc ? globalFunc.apply(void 0, __spreadArray([formatParams], formatter.slice(1))) : '';
|
|
5570
|
+
cellLabel = globalFunc ? globalFunc.apply(void 0, __spreadArray([formatParams], formatter.slice(1), false)) : '';
|
|
5566
5571
|
}
|
|
5567
5572
|
else {
|
|
5568
5573
|
cellLabel = formatter(formatParams);
|
|
@@ -5613,7 +5618,7 @@ export default defineComponent({
|
|
|
5613
5618
|
var fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList;
|
|
5614
5619
|
return h('div', {
|
|
5615
5620
|
ref: isFixedLeft ? refLeftContainer : refRightContainer,
|
|
5616
|
-
class: "vxe-table--fixed-"
|
|
5621
|
+
class: "vxe-table--fixed-".concat(fixedType, "-wrapper")
|
|
5617
5622
|
}, [
|
|
5618
5623
|
showHeader ? h(TableHeaderComponent, {
|
|
5619
5624
|
ref: isFixedLeft ? refTableLeftHeader : refTableRightHeader,
|
|
@@ -5799,10 +5804,10 @@ export default defineComponent({
|
|
|
5799
5804
|
var exportOpts = computeExportOpts.value;
|
|
5800
5805
|
var importOpts = computeImportOpts.value;
|
|
5801
5806
|
if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(VXETable.config.importTypes, importOpts.types)) {
|
|
5802
|
-
warnLog('vxe.error.errProp', ["export-config.types="
|
|
5807
|
+
warnLog('vxe.error.errProp', ["export-config.types=".concat(importOpts.types.join(',')), importOpts.types.filter(function (type) { return XEUtils.includes(VXETable.config.importTypes, type); }).join(',') || VXETable.config.importTypes.join(',')]);
|
|
5803
5808
|
}
|
|
5804
5809
|
if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(VXETable.config.exportTypes, exportOpts.types)) {
|
|
5805
|
-
warnLog('vxe.error.errProp', ["export-config.types="
|
|
5810
|
+
warnLog('vxe.error.errProp', ["export-config.types=".concat(exportOpts.types.join(',')), exportOpts.types.filter(function (type) { return XEUtils.includes(VXETable.config.exportTypes, type); }).join(',') || VXETable.config.exportTypes.join(',')]);
|
|
5806
5811
|
}
|
|
5807
5812
|
}
|
|
5808
5813
|
if (process.env.NODE_ENV === 'development') {
|
|
@@ -5946,8 +5951,8 @@ export default defineComponent({
|
|
|
5946
5951
|
var isMenu = computeIsMenu.value;
|
|
5947
5952
|
return h('div', {
|
|
5948
5953
|
ref: refElem,
|
|
5949
|
-
class: ['vxe-table', 'vxe-table--render-default', "tid_"
|
|
5950
|
-
_a["size--"
|
|
5954
|
+
class: ['vxe-table', 'vxe-table--render-default', "tid_".concat(xID), "border--".concat(tableBorder), (_a = {},
|
|
5955
|
+
_a["size--".concat(vSize)] = vSize,
|
|
5951
5956
|
_a['vxe-editable'] = !!editConfig,
|
|
5952
5957
|
_a['cell--highlight'] = highlightCell,
|
|
5953
5958
|
_a['cell--selected'] = mouseConfig && mouseOpts.selected,
|
|
@@ -6047,7 +6052,7 @@ export default defineComponent({
|
|
|
6047
6052
|
ref: refCellResizeBar,
|
|
6048
6053
|
class: 'vxe-table--resizable-bar',
|
|
6049
6054
|
style: overflowX ? {
|
|
6050
|
-
'padding-bottom': scrollbarHeight
|
|
6055
|
+
'padding-bottom': "".concat(scrollbarHeight, "px")
|
|
6051
6056
|
} : null
|
|
6052
6057
|
}),
|
|
6053
6058
|
/**
|
package/es/table/src/util.js
CHANGED
|
@@ -224,7 +224,7 @@ export function rowToVisible($xetable, row) {
|
|
|
224
224
|
var tableBody = refTableBody.value;
|
|
225
225
|
var bodyElem = tableBody ? tableBody.$el : null;
|
|
226
226
|
if (bodyElem) {
|
|
227
|
-
var trElem = bodyElem.querySelector("[rowid=\""
|
|
227
|
+
var trElem = bodyElem.querySelector("[rowid=\"".concat(getRowid($xetable, row), "\"]"));
|
|
228
228
|
if (trElem) {
|
|
229
229
|
var bodyHeight = bodyElem.clientHeight;
|
|
230
230
|
var bodySrcollTop = bodyElem.scrollTop;
|
|
@@ -258,7 +258,7 @@ export function colToVisible($xetable, column) {
|
|
|
258
258
|
var tableBody = refTableBody.value;
|
|
259
259
|
var bodyElem = tableBody ? tableBody.$el : null;
|
|
260
260
|
if (bodyElem) {
|
|
261
|
-
var tdElem = bodyElem.querySelector("."
|
|
261
|
+
var tdElem = bodyElem.querySelector(".".concat(column.id));
|
|
262
262
|
if (tdElem) {
|
|
263
263
|
var bodyWidth = bodyElem.clientWidth;
|
|
264
264
|
var bodySrcollLeft = bodyElem.scrollLeft;
|