vxe-table 3.4.14-beta.1 → 3.4.14-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/lib/filter/src/mixin.js +5 -1
- package/lib/filter/src/mixin.min.js +1 -1
- package/lib/index.umd.js +348 -301
- package/lib/index.umd.min.js +1 -1
- package/lib/input/src/date.js +54 -0
- package/lib/input/src/date.min.js +1 -0
- package/lib/input/src/input.js +12 -59
- package/lib/input/src/input.min.js +1 -1
- package/lib/input/src/number.js +23 -0
- package/lib/input/src/number.min.js +1 -0
- package/lib/pager/src/pager.js +15 -1
- package/lib/pager/src/pager.min.js +1 -1
- package/lib/table/src/methods.js +302 -282
- package/lib/table/src/methods.min.js +1 -1
- package/package.json +1 -1
- package/packages/filter/src/mixin.js +4 -1
- package/packages/input/src/date.js +38 -0
- package/packages/input/src/input.js +4 -46
- package/packages/input/src/number.js +12 -0
- package/packages/pager/src/pager.js +15 -1
- package/packages/table/src/methods.js +14 -2
package/lib/table/src/methods.js
CHANGED
|
@@ -432,14 +432,34 @@ var Methods = {
|
|
|
432
432
|
},
|
|
433
433
|
|
|
434
434
|
/**
|
|
435
|
-
*
|
|
435
|
+
* 手动处理数据,用于手动排序与筛选
|
|
436
436
|
* 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
|
|
437
437
|
*/
|
|
438
438
|
updateData: function updateData() {
|
|
439
|
-
|
|
439
|
+
var _this2 = this;
|
|
440
|
+
|
|
441
|
+
var scrollXLoad = this.scrollXLoad,
|
|
442
|
+
scrollYLoad = this.scrollYLoad;
|
|
443
|
+
return this.handleTableData(true).then(function () {
|
|
444
|
+
_this2.updateFooter();
|
|
445
|
+
|
|
446
|
+
if (scrollXLoad || scrollYLoad) {
|
|
447
|
+
if (scrollXLoad) {
|
|
448
|
+
_this2.updateScrollXSpace();
|
|
449
|
+
}
|
|
450
|
+
|
|
451
|
+
if (scrollYLoad) {
|
|
452
|
+
_this2.updateScrollYSpace();
|
|
453
|
+
}
|
|
454
|
+
|
|
455
|
+
return _this2.refreshScroll();
|
|
456
|
+
}
|
|
457
|
+
}).then(function () {
|
|
458
|
+
return _this2.recalculate();
|
|
459
|
+
});
|
|
440
460
|
},
|
|
441
461
|
handleTableData: function handleTableData(force) {
|
|
442
|
-
var
|
|
462
|
+
var _this3 = this;
|
|
443
463
|
|
|
444
464
|
var scrollYLoad = this.scrollYLoad,
|
|
445
465
|
scrollYStore = this.scrollYStore,
|
|
@@ -456,7 +476,7 @@ var Methods = {
|
|
|
456
476
|
|
|
457
477
|
var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
|
|
458
478
|
tableData.forEach(function (row, $index) {
|
|
459
|
-
var rowid = getRowid(
|
|
479
|
+
var rowid = getRowid(_this3, row);
|
|
460
480
|
var rest = fullDataRowIdData[rowid];
|
|
461
481
|
|
|
462
482
|
if (rest) {
|
|
@@ -481,7 +501,7 @@ var Methods = {
|
|
|
481
501
|
* @param {Array} datas 数据
|
|
482
502
|
*/
|
|
483
503
|
loadTableData: function loadTableData(datas) {
|
|
484
|
-
var
|
|
504
|
+
var _this4 = this;
|
|
485
505
|
|
|
486
506
|
var keepSource = this.keepSource,
|
|
487
507
|
treeConfig = this.treeConfig,
|
|
@@ -584,31 +604,31 @@ var Methods = {
|
|
|
584
604
|
this.handleTableData(true);
|
|
585
605
|
this.updateFooter();
|
|
586
606
|
return this.$nextTick().then(function () {
|
|
587
|
-
|
|
607
|
+
_this4.updateHeight();
|
|
588
608
|
|
|
589
|
-
|
|
609
|
+
_this4.updateStyle();
|
|
590
610
|
}).then(function () {
|
|
591
|
-
|
|
611
|
+
_this4.computeScrollLoad();
|
|
592
612
|
}).then(function () {
|
|
593
613
|
// 是否启用了虚拟滚动
|
|
594
614
|
if (sYLoad) {
|
|
595
615
|
scrollYStore.endIndex = scrollYStore.visibleSize;
|
|
596
616
|
}
|
|
597
617
|
|
|
598
|
-
|
|
618
|
+
_this4.handleReserveStatus();
|
|
599
619
|
|
|
600
|
-
|
|
620
|
+
_this4.checkSelectionStatus();
|
|
601
621
|
|
|
602
622
|
return new Promise(function (resolve) {
|
|
603
|
-
|
|
604
|
-
return
|
|
623
|
+
_this4.$nextTick().then(function () {
|
|
624
|
+
return _this4.recalculate();
|
|
605
625
|
}).then(function () {
|
|
606
626
|
// 是否变更虚拟滚动
|
|
607
627
|
if (oldScrollYLoad === sYLoad) {
|
|
608
|
-
(0, _util.restoreScrollLocation)(
|
|
628
|
+
(0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
|
|
609
629
|
} else {
|
|
610
630
|
setTimeout(function () {
|
|
611
|
-
return (0, _util.restoreScrollLocation)(
|
|
631
|
+
return (0, _util.restoreScrollLocation)(_this4, lastScrollLeft, lastScrollTop).then(resolve);
|
|
612
632
|
});
|
|
613
633
|
}
|
|
614
634
|
});
|
|
@@ -621,23 +641,23 @@ var Methods = {
|
|
|
621
641
|
* @param {Array} datas 数据
|
|
622
642
|
*/
|
|
623
643
|
loadData: function loadData(datas) {
|
|
624
|
-
var
|
|
644
|
+
var _this5 = this;
|
|
625
645
|
|
|
626
646
|
var inited = this.inited,
|
|
627
647
|
initStatus = this.initStatus;
|
|
628
648
|
return this.loadTableData(datas).then(function () {
|
|
629
|
-
|
|
630
|
-
|
|
649
|
+
_this5.inited = true;
|
|
650
|
+
_this5.initStatus = true;
|
|
631
651
|
|
|
632
652
|
if (!initStatus) {
|
|
633
|
-
|
|
653
|
+
_this5.handleLoadDefaults();
|
|
634
654
|
}
|
|
635
655
|
|
|
636
656
|
if (!inited) {
|
|
637
|
-
|
|
657
|
+
_this5.handleInitDefaults();
|
|
638
658
|
}
|
|
639
659
|
|
|
640
|
-
return
|
|
660
|
+
return _this5.recalculate();
|
|
641
661
|
});
|
|
642
662
|
},
|
|
643
663
|
|
|
@@ -646,21 +666,21 @@ var Methods = {
|
|
|
646
666
|
* @param {Array} datas 数据
|
|
647
667
|
*/
|
|
648
668
|
reloadData: function reloadData(datas) {
|
|
649
|
-
var
|
|
669
|
+
var _this6 = this;
|
|
650
670
|
|
|
651
671
|
var inited = this.inited;
|
|
652
672
|
return this.clearAll().then(function () {
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
return
|
|
673
|
+
_this6.inited = true;
|
|
674
|
+
_this6.initStatus = true;
|
|
675
|
+
return _this6.loadTableData(datas);
|
|
656
676
|
}).then(function () {
|
|
657
|
-
|
|
677
|
+
_this6.handleLoadDefaults();
|
|
658
678
|
|
|
659
679
|
if (!inited) {
|
|
660
|
-
|
|
680
|
+
_this6.handleInitDefaults();
|
|
661
681
|
}
|
|
662
682
|
|
|
663
|
-
return
|
|
683
|
+
return _this6.recalculate();
|
|
664
684
|
});
|
|
665
685
|
},
|
|
666
686
|
|
|
@@ -710,10 +730,10 @@ var Methods = {
|
|
|
710
730
|
* @param {ColumnInfo} columns 列配置
|
|
711
731
|
*/
|
|
712
732
|
loadColumn: function loadColumn(columns) {
|
|
713
|
-
var
|
|
733
|
+
var _this7 = this;
|
|
714
734
|
|
|
715
735
|
var collectColumn = _xeUtils.default.mapTree(columns, function (column) {
|
|
716
|
-
return _cell.default.createColumn(
|
|
736
|
+
return _cell.default.createColumn(_this7, column);
|
|
717
737
|
}, {
|
|
718
738
|
children: 'children'
|
|
719
739
|
});
|
|
@@ -727,14 +747,14 @@ var Methods = {
|
|
|
727
747
|
* @param {ColumnInfo} columns 列配置
|
|
728
748
|
*/
|
|
729
749
|
reloadColumn: function reloadColumn(columns) {
|
|
730
|
-
var
|
|
750
|
+
var _this8 = this;
|
|
731
751
|
|
|
732
752
|
return this.clearAll().then(function () {
|
|
733
|
-
return
|
|
753
|
+
return _this8.loadColumn(columns);
|
|
734
754
|
});
|
|
735
755
|
},
|
|
736
756
|
handleColumn: function handleColumn(collectColumn) {
|
|
737
|
-
var
|
|
757
|
+
var _this9 = this;
|
|
738
758
|
|
|
739
759
|
this.collectColumn = collectColumn;
|
|
740
760
|
var tableFullColumn = getColumnList(collectColumn);
|
|
@@ -742,8 +762,8 @@ var Methods = {
|
|
|
742
762
|
this.cacheColumnMap();
|
|
743
763
|
this.restoreCustomStorage();
|
|
744
764
|
this.parseColumns().then(function () {
|
|
745
|
-
if (
|
|
746
|
-
|
|
765
|
+
if (_this9.scrollXLoad) {
|
|
766
|
+
_this9.loadScrollXData(true);
|
|
747
767
|
}
|
|
748
768
|
});
|
|
749
769
|
this.clearMergeCells();
|
|
@@ -757,14 +777,14 @@ var Methods = {
|
|
|
757
777
|
}
|
|
758
778
|
|
|
759
779
|
return this.$nextTick().then(function () {
|
|
760
|
-
if (
|
|
761
|
-
|
|
780
|
+
if (_this9.$toolbar) {
|
|
781
|
+
_this9.$toolbar.syncUpdate({
|
|
762
782
|
collectColumn: collectColumn,
|
|
763
|
-
$table:
|
|
783
|
+
$table: _this9
|
|
764
784
|
});
|
|
765
785
|
}
|
|
766
786
|
|
|
767
|
-
return
|
|
787
|
+
return _this9.recalculate();
|
|
768
788
|
});
|
|
769
789
|
},
|
|
770
790
|
|
|
@@ -773,7 +793,7 @@ var Methods = {
|
|
|
773
793
|
* 牺牲数据组装的耗时,用来换取使用过程中的流畅
|
|
774
794
|
*/
|
|
775
795
|
cacheRowMap: function cacheRowMap(source) {
|
|
776
|
-
var
|
|
796
|
+
var _this10 = this;
|
|
777
797
|
|
|
778
798
|
var treeConfig = this.treeConfig,
|
|
779
799
|
treeOpts = this.treeOpts,
|
|
@@ -787,7 +807,7 @@ var Methods = {
|
|
|
787
807
|
var isLazy = treeConfig && treeOpts.lazy;
|
|
788
808
|
|
|
789
809
|
var handleCache = function handleCache(row, index, items, path, parent, nodes) {
|
|
790
|
-
var rowid = getRowid(
|
|
810
|
+
var rowid = getRowid(_this10, row);
|
|
791
811
|
var seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
|
|
792
812
|
var level = nodes ? nodes.length - 1 : 0;
|
|
793
813
|
|
|
@@ -837,7 +857,7 @@ var Methods = {
|
|
|
837
857
|
}
|
|
838
858
|
},
|
|
839
859
|
loadTreeChildren: function loadTreeChildren(row, childRecords) {
|
|
840
|
-
var
|
|
860
|
+
var _this11 = this;
|
|
841
861
|
|
|
842
862
|
var keepSource = this.keepSource,
|
|
843
863
|
tableSourceData = this.tableSourceData,
|
|
@@ -853,10 +873,10 @@ var Methods = {
|
|
|
853
873
|
var parentLevel = rest ? rest.level : 0;
|
|
854
874
|
return this.createData(childRecords).then(function (rows) {
|
|
855
875
|
if (keepSource) {
|
|
856
|
-
var rowid = getRowid(
|
|
876
|
+
var rowid = getRowid(_this11, row);
|
|
857
877
|
|
|
858
878
|
var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
|
|
859
|
-
return rowid === getRowid(
|
|
879
|
+
return rowid === getRowid(_this11, item);
|
|
860
880
|
}, treeOpts);
|
|
861
881
|
|
|
862
882
|
if (matchObj) {
|
|
@@ -865,7 +885,7 @@ var Methods = {
|
|
|
865
885
|
}
|
|
866
886
|
|
|
867
887
|
_xeUtils.default.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
|
|
868
|
-
var rowid = getRowid(
|
|
888
|
+
var rowid = getRowid(_this11, childRow);
|
|
869
889
|
var rest = {
|
|
870
890
|
row: childRow,
|
|
871
891
|
rowid: rowid,
|
|
@@ -889,7 +909,7 @@ var Methods = {
|
|
|
889
909
|
row[mapChildren] = rows;
|
|
890
910
|
}
|
|
891
911
|
|
|
892
|
-
|
|
912
|
+
_this11.updateAfterDataIndex();
|
|
893
913
|
|
|
894
914
|
return rows;
|
|
895
915
|
});
|
|
@@ -900,7 +920,7 @@ var Methods = {
|
|
|
900
920
|
* 牺牲数据组装的耗时,用来换取使用过程中的流畅
|
|
901
921
|
*/
|
|
902
922
|
cacheColumnMap: function cacheColumnMap() {
|
|
903
|
-
var
|
|
923
|
+
var _this12 = this;
|
|
904
924
|
|
|
905
925
|
var tableFullColumn = this.tableFullColumn,
|
|
906
926
|
collectColumn = this.collectColumn,
|
|
@@ -987,16 +1007,16 @@ var Methods = {
|
|
|
987
1007
|
}
|
|
988
1008
|
|
|
989
1009
|
if (process.env.NODE_ENV === 'development') {
|
|
990
|
-
if (
|
|
991
|
-
_tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-overflow=".concat(
|
|
1010
|
+
if (_this12.showOverflow && column.showOverflow === false) {
|
|
1011
|
+
_tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-overflow=".concat(_this12.showOverflow), "column.show-overflow=".concat(column.showOverflow)]);
|
|
992
1012
|
}
|
|
993
1013
|
|
|
994
|
-
if (
|
|
995
|
-
_tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-header-overflow=".concat(
|
|
1014
|
+
if (_this12.showHeaderOverflow && column.showHeaderOverflow === false) {
|
|
1015
|
+
_tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-header-overflow=".concat(_this12.showHeaderOverflow), "column.show-header-overflow=".concat(column.showHeaderOverflow)]);
|
|
996
1016
|
}
|
|
997
1017
|
|
|
998
|
-
if (
|
|
999
|
-
_tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(
|
|
1018
|
+
if (_this12.showFooterOverflow && column.showFooterOverflow === false) {
|
|
1019
|
+
_tools.UtilTools.warn('vxe.error.errConflicts', ["table.show-footer-overflow=".concat(_this12.showFooterOverflow), "column.show-footer-overflow=".concat(column.showFooterOverflow)]);
|
|
1000
1020
|
}
|
|
1001
1021
|
}
|
|
1002
1022
|
|
|
@@ -1248,13 +1268,13 @@ var Methods = {
|
|
|
1248
1268
|
* @param {Array} records 新数据
|
|
1249
1269
|
*/
|
|
1250
1270
|
createData: function createData(records) {
|
|
1251
|
-
var
|
|
1271
|
+
var _this13 = this;
|
|
1252
1272
|
|
|
1253
1273
|
var treeConfig = this.treeConfig,
|
|
1254
1274
|
treeOpts = this.treeOpts;
|
|
1255
1275
|
|
|
1256
1276
|
var handleRrecord = function handleRrecord(record) {
|
|
1257
|
-
return
|
|
1277
|
+
return _this13.defineField(Object.assign({}, record));
|
|
1258
1278
|
};
|
|
1259
1279
|
|
|
1260
1280
|
var rows = treeConfig ? _xeUtils.default.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
|
|
@@ -1269,7 +1289,7 @@ var Methods = {
|
|
|
1269
1289
|
* @param {Array/Object} records 新数据
|
|
1270
1290
|
*/
|
|
1271
1291
|
createRow: function createRow(records) {
|
|
1272
|
-
var
|
|
1292
|
+
var _this14 = this;
|
|
1273
1293
|
|
|
1274
1294
|
var isArr = _xeUtils.default.isArray(records);
|
|
1275
1295
|
|
|
@@ -1278,7 +1298,7 @@ var Methods = {
|
|
|
1278
1298
|
}
|
|
1279
1299
|
|
|
1280
1300
|
return this.$nextTick().then(function () {
|
|
1281
|
-
return
|
|
1301
|
+
return _this14.createData(records).then(function (rows) {
|
|
1282
1302
|
return isArr ? rows : rows[0];
|
|
1283
1303
|
});
|
|
1284
1304
|
});
|
|
@@ -1292,7 +1312,7 @@ var Methods = {
|
|
|
1292
1312
|
* 如果还额外传了 field 则还原指定的单元格数据
|
|
1293
1313
|
*/
|
|
1294
1314
|
revertData: function revertData(rows, field) {
|
|
1295
|
-
var
|
|
1315
|
+
var _this15 = this;
|
|
1296
1316
|
|
|
1297
1317
|
var keepSource = this.keepSource,
|
|
1298
1318
|
tableSourceData = this.tableSourceData,
|
|
@@ -1318,8 +1338,8 @@ var Methods = {
|
|
|
1318
1338
|
|
|
1319
1339
|
if (targetRows.length) {
|
|
1320
1340
|
targetRows.forEach(function (row) {
|
|
1321
|
-
if (!
|
|
1322
|
-
var rowIndex =
|
|
1341
|
+
if (!_this15.isInsertByRow(row)) {
|
|
1342
|
+
var rowIndex = _this15.getRowIndex(row);
|
|
1323
1343
|
|
|
1324
1344
|
if (treeConfig && rowIndex === -1) {
|
|
1325
1345
|
throw new Error(_tools.UtilTools.getLog('vxe.error.noTree', ['revertData']));
|
|
@@ -1403,7 +1423,7 @@ var Methods = {
|
|
|
1403
1423
|
* @param {String} field 字段名
|
|
1404
1424
|
*/
|
|
1405
1425
|
isUpdateByRow: function isUpdateByRow(row, field) {
|
|
1406
|
-
var
|
|
1426
|
+
var _this16 = this;
|
|
1407
1427
|
|
|
1408
1428
|
var visibleColumn = this.visibleColumn,
|
|
1409
1429
|
keepSource = this.keepSource,
|
|
@@ -1424,7 +1444,7 @@ var Methods = {
|
|
|
1424
1444
|
var children = treeOpts.children;
|
|
1425
1445
|
|
|
1426
1446
|
var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
|
|
1427
|
-
return rowid === getRowid(
|
|
1447
|
+
return rowid === getRowid(_this16, item);
|
|
1428
1448
|
}, treeOpts);
|
|
1429
1449
|
|
|
1430
1450
|
row = Object.assign({}, row, _defineProperty({}, children, null));
|
|
@@ -1589,7 +1609,7 @@ var Methods = {
|
|
|
1589
1609
|
* 如果存在筛选条件,继续处理
|
|
1590
1610
|
*/
|
|
1591
1611
|
updateAfterFullData: function updateAfterFullData() {
|
|
1592
|
-
var
|
|
1612
|
+
var _this17 = this;
|
|
1593
1613
|
|
|
1594
1614
|
var tableFullColumn = this.tableFullColumn,
|
|
1595
1615
|
tableFullData = this.tableFullData,
|
|
@@ -1667,7 +1687,7 @@ var Methods = {
|
|
|
1667
1687
|
cellValue: cellValue,
|
|
1668
1688
|
row: row,
|
|
1669
1689
|
column: column,
|
|
1670
|
-
$table:
|
|
1690
|
+
$table: _this17
|
|
1671
1691
|
});
|
|
1672
1692
|
});
|
|
1673
1693
|
} else if (compFilterMethod) {
|
|
@@ -1678,7 +1698,7 @@ var Methods = {
|
|
|
1678
1698
|
cellValue: cellValue,
|
|
1679
1699
|
row: row,
|
|
1680
1700
|
column: column,
|
|
1681
|
-
$table:
|
|
1701
|
+
$table: _this17
|
|
1682
1702
|
});
|
|
1683
1703
|
});
|
|
1684
1704
|
} else if (allFilterMethod) {
|
|
@@ -1697,7 +1717,7 @@ var Methods = {
|
|
|
1697
1717
|
cellValue: cellValue,
|
|
1698
1718
|
row: row,
|
|
1699
1719
|
column: column,
|
|
1700
|
-
$table:
|
|
1720
|
+
$table: _this17
|
|
1701
1721
|
});
|
|
1702
1722
|
});
|
|
1703
1723
|
}
|
|
@@ -1750,7 +1770,7 @@ var Methods = {
|
|
|
1750
1770
|
tableTree = _xeUtils.default.orderBy(tableTree, orderColumns.map(function (_ref2) {
|
|
1751
1771
|
var column = _ref2.column,
|
|
1752
1772
|
order = _ref2.order;
|
|
1753
|
-
return [getOrderField(
|
|
1773
|
+
return [getOrderField(_this17, column), order];
|
|
1754
1774
|
}));
|
|
1755
1775
|
}
|
|
1756
1776
|
|
|
@@ -1773,7 +1793,7 @@ var Methods = {
|
|
|
1773
1793
|
tableData = _xeUtils.default.orderBy(tableData, orderColumns.map(function (_ref3) {
|
|
1774
1794
|
var column = _ref3.column,
|
|
1775
1795
|
order = _ref3.order;
|
|
1776
|
-
return [getOrderField(
|
|
1796
|
+
return [getOrderField(_this17, column), order];
|
|
1777
1797
|
}));
|
|
1778
1798
|
} else {
|
|
1779
1799
|
// 兼容 v2,在 v4 中废弃, sortBy 不能为数组
|
|
@@ -1788,7 +1808,7 @@ var Methods = {
|
|
|
1788
1808
|
tableData = _xeUtils.default.orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref4) {
|
|
1789
1809
|
var column = _ref4.column,
|
|
1790
1810
|
order = _ref4.order;
|
|
1791
|
-
return [getOrderField(
|
|
1811
|
+
return [getOrderField(_this17, column), order];
|
|
1792
1812
|
}));
|
|
1793
1813
|
}
|
|
1794
1814
|
}
|
|
@@ -1807,7 +1827,7 @@ var Methods = {
|
|
|
1807
1827
|
* 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗,使运行时更加流畅
|
|
1808
1828
|
*/
|
|
1809
1829
|
updateAfterDataIndex: function updateAfterDataIndex() {
|
|
1810
|
-
var
|
|
1830
|
+
var _this18 = this;
|
|
1811
1831
|
|
|
1812
1832
|
var treeConfig = this.treeConfig,
|
|
1813
1833
|
afterFullData = this.afterFullData,
|
|
@@ -1818,7 +1838,7 @@ var Methods = {
|
|
|
1818
1838
|
|
|
1819
1839
|
if (treeConfig) {
|
|
1820
1840
|
_xeUtils.default.eachTree(afterTreeFullData, function (row, index, items, path) {
|
|
1821
|
-
var rowid = getRowid(
|
|
1841
|
+
var rowid = getRowid(_this18, row);
|
|
1822
1842
|
var allrest = fullAllDataRowIdData[rowid];
|
|
1823
1843
|
var seq = path.map(function (num, i) {
|
|
1824
1844
|
return i % 2 === 0 ? Number(num) + 1 : '.';
|
|
@@ -1847,7 +1867,7 @@ var Methods = {
|
|
|
1847
1867
|
});
|
|
1848
1868
|
} else {
|
|
1849
1869
|
afterFullData.forEach(function (row, index) {
|
|
1850
|
-
var rowid = getRowid(
|
|
1870
|
+
var rowid = getRowid(_this18, row);
|
|
1851
1871
|
var allrest = fullAllDataRowIdData[rowid];
|
|
1852
1872
|
var seq = index + 1;
|
|
1853
1873
|
|
|
@@ -1938,7 +1958,7 @@ var Methods = {
|
|
|
1938
1958
|
* 默认执行一次,除非被重置
|
|
1939
1959
|
*/
|
|
1940
1960
|
handleLoadDefaults: function handleLoadDefaults() {
|
|
1941
|
-
var
|
|
1961
|
+
var _this19 = this;
|
|
1942
1962
|
|
|
1943
1963
|
if (this.checkboxConfig) {
|
|
1944
1964
|
this.handleDefaultSelectionChecked();
|
|
@@ -1965,7 +1985,7 @@ var Methods = {
|
|
|
1965
1985
|
}
|
|
1966
1986
|
|
|
1967
1987
|
this.$nextTick(function () {
|
|
1968
|
-
return setTimeout(
|
|
1988
|
+
return setTimeout(_this19.recalculate);
|
|
1969
1989
|
});
|
|
1970
1990
|
},
|
|
1971
1991
|
|
|
@@ -2222,12 +2242,12 @@ var Methods = {
|
|
|
2222
2242
|
* 刷新列配置
|
|
2223
2243
|
*/
|
|
2224
2244
|
refreshColumn: function refreshColumn() {
|
|
2225
|
-
var
|
|
2245
|
+
var _this20 = this;
|
|
2226
2246
|
|
|
2227
2247
|
return this.parseColumns().then(function () {
|
|
2228
|
-
return
|
|
2248
|
+
return _this20.refreshScroll();
|
|
2229
2249
|
}).then(function () {
|
|
2230
|
-
return
|
|
2250
|
+
return _this20.recalculate();
|
|
2231
2251
|
});
|
|
2232
2252
|
},
|
|
2233
2253
|
|
|
@@ -2236,7 +2256,7 @@ var Methods = {
|
|
|
2236
2256
|
* 将固定的列左边、右边分别靠边
|
|
2237
2257
|
*/
|
|
2238
2258
|
parseColumns: function parseColumns() {
|
|
2239
|
-
var
|
|
2259
|
+
var _this21 = this;
|
|
2240
2260
|
|
|
2241
2261
|
var leftList = [];
|
|
2242
2262
|
var centerList = [];
|
|
@@ -2363,11 +2383,11 @@ var Methods = {
|
|
|
2363
2383
|
this.visibleColumn = visibleColumn;
|
|
2364
2384
|
this.handleTableColumn();
|
|
2365
2385
|
return this.updateFooter().then(function () {
|
|
2366
|
-
return
|
|
2386
|
+
return _this21.recalculate();
|
|
2367
2387
|
}).then(function () {
|
|
2368
|
-
|
|
2388
|
+
_this21.updateCellAreas();
|
|
2369
2389
|
|
|
2370
|
-
return
|
|
2390
|
+
return _this21.recalculate();
|
|
2371
2391
|
});
|
|
2372
2392
|
},
|
|
2373
2393
|
|
|
@@ -2451,7 +2471,7 @@ var Methods = {
|
|
|
2451
2471
|
* 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
|
|
2452
2472
|
*/
|
|
2453
2473
|
recalculate: function recalculate(refull) {
|
|
2454
|
-
var
|
|
2474
|
+
var _this22 = this;
|
|
2455
2475
|
|
|
2456
2476
|
var $refs = this.$refs;
|
|
2457
2477
|
var tableBody = $refs.tableBody,
|
|
@@ -2467,9 +2487,9 @@ var Methods = {
|
|
|
2467
2487
|
if (refull === true) {
|
|
2468
2488
|
// 初始化时需要在列计算之后再执行优化运算,达到最优显示效果
|
|
2469
2489
|
return this.computeScrollLoad().then(function () {
|
|
2470
|
-
|
|
2490
|
+
_this22.autoCellWidth(headerElem, bodyElem, footerElem);
|
|
2471
2491
|
|
|
2472
|
-
return
|
|
2492
|
+
return _this22.computeScrollLoad();
|
|
2473
2493
|
});
|
|
2474
2494
|
}
|
|
2475
2495
|
}
|
|
@@ -2617,7 +2637,7 @@ var Methods = {
|
|
|
2617
2637
|
this.customMaxHeight = calcHeight(this, 'maxHeight');
|
|
2618
2638
|
},
|
|
2619
2639
|
updateStyle: function updateStyle() {
|
|
2620
|
-
var
|
|
2640
|
+
var _this23 = this;
|
|
2621
2641
|
|
|
2622
2642
|
var $refs = this.$refs,
|
|
2623
2643
|
isGroup = this.isGroup,
|
|
@@ -2721,7 +2741,7 @@ var Methods = {
|
|
|
2721
2741
|
|
|
2722
2742
|
if (isGroup && listElem) {
|
|
2723
2743
|
_xeUtils.default.arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
|
|
2724
|
-
var colNode =
|
|
2744
|
+
var colNode = _this23.getColumnNode(thElem);
|
|
2725
2745
|
|
|
2726
2746
|
if (colNode) {
|
|
2727
2747
|
var column = colNode.item;
|
|
@@ -2902,10 +2922,10 @@ var Methods = {
|
|
|
2902
2922
|
|
|
2903
2923
|
if (cellElem) {
|
|
2904
2924
|
if (colspan > 1) {
|
|
2905
|
-
var columnIndex =
|
|
2925
|
+
var columnIndex = _this23.getColumnIndex(column);
|
|
2906
2926
|
|
|
2907
2927
|
for (var _index = 1; _index < colspan; _index++) {
|
|
2908
|
-
var nextColumn =
|
|
2928
|
+
var nextColumn = _this23.getColumns(columnIndex + _index);
|
|
2909
2929
|
|
|
2910
2930
|
if (nextColumn) {
|
|
2911
2931
|
colWidth += nextColumn.renderWidth;
|
|
@@ -2955,7 +2975,7 @@ var Methods = {
|
|
|
2955
2975
|
}
|
|
2956
2976
|
},
|
|
2957
2977
|
preventEvent: function preventEvent(evnt, type, args, next, end) {
|
|
2958
|
-
var
|
|
2978
|
+
var _this24 = this;
|
|
2959
2979
|
|
|
2960
2980
|
var evntList = _vXETable.default.interceptor.get(type);
|
|
2961
2981
|
|
|
@@ -2963,8 +2983,8 @@ var Methods = {
|
|
|
2963
2983
|
|
|
2964
2984
|
if (!evntList.some(function (func) {
|
|
2965
2985
|
return func(Object.assign({
|
|
2966
|
-
$grid:
|
|
2967
|
-
$table:
|
|
2986
|
+
$grid: _this24.$xegrid,
|
|
2987
|
+
$table: _this24,
|
|
2968
2988
|
$event: evnt
|
|
2969
2989
|
}, args)) === false;
|
|
2970
2990
|
})) {
|
|
@@ -2984,7 +3004,7 @@ var Methods = {
|
|
|
2984
3004
|
* 全局按下事件处理
|
|
2985
3005
|
*/
|
|
2986
3006
|
handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
|
|
2987
|
-
var
|
|
3007
|
+
var _this25 = this;
|
|
2988
3008
|
|
|
2989
3009
|
var $el = this.$el,
|
|
2990
3010
|
$refs = this.$refs,
|
|
@@ -3045,7 +3065,7 @@ var Methods = {
|
|
|
3045
3065
|
} // 如果固定了高度且点击了行之外的空白处,则清除激活状态
|
|
3046
3066
|
|
|
3047
3067
|
|
|
3048
|
-
if (!isClearActived &&
|
|
3068
|
+
if (!isClearActived && _this25.height && !_this25.overflowY) {
|
|
3049
3069
|
var bodyWrapperElem = evnt.target;
|
|
3050
3070
|
|
|
3051
3071
|
if (hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
|
|
@@ -3056,7 +3076,7 @@ var Methods = {
|
|
|
3056
3076
|
if (isClearActived || // 如果点击了当前表格之外
|
|
3057
3077
|
!getEventTargetNode(evnt, $el).flag) {
|
|
3058
3078
|
setTimeout(function () {
|
|
3059
|
-
return
|
|
3079
|
+
return _this25.clearActived(evnt);
|
|
3060
3080
|
});
|
|
3061
3081
|
}
|
|
3062
3082
|
});
|
|
@@ -3070,9 +3090,9 @@ var Methods = {
|
|
|
3070
3090
|
|
|
3071
3091
|
if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
|
|
3072
3092
|
this.preventEvent(evnt, 'event.clearAreas', {}, function () {
|
|
3073
|
-
|
|
3093
|
+
_this25.clearCellAreas();
|
|
3074
3094
|
|
|
3075
|
-
|
|
3095
|
+
_this25.clearCopyCellArea();
|
|
3076
3096
|
});
|
|
3077
3097
|
}
|
|
3078
3098
|
}
|
|
@@ -3107,7 +3127,7 @@ var Methods = {
|
|
|
3107
3127
|
* 表格键盘事件
|
|
3108
3128
|
*/
|
|
3109
3129
|
keydownEvent: function keydownEvent(evnt) {
|
|
3110
|
-
var
|
|
3130
|
+
var _this26 = this;
|
|
3111
3131
|
|
|
3112
3132
|
var filterStore = this.filterStore,
|
|
3113
3133
|
ctxMenuStore = this.ctxMenuStore,
|
|
@@ -3122,33 +3142,33 @@ var Methods = {
|
|
|
3122
3142
|
|
|
3123
3143
|
if (isEsc) {
|
|
3124
3144
|
this.preventEvent(evnt, 'event.keydown', null, function () {
|
|
3125
|
-
if (keyboardConfig && mouseConfig && mouseOpts.area &&
|
|
3126
|
-
|
|
3145
|
+
if (keyboardConfig && mouseConfig && mouseOpts.area && _this26.handleKeyboardEvent) {
|
|
3146
|
+
_this26.handleKeyboardEvent(evnt);
|
|
3127
3147
|
} else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
|
|
3128
3148
|
evnt.stopPropagation(); // 如果按下了 Esc 键,关闭快捷菜单、筛选
|
|
3129
3149
|
|
|
3130
|
-
|
|
3150
|
+
_this26.closeFilter();
|
|
3131
3151
|
|
|
3132
|
-
|
|
3152
|
+
_this26.closeMenu();
|
|
3133
3153
|
|
|
3134
3154
|
if (keyboardConfig && keyboardOpts.isEsc) {
|
|
3135
3155
|
// 如果是激活编辑状态,则取消编辑
|
|
3136
3156
|
if (actived.row) {
|
|
3137
3157
|
var params = actived.args;
|
|
3138
3158
|
|
|
3139
|
-
|
|
3159
|
+
_this26.clearActived(evnt); // 如果配置了选中功能,则为选中状态
|
|
3140
3160
|
|
|
3141
3161
|
|
|
3142
3162
|
if (mouseConfig && mouseOpts.selected) {
|
|
3143
|
-
|
|
3144
|
-
return
|
|
3163
|
+
_this26.$nextTick(function () {
|
|
3164
|
+
return _this26.handleSelected(params, evnt);
|
|
3145
3165
|
});
|
|
3146
3166
|
}
|
|
3147
3167
|
}
|
|
3148
3168
|
}
|
|
3149
3169
|
}
|
|
3150
3170
|
|
|
3151
|
-
|
|
3171
|
+
_this26.emitEvent('keydown', {}, evnt);
|
|
3152
3172
|
});
|
|
3153
3173
|
}
|
|
3154
3174
|
},
|
|
@@ -3157,27 +3177,27 @@ var Methods = {
|
|
|
3157
3177
|
* 全局键盘事件
|
|
3158
3178
|
*/
|
|
3159
3179
|
handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
|
|
3160
|
-
var
|
|
3180
|
+
var _this27 = this;
|
|
3161
3181
|
|
|
3162
3182
|
// 该行为只对当前激活的表格有效
|
|
3163
3183
|
if (this.isActivated) {
|
|
3164
3184
|
this.preventEvent(evnt, 'event.keydown', null, function () {
|
|
3165
|
-
var filterStore =
|
|
3166
|
-
isCtxMenu =
|
|
3167
|
-
ctxMenuStore =
|
|
3168
|
-
editStore =
|
|
3169
|
-
editOpts =
|
|
3170
|
-
editConfig =
|
|
3171
|
-
mouseConfig =
|
|
3172
|
-
mouseOpts =
|
|
3173
|
-
keyboardConfig =
|
|
3174
|
-
keyboardOpts =
|
|
3175
|
-
treeConfig =
|
|
3176
|
-
treeOpts =
|
|
3177
|
-
highlightCurrentRow =
|
|
3178
|
-
currentRow =
|
|
3179
|
-
bodyCtxMenu =
|
|
3180
|
-
rowOpts =
|
|
3185
|
+
var filterStore = _this27.filterStore,
|
|
3186
|
+
isCtxMenu = _this27.isCtxMenu,
|
|
3187
|
+
ctxMenuStore = _this27.ctxMenuStore,
|
|
3188
|
+
editStore = _this27.editStore,
|
|
3189
|
+
editOpts = _this27.editOpts,
|
|
3190
|
+
editConfig = _this27.editConfig,
|
|
3191
|
+
mouseConfig = _this27.mouseConfig,
|
|
3192
|
+
mouseOpts = _this27.mouseOpts,
|
|
3193
|
+
keyboardConfig = _this27.keyboardConfig,
|
|
3194
|
+
keyboardOpts = _this27.keyboardOpts,
|
|
3195
|
+
treeConfig = _this27.treeConfig,
|
|
3196
|
+
treeOpts = _this27.treeOpts,
|
|
3197
|
+
highlightCurrentRow = _this27.highlightCurrentRow,
|
|
3198
|
+
currentRow = _this27.currentRow,
|
|
3199
|
+
bodyCtxMenu = _this27.bodyCtxMenu,
|
|
3200
|
+
rowOpts = _this27.rowOpts;
|
|
3181
3201
|
var selected = editStore.selected,
|
|
3182
3202
|
actived = editStore.actived;
|
|
3183
3203
|
var keyCode = evnt.keyCode;
|
|
@@ -3204,7 +3224,7 @@ var Methods = {
|
|
|
3204
3224
|
|
|
3205
3225
|
if (filterStore.visible) {
|
|
3206
3226
|
if (isEsc) {
|
|
3207
|
-
|
|
3227
|
+
_this27.closeFilter();
|
|
3208
3228
|
}
|
|
3209
3229
|
|
|
3210
3230
|
return;
|
|
@@ -3215,20 +3235,20 @@ var Methods = {
|
|
|
3215
3235
|
evnt.preventDefault();
|
|
3216
3236
|
|
|
3217
3237
|
if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
|
|
3218
|
-
|
|
3238
|
+
_this27.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
|
|
3219
3239
|
} else {
|
|
3220
|
-
|
|
3240
|
+
_this27.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this27.ctxMenuList);
|
|
3221
3241
|
}
|
|
3222
|
-
} else if (keyboardConfig && mouseConfig && mouseOpts.area &&
|
|
3223
|
-
|
|
3242
|
+
} else if (keyboardConfig && mouseConfig && mouseOpts.area && _this27.handleKeyboardEvent) {
|
|
3243
|
+
_this27.handleKeyboardEvent(evnt);
|
|
3224
3244
|
} else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === 'checkbox' || selected.column.type === 'radio')) {
|
|
3225
3245
|
// 空格键支持选中复选框
|
|
3226
3246
|
evnt.preventDefault();
|
|
3227
3247
|
|
|
3228
3248
|
if (selected.column.type === 'checkbox') {
|
|
3229
|
-
|
|
3249
|
+
_this27.handleToggleCheckRowEvent(evnt, selected.args);
|
|
3230
3250
|
} else {
|
|
3231
|
-
|
|
3251
|
+
_this27.triggerRadioRowEvent(evnt, selected.args);
|
|
3232
3252
|
}
|
|
3233
3253
|
} else if (isF2 && (0, _utils.isEnableConf)(editConfig)) {
|
|
3234
3254
|
if (!isEditStatus) {
|
|
@@ -3237,15 +3257,15 @@ var Methods = {
|
|
|
3237
3257
|
evnt.stopPropagation();
|
|
3238
3258
|
evnt.preventDefault();
|
|
3239
3259
|
|
|
3240
|
-
|
|
3260
|
+
_this27.handleActived(selected.args, evnt);
|
|
3241
3261
|
}
|
|
3242
3262
|
}
|
|
3243
3263
|
} else if (isContextMenu) {
|
|
3244
3264
|
// 如果按下上下文键
|
|
3245
|
-
|
|
3246
|
-
clearTimeout(
|
|
3247
|
-
|
|
3248
|
-
|
|
3265
|
+
_this27._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
|
|
3266
|
+
clearTimeout(_this27.keyCtxTimeout);
|
|
3267
|
+
_this27.keyCtxTimeout = setTimeout(function () {
|
|
3268
|
+
_this27._keyCtx = false;
|
|
3249
3269
|
}, 1000);
|
|
3250
3270
|
} else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
|
|
3251
3271
|
// 退出选中
|
|
@@ -3254,12 +3274,12 @@ var Methods = {
|
|
|
3254
3274
|
if (actived.row) {
|
|
3255
3275
|
params = actived.args;
|
|
3256
3276
|
|
|
3257
|
-
|
|
3277
|
+
_this27.clearActived(evnt); // 如果配置了选中功能,则为选中状态
|
|
3258
3278
|
|
|
3259
3279
|
|
|
3260
3280
|
if (mouseConfig && mouseOpts.selected) {
|
|
3261
|
-
|
|
3262
|
-
return
|
|
3281
|
+
_this27.$nextTick(function () {
|
|
3282
|
+
return _this27.handleSelected(params, evnt);
|
|
3263
3283
|
});
|
|
3264
3284
|
}
|
|
3265
3285
|
}
|
|
@@ -3270,15 +3290,15 @@ var Methods = {
|
|
|
3270
3290
|
|
|
3271
3291
|
if (hasShiftKey) {
|
|
3272
3292
|
if (keyboardOpts.enterToTab) {
|
|
3273
|
-
|
|
3293
|
+
_this27.moveTabSelected(targetArgs, hasShiftKey, evnt);
|
|
3274
3294
|
} else {
|
|
3275
|
-
|
|
3295
|
+
_this27.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
|
|
3276
3296
|
}
|
|
3277
3297
|
} else {
|
|
3278
3298
|
if (keyboardOpts.enterToTab) {
|
|
3279
|
-
|
|
3299
|
+
_this27.moveTabSelected(targetArgs, hasShiftKey, evnt);
|
|
3280
3300
|
} else {
|
|
3281
|
-
|
|
3301
|
+
_this27.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
|
|
3282
3302
|
}
|
|
3283
3303
|
}
|
|
3284
3304
|
} else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
|
|
@@ -3289,14 +3309,14 @@ var Methods = {
|
|
|
3289
3309
|
evnt.preventDefault();
|
|
3290
3310
|
var targetRow = childrens[0];
|
|
3291
3311
|
params = {
|
|
3292
|
-
$table:
|
|
3312
|
+
$table: _this27,
|
|
3293
3313
|
row: targetRow
|
|
3294
3314
|
};
|
|
3295
3315
|
|
|
3296
|
-
|
|
3297
|
-
return
|
|
3316
|
+
_this27.setTreeExpand(currentRow, true).then(function () {
|
|
3317
|
+
return _this27.scrollToRow(targetRow);
|
|
3298
3318
|
}).then(function () {
|
|
3299
|
-
return
|
|
3319
|
+
return _this27.triggerCurrentRowEvent(evnt, params);
|
|
3300
3320
|
});
|
|
3301
3321
|
}
|
|
3302
3322
|
}
|
|
@@ -3305,18 +3325,18 @@ var Methods = {
|
|
|
3305
3325
|
if (!isEditStatus) {
|
|
3306
3326
|
// 如果按下了方向键
|
|
3307
3327
|
if (selected.row && selected.column) {
|
|
3308
|
-
|
|
3328
|
+
_this27.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
|
|
3309
3329
|
} else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
|
|
3310
3330
|
// 当前行按键上下移动
|
|
3311
|
-
|
|
3331
|
+
_this27.moveCurrentRow(isUpArrow, isDwArrow, evnt);
|
|
3312
3332
|
}
|
|
3313
3333
|
}
|
|
3314
3334
|
} else if (isTab && keyboardConfig && keyboardOpts.isTab) {
|
|
3315
3335
|
// 如果按下了 Tab 键切换
|
|
3316
3336
|
if (selected.row || selected.column) {
|
|
3317
|
-
|
|
3337
|
+
_this27.moveTabSelected(selected.args, hasShiftKey, evnt);
|
|
3318
3338
|
} else if (actived.row || actived.column) {
|
|
3319
|
-
|
|
3339
|
+
_this27.moveTabSelected(actived.args, hasShiftKey, evnt);
|
|
3320
3340
|
}
|
|
3321
3341
|
} else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
|
|
3322
3342
|
if (!isEditStatus) {
|
|
@@ -3327,10 +3347,10 @@ var Methods = {
|
|
|
3327
3347
|
if (delMethod) {
|
|
3328
3348
|
delMethod({
|
|
3329
3349
|
row: selected.row,
|
|
3330
|
-
rowIndex:
|
|
3350
|
+
rowIndex: _this27.getRowIndex(selected.row),
|
|
3331
3351
|
column: selected.column,
|
|
3332
|
-
columnIndex:
|
|
3333
|
-
$table:
|
|
3352
|
+
columnIndex: _this27.getColumnIndex(selected.column),
|
|
3353
|
+
$table: _this27
|
|
3334
3354
|
});
|
|
3335
3355
|
} else {
|
|
3336
3356
|
setCellValue(selected.row, selected.column, null);
|
|
@@ -3340,21 +3360,21 @@ var Methods = {
|
|
|
3340
3360
|
if (backMethod) {
|
|
3341
3361
|
backMethod({
|
|
3342
3362
|
row: selected.row,
|
|
3343
|
-
rowIndex:
|
|
3363
|
+
rowIndex: _this27.getRowIndex(selected.row),
|
|
3344
3364
|
column: selected.column,
|
|
3345
|
-
columnIndex:
|
|
3346
|
-
$table:
|
|
3365
|
+
columnIndex: _this27.getColumnIndex(selected.column),
|
|
3366
|
+
$table: _this27
|
|
3347
3367
|
});
|
|
3348
3368
|
} else {
|
|
3349
|
-
|
|
3369
|
+
_this27.handleActived(selected.args, evnt);
|
|
3350
3370
|
}
|
|
3351
3371
|
} else if (isDel) {
|
|
3352
3372
|
// 如果按下 del 键,更新表尾数据
|
|
3353
|
-
|
|
3373
|
+
_this27.updateFooter();
|
|
3354
3374
|
}
|
|
3355
3375
|
} else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
|
|
3356
3376
|
// 如果树形表格回退键关闭当前行返回父节点
|
|
3357
|
-
var _XEUtils$findTree = _xeUtils.default.findTree(
|
|
3377
|
+
var _XEUtils$findTree = _xeUtils.default.findTree(_this27.afterFullData, function (item) {
|
|
3358
3378
|
return item === currentRow;
|
|
3359
3379
|
}, treeOpts),
|
|
3360
3380
|
parentRow = _XEUtils$findTree.parent;
|
|
@@ -3362,14 +3382,14 @@ var Methods = {
|
|
|
3362
3382
|
if (parentRow) {
|
|
3363
3383
|
evnt.preventDefault();
|
|
3364
3384
|
params = {
|
|
3365
|
-
$table:
|
|
3385
|
+
$table: _this27,
|
|
3366
3386
|
row: parentRow
|
|
3367
3387
|
};
|
|
3368
3388
|
|
|
3369
|
-
|
|
3370
|
-
return
|
|
3389
|
+
_this27.setTreeExpand(parentRow, false).then(function () {
|
|
3390
|
+
return _this27.scrollToRow(parentRow);
|
|
3371
3391
|
}).then(function () {
|
|
3372
|
-
return
|
|
3392
|
+
return _this27.triggerCurrentRowEvent(evnt, params);
|
|
3373
3393
|
});
|
|
3374
3394
|
}
|
|
3375
3395
|
}
|
|
@@ -3383,26 +3403,26 @@ var Methods = {
|
|
|
3383
3403
|
|
|
3384
3404
|
if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
|
|
3385
3405
|
if (!editOpts.activeMethod || editOpts.activeMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
|
|
3386
|
-
$table:
|
|
3406
|
+
$table: _this27
|
|
3387
3407
|
}))) {
|
|
3388
3408
|
if (editMethod) {
|
|
3389
3409
|
editMethod({
|
|
3390
3410
|
row: selected.row,
|
|
3391
|
-
rowIndex:
|
|
3411
|
+
rowIndex: _this27.getRowIndex(selected.row),
|
|
3392
3412
|
column: selected.column,
|
|
3393
|
-
columnIndex:
|
|
3394
|
-
$table:
|
|
3413
|
+
columnIndex: _this27.getColumnIndex(selected.column),
|
|
3414
|
+
$table: _this27
|
|
3395
3415
|
});
|
|
3396
3416
|
} else {
|
|
3397
3417
|
setCellValue(selected.row, selected.column, null);
|
|
3398
3418
|
|
|
3399
|
-
|
|
3419
|
+
_this27.handleActived(selected.args, evnt);
|
|
3400
3420
|
}
|
|
3401
3421
|
}
|
|
3402
3422
|
}
|
|
3403
3423
|
}
|
|
3404
3424
|
|
|
3405
|
-
|
|
3425
|
+
_this27.emitEvent('keydown', {}, evnt);
|
|
3406
3426
|
});
|
|
3407
3427
|
}
|
|
3408
3428
|
},
|
|
@@ -3472,12 +3492,12 @@ var Methods = {
|
|
|
3472
3492
|
this.recalculate(true);
|
|
3473
3493
|
},
|
|
3474
3494
|
handleTooltipLeaveMethod: function handleTooltipLeaveMethod() {
|
|
3475
|
-
var
|
|
3495
|
+
var _this28 = this;
|
|
3476
3496
|
|
|
3477
3497
|
var tooltipOpts = this.tooltipOpts;
|
|
3478
3498
|
setTimeout(function () {
|
|
3479
|
-
if (!
|
|
3480
|
-
|
|
3499
|
+
if (!_this28.tooltipActive) {
|
|
3500
|
+
_this28.closeTooltip();
|
|
3481
3501
|
}
|
|
3482
3502
|
}, tooltipOpts.leaveDelay);
|
|
3483
3503
|
return false;
|
|
@@ -3488,17 +3508,17 @@ var Methods = {
|
|
|
3488
3508
|
this.closeTooltip();
|
|
3489
3509
|
},
|
|
3490
3510
|
handleTargetLeaveEvent: function handleTargetLeaveEvent() {
|
|
3491
|
-
var
|
|
3511
|
+
var _this29 = this;
|
|
3492
3512
|
|
|
3493
3513
|
var tooltipOpts = this.tooltipOpts;
|
|
3494
3514
|
this.tooltipActive = false;
|
|
3495
3515
|
|
|
3496
3516
|
if (tooltipOpts.enterable) {
|
|
3497
3517
|
this.tooltipTimeout = setTimeout(function () {
|
|
3498
|
-
var tooltip =
|
|
3518
|
+
var tooltip = _this29.$refs.tooltip;
|
|
3499
3519
|
|
|
3500
3520
|
if (tooltip && !tooltip.isHover) {
|
|
3501
|
-
|
|
3521
|
+
_this29.closeTooltip();
|
|
3502
3522
|
}
|
|
3503
3523
|
}, tooltipOpts.leaveDelay);
|
|
3504
3524
|
} else {
|
|
@@ -3731,14 +3751,14 @@ var Methods = {
|
|
|
3731
3751
|
* @param {Boolean} value 是否选中
|
|
3732
3752
|
*/
|
|
3733
3753
|
setCheckboxRow: function setCheckboxRow(rows, value) {
|
|
3734
|
-
var
|
|
3754
|
+
var _this30 = this;
|
|
3735
3755
|
|
|
3736
3756
|
if (rows && !_xeUtils.default.isArray(rows)) {
|
|
3737
3757
|
rows = [rows];
|
|
3738
3758
|
}
|
|
3739
3759
|
|
|
3740
3760
|
rows.forEach(function (row) {
|
|
3741
|
-
return
|
|
3761
|
+
return _this30.handleSelectRow({
|
|
3742
3762
|
row: row
|
|
3743
3763
|
}, !!value);
|
|
3744
3764
|
});
|
|
@@ -3762,7 +3782,7 @@ var Methods = {
|
|
|
3762
3782
|
* value 选中true 不选false 半选-1
|
|
3763
3783
|
*/
|
|
3764
3784
|
handleSelectRow: function handleSelectRow(_ref6, value) {
|
|
3765
|
-
var
|
|
3785
|
+
var _this31 = this;
|
|
3766
3786
|
|
|
3767
3787
|
var row = _ref6.row;
|
|
3768
3788
|
var selection = this.selection,
|
|
@@ -3795,7 +3815,7 @@ var Methods = {
|
|
|
3795
3815
|
return half === item;
|
|
3796
3816
|
});
|
|
3797
3817
|
|
|
3798
|
-
|
|
3818
|
+
_this31.handleCheckboxReserveRow(row, value);
|
|
3799
3819
|
}
|
|
3800
3820
|
}, treeOpts);
|
|
3801
3821
|
} // 如果存在父节点,更新父节点状态
|
|
@@ -3869,7 +3889,7 @@ var Methods = {
|
|
|
3869
3889
|
return half === item;
|
|
3870
3890
|
});
|
|
3871
3891
|
|
|
3872
|
-
|
|
3892
|
+
_this31.handleCheckboxReserveRow(row, value);
|
|
3873
3893
|
}
|
|
3874
3894
|
}, treeOpts);
|
|
3875
3895
|
} // 如果存在父节点,更新父节点状态
|
|
@@ -3973,7 +3993,7 @@ var Methods = {
|
|
|
3973
3993
|
* @param {Boolean} value 是否选中
|
|
3974
3994
|
*/
|
|
3975
3995
|
setAllCheckboxRow: function setAllCheckboxRow(value) {
|
|
3976
|
-
var
|
|
3996
|
+
var _this32 = this;
|
|
3977
3997
|
|
|
3978
3998
|
var afterFullData = this.afterFullData,
|
|
3979
3999
|
treeConfig = this.treeConfig,
|
|
@@ -4086,11 +4106,11 @@ var Methods = {
|
|
|
4086
4106
|
if (reserve) {
|
|
4087
4107
|
if (value) {
|
|
4088
4108
|
selectRows.forEach(function (row) {
|
|
4089
|
-
checkboxReserveRowMap[getRowid(
|
|
4109
|
+
checkboxReserveRowMap[getRowid(_this32, row)] = row;
|
|
4090
4110
|
});
|
|
4091
4111
|
} else {
|
|
4092
4112
|
afterFullData.forEach(function (row) {
|
|
4093
|
-
return
|
|
4113
|
+
return _this32.handleCheckboxReserveRow(row, false);
|
|
4094
4114
|
});
|
|
4095
4115
|
}
|
|
4096
4116
|
}
|
|
@@ -4310,7 +4330,7 @@ var Methods = {
|
|
|
4310
4330
|
* 获取复选框保留选中的行
|
|
4311
4331
|
*/
|
|
4312
4332
|
getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
|
|
4313
|
-
var
|
|
4333
|
+
var _this33 = this;
|
|
4314
4334
|
|
|
4315
4335
|
var fullDataRowIdData = this.fullDataRowIdData,
|
|
4316
4336
|
afterFullData = this.afterFullData,
|
|
@@ -4325,11 +4345,11 @@ var Methods = {
|
|
|
4325
4345
|
|
|
4326
4346
|
if (treeConfig) {
|
|
4327
4347
|
_xeUtils.default.eachTree(afterFullData, function (row) {
|
|
4328
|
-
afterFullIdMaps[getRowid(
|
|
4348
|
+
afterFullIdMaps[getRowid(_this33, row)] = 1;
|
|
4329
4349
|
}, treeOpts);
|
|
4330
4350
|
} else {
|
|
4331
4351
|
afterFullData.forEach(function (row) {
|
|
4332
|
-
afterFullIdMaps[getRowid(
|
|
4352
|
+
afterFullIdMaps[getRowid(_this33, row)] = 1;
|
|
4333
4353
|
});
|
|
4334
4354
|
}
|
|
4335
4355
|
|
|
@@ -4395,7 +4415,7 @@ var Methods = {
|
|
|
4395
4415
|
* 清空行为不管是否被禁用还是保留记录,都将彻底清空选中状态
|
|
4396
4416
|
*/
|
|
4397
4417
|
clearCheckboxRow: function clearCheckboxRow() {
|
|
4398
|
-
var
|
|
4418
|
+
var _this34 = this;
|
|
4399
4419
|
|
|
4400
4420
|
var tableFullData = this.tableFullData,
|
|
4401
4421
|
treeConfig = this.treeConfig,
|
|
@@ -4418,7 +4438,7 @@ var Methods = {
|
|
|
4418
4438
|
|
|
4419
4439
|
if (reserve) {
|
|
4420
4440
|
tableFullData.forEach(function (row) {
|
|
4421
|
-
return
|
|
4441
|
+
return _this34.handleCheckboxReserveRow(row, false);
|
|
4422
4442
|
});
|
|
4423
4443
|
}
|
|
4424
4444
|
|
|
@@ -4710,13 +4730,13 @@ var Methods = {
|
|
|
4710
4730
|
* 如果存在规则,则校验
|
|
4711
4731
|
*/
|
|
4712
4732
|
handleChangeCell: function handleChangeCell(evnt, params) {
|
|
4713
|
-
var
|
|
4733
|
+
var _this35 = this;
|
|
4714
4734
|
|
|
4715
4735
|
this.checkValidate('blur').catch(function (e) {
|
|
4716
4736
|
return e;
|
|
4717
4737
|
}).then(function () {
|
|
4718
|
-
|
|
4719
|
-
return
|
|
4738
|
+
_this35.handleActived(params, evnt).then(function () {
|
|
4739
|
+
return _this35.checkValidate('change');
|
|
4720
4740
|
}).catch(function (e) {
|
|
4721
4741
|
return e;
|
|
4722
4742
|
});
|
|
@@ -4819,7 +4839,7 @@ var Methods = {
|
|
|
4819
4839
|
* 如果是双击模式,则激活为编辑状态
|
|
4820
4840
|
*/
|
|
4821
4841
|
triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
|
|
4822
|
-
var
|
|
4842
|
+
var _this36 = this;
|
|
4823
4843
|
|
|
4824
4844
|
var editStore = this.editStore,
|
|
4825
4845
|
editConfig = this.editConfig,
|
|
@@ -4834,15 +4854,15 @@ var Methods = {
|
|
|
4834
4854
|
this.checkValidate('blur').catch(function (e) {
|
|
4835
4855
|
return e;
|
|
4836
4856
|
}).then(function () {
|
|
4837
|
-
|
|
4838
|
-
return
|
|
4857
|
+
_this36.handleActived(params, evnt).then(function () {
|
|
4858
|
+
return _this36.checkValidate('change');
|
|
4839
4859
|
}).catch(function (e) {
|
|
4840
4860
|
return e;
|
|
4841
4861
|
});
|
|
4842
4862
|
});
|
|
4843
4863
|
} else if (editOpts.mode === 'cell') {
|
|
4844
4864
|
this.handleActived(params, evnt).then(function () {
|
|
4845
|
-
return
|
|
4865
|
+
return _this36.checkValidate('change');
|
|
4846
4866
|
}).catch(function (e) {
|
|
4847
4867
|
return e;
|
|
4848
4868
|
});
|
|
@@ -4853,7 +4873,7 @@ var Methods = {
|
|
|
4853
4873
|
this.emitEvent('cell-dblclick', params, evnt);
|
|
4854
4874
|
},
|
|
4855
4875
|
handleDefaultSort: function handleDefaultSort() {
|
|
4856
|
-
var
|
|
4876
|
+
var _this37 = this;
|
|
4857
4877
|
|
|
4858
4878
|
var sortConfig = this.sortConfig,
|
|
4859
4879
|
sortOpts = this.sortOpts;
|
|
@@ -4870,7 +4890,7 @@ var Methods = {
|
|
|
4870
4890
|
order = item.order;
|
|
4871
4891
|
|
|
4872
4892
|
if (field && order) {
|
|
4873
|
-
var column =
|
|
4893
|
+
var column = _this37.getColumnByField(field);
|
|
4874
4894
|
|
|
4875
4895
|
if (column && column.sortable) {
|
|
4876
4896
|
column.order = order;
|
|
@@ -4913,7 +4933,7 @@ var Methods = {
|
|
|
4913
4933
|
}
|
|
4914
4934
|
},
|
|
4915
4935
|
sort: function sort(sortConfs, sortOrder) {
|
|
4916
|
-
var
|
|
4936
|
+
var _this38 = this;
|
|
4917
4937
|
|
|
4918
4938
|
var sortOpts = this.sortOpts;
|
|
4919
4939
|
var multiple = sortOpts.multiple,
|
|
@@ -4946,7 +4966,7 @@ var Methods = {
|
|
|
4946
4966
|
var column = field;
|
|
4947
4967
|
|
|
4948
4968
|
if (_xeUtils.default.isString(field)) {
|
|
4949
|
-
column =
|
|
4969
|
+
column = _this38.getColumnByField(field);
|
|
4950
4970
|
}
|
|
4951
4971
|
|
|
4952
4972
|
if (column && (column.sortable || column.remoteSort)) {
|
|
@@ -4955,7 +4975,7 @@ var Methods = {
|
|
|
4955
4975
|
}
|
|
4956
4976
|
|
|
4957
4977
|
if (orders.indexOf(order) === -1) {
|
|
4958
|
-
order = getNextSortOrder(
|
|
4978
|
+
order = getNextSortOrder(_this38, column);
|
|
4959
4979
|
}
|
|
4960
4980
|
|
|
4961
4981
|
if (column.order !== order) {
|
|
@@ -5108,7 +5128,7 @@ var Methods = {
|
|
|
5108
5128
|
* @param {Row} row 行对象
|
|
5109
5129
|
*/
|
|
5110
5130
|
reloadRowExpand: function reloadRowExpand(row) {
|
|
5111
|
-
var
|
|
5131
|
+
var _this39 = this;
|
|
5112
5132
|
|
|
5113
5133
|
var expandOpts = this.expandOpts,
|
|
5114
5134
|
expandLazyLoadeds = this.expandLazyLoadeds;
|
|
@@ -5116,7 +5136,7 @@ var Methods = {
|
|
|
5116
5136
|
|
|
5117
5137
|
if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
|
|
5118
5138
|
this.clearRowExpandLoaded(row).then(function () {
|
|
5119
|
-
return
|
|
5139
|
+
return _this39.handleAsyncRowExpand(row);
|
|
5120
5140
|
});
|
|
5121
5141
|
}
|
|
5122
5142
|
|
|
@@ -5195,29 +5215,29 @@ var Methods = {
|
|
|
5195
5215
|
return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
|
|
5196
5216
|
},
|
|
5197
5217
|
handleAsyncRowExpand: function handleAsyncRowExpand(row) {
|
|
5198
|
-
var
|
|
5218
|
+
var _this40 = this;
|
|
5199
5219
|
|
|
5200
5220
|
var rest = this.fullAllDataRowMap.get(row);
|
|
5201
5221
|
return new Promise(function (resolve) {
|
|
5202
|
-
|
|
5222
|
+
_this40.expandLazyLoadeds.push(row);
|
|
5203
5223
|
|
|
5204
|
-
|
|
5205
|
-
$table:
|
|
5224
|
+
_this40.expandOpts.loadMethod({
|
|
5225
|
+
$table: _this40,
|
|
5206
5226
|
row: row,
|
|
5207
|
-
rowIndex:
|
|
5208
|
-
$rowIndex:
|
|
5227
|
+
rowIndex: _this40.getRowIndex(row),
|
|
5228
|
+
$rowIndex: _this40.getVMRowIndex(row)
|
|
5209
5229
|
}).catch(function (e) {
|
|
5210
5230
|
return e;
|
|
5211
5231
|
}).then(function () {
|
|
5212
5232
|
rest.expandLoaded = true;
|
|
5213
5233
|
|
|
5214
|
-
_xeUtils.default.remove(
|
|
5234
|
+
_xeUtils.default.remove(_this40.expandLazyLoadeds, function (item) {
|
|
5215
5235
|
return item === row;
|
|
5216
5236
|
});
|
|
5217
5237
|
|
|
5218
|
-
|
|
5238
|
+
_this40.rowExpandeds.push(row);
|
|
5219
5239
|
|
|
5220
|
-
resolve(
|
|
5240
|
+
resolve(_this40.$nextTick().then(_this40.recalculate));
|
|
5221
5241
|
});
|
|
5222
5242
|
});
|
|
5223
5243
|
},
|
|
@@ -5230,7 +5250,7 @@ var Methods = {
|
|
|
5230
5250
|
* @param {Boolean} expanded 是否展开
|
|
5231
5251
|
*/
|
|
5232
5252
|
setRowExpand: function setRowExpand(rows, expanded) {
|
|
5233
|
-
var
|
|
5253
|
+
var _this41 = this;
|
|
5234
5254
|
|
|
5235
5255
|
var fullAllDataRowMap = this.fullAllDataRowMap,
|
|
5236
5256
|
expandLazyLoadeds = this.expandLazyLoadeds,
|
|
@@ -5263,8 +5283,8 @@ var Methods = {
|
|
|
5263
5283
|
columnIndex: columnIndex,
|
|
5264
5284
|
$columnIndex: $columnIndex,
|
|
5265
5285
|
row: row,
|
|
5266
|
-
rowIndex:
|
|
5267
|
-
$rowIndex:
|
|
5286
|
+
rowIndex: _this41.getRowIndex(row),
|
|
5287
|
+
$rowIndex: _this41.getVMRowIndex(row)
|
|
5268
5288
|
});
|
|
5269
5289
|
}) : rows;
|
|
5270
5290
|
|
|
@@ -5275,7 +5295,7 @@ var Methods = {
|
|
|
5275
5295
|
var isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1;
|
|
5276
5296
|
|
|
5277
5297
|
if (isLoad) {
|
|
5278
|
-
lazyRests.push(
|
|
5298
|
+
lazyRests.push(_this41.handleAsyncRowExpand(row));
|
|
5279
5299
|
} else {
|
|
5280
5300
|
rowExpandeds.push(row);
|
|
5281
5301
|
}
|
|
@@ -5289,7 +5309,7 @@ var Methods = {
|
|
|
5289
5309
|
|
|
5290
5310
|
if (reserve) {
|
|
5291
5311
|
validRows.forEach(function (row) {
|
|
5292
|
-
return
|
|
5312
|
+
return _this41.handleRowExpandReserve(row, expanded);
|
|
5293
5313
|
});
|
|
5294
5314
|
}
|
|
5295
5315
|
}
|
|
@@ -5310,7 +5330,7 @@ var Methods = {
|
|
|
5310
5330
|
* 手动清空展开行状态,数据会恢复成未展开的状态
|
|
5311
5331
|
*/
|
|
5312
5332
|
clearRowExpand: function clearRowExpand() {
|
|
5313
|
-
var
|
|
5333
|
+
var _this42 = this;
|
|
5314
5334
|
|
|
5315
5335
|
var expandOpts = this.expandOpts,
|
|
5316
5336
|
rowExpandeds = this.rowExpandeds,
|
|
@@ -5321,13 +5341,13 @@ var Methods = {
|
|
|
5321
5341
|
|
|
5322
5342
|
if (reserve) {
|
|
5323
5343
|
tableFullData.forEach(function (row) {
|
|
5324
|
-
return
|
|
5344
|
+
return _this42.handleRowExpandReserve(row, false);
|
|
5325
5345
|
});
|
|
5326
5346
|
}
|
|
5327
5347
|
|
|
5328
5348
|
return this.$nextTick().then(function () {
|
|
5329
5349
|
if (isExists) {
|
|
5330
|
-
|
|
5350
|
+
_this42.recalculate();
|
|
5331
5351
|
}
|
|
5332
5352
|
});
|
|
5333
5353
|
},
|
|
@@ -5407,7 +5427,7 @@ var Methods = {
|
|
|
5407
5427
|
* @param {Row} row 行对象
|
|
5408
5428
|
*/
|
|
5409
5429
|
reloadTreeExpand: function reloadTreeExpand(row) {
|
|
5410
|
-
var
|
|
5430
|
+
var _this43 = this;
|
|
5411
5431
|
|
|
5412
5432
|
var treeOpts = this.treeOpts,
|
|
5413
5433
|
treeLazyLoadeds = this.treeLazyLoadeds;
|
|
@@ -5417,15 +5437,15 @@ var Methods = {
|
|
|
5417
5437
|
|
|
5418
5438
|
if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
|
|
5419
5439
|
this.clearTreeExpandLoaded(row).then(function () {
|
|
5420
|
-
return
|
|
5440
|
+
return _this43.handleAsyncTreeExpandChilds(row);
|
|
5421
5441
|
}).then(function () {
|
|
5422
5442
|
if (transform) {
|
|
5423
|
-
|
|
5443
|
+
_this43.handleVirtualTreeToList();
|
|
5424
5444
|
|
|
5425
|
-
return
|
|
5445
|
+
return _this43.handleTableData();
|
|
5426
5446
|
}
|
|
5427
5447
|
}).then(function () {
|
|
5428
|
-
return
|
|
5448
|
+
return _this43.recalculate();
|
|
5429
5449
|
});
|
|
5430
5450
|
}
|
|
5431
5451
|
|
|
@@ -5503,7 +5523,7 @@ var Methods = {
|
|
|
5503
5523
|
}
|
|
5504
5524
|
},
|
|
5505
5525
|
handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
|
|
5506
|
-
var
|
|
5526
|
+
var _this44 = this;
|
|
5507
5527
|
|
|
5508
5528
|
var fullAllDataRowMap = this.fullAllDataRowMap,
|
|
5509
5529
|
treeExpandeds = this.treeExpandeds,
|
|
@@ -5517,7 +5537,7 @@ var Methods = {
|
|
|
5517
5537
|
return new Promise(function (resolve) {
|
|
5518
5538
|
treeLazyLoadeds.push(row);
|
|
5519
5539
|
loadMethod({
|
|
5520
|
-
$table:
|
|
5540
|
+
$table: _this44,
|
|
5521
5541
|
row: row
|
|
5522
5542
|
}).catch(function () {
|
|
5523
5543
|
return [];
|
|
@@ -5533,29 +5553,29 @@ var Methods = {
|
|
|
5533
5553
|
}
|
|
5534
5554
|
|
|
5535
5555
|
if (childRecords) {
|
|
5536
|
-
|
|
5556
|
+
_this44.loadTreeChildren(row, childRecords).then(function (childRows) {
|
|
5537
5557
|
if (childRows.length && treeExpandeds.indexOf(row) === -1) {
|
|
5538
5558
|
treeExpandeds.push(row);
|
|
5539
5559
|
} // 如果当前节点已选中,则展开后子节点也被选中
|
|
5540
5560
|
|
|
5541
5561
|
|
|
5542
|
-
if (!checkStrictly &&
|
|
5543
|
-
|
|
5562
|
+
if (!checkStrictly && _this44.isCheckedByCheckboxRow(row)) {
|
|
5563
|
+
_this44.setCheckboxRow(childRows, true);
|
|
5544
5564
|
}
|
|
5545
5565
|
|
|
5546
|
-
|
|
5566
|
+
_this44.$nextTick().then(function () {
|
|
5547
5567
|
if (transform) {
|
|
5548
|
-
return
|
|
5568
|
+
return _this44.handleTableData();
|
|
5549
5569
|
}
|
|
5550
5570
|
}).then(function () {
|
|
5551
|
-
return
|
|
5571
|
+
return _this44.recalculate();
|
|
5552
5572
|
}).then(function () {
|
|
5553
5573
|
return resolve();
|
|
5554
5574
|
});
|
|
5555
5575
|
});
|
|
5556
5576
|
} else {
|
|
5557
|
-
|
|
5558
|
-
return
|
|
5577
|
+
_this44.$nextTick().then(function () {
|
|
5578
|
+
return _this44.recalculate();
|
|
5559
5579
|
}).then(function () {
|
|
5560
5580
|
return resolve();
|
|
5561
5581
|
});
|
|
@@ -5593,7 +5613,7 @@ var Methods = {
|
|
|
5593
5613
|
* @returns
|
|
5594
5614
|
*/
|
|
5595
5615
|
handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
|
|
5596
|
-
var
|
|
5616
|
+
var _this45 = this;
|
|
5597
5617
|
|
|
5598
5618
|
var fullAllDataRowMap = this.fullAllDataRowMap,
|
|
5599
5619
|
tableFullData = this.tableFullData,
|
|
@@ -5641,7 +5661,7 @@ var Methods = {
|
|
|
5641
5661
|
var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
|
|
5642
5662
|
|
|
5643
5663
|
if (isLoad) {
|
|
5644
|
-
result.push(
|
|
5664
|
+
result.push(_this45.handleAsyncTreeExpandChilds(row));
|
|
5645
5665
|
} else {
|
|
5646
5666
|
if (row[children] && row[children].length) {
|
|
5647
5667
|
treeExpandeds.push(row);
|
|
@@ -5657,7 +5677,7 @@ var Methods = {
|
|
|
5657
5677
|
|
|
5658
5678
|
if (reserve) {
|
|
5659
5679
|
validRows.forEach(function (row) {
|
|
5660
|
-
return
|
|
5680
|
+
return _this45.handleTreeExpandReserve(row, expanded);
|
|
5661
5681
|
});
|
|
5662
5682
|
}
|
|
5663
5683
|
|
|
@@ -5671,14 +5691,14 @@ var Methods = {
|
|
|
5671
5691
|
* @returns
|
|
5672
5692
|
*/
|
|
5673
5693
|
handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
|
|
5674
|
-
var
|
|
5694
|
+
var _this46 = this;
|
|
5675
5695
|
|
|
5676
5696
|
return this.handleBaseTreeExpand(rows, expanded).then(function () {
|
|
5677
|
-
|
|
5697
|
+
_this46.handleVirtualTreeToList();
|
|
5678
5698
|
|
|
5679
|
-
return
|
|
5699
|
+
return _this46.handleTableData();
|
|
5680
5700
|
}).then(function () {
|
|
5681
|
-
return
|
|
5701
|
+
return _this46.recalculate();
|
|
5682
5702
|
});
|
|
5683
5703
|
},
|
|
5684
5704
|
|
|
@@ -5723,7 +5743,7 @@ var Methods = {
|
|
|
5723
5743
|
* 手动清空树形节点的展开状态,数据会恢复成未展开的状态
|
|
5724
5744
|
*/
|
|
5725
5745
|
clearTreeExpand: function clearTreeExpand() {
|
|
5726
|
-
var
|
|
5746
|
+
var _this47 = this;
|
|
5727
5747
|
|
|
5728
5748
|
var treeOpts = this.treeOpts,
|
|
5729
5749
|
treeExpandeds = this.treeExpandeds,
|
|
@@ -5735,19 +5755,19 @@ var Methods = {
|
|
|
5735
5755
|
|
|
5736
5756
|
if (reserve) {
|
|
5737
5757
|
_xeUtils.default.eachTree(tableFullData, function (row) {
|
|
5738
|
-
return
|
|
5758
|
+
return _this47.handleTreeExpandReserve(row, false);
|
|
5739
5759
|
}, treeOpts);
|
|
5740
5760
|
}
|
|
5741
5761
|
|
|
5742
5762
|
return this.handleTableData().then(function () {
|
|
5743
5763
|
if (transform) {
|
|
5744
|
-
|
|
5764
|
+
_this47.handleVirtualTreeToList();
|
|
5745
5765
|
|
|
5746
|
-
return
|
|
5766
|
+
return _this47.handleTableData();
|
|
5747
5767
|
}
|
|
5748
5768
|
}).then(function () {
|
|
5749
5769
|
if (isExists) {
|
|
5750
|
-
|
|
5770
|
+
_this47.recalculate();
|
|
5751
5771
|
}
|
|
5752
5772
|
});
|
|
5753
5773
|
},
|
|
@@ -5877,18 +5897,18 @@ var Methods = {
|
|
|
5877
5897
|
},
|
|
5878
5898
|
// 计算可视渲染相关数据
|
|
5879
5899
|
computeScrollLoad: function computeScrollLoad() {
|
|
5880
|
-
var
|
|
5900
|
+
var _this48 = this;
|
|
5881
5901
|
|
|
5882
5902
|
return this.$nextTick().then(function () {
|
|
5883
|
-
var sYOpts =
|
|
5884
|
-
sXOpts =
|
|
5885
|
-
scrollXLoad =
|
|
5886
|
-
scrollYLoad =
|
|
5887
|
-
scrollXStore =
|
|
5888
|
-
scrollYStore =
|
|
5903
|
+
var sYOpts = _this48.sYOpts,
|
|
5904
|
+
sXOpts = _this48.sXOpts,
|
|
5905
|
+
scrollXLoad = _this48.scrollXLoad,
|
|
5906
|
+
scrollYLoad = _this48.scrollYLoad,
|
|
5907
|
+
scrollXStore = _this48.scrollXStore,
|
|
5908
|
+
scrollYStore = _this48.scrollYStore; // 计算 X 逻辑
|
|
5889
5909
|
|
|
5890
5910
|
if (scrollXLoad) {
|
|
5891
|
-
var _computeVirtualX3 = computeVirtualX(
|
|
5911
|
+
var _computeVirtualX3 = computeVirtualX(_this48),
|
|
5892
5912
|
visibleXSize = _computeVirtualX3.visibleSize;
|
|
5893
5913
|
|
|
5894
5914
|
var offsetXSize = sXOpts.oSize ? _xeUtils.default.toNumber(sXOpts.oSize) : _dom.browse.msie ? 10 : _dom.browse.edge ? 5 : 0;
|
|
@@ -5896,13 +5916,13 @@ var Methods = {
|
|
|
5896
5916
|
scrollXStore.visibleSize = visibleXSize;
|
|
5897
5917
|
scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
|
|
5898
5918
|
|
|
5899
|
-
|
|
5919
|
+
_this48.updateScrollXData();
|
|
5900
5920
|
} else {
|
|
5901
|
-
|
|
5921
|
+
_this48.updateScrollXSpace();
|
|
5902
5922
|
} // 计算 Y 逻辑
|
|
5903
5923
|
|
|
5904
5924
|
|
|
5905
|
-
var _computeVirtualY = computeVirtualY(
|
|
5925
|
+
var _computeVirtualY = computeVirtualY(_this48),
|
|
5906
5926
|
rowHeight = _computeVirtualY.rowHeight,
|
|
5907
5927
|
visibleYSize = _computeVirtualY.visibleSize;
|
|
5908
5928
|
|
|
@@ -5914,14 +5934,14 @@ var Methods = {
|
|
|
5914
5934
|
scrollYStore.visibleSize = visibleYSize;
|
|
5915
5935
|
scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
|
|
5916
5936
|
|
|
5917
|
-
|
|
5937
|
+
_this48.updateScrollYData();
|
|
5918
5938
|
} else {
|
|
5919
|
-
|
|
5939
|
+
_this48.updateScrollYSpace();
|
|
5920
5940
|
}
|
|
5921
5941
|
|
|
5922
|
-
|
|
5942
|
+
_this48.rowHeight = rowHeight;
|
|
5923
5943
|
|
|
5924
|
-
|
|
5944
|
+
_this48.$nextTick(_this48.updateStyle);
|
|
5925
5945
|
});
|
|
5926
5946
|
},
|
|
5927
5947
|
handleTableColumn: function handleTableColumn() {
|
|
@@ -6035,7 +6055,7 @@ var Methods = {
|
|
|
6035
6055
|
* @param {Number} scrollTop 上距离
|
|
6036
6056
|
*/
|
|
6037
6057
|
scrollTo: function scrollTo(scrollLeft, scrollTop) {
|
|
6038
|
-
var
|
|
6058
|
+
var _this49 = this;
|
|
6039
6059
|
|
|
6040
6060
|
var $refs = this.$refs;
|
|
6041
6061
|
var tableBody = $refs.tableBody,
|
|
@@ -6056,7 +6076,7 @@ var Methods = {
|
|
|
6056
6076
|
if (this.scrollXLoad || this.scrollYLoad) {
|
|
6057
6077
|
return new Promise(function (resolve) {
|
|
6058
6078
|
return setTimeout(function () {
|
|
6059
|
-
return resolve(
|
|
6079
|
+
return resolve(_this49.$nextTick());
|
|
6060
6080
|
}, 50);
|
|
6061
6081
|
});
|
|
6062
6082
|
}
|
|
@@ -6107,7 +6127,7 @@ var Methods = {
|
|
|
6107
6127
|
* @param {Row} row 行对象
|
|
6108
6128
|
*/
|
|
6109
6129
|
scrollToTreeRow: function scrollToTreeRow(row) {
|
|
6110
|
-
var
|
|
6130
|
+
var _this50 = this;
|
|
6111
6131
|
|
|
6112
6132
|
var tableFullData = this.tableFullData,
|
|
6113
6133
|
treeConfig = this.treeConfig,
|
|
@@ -6122,15 +6142,15 @@ var Methods = {
|
|
|
6122
6142
|
if (matchObj) {
|
|
6123
6143
|
var nodes = matchObj.nodes;
|
|
6124
6144
|
nodes.forEach(function (row, index) {
|
|
6125
|
-
if (index < nodes.length - 1 && !
|
|
6126
|
-
rests.push(
|
|
6145
|
+
if (index < nodes.length - 1 && !_this50.isTreeExpandByRow(row)) {
|
|
6146
|
+
rests.push(_this50.setTreeExpand(row, true));
|
|
6127
6147
|
}
|
|
6128
6148
|
});
|
|
6129
6149
|
}
|
|
6130
6150
|
}
|
|
6131
6151
|
|
|
6132
6152
|
return Promise.all(rests).then(function () {
|
|
6133
|
-
return _tools.DomTools.rowToVisible(
|
|
6153
|
+
return _tools.DomTools.rowToVisible(_this50, row);
|
|
6134
6154
|
});
|
|
6135
6155
|
},
|
|
6136
6156
|
|
|
@@ -6194,29 +6214,29 @@ var Methods = {
|
|
|
6194
6214
|
* 如果单元格配置了校验规则,则会进行校验
|
|
6195
6215
|
*/
|
|
6196
6216
|
updateStatus: function updateStatus(scope, cellValue) {
|
|
6197
|
-
var
|
|
6217
|
+
var _this51 = this;
|
|
6198
6218
|
|
|
6199
6219
|
var customVal = !_xeUtils.default.isUndefined(cellValue);
|
|
6200
6220
|
return this.$nextTick().then(function () {
|
|
6201
|
-
var $refs =
|
|
6202
|
-
editRules =
|
|
6203
|
-
validStore =
|
|
6221
|
+
var $refs = _this51.$refs,
|
|
6222
|
+
editRules = _this51.editRules,
|
|
6223
|
+
validStore = _this51.validStore;
|
|
6204
6224
|
|
|
6205
6225
|
if (scope && $refs.tableBody && editRules) {
|
|
6206
6226
|
var row = scope.row,
|
|
6207
6227
|
column = scope.column;
|
|
6208
6228
|
var type = 'change';
|
|
6209
6229
|
|
|
6210
|
-
if (
|
|
6211
|
-
var cell =
|
|
6230
|
+
if (_this51.hasCellRules(type, row, column)) {
|
|
6231
|
+
var cell = _this51.getCell(row, column);
|
|
6212
6232
|
|
|
6213
6233
|
if (cell) {
|
|
6214
|
-
return
|
|
6234
|
+
return _this51.validCellRules(type, row, column, cellValue).then(function () {
|
|
6215
6235
|
if (customVal && validStore.visible) {
|
|
6216
6236
|
setCellValue(row, column, cellValue);
|
|
6217
6237
|
}
|
|
6218
6238
|
|
|
6219
|
-
|
|
6239
|
+
_this51.clearValidate();
|
|
6220
6240
|
}).catch(function (_ref8) {
|
|
6221
6241
|
var rule = _ref8.rule;
|
|
6222
6242
|
|
|
@@ -6224,7 +6244,7 @@ var Methods = {
|
|
|
6224
6244
|
setCellValue(row, column, cellValue);
|
|
6225
6245
|
}
|
|
6226
6246
|
|
|
6227
|
-
|
|
6247
|
+
_this51.showValidTooltip({
|
|
6228
6248
|
rule: rule,
|
|
6229
6249
|
row: row,
|
|
6230
6250
|
column: column,
|
|
@@ -6245,7 +6265,7 @@ var Methods = {
|
|
|
6245
6265
|
* @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
|
|
6246
6266
|
*/
|
|
6247
6267
|
setMergeCells: function setMergeCells(merges) {
|
|
6248
|
-
var
|
|
6268
|
+
var _this52 = this;
|
|
6249
6269
|
|
|
6250
6270
|
if (this.spanMethod) {
|
|
6251
6271
|
_tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
|
|
@@ -6253,7 +6273,7 @@ var Methods = {
|
|
|
6253
6273
|
|
|
6254
6274
|
setMerges(this, merges, this.mergeList, this.afterFullData);
|
|
6255
6275
|
return this.$nextTick().then(function () {
|
|
6256
|
-
return
|
|
6276
|
+
return _this52.updateCellAreas();
|
|
6257
6277
|
});
|
|
6258
6278
|
},
|
|
6259
6279
|
|
|
@@ -6262,7 +6282,7 @@ var Methods = {
|
|
|
6262
6282
|
* @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
|
|
6263
6283
|
*/
|
|
6264
6284
|
removeMergeCells: function removeMergeCells(merges) {
|
|
6265
|
-
var
|
|
6285
|
+
var _this53 = this;
|
|
6266
6286
|
|
|
6267
6287
|
if (this.spanMethod) {
|
|
6268
6288
|
_tools.UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
|
|
@@ -6270,7 +6290,7 @@ var Methods = {
|
|
|
6270
6290
|
|
|
6271
6291
|
var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
|
|
6272
6292
|
return this.$nextTick().then(function () {
|
|
6273
|
-
|
|
6293
|
+
_this53.updateCellAreas();
|
|
6274
6294
|
|
|
6275
6295
|
return rest;
|
|
6276
6296
|
});
|
|
@@ -6294,7 +6314,7 @@ var Methods = {
|
|
|
6294
6314
|
this.setMergeFooterItems(this.mergeFooterItems);
|
|
6295
6315
|
},
|
|
6296
6316
|
setMergeFooterItems: function setMergeFooterItems(merges) {
|
|
6297
|
-
var
|
|
6317
|
+
var _this54 = this;
|
|
6298
6318
|
|
|
6299
6319
|
if (this.footerSpanMethod) {
|
|
6300
6320
|
_tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
|
|
@@ -6302,11 +6322,11 @@ var Methods = {
|
|
|
6302
6322
|
|
|
6303
6323
|
setMerges(this, merges, this.mergeFooterList, null);
|
|
6304
6324
|
return this.$nextTick().then(function () {
|
|
6305
|
-
return
|
|
6325
|
+
return _this54.updateCellAreas();
|
|
6306
6326
|
});
|
|
6307
6327
|
},
|
|
6308
6328
|
removeMergeFooterItems: function removeMergeFooterItems(merges) {
|
|
6309
|
-
var
|
|
6329
|
+
var _this55 = this;
|
|
6310
6330
|
|
|
6311
6331
|
if (this.footerSpanMethod) {
|
|
6312
6332
|
_tools.UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
|
|
@@ -6314,7 +6334,7 @@ var Methods = {
|
|
|
6314
6334
|
|
|
6315
6335
|
var rest = removeMerges(this, merges, this.mergeFooterList, null);
|
|
6316
6336
|
return this.$nextTick().then(function () {
|
|
6317
|
-
|
|
6337
|
+
_this55.updateCellAreas();
|
|
6318
6338
|
|
|
6319
6339
|
return rest;
|
|
6320
6340
|
});
|