vxe-table 3.6.14-beta.1 → 3.6.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/README.md +1 -1
- package/lib/form/src/form-config-item.js +4 -1
- package/lib/form/src/form-config-item.min.js +1 -1
- package/lib/form/src/form-item.js +4 -1
- package/lib/form/src/form-item.min.js +1 -1
- package/lib/icon/style/style.css +1 -1
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +299 -291
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/table/src/methods.js +298 -287
- package/lib/table/src/methods.min.js +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.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/package.json +1 -1
- package/packages/form/src/form-config-item.js +4 -1
- package/packages/form/src/form-item.js +4 -1
- package/packages/table/src/methods.js +29 -8
- package/types/table.d.ts +5 -0
- package/types/v-x-e-table/renderer.d.ts +2 -0
- /package/lib/icon/style/{iconfont.1683440144042.ttf → iconfont.1684560851897.ttf} +0 -0
- /package/lib/icon/style/{iconfont.1683440144042.woff → iconfont.1684560851897.woff} +0 -0
- /package/lib/icon/style/{iconfont.1683440144042.woff2 → iconfont.1684560851897.woff2} +0 -0
- /package/lib/{iconfont.1683440144042.ttf → iconfont.1684560851897.ttf} +0 -0
- /package/lib/{iconfont.1683440144042.woff → iconfont.1684560851897.woff} +0 -0
- /package/lib/{iconfont.1683440144042.woff2 → iconfont.1684560851897.woff2} +0 -0
package/lib/index.umd.js
CHANGED
|
@@ -11033,7 +11033,7 @@ var es_array_concat = __webpack_require__(2222);
|
|
|
11033
11033
|
|
|
11034
11034
|
|
|
11035
11035
|
function getLog(message, params) {
|
|
11036
|
-
return "[vxe-table v".concat("3.6.14-beta.
|
|
11036
|
+
return "[vxe-table v".concat("3.6.14-beta.2", "] ").concat(conf.i18n(message, params));
|
|
11037
11037
|
}
|
|
11038
11038
|
function outLog(type) {
|
|
11039
11039
|
return function (message, params) {
|
|
@@ -12220,7 +12220,7 @@ function _t(key, args) {
|
|
|
12220
12220
|
var v = 'v3';
|
|
12221
12221
|
var VXETable = {
|
|
12222
12222
|
v: v,
|
|
12223
|
-
version: "3.6.14-beta.
|
|
12223
|
+
version: "3.6.14-beta.2",
|
|
12224
12224
|
reg: reg,
|
|
12225
12225
|
use: use,
|
|
12226
12226
|
setup: setup,
|
|
@@ -16086,7 +16086,9 @@ var Methods = {
|
|
|
16086
16086
|
var tableFullColumn = this.tableFullColumn,
|
|
16087
16087
|
collectColumn = this.collectColumn,
|
|
16088
16088
|
fullColumnMap = this.fullColumnMap,
|
|
16089
|
-
showOverflow = this.showOverflow
|
|
16089
|
+
showOverflow = this.showOverflow,
|
|
16090
|
+
columnOpts = this.columnOpts,
|
|
16091
|
+
rowOpts = this.rowOpts;
|
|
16090
16092
|
var fullColumnIdData = this.fullColumnIdData = {};
|
|
16091
16093
|
var fullColumnFieldData = this.fullColumnFieldData = {};
|
|
16092
16094
|
var isGroup = collectColumn.some(hasChildrenList);
|
|
@@ -16095,6 +16097,7 @@ var Methods = {
|
|
|
16095
16097
|
var treeNodeColumn;
|
|
16096
16098
|
var checkboxColumn;
|
|
16097
16099
|
var radioColumn;
|
|
16100
|
+
var htmlColumn;
|
|
16098
16101
|
var hasFixed;
|
|
16099
16102
|
var handleFunc = function handleFunc(column, index, items, path, parent) {
|
|
16100
16103
|
var colid = column.id,
|
|
@@ -16116,6 +16119,9 @@ var Methods = {
|
|
|
16116
16119
|
if (!hasFixed && fixed) {
|
|
16117
16120
|
hasFixed = fixed;
|
|
16118
16121
|
}
|
|
16122
|
+
if (!htmlColumn && type === 'html') {
|
|
16123
|
+
htmlColumn = column;
|
|
16124
|
+
}
|
|
16119
16125
|
if (treeNode) {
|
|
16120
16126
|
if (false) {}
|
|
16121
16127
|
if (!treeNodeColumn) {
|
|
@@ -16129,6 +16135,7 @@ var Methods = {
|
|
|
16129
16135
|
}
|
|
16130
16136
|
if (false) {}
|
|
16131
16137
|
if (false) {}
|
|
16138
|
+
if (false) {}
|
|
16132
16139
|
if (isAllOverflow && column.showOverflow === false) {
|
|
16133
16140
|
isAllOverflow = false;
|
|
16134
16141
|
}
|
|
@@ -16292,7 +16299,7 @@ var Methods = {
|
|
|
16292
16299
|
expandOpts = this.expandOpts;
|
|
16293
16300
|
var rowkey = getRowkey(this);
|
|
16294
16301
|
if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records)) {
|
|
16295
|
-
records = [records];
|
|
16302
|
+
records = [records || {}];
|
|
16296
16303
|
}
|
|
16297
16304
|
return records.map(function (record) {
|
|
16298
16305
|
_this13.tableFullColumn.forEach(function (column) {
|
|
@@ -16336,14 +16343,8 @@ var Methods = {
|
|
|
16336
16343
|
*/
|
|
16337
16344
|
createData: function createData(records) {
|
|
16338
16345
|
var _this14 = this;
|
|
16339
|
-
var treeConfig = this.treeConfig,
|
|
16340
|
-
treeOpts = this.treeOpts;
|
|
16341
|
-
var handleRrecord = function handleRrecord(record) {
|
|
16342
|
-
return _this14.defineField(Object.assign({}, record));
|
|
16343
|
-
};
|
|
16344
|
-
var rows = treeConfig ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
|
|
16345
16346
|
return this.$nextTick().then(function () {
|
|
16346
|
-
return
|
|
16347
|
+
return _this14.defineField(records);
|
|
16347
16348
|
});
|
|
16348
16349
|
},
|
|
16349
16350
|
/**
|
|
@@ -16352,15 +16353,12 @@ var Methods = {
|
|
|
16352
16353
|
* @param {Array/Object} records 新数据
|
|
16353
16354
|
*/
|
|
16354
16355
|
createRow: function createRow(records) {
|
|
16355
|
-
var _this15 = this;
|
|
16356
16356
|
var isArr = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(records);
|
|
16357
16357
|
if (!isArr) {
|
|
16358
16358
|
records = [records];
|
|
16359
16359
|
}
|
|
16360
|
-
return this
|
|
16361
|
-
return
|
|
16362
|
-
return isArr ? rows : rows[0];
|
|
16363
|
-
});
|
|
16360
|
+
return this.createData(records).then(function (rows) {
|
|
16361
|
+
return isArr ? rows : rows[0];
|
|
16364
16362
|
});
|
|
16365
16363
|
},
|
|
16366
16364
|
/**
|
|
@@ -16371,7 +16369,7 @@ var Methods = {
|
|
|
16371
16369
|
* 如果还额外传了 field 则还原指定的单元格数据
|
|
16372
16370
|
*/
|
|
16373
16371
|
revertData: function revertData(rows, field) {
|
|
16374
|
-
var
|
|
16372
|
+
var _this15 = this;
|
|
16375
16373
|
var keepSource = this.keepSource,
|
|
16376
16374
|
tableSourceData = this.tableSourceData,
|
|
16377
16375
|
treeConfig = this.treeConfig;
|
|
@@ -16389,8 +16387,8 @@ var Methods = {
|
|
|
16389
16387
|
}
|
|
16390
16388
|
if (targetRows.length) {
|
|
16391
16389
|
targetRows.forEach(function (row) {
|
|
16392
|
-
if (!
|
|
16393
|
-
var rowIndex =
|
|
16390
|
+
if (!_this15.isInsertByRow(row)) {
|
|
16391
|
+
var rowIndex = _this15.getRowIndex(row);
|
|
16394
16392
|
if (treeConfig && rowIndex === -1) {
|
|
16395
16393
|
errLog('vxe.error.noTree', ['revertData']);
|
|
16396
16394
|
}
|
|
@@ -16464,7 +16462,7 @@ var Methods = {
|
|
|
16464
16462
|
* @param {String} field 字段名
|
|
16465
16463
|
*/
|
|
16466
16464
|
isUpdateByRow: function isUpdateByRow(row, field) {
|
|
16467
|
-
var
|
|
16465
|
+
var _this16 = this;
|
|
16468
16466
|
var visibleColumn = this.visibleColumn,
|
|
16469
16467
|
keepSource = this.keepSource,
|
|
16470
16468
|
treeConfig = this.treeConfig,
|
|
@@ -16481,7 +16479,7 @@ var Methods = {
|
|
|
16481
16479
|
if (treeConfig) {
|
|
16482
16480
|
var children = treeOpts.children;
|
|
16483
16481
|
var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableSourceData, function (item) {
|
|
16484
|
-
return rowid === getRowid(
|
|
16482
|
+
return rowid === getRowid(_this16, item);
|
|
16485
16483
|
}, treeOpts);
|
|
16486
16484
|
row = Object.assign({}, row, _defineProperty({}, children, null));
|
|
16487
16485
|
if (matchObj) {
|
|
@@ -16552,7 +16550,7 @@ var Methods = {
|
|
|
16552
16550
|
* 用于多选行,获取已选中的数据
|
|
16553
16551
|
*/
|
|
16554
16552
|
getCheckboxRecords: function getCheckboxRecords(isFull) {
|
|
16555
|
-
var
|
|
16553
|
+
var _this17 = this;
|
|
16556
16554
|
var tableFullData = this.tableFullData,
|
|
16557
16555
|
afterFullData = this.afterFullData,
|
|
16558
16556
|
treeConfig = this.treeConfig,
|
|
@@ -16582,13 +16580,13 @@ var Methods = {
|
|
|
16582
16580
|
var selection = this.selection;
|
|
16583
16581
|
if (treeConfig) {
|
|
16584
16582
|
rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
|
|
16585
|
-
return
|
|
16583
|
+
return _this17.findRowIndexOf(selection, row) > -1;
|
|
16586
16584
|
}, {
|
|
16587
16585
|
children: transform ? mapChildren : children
|
|
16588
16586
|
});
|
|
16589
16587
|
} else {
|
|
16590
16588
|
rowList = currTableData.filter(function (row) {
|
|
16591
|
-
return
|
|
16589
|
+
return _this17.findRowIndexOf(selection, row) > -1;
|
|
16592
16590
|
});
|
|
16593
16591
|
}
|
|
16594
16592
|
}
|
|
@@ -16626,7 +16624,7 @@ var Methods = {
|
|
|
16626
16624
|
* 如果存在筛选条件,继续处理
|
|
16627
16625
|
*/
|
|
16628
16626
|
updateAfterFullData: function updateAfterFullData() {
|
|
16629
|
-
var
|
|
16627
|
+
var _this18 = this;
|
|
16630
16628
|
var tableFullColumn = this.tableFullColumn,
|
|
16631
16629
|
tableFullData = this.tableFullData,
|
|
16632
16630
|
filterOpts = this.filterOpts,
|
|
@@ -16702,7 +16700,7 @@ var Methods = {
|
|
|
16702
16700
|
cellValue: cellValue,
|
|
16703
16701
|
row: row,
|
|
16704
16702
|
column: column,
|
|
16705
|
-
$table:
|
|
16703
|
+
$table: _this18
|
|
16706
16704
|
});
|
|
16707
16705
|
});
|
|
16708
16706
|
} else if (compFilterMethod) {
|
|
@@ -16713,7 +16711,7 @@ var Methods = {
|
|
|
16713
16711
|
cellValue: cellValue,
|
|
16714
16712
|
row: row,
|
|
16715
16713
|
column: column,
|
|
16716
|
-
$table:
|
|
16714
|
+
$table: _this18
|
|
16717
16715
|
});
|
|
16718
16716
|
});
|
|
16719
16717
|
} else if (allFilterMethod) {
|
|
@@ -16732,7 +16730,7 @@ var Methods = {
|
|
|
16732
16730
|
cellValue: cellValue,
|
|
16733
16731
|
row: row,
|
|
16734
16732
|
column: column,
|
|
16735
|
-
$table:
|
|
16733
|
+
$table: _this18
|
|
16736
16734
|
});
|
|
16737
16735
|
});
|
|
16738
16736
|
}
|
|
@@ -16780,7 +16778,7 @@ var Methods = {
|
|
|
16780
16778
|
tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableTree, orderColumns.map(function (_ref2) {
|
|
16781
16779
|
var column = _ref2.column,
|
|
16782
16780
|
order = _ref2.order;
|
|
16783
|
-
return [getOrderField(
|
|
16781
|
+
return [getOrderField(_this18, column), order];
|
|
16784
16782
|
}));
|
|
16785
16783
|
}
|
|
16786
16784
|
tableData = tableTree;
|
|
@@ -16802,7 +16800,7 @@ var Methods = {
|
|
|
16802
16800
|
tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, orderColumns.map(function (_ref3) {
|
|
16803
16801
|
var column = _ref3.column,
|
|
16804
16802
|
order = _ref3.order;
|
|
16805
|
-
return [getOrderField(
|
|
16803
|
+
return [getOrderField(_this18, column), order];
|
|
16806
16804
|
}));
|
|
16807
16805
|
} else {
|
|
16808
16806
|
// 兼容 v2,在 v4 中废弃, sortBy 不能为数组
|
|
@@ -16815,7 +16813,7 @@ var Methods = {
|
|
|
16815
16813
|
tableData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableData, sortByConfs || [firstOrderColumn].map(function (_ref4) {
|
|
16816
16814
|
var column = _ref4.column,
|
|
16817
16815
|
order = _ref4.order;
|
|
16818
|
-
return [getOrderField(
|
|
16816
|
+
return [getOrderField(_this18, column), order];
|
|
16819
16817
|
}));
|
|
16820
16818
|
}
|
|
16821
16819
|
}
|
|
@@ -16831,7 +16829,7 @@ var Methods = {
|
|
|
16831
16829
|
* 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗,使运行时更加流畅
|
|
16832
16830
|
*/
|
|
16833
16831
|
updateAfterDataIndex: function updateAfterDataIndex() {
|
|
16834
|
-
var
|
|
16832
|
+
var _this19 = this;
|
|
16835
16833
|
var treeConfig = this.treeConfig,
|
|
16836
16834
|
afterFullData = this.afterFullData,
|
|
16837
16835
|
fullDataRowIdData = this.fullDataRowIdData,
|
|
@@ -16840,7 +16838,7 @@ var Methods = {
|
|
|
16840
16838
|
treeOpts = this.treeOpts;
|
|
16841
16839
|
if (treeConfig) {
|
|
16842
16840
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, function (row, index, items, path) {
|
|
16843
|
-
var rowid = getRowid(
|
|
16841
|
+
var rowid = getRowid(_this19, row);
|
|
16844
16842
|
var allrest = fullAllDataRowIdData[rowid];
|
|
16845
16843
|
var seq = path.map(function (num, i) {
|
|
16846
16844
|
return i % 2 === 0 ? Number(num) + 1 : '.';
|
|
@@ -16868,7 +16866,7 @@ var Methods = {
|
|
|
16868
16866
|
});
|
|
16869
16867
|
} else {
|
|
16870
16868
|
afterFullData.forEach(function (row, index) {
|
|
16871
|
-
var rowid = getRowid(
|
|
16869
|
+
var rowid = getRowid(_this19, row);
|
|
16872
16870
|
var allrest = fullAllDataRowIdData[rowid];
|
|
16873
16871
|
var seq = index + 1;
|
|
16874
16872
|
if (allrest) {
|
|
@@ -16950,7 +16948,7 @@ var Methods = {
|
|
|
16950
16948
|
* 默认执行一次,除非被重置
|
|
16951
16949
|
*/
|
|
16952
16950
|
handleLoadDefaults: function handleLoadDefaults() {
|
|
16953
|
-
var
|
|
16951
|
+
var _this20 = this;
|
|
16954
16952
|
if (this.checkboxConfig) {
|
|
16955
16953
|
this.handleDefaultSelectionChecked();
|
|
16956
16954
|
}
|
|
@@ -16970,7 +16968,7 @@ var Methods = {
|
|
|
16970
16968
|
this.handleDefaultMergeFooterItems();
|
|
16971
16969
|
}
|
|
16972
16970
|
this.$nextTick(function () {
|
|
16973
|
-
return setTimeout(
|
|
16971
|
+
return setTimeout(_this20.recalculate);
|
|
16974
16972
|
});
|
|
16975
16973
|
},
|
|
16976
16974
|
/**
|
|
@@ -17208,11 +17206,11 @@ var Methods = {
|
|
|
17208
17206
|
* 刷新列配置
|
|
17209
17207
|
*/
|
|
17210
17208
|
refreshColumn: function refreshColumn() {
|
|
17211
|
-
var
|
|
17209
|
+
var _this21 = this;
|
|
17212
17210
|
return this.parseColumns().then(function () {
|
|
17213
|
-
return
|
|
17211
|
+
return _this21.refreshScroll();
|
|
17214
17212
|
}).then(function () {
|
|
17215
|
-
return
|
|
17213
|
+
return _this21.recalculate();
|
|
17216
17214
|
});
|
|
17217
17215
|
},
|
|
17218
17216
|
/**
|
|
@@ -17220,7 +17218,7 @@ var Methods = {
|
|
|
17220
17218
|
* 将固定的列左边、右边分别靠边
|
|
17221
17219
|
*/
|
|
17222
17220
|
parseColumns: function parseColumns() {
|
|
17223
|
-
var
|
|
17221
|
+
var _this22 = this;
|
|
17224
17222
|
var leftList = [];
|
|
17225
17223
|
var centerList = [];
|
|
17226
17224
|
var rightList = [];
|
|
@@ -17313,10 +17311,10 @@ var Methods = {
|
|
|
17313
17311
|
this.visibleColumn = visibleColumn;
|
|
17314
17312
|
this.handleTableColumn();
|
|
17315
17313
|
return this.updateFooter().then(function () {
|
|
17316
|
-
return
|
|
17314
|
+
return _this22.recalculate();
|
|
17317
17315
|
}).then(function () {
|
|
17318
|
-
|
|
17319
|
-
return
|
|
17316
|
+
_this22.updateCellAreas();
|
|
17317
|
+
return _this22.recalculate();
|
|
17320
17318
|
});
|
|
17321
17319
|
},
|
|
17322
17320
|
/**
|
|
@@ -17368,7 +17366,7 @@ var Methods = {
|
|
|
17368
17366
|
* 刷新滚动操作,手动同步滚动相关位置(对于某些特殊的操作,比如滚动条错位、固定列不同步)
|
|
17369
17367
|
*/
|
|
17370
17368
|
refreshScroll: function refreshScroll() {
|
|
17371
|
-
var
|
|
17369
|
+
var _this23 = this;
|
|
17372
17370
|
var lastScrollLeft = this.lastScrollLeft,
|
|
17373
17371
|
lastScrollTop = this.lastScrollTop;
|
|
17374
17372
|
var $refs = this.$refs;
|
|
@@ -17383,7 +17381,7 @@ var Methods = {
|
|
|
17383
17381
|
return new Promise(function (resolve) {
|
|
17384
17382
|
// 还原滚动条位置
|
|
17385
17383
|
if (lastScrollLeft || lastScrollTop) {
|
|
17386
|
-
return restoreScrollLocation(
|
|
17384
|
+
return restoreScrollLocation(_this23, lastScrollLeft, lastScrollTop).then(function () {
|
|
17387
17385
|
// 存在滚动行为未结束情况
|
|
17388
17386
|
setTimeout(resolve, 30);
|
|
17389
17387
|
});
|
|
@@ -17402,7 +17400,7 @@ var Methods = {
|
|
|
17402
17400
|
* 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
|
|
17403
17401
|
*/
|
|
17404
17402
|
recalculate: function recalculate(refull) {
|
|
17405
|
-
var
|
|
17403
|
+
var _this24 = this;
|
|
17406
17404
|
var $refs = this.$refs;
|
|
17407
17405
|
var tableBody = $refs.tableBody,
|
|
17408
17406
|
tableHeader = $refs.tableHeader,
|
|
@@ -17415,8 +17413,8 @@ var Methods = {
|
|
|
17415
17413
|
if (refull === true) {
|
|
17416
17414
|
// 初始化时需要在列计算之后再执行优化运算,达到最优显示效果
|
|
17417
17415
|
return this.computeScrollLoad().then(function () {
|
|
17418
|
-
|
|
17419
|
-
return
|
|
17416
|
+
_this24.autoCellWidth(headerElem, bodyElem, footerElem);
|
|
17417
|
+
return _this24.computeScrollLoad();
|
|
17420
17418
|
});
|
|
17421
17419
|
}
|
|
17422
17420
|
}
|
|
@@ -17550,7 +17548,7 @@ var Methods = {
|
|
|
17550
17548
|
this.customMaxHeight = calcHeight(this, 'maxHeight');
|
|
17551
17549
|
},
|
|
17552
17550
|
updateStyle: function updateStyle() {
|
|
17553
|
-
var
|
|
17551
|
+
var _this25 = this;
|
|
17554
17552
|
var $refs = this.$refs,
|
|
17555
17553
|
isGroup = this.isGroup,
|
|
17556
17554
|
fullColumnIdData = this.fullColumnIdData,
|
|
@@ -17638,7 +17636,7 @@ var Methods = {
|
|
|
17638
17636
|
var listElem = elemStore["".concat(name, "-").concat(layout, "-list")];
|
|
17639
17637
|
if (isGroup && listElem) {
|
|
17640
17638
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(listElem.querySelectorAll('.col--group'), function (thElem) {
|
|
17641
|
-
var colNode =
|
|
17639
|
+
var colNode = _this25.getColumnNode(thElem);
|
|
17642
17640
|
if (colNode) {
|
|
17643
17641
|
var column = colNode.item;
|
|
17644
17642
|
var showHeaderOverflow = column.showHeaderOverflow;
|
|
@@ -17693,7 +17691,7 @@ var Methods = {
|
|
|
17693
17691
|
// 如果是使用优化模式
|
|
17694
17692
|
if (fixedType) {
|
|
17695
17693
|
// 如果存在展开行使用全量渲染
|
|
17696
|
-
if (!
|
|
17694
|
+
if (!_this25.expandColumn && (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow))) {
|
|
17697
17695
|
if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
|
|
17698
17696
|
_renderColumnList = fixedColumn;
|
|
17699
17697
|
} else {
|
|
@@ -17721,7 +17719,7 @@ var Methods = {
|
|
|
17721
17719
|
// 如果是使用优化模式
|
|
17722
17720
|
if (fixedType) {
|
|
17723
17721
|
// 如果存在展开行使用全量渲染
|
|
17724
|
-
if (!
|
|
17722
|
+
if (!_this25.expandColumn && (scrollXLoad || allColumnFooterOverflow)) {
|
|
17725
17723
|
if (!mergeFooterList.length || !footerSpanMethod) {
|
|
17726
17724
|
_renderColumnList2 = fixedColumn;
|
|
17727
17725
|
} else {
|
|
@@ -17788,9 +17786,9 @@ var Methods = {
|
|
|
17788
17786
|
var colWidth = column.renderWidth;
|
|
17789
17787
|
if (cellElem) {
|
|
17790
17788
|
if (colspan > 1) {
|
|
17791
|
-
var columnIndex =
|
|
17789
|
+
var columnIndex = _this25.getColumnIndex(column);
|
|
17792
17790
|
for (var _index = 1; _index < colspan; _index++) {
|
|
17793
|
-
var nextColumn =
|
|
17791
|
+
var nextColumn = _this25.getColumns(columnIndex + _index);
|
|
17794
17792
|
if (nextColumn) {
|
|
17795
17793
|
colWidth += nextColumn.renderWidth;
|
|
17796
17794
|
}
|
|
@@ -17832,13 +17830,13 @@ var Methods = {
|
|
|
17832
17830
|
}
|
|
17833
17831
|
},
|
|
17834
17832
|
preventEvent: function preventEvent(evnt, type, args, next, end) {
|
|
17835
|
-
var
|
|
17833
|
+
var _this26 = this;
|
|
17836
17834
|
var evntList = v_x_e_table.interceptor.get(type);
|
|
17837
17835
|
var rest;
|
|
17838
17836
|
if (!evntList.some(function (func) {
|
|
17839
17837
|
return func(Object.assign({
|
|
17840
|
-
$grid:
|
|
17841
|
-
$table:
|
|
17838
|
+
$grid: _this26.$xegrid,
|
|
17839
|
+
$table: _this26,
|
|
17842
17840
|
$event: evnt
|
|
17843
17841
|
}, args)) === false;
|
|
17844
17842
|
})) {
|
|
@@ -17855,7 +17853,7 @@ var Methods = {
|
|
|
17855
17853
|
* 全局按下事件处理
|
|
17856
17854
|
*/
|
|
17857
17855
|
handleGlobalMousedownEvent: function handleGlobalMousedownEvent(evnt) {
|
|
17858
|
-
var
|
|
17856
|
+
var _this27 = this;
|
|
17859
17857
|
var $el = this.$el,
|
|
17860
17858
|
$refs = this.$refs,
|
|
17861
17859
|
$xegrid = this.$xegrid,
|
|
@@ -17911,7 +17909,7 @@ var Methods = {
|
|
|
17911
17909
|
isClearActived = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag;
|
|
17912
17910
|
}
|
|
17913
17911
|
// 如果固定了高度且点击了行之外的空白处,则清除激活状态
|
|
17914
|
-
if (!isClearActived &&
|
|
17912
|
+
if (!isClearActived && _this27.height && !_this27.overflowY) {
|
|
17915
17913
|
var bodyWrapperElem = evnt.target;
|
|
17916
17914
|
if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
|
|
17917
17915
|
isClearActived = evnt.offsetY < bodyWrapperElem.clientHeight;
|
|
@@ -17921,7 +17919,7 @@ var Methods = {
|
|
|
17921
17919
|
// 如果点击了当前表格之外
|
|
17922
17920
|
!getEventTargetNode(evnt, $el).flag) {
|
|
17923
17921
|
setTimeout(function () {
|
|
17924
|
-
return
|
|
17922
|
+
return _this27.clearEdit(evnt);
|
|
17925
17923
|
});
|
|
17926
17924
|
}
|
|
17927
17925
|
});
|
|
@@ -17934,8 +17932,8 @@ var Methods = {
|
|
|
17934
17932
|
this.clearSelected();
|
|
17935
17933
|
if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-areas-clear').flag) {
|
|
17936
17934
|
this.preventEvent(evnt, 'event.clearAreas', {}, function () {
|
|
17937
|
-
|
|
17938
|
-
|
|
17935
|
+
_this27.clearCellAreas();
|
|
17936
|
+
_this27.clearCopyCellArea();
|
|
17939
17937
|
});
|
|
17940
17938
|
}
|
|
17941
17939
|
}
|
|
@@ -17965,7 +17963,7 @@ var Methods = {
|
|
|
17965
17963
|
* 表格键盘事件
|
|
17966
17964
|
*/
|
|
17967
17965
|
keydownEvent: function keydownEvent(evnt) {
|
|
17968
|
-
var
|
|
17966
|
+
var _this28 = this;
|
|
17969
17967
|
var filterStore = this.filterStore,
|
|
17970
17968
|
ctxMenuStore = this.ctxMenuStore,
|
|
17971
17969
|
editStore = this.editStore,
|
|
@@ -17978,30 +17976,30 @@ var Methods = {
|
|
|
17978
17976
|
var isEsc = keyCode === 27;
|
|
17979
17977
|
if (isEsc) {
|
|
17980
17978
|
this.preventEvent(evnt, 'event.keydown', null, function () {
|
|
17981
|
-
|
|
17982
|
-
if (keyboardConfig && mouseConfig && mouseOpts.area &&
|
|
17983
|
-
|
|
17979
|
+
_this28.emitEvent('keydown-start', {}, evnt);
|
|
17980
|
+
if (keyboardConfig && mouseConfig && mouseOpts.area && _this28.handleKeyboardEvent) {
|
|
17981
|
+
_this28.handleKeyboardEvent(evnt);
|
|
17984
17982
|
} else if (actived.row || filterStore.visible || ctxMenuStore.visible) {
|
|
17985
17983
|
evnt.stopPropagation();
|
|
17986
17984
|
// 如果按下了 Esc 键,关闭快捷菜单、筛选
|
|
17987
|
-
|
|
17988
|
-
|
|
17985
|
+
_this28.closeFilter();
|
|
17986
|
+
_this28.closeMenu();
|
|
17989
17987
|
if (keyboardConfig && keyboardOpts.isEsc) {
|
|
17990
17988
|
// 如果是激活编辑状态,则取消编辑
|
|
17991
17989
|
if (actived.row) {
|
|
17992
17990
|
var params = actived.args;
|
|
17993
|
-
|
|
17991
|
+
_this28.clearEdit(evnt);
|
|
17994
17992
|
// 如果配置了选中功能,则为选中状态
|
|
17995
17993
|
if (mouseConfig && mouseOpts.selected) {
|
|
17996
|
-
|
|
17997
|
-
return
|
|
17994
|
+
_this28.$nextTick(function () {
|
|
17995
|
+
return _this28.handleSelected(params, evnt);
|
|
17998
17996
|
});
|
|
17999
17997
|
}
|
|
18000
17998
|
}
|
|
18001
17999
|
}
|
|
18002
18000
|
}
|
|
18003
|
-
|
|
18004
|
-
|
|
18001
|
+
_this28.emitEvent('keydown', {}, evnt);
|
|
18002
|
+
_this28.emitEvent('keydown-end', {}, evnt);
|
|
18005
18003
|
});
|
|
18006
18004
|
}
|
|
18007
18005
|
},
|
|
@@ -18009,26 +18007,26 @@ var Methods = {
|
|
|
18009
18007
|
* 全局键盘事件
|
|
18010
18008
|
*/
|
|
18011
18009
|
handleGlobalKeydownEvent: function handleGlobalKeydownEvent(evnt) {
|
|
18012
|
-
var
|
|
18010
|
+
var _this29 = this;
|
|
18013
18011
|
// 该行为只对当前激活的表格有效
|
|
18014
18012
|
if (this.isActivated) {
|
|
18015
18013
|
this.preventEvent(evnt, 'event.keydown', null, function () {
|
|
18016
|
-
var filterStore =
|
|
18017
|
-
isCtxMenu =
|
|
18018
|
-
ctxMenuStore =
|
|
18019
|
-
editStore =
|
|
18020
|
-
editOpts =
|
|
18021
|
-
editConfig =
|
|
18022
|
-
mouseConfig =
|
|
18023
|
-
mouseOpts =
|
|
18024
|
-
keyboardConfig =
|
|
18025
|
-
keyboardOpts =
|
|
18026
|
-
treeConfig =
|
|
18027
|
-
treeOpts =
|
|
18028
|
-
highlightCurrentRow =
|
|
18029
|
-
currentRow =
|
|
18030
|
-
bodyCtxMenu =
|
|
18031
|
-
rowOpts =
|
|
18014
|
+
var filterStore = _this29.filterStore,
|
|
18015
|
+
isCtxMenu = _this29.isCtxMenu,
|
|
18016
|
+
ctxMenuStore = _this29.ctxMenuStore,
|
|
18017
|
+
editStore = _this29.editStore,
|
|
18018
|
+
editOpts = _this29.editOpts,
|
|
18019
|
+
editConfig = _this29.editConfig,
|
|
18020
|
+
mouseConfig = _this29.mouseConfig,
|
|
18021
|
+
mouseOpts = _this29.mouseOpts,
|
|
18022
|
+
keyboardConfig = _this29.keyboardConfig,
|
|
18023
|
+
keyboardOpts = _this29.keyboardOpts,
|
|
18024
|
+
treeConfig = _this29.treeConfig,
|
|
18025
|
+
treeOpts = _this29.treeOpts,
|
|
18026
|
+
highlightCurrentRow = _this29.highlightCurrentRow,
|
|
18027
|
+
currentRow = _this29.currentRow,
|
|
18028
|
+
bodyCtxMenu = _this29.bodyCtxMenu,
|
|
18029
|
+
rowOpts = _this29.rowOpts;
|
|
18032
18030
|
var selected = editStore.selected,
|
|
18033
18031
|
actived = editStore.actived;
|
|
18034
18032
|
var keyCode = evnt.keyCode;
|
|
@@ -18054,7 +18052,7 @@ var Methods = {
|
|
|
18054
18052
|
var params;
|
|
18055
18053
|
if (filterStore.visible) {
|
|
18056
18054
|
if (isEsc) {
|
|
18057
|
-
|
|
18055
|
+
_this29.closeFilter();
|
|
18058
18056
|
}
|
|
18059
18057
|
return;
|
|
18060
18058
|
}
|
|
@@ -18062,19 +18060,19 @@ var Methods = {
|
|
|
18062
18060
|
// 如果配置了右键菜单; 支持方向键操作、回车
|
|
18063
18061
|
evnt.preventDefault();
|
|
18064
18062
|
if (ctxMenuStore.showChild && hasChildrenList(ctxMenuStore.selected)) {
|
|
18065
|
-
|
|
18063
|
+
_this29.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selectChild', 37, false, ctxMenuStore.selected.children);
|
|
18066
18064
|
} else {
|
|
18067
|
-
|
|
18065
|
+
_this29.moveCtxMenu(evnt, keyCode, ctxMenuStore, 'selected', 39, true, _this29.ctxMenuList);
|
|
18068
18066
|
}
|
|
18069
|
-
} else if (keyboardConfig && mouseConfig && mouseOpts.area &&
|
|
18070
|
-
|
|
18067
|
+
} else if (keyboardConfig && mouseConfig && mouseOpts.area && _this29.handleKeyboardEvent) {
|
|
18068
|
+
_this29.handleKeyboardEvent(evnt);
|
|
18071
18069
|
} else if (keyboardConfig && isSpacebar && keyboardOpts.isChecked && selected.row && selected.column && (selected.column.type === 'checkbox' || selected.column.type === 'radio')) {
|
|
18072
18070
|
// 空格键支持选中复选框
|
|
18073
18071
|
evnt.preventDefault();
|
|
18074
18072
|
if (selected.column.type === 'checkbox') {
|
|
18075
|
-
|
|
18073
|
+
_this29.handleToggleCheckRowEvent(evnt, selected.args);
|
|
18076
18074
|
} else {
|
|
18077
|
-
|
|
18075
|
+
_this29.triggerRadioRowEvent(evnt, selected.args);
|
|
18078
18076
|
}
|
|
18079
18077
|
} else if (isF2 && isEnableConf(editConfig)) {
|
|
18080
18078
|
if (!isEditStatus) {
|
|
@@ -18082,15 +18080,15 @@ var Methods = {
|
|
|
18082
18080
|
if (selected.row && selected.column) {
|
|
18083
18081
|
evnt.stopPropagation();
|
|
18084
18082
|
evnt.preventDefault();
|
|
18085
|
-
|
|
18083
|
+
_this29.handleActived(selected.args, evnt);
|
|
18086
18084
|
}
|
|
18087
18085
|
}
|
|
18088
18086
|
} else if (isContextMenu) {
|
|
18089
18087
|
// 如果按下上下文键
|
|
18090
|
-
|
|
18091
|
-
clearTimeout(
|
|
18092
|
-
|
|
18093
|
-
|
|
18088
|
+
_this29._keyCtx = selected.row && selected.column && bodyCtxMenu.length;
|
|
18089
|
+
clearTimeout(_this29.keyCtxTimeout);
|
|
18090
|
+
_this29.keyCtxTimeout = setTimeout(function () {
|
|
18091
|
+
_this29._keyCtx = false;
|
|
18094
18092
|
}, 1000);
|
|
18095
18093
|
} else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
|
|
18096
18094
|
// 退出选中
|
|
@@ -18098,11 +18096,11 @@ var Methods = {
|
|
|
18098
18096
|
// 如果是激活编辑状态,则取消编辑
|
|
18099
18097
|
if (actived.row) {
|
|
18100
18098
|
params = actived.args;
|
|
18101
|
-
|
|
18099
|
+
_this29.clearEdit(evnt);
|
|
18102
18100
|
// 如果配置了选中功能,则为选中状态
|
|
18103
18101
|
if (mouseConfig && mouseOpts.selected) {
|
|
18104
|
-
|
|
18105
|
-
return
|
|
18102
|
+
_this29.$nextTick(function () {
|
|
18103
|
+
return _this29.handleSelected(params, evnt);
|
|
18106
18104
|
});
|
|
18107
18105
|
}
|
|
18108
18106
|
}
|
|
@@ -18112,15 +18110,15 @@ var Methods = {
|
|
|
18112
18110
|
var targetArgs = selected.row ? selected.args : actived.args;
|
|
18113
18111
|
if (hasShiftKey) {
|
|
18114
18112
|
if (keyboardOpts.enterToTab) {
|
|
18115
|
-
|
|
18113
|
+
_this29.moveTabSelected(targetArgs, hasShiftKey, evnt);
|
|
18116
18114
|
} else {
|
|
18117
|
-
|
|
18115
|
+
_this29.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
|
|
18118
18116
|
}
|
|
18119
18117
|
} else {
|
|
18120
18118
|
if (keyboardOpts.enterToTab) {
|
|
18121
|
-
|
|
18119
|
+
_this29.moveTabSelected(targetArgs, hasShiftKey, evnt);
|
|
18122
18120
|
} else {
|
|
18123
|
-
|
|
18121
|
+
_this29.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
|
|
18124
18122
|
}
|
|
18125
18123
|
}
|
|
18126
18124
|
} else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
|
|
@@ -18130,13 +18128,13 @@ var Methods = {
|
|
|
18130
18128
|
evnt.preventDefault();
|
|
18131
18129
|
var targetRow = childrens[0];
|
|
18132
18130
|
params = {
|
|
18133
|
-
$table:
|
|
18131
|
+
$table: _this29,
|
|
18134
18132
|
row: targetRow
|
|
18135
18133
|
};
|
|
18136
|
-
|
|
18137
|
-
return
|
|
18134
|
+
_this29.setTreeExpand(currentRow, true).then(function () {
|
|
18135
|
+
return _this29.scrollToRow(targetRow);
|
|
18138
18136
|
}).then(function () {
|
|
18139
|
-
return
|
|
18137
|
+
return _this29.triggerCurrentRowEvent(evnt, params);
|
|
18140
18138
|
});
|
|
18141
18139
|
}
|
|
18142
18140
|
}
|
|
@@ -18145,18 +18143,18 @@ var Methods = {
|
|
|
18145
18143
|
if (!isEditStatus) {
|
|
18146
18144
|
// 如果按下了方向键
|
|
18147
18145
|
if (selected.row && selected.column) {
|
|
18148
|
-
|
|
18146
|
+
_this29.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
|
|
18149
18147
|
} else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
|
|
18150
18148
|
// 当前行按键上下移动
|
|
18151
|
-
|
|
18149
|
+
_this29.moveCurrentRow(isUpArrow, isDwArrow, evnt);
|
|
18152
18150
|
}
|
|
18153
18151
|
}
|
|
18154
18152
|
} else if (isTab && keyboardConfig && keyboardOpts.isTab) {
|
|
18155
18153
|
// 如果按下了 Tab 键切换
|
|
18156
18154
|
if (selected.row || selected.column) {
|
|
18157
|
-
|
|
18155
|
+
_this29.moveTabSelected(selected.args, hasShiftKey, evnt);
|
|
18158
18156
|
} else if (actived.row || actived.column) {
|
|
18159
|
-
|
|
18157
|
+
_this29.moveTabSelected(actived.args, hasShiftKey, evnt);
|
|
18160
18158
|
}
|
|
18161
18159
|
} else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
|
|
18162
18160
|
if (!isEditStatus) {
|
|
@@ -18167,10 +18165,10 @@ var Methods = {
|
|
|
18167
18165
|
if (delMethod) {
|
|
18168
18166
|
delMethod({
|
|
18169
18167
|
row: selected.row,
|
|
18170
|
-
rowIndex:
|
|
18168
|
+
rowIndex: _this29.getRowIndex(selected.row),
|
|
18171
18169
|
column: selected.column,
|
|
18172
|
-
columnIndex:
|
|
18173
|
-
$table:
|
|
18170
|
+
columnIndex: _this29.getColumnIndex(selected.column),
|
|
18171
|
+
$table: _this29
|
|
18174
18172
|
});
|
|
18175
18173
|
} else {
|
|
18176
18174
|
setCellValue(selected.row, selected.column, null);
|
|
@@ -18179,34 +18177,34 @@ var Methods = {
|
|
|
18179
18177
|
if (backMethod) {
|
|
18180
18178
|
backMethod({
|
|
18181
18179
|
row: selected.row,
|
|
18182
|
-
rowIndex:
|
|
18180
|
+
rowIndex: _this29.getRowIndex(selected.row),
|
|
18183
18181
|
column: selected.column,
|
|
18184
|
-
columnIndex:
|
|
18185
|
-
$table:
|
|
18182
|
+
columnIndex: _this29.getColumnIndex(selected.column),
|
|
18183
|
+
$table: _this29
|
|
18186
18184
|
});
|
|
18187
18185
|
} else {
|
|
18188
|
-
|
|
18186
|
+
_this29.handleActived(selected.args, evnt);
|
|
18189
18187
|
}
|
|
18190
18188
|
} else if (isDel) {
|
|
18191
18189
|
// 如果按下 del 键,更新表尾数据
|
|
18192
|
-
|
|
18190
|
+
_this29.updateFooter();
|
|
18193
18191
|
}
|
|
18194
18192
|
} else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
|
|
18195
18193
|
// 如果树形表格回退键关闭当前行返回父节点
|
|
18196
|
-
var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(
|
|
18194
|
+
var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this29.afterFullData, function (item) {
|
|
18197
18195
|
return item === currentRow;
|
|
18198
18196
|
}, treeOpts),
|
|
18199
18197
|
parentRow = _XEUtils$findTree.parent;
|
|
18200
18198
|
if (parentRow) {
|
|
18201
18199
|
evnt.preventDefault();
|
|
18202
18200
|
params = {
|
|
18203
|
-
$table:
|
|
18201
|
+
$table: _this29,
|
|
18204
18202
|
row: parentRow
|
|
18205
18203
|
};
|
|
18206
|
-
|
|
18207
|
-
return
|
|
18204
|
+
_this29.setTreeExpand(parentRow, false).then(function () {
|
|
18205
|
+
return _this29.scrollToRow(parentRow);
|
|
18208
18206
|
}).then(function () {
|
|
18209
|
-
return
|
|
18207
|
+
return _this29.triggerCurrentRowEvent(evnt, params);
|
|
18210
18208
|
});
|
|
18211
18209
|
}
|
|
18212
18210
|
}
|
|
@@ -18221,24 +18219,24 @@ var Methods = {
|
|
|
18221
18219
|
if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
|
|
18222
18220
|
var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
|
|
18223
18221
|
if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
|
|
18224
|
-
$table:
|
|
18222
|
+
$table: _this29
|
|
18225
18223
|
}))) {
|
|
18226
18224
|
if (editMethod) {
|
|
18227
18225
|
editMethod({
|
|
18228
18226
|
row: selected.row,
|
|
18229
|
-
rowIndex:
|
|
18227
|
+
rowIndex: _this29.getRowIndex(selected.row),
|
|
18230
18228
|
column: selected.column,
|
|
18231
|
-
columnIndex:
|
|
18232
|
-
$table:
|
|
18229
|
+
columnIndex: _this29.getColumnIndex(selected.column),
|
|
18230
|
+
$table: _this29
|
|
18233
18231
|
});
|
|
18234
18232
|
} else {
|
|
18235
18233
|
setCellValue(selected.row, selected.column, null);
|
|
18236
|
-
|
|
18234
|
+
_this29.handleActived(selected.args, evnt);
|
|
18237
18235
|
}
|
|
18238
18236
|
}
|
|
18239
18237
|
}
|
|
18240
18238
|
}
|
|
18241
|
-
|
|
18239
|
+
_this29.emitEvent('keydown', {}, evnt);
|
|
18242
18240
|
});
|
|
18243
18241
|
}
|
|
18244
18242
|
},
|
|
@@ -18313,7 +18311,7 @@ var Methods = {
|
|
|
18313
18311
|
}
|
|
18314
18312
|
},
|
|
18315
18313
|
handleTargetLeaveEvent: function handleTargetLeaveEvent() {
|
|
18316
|
-
var
|
|
18314
|
+
var _this30 = this;
|
|
18317
18315
|
var tooltipOpts = this.tooltipOpts;
|
|
18318
18316
|
var $tooltip = this.$refs.tooltip;
|
|
18319
18317
|
if ($tooltip) {
|
|
@@ -18321,9 +18319,9 @@ var Methods = {
|
|
|
18321
18319
|
}
|
|
18322
18320
|
if (tooltipOpts.enterable) {
|
|
18323
18321
|
this.tooltipTimeout = setTimeout(function () {
|
|
18324
|
-
$tooltip =
|
|
18322
|
+
$tooltip = _this30.$refs.tooltip;
|
|
18325
18323
|
if ($tooltip && !$tooltip.isActived()) {
|
|
18326
|
-
|
|
18324
|
+
_this30.closeTooltip();
|
|
18327
18325
|
}
|
|
18328
18326
|
}, tooltipOpts.leaveDelay);
|
|
18329
18327
|
} else {
|
|
@@ -18501,13 +18499,13 @@ var Methods = {
|
|
|
18501
18499
|
* 获取复选框半选状态的行数据
|
|
18502
18500
|
*/
|
|
18503
18501
|
getCheckboxIndeterminateRecords: function getCheckboxIndeterminateRecords(isFull) {
|
|
18504
|
-
var
|
|
18502
|
+
var _this31 = this;
|
|
18505
18503
|
var treeConfig = this.treeConfig,
|
|
18506
18504
|
treeIndeterminates = this.treeIndeterminates,
|
|
18507
18505
|
fullDataRowIdData = this.fullDataRowIdData;
|
|
18508
18506
|
if (treeConfig) {
|
|
18509
18507
|
return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(function (row) {
|
|
18510
|
-
var rowid = getRowid(
|
|
18508
|
+
var rowid = getRowid(_this31, row);
|
|
18511
18509
|
return fullDataRowIdData[rowid];
|
|
18512
18510
|
});
|
|
18513
18511
|
}
|
|
@@ -18534,12 +18532,12 @@ var Methods = {
|
|
|
18534
18532
|
}
|
|
18535
18533
|
},
|
|
18536
18534
|
handleCheckedCheckboxRow: function handleCheckedCheckboxRow(rows, value, isForce) {
|
|
18537
|
-
var
|
|
18535
|
+
var _this32 = this;
|
|
18538
18536
|
if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
|
|
18539
18537
|
rows = [rows];
|
|
18540
18538
|
}
|
|
18541
18539
|
rows.forEach(function (row) {
|
|
18542
|
-
return
|
|
18540
|
+
return _this32.handleSelectRow({
|
|
18543
18541
|
row: row
|
|
18544
18542
|
}, !!value, isForce);
|
|
18545
18543
|
});
|
|
@@ -18570,7 +18568,7 @@ var Methods = {
|
|
|
18570
18568
|
* value 选中true 不选false 半选-1
|
|
18571
18569
|
*/
|
|
18572
18570
|
handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
|
|
18573
|
-
var
|
|
18571
|
+
var _this33 = this;
|
|
18574
18572
|
var row = _ref6.row;
|
|
18575
18573
|
var selection = this.selection,
|
|
18576
18574
|
afterFullData = this.afterFullData,
|
|
@@ -18591,20 +18589,20 @@ var Methods = {
|
|
|
18591
18589
|
} else {
|
|
18592
18590
|
// 更新子节点状态
|
|
18593
18591
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
|
|
18594
|
-
if (
|
|
18592
|
+
if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
|
|
18595
18593
|
row: item
|
|
18596
18594
|
})) {
|
|
18597
18595
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, value);
|
|
18598
18596
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeIndeterminates, function (half) {
|
|
18599
|
-
return
|
|
18597
|
+
return _this33.eqRow(half, item);
|
|
18600
18598
|
});
|
|
18601
|
-
|
|
18599
|
+
_this33.handleCheckboxReserveRow(row, value);
|
|
18602
18600
|
}
|
|
18603
18601
|
}, treeOpts);
|
|
18604
18602
|
}
|
|
18605
18603
|
// 如果存在父节点,更新父节点状态
|
|
18606
18604
|
var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, function (item) {
|
|
18607
|
-
return
|
|
18605
|
+
return _this33.eqRow(item, row);
|
|
18608
18606
|
}, treeOpts);
|
|
18609
18607
|
if (matchObj && matchObj.parent) {
|
|
18610
18608
|
var parentStatus;
|
|
@@ -18614,7 +18612,7 @@ var Methods = {
|
|
|
18614
18612
|
});
|
|
18615
18613
|
}) : matchObj.items;
|
|
18616
18614
|
var indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(matchObj.items, function (item) {
|
|
18617
|
-
return
|
|
18615
|
+
return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
|
|
18618
18616
|
});
|
|
18619
18617
|
if (indeterminatesItem) {
|
|
18620
18618
|
parentStatus = -1;
|
|
@@ -18623,7 +18621,7 @@ var Methods = {
|
|
|
18623
18621
|
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField);
|
|
18624
18622
|
});
|
|
18625
18623
|
parentStatus = selectItems.filter(function (item) {
|
|
18626
|
-
return
|
|
18624
|
+
return _this33.findRowIndexOf(vItems, item) > -1;
|
|
18627
18625
|
}).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
|
|
18628
18626
|
}
|
|
18629
18627
|
return this.handleSelectRow({
|
|
@@ -18645,31 +18643,31 @@ var Methods = {
|
|
|
18645
18643
|
treeIndeterminates.push(row);
|
|
18646
18644
|
}
|
|
18647
18645
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (item) {
|
|
18648
|
-
return
|
|
18646
|
+
return _this33.eqRow(item, row);
|
|
18649
18647
|
});
|
|
18650
18648
|
} else {
|
|
18651
18649
|
// 更新子节点状态
|
|
18652
18650
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], function (item) {
|
|
18653
|
-
if (
|
|
18651
|
+
if (_this33.eqRow(item, row) || isForce || !checkMethod || checkMethod({
|
|
18654
18652
|
row: item
|
|
18655
18653
|
})) {
|
|
18656
18654
|
if (value) {
|
|
18657
18655
|
selection.push(item);
|
|
18658
18656
|
} else {
|
|
18659
18657
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (select) {
|
|
18660
|
-
return
|
|
18658
|
+
return _this33.eqRow(select, item);
|
|
18661
18659
|
});
|
|
18662
18660
|
}
|
|
18663
18661
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(treeIndeterminates, function (half) {
|
|
18664
|
-
return
|
|
18662
|
+
return _this33.eqRow(half, item);
|
|
18665
18663
|
});
|
|
18666
|
-
|
|
18664
|
+
_this33.handleCheckboxReserveRow(row, value);
|
|
18667
18665
|
}
|
|
18668
18666
|
}, treeOpts);
|
|
18669
18667
|
}
|
|
18670
18668
|
// 如果存在父节点,更新父节点状态
|
|
18671
18669
|
var _matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, function (item) {
|
|
18672
|
-
return
|
|
18670
|
+
return _this33.eqRow(item, row);
|
|
18673
18671
|
}, treeOpts);
|
|
18674
18672
|
if (_matchObj && _matchObj.parent) {
|
|
18675
18673
|
var _parentStatus;
|
|
@@ -18679,16 +18677,16 @@ var Methods = {
|
|
|
18679
18677
|
});
|
|
18680
18678
|
}) : _matchObj.items;
|
|
18681
18679
|
var _indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(_matchObj.items, function (item) {
|
|
18682
|
-
return
|
|
18680
|
+
return _this33.findRowIndexOf(treeIndeterminates, item) > -1;
|
|
18683
18681
|
});
|
|
18684
18682
|
if (_indeterminatesItem) {
|
|
18685
18683
|
_parentStatus = -1;
|
|
18686
18684
|
} else {
|
|
18687
18685
|
var _selectItems = _matchObj.items.filter(function (item) {
|
|
18688
|
-
return
|
|
18686
|
+
return _this33.findRowIndexOf(selection, item) > -1;
|
|
18689
18687
|
});
|
|
18690
18688
|
_parentStatus = _selectItems.filter(function (item) {
|
|
18691
|
-
return
|
|
18689
|
+
return _this33.findRowIndexOf(_vItems, item) > -1;
|
|
18692
18690
|
}).length === _vItems.length ? true : _selectItems.length || value === -1 ? -1 : false;
|
|
18693
18691
|
}
|
|
18694
18692
|
return this.handleSelectRow({
|
|
@@ -18705,7 +18703,7 @@ var Methods = {
|
|
|
18705
18703
|
}
|
|
18706
18704
|
} else {
|
|
18707
18705
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (item) {
|
|
18708
|
-
return
|
|
18706
|
+
return _this33.eqRow(item, row);
|
|
18709
18707
|
});
|
|
18710
18708
|
}
|
|
18711
18709
|
this.handleCheckboxReserveRow(row, value);
|
|
@@ -18754,7 +18752,7 @@ var Methods = {
|
|
|
18754
18752
|
return this.$nextTick();
|
|
18755
18753
|
},
|
|
18756
18754
|
handleCheckedAllCheckboxRow: function handleCheckedAllCheckboxRow(value, isForce) {
|
|
18757
|
-
var
|
|
18755
|
+
var _this34 = this;
|
|
18758
18756
|
var afterFullData = this.afterFullData,
|
|
18759
18757
|
treeConfig = this.treeConfig,
|
|
18760
18758
|
treeOpts = this.treeOpts,
|
|
@@ -18767,7 +18765,7 @@ var Methods = {
|
|
|
18767
18765
|
checkMethod = checkboxOpts.checkMethod;
|
|
18768
18766
|
var selectRows = [];
|
|
18769
18767
|
var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
|
|
18770
|
-
return
|
|
18768
|
+
return _this34.findRowIndexOf(afterFullData, row) === -1;
|
|
18771
18769
|
});
|
|
18772
18770
|
if (checkStrictly) {
|
|
18773
18771
|
this.isAllSelected = value;
|
|
@@ -18821,7 +18819,7 @@ var Methods = {
|
|
|
18821
18819
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
|
|
18822
18820
|
if (checkMethod({
|
|
18823
18821
|
row: row
|
|
18824
|
-
}) ? 0 :
|
|
18822
|
+
}) ? 0 : _this34.findRowIndexOf(selection, row) > -1) {
|
|
18825
18823
|
selectRows.push(row);
|
|
18826
18824
|
}
|
|
18827
18825
|
}, treeOpts);
|
|
@@ -18836,7 +18834,7 @@ var Methods = {
|
|
|
18836
18834
|
*/
|
|
18837
18835
|
if (!isForce && checkMethod) {
|
|
18838
18836
|
selectRows = afterFullData.filter(function (row) {
|
|
18839
|
-
return
|
|
18837
|
+
return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
|
|
18840
18838
|
row: row
|
|
18841
18839
|
});
|
|
18842
18840
|
});
|
|
@@ -18853,7 +18851,7 @@ var Methods = {
|
|
|
18853
18851
|
selectRows = afterFullData.filter(function (row) {
|
|
18854
18852
|
return checkMethod({
|
|
18855
18853
|
row: row
|
|
18856
|
-
}) ? 0 :
|
|
18854
|
+
}) ? 0 : _this34.findRowIndexOf(selection, row) > -1;
|
|
18857
18855
|
});
|
|
18858
18856
|
}
|
|
18859
18857
|
}
|
|
@@ -18862,11 +18860,11 @@ var Methods = {
|
|
|
18862
18860
|
if (reserve) {
|
|
18863
18861
|
if (value) {
|
|
18864
18862
|
selectRows.forEach(function (row) {
|
|
18865
|
-
checkboxReserveRowMap[getRowid(
|
|
18863
|
+
checkboxReserveRowMap[getRowid(_this34, row)] = row;
|
|
18866
18864
|
});
|
|
18867
18865
|
} else {
|
|
18868
18866
|
afterFullData.forEach(function (row) {
|
|
18869
|
-
return
|
|
18867
|
+
return _this34.handleCheckboxReserveRow(row, false);
|
|
18870
18868
|
});
|
|
18871
18869
|
}
|
|
18872
18870
|
}
|
|
@@ -18884,7 +18882,7 @@ var Methods = {
|
|
|
18884
18882
|
return this.handleCheckedAllCheckboxRow(value, true);
|
|
18885
18883
|
},
|
|
18886
18884
|
checkSelectionStatus: function checkSelectionStatus() {
|
|
18887
|
-
var
|
|
18885
|
+
var _this35 = this;
|
|
18888
18886
|
var afterFullData = this.afterFullData,
|
|
18889
18887
|
selection = this.selection,
|
|
18890
18888
|
treeIndeterminates = this.treeIndeterminates,
|
|
@@ -18920,11 +18918,11 @@ var Methods = {
|
|
|
18920
18918
|
if (treeConfig) {
|
|
18921
18919
|
if (halfField) {
|
|
18922
18920
|
isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
|
|
18923
|
-
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField) ||
|
|
18921
|
+
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, halfField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
|
|
18924
18922
|
});
|
|
18925
18923
|
} else {
|
|
18926
18924
|
isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
|
|
18927
|
-
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) ||
|
|
18925
|
+
return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || _this35.findRowIndexOf(treeIndeterminates, row) > -1;
|
|
18928
18926
|
});
|
|
18929
18927
|
}
|
|
18930
18928
|
} else {
|
|
@@ -18946,22 +18944,22 @@ var Methods = {
|
|
|
18946
18944
|
disableRows.push(row);
|
|
18947
18945
|
return true;
|
|
18948
18946
|
}
|
|
18949
|
-
if (
|
|
18947
|
+
if (_this35.findRowIndexOf(selection, row) > -1) {
|
|
18950
18948
|
checkRows.push(row);
|
|
18951
18949
|
return true;
|
|
18952
18950
|
}
|
|
18953
18951
|
return false;
|
|
18954
18952
|
} : function (row) {
|
|
18955
|
-
return
|
|
18953
|
+
return _this35.findRowIndexOf(selection, row) > -1;
|
|
18956
18954
|
});
|
|
18957
18955
|
isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
|
|
18958
18956
|
if (treeConfig) {
|
|
18959
18957
|
isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
|
|
18960
|
-
return
|
|
18958
|
+
return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selection, row) > -1;
|
|
18961
18959
|
});
|
|
18962
18960
|
} else {
|
|
18963
18961
|
isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
|
|
18964
|
-
return
|
|
18962
|
+
return _this35.findRowIndexOf(selection, row) > -1;
|
|
18965
18963
|
});
|
|
18966
18964
|
}
|
|
18967
18965
|
}
|
|
@@ -19067,7 +19065,7 @@ var Methods = {
|
|
|
19067
19065
|
* 获取复选框保留选中的行
|
|
19068
19066
|
*/
|
|
19069
19067
|
getCheckboxReserveRecords: function getCheckboxReserveRecords(isFull) {
|
|
19070
|
-
var
|
|
19068
|
+
var _this36 = this;
|
|
19071
19069
|
var fullDataRowIdData = this.fullDataRowIdData,
|
|
19072
19070
|
afterFullData = this.afterFullData,
|
|
19073
19071
|
checkboxReserveRowMap = this.checkboxReserveRowMap,
|
|
@@ -19079,11 +19077,11 @@ var Methods = {
|
|
|
19079
19077
|
var afterFullIdMaps = {};
|
|
19080
19078
|
if (treeConfig) {
|
|
19081
19079
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
|
|
19082
|
-
afterFullIdMaps[getRowid(
|
|
19080
|
+
afterFullIdMaps[getRowid(_this36, row)] = 1;
|
|
19083
19081
|
}, treeOpts);
|
|
19084
19082
|
} else {
|
|
19085
19083
|
afterFullData.forEach(function (row) {
|
|
19086
|
-
afterFullIdMaps[getRowid(
|
|
19084
|
+
afterFullIdMaps[getRowid(_this36, row)] = 1;
|
|
19087
19085
|
});
|
|
19088
19086
|
}
|
|
19089
19087
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(checkboxReserveRowMap, function (oldRow, oldRowid) {
|
|
@@ -19142,7 +19140,7 @@ var Methods = {
|
|
|
19142
19140
|
* 清空行为不管是否被禁用还是保留记录,都将彻底清空选中状态
|
|
19143
19141
|
*/
|
|
19144
19142
|
clearCheckboxRow: function clearCheckboxRow() {
|
|
19145
|
-
var
|
|
19143
|
+
var _this37 = this;
|
|
19146
19144
|
var tableFullData = this.tableFullData,
|
|
19147
19145
|
treeConfig = this.treeConfig,
|
|
19148
19146
|
treeOpts = this.treeOpts,
|
|
@@ -19162,7 +19160,7 @@ var Methods = {
|
|
|
19162
19160
|
}
|
|
19163
19161
|
if (reserve) {
|
|
19164
19162
|
tableFullData.forEach(function (row) {
|
|
19165
|
-
return
|
|
19163
|
+
return _this37.handleCheckboxReserveRow(row, false);
|
|
19166
19164
|
});
|
|
19167
19165
|
}
|
|
19168
19166
|
this.isAllSelected = false;
|
|
@@ -19414,12 +19412,12 @@ var Methods = {
|
|
|
19414
19412
|
* 如果存在规则,则校验
|
|
19415
19413
|
*/
|
|
19416
19414
|
handleChangeCell: function handleChangeCell(evnt, params) {
|
|
19417
|
-
var
|
|
19415
|
+
var _this38 = this;
|
|
19418
19416
|
this.checkValidate('blur')["catch"](function (e) {
|
|
19419
19417
|
return e;
|
|
19420
19418
|
}).then(function () {
|
|
19421
|
-
|
|
19422
|
-
return
|
|
19419
|
+
_this38.handleActived(params, evnt).then(function () {
|
|
19420
|
+
return _this38.checkValidate('change');
|
|
19423
19421
|
})["catch"](function (e) {
|
|
19424
19422
|
return e;
|
|
19425
19423
|
});
|
|
@@ -19513,7 +19511,7 @@ var Methods = {
|
|
|
19513
19511
|
* 如果是双击模式,则激活为编辑状态
|
|
19514
19512
|
*/
|
|
19515
19513
|
triggerCellDblclickEvent: function triggerCellDblclickEvent(evnt, params) {
|
|
19516
|
-
var
|
|
19514
|
+
var _this39 = this;
|
|
19517
19515
|
var editStore = this.editStore,
|
|
19518
19516
|
editConfig = this.editConfig,
|
|
19519
19517
|
editOpts = this.editOpts;
|
|
@@ -19526,15 +19524,15 @@ var Methods = {
|
|
|
19526
19524
|
this.checkValidate('blur')["catch"](function (e) {
|
|
19527
19525
|
return e;
|
|
19528
19526
|
}).then(function () {
|
|
19529
|
-
|
|
19530
|
-
return
|
|
19527
|
+
_this39.handleActived(params, evnt).then(function () {
|
|
19528
|
+
return _this39.checkValidate('change');
|
|
19531
19529
|
})["catch"](function (e) {
|
|
19532
19530
|
return e;
|
|
19533
19531
|
});
|
|
19534
19532
|
});
|
|
19535
19533
|
} else if (editOpts.mode === 'cell') {
|
|
19536
19534
|
this.handleActived(params, evnt).then(function () {
|
|
19537
|
-
return
|
|
19535
|
+
return _this39.checkValidate('change');
|
|
19538
19536
|
})["catch"](function (e) {
|
|
19539
19537
|
return e;
|
|
19540
19538
|
});
|
|
@@ -19544,7 +19542,7 @@ var Methods = {
|
|
|
19544
19542
|
this.emitEvent('cell-dblclick', params, evnt);
|
|
19545
19543
|
},
|
|
19546
19544
|
handleDefaultSort: function handleDefaultSort() {
|
|
19547
|
-
var
|
|
19545
|
+
var _this40 = this;
|
|
19548
19546
|
var sortConfig = this.sortConfig,
|
|
19549
19547
|
sortOpts = this.sortOpts;
|
|
19550
19548
|
var defaultSort = sortOpts.defaultSort;
|
|
@@ -19557,7 +19555,7 @@ var Methods = {
|
|
|
19557
19555
|
var field = item.field,
|
|
19558
19556
|
order = item.order;
|
|
19559
19557
|
if (field && order) {
|
|
19560
|
-
var column =
|
|
19558
|
+
var column = _this40.getColumnByField(field);
|
|
19561
19559
|
if (column && column.sortable) {
|
|
19562
19560
|
column.order = order;
|
|
19563
19561
|
column.sortTime = Date.now() + index;
|
|
@@ -19598,7 +19596,7 @@ var Methods = {
|
|
|
19598
19596
|
}
|
|
19599
19597
|
},
|
|
19600
19598
|
sort: function sort(sortConfs, sortOrder) {
|
|
19601
|
-
var
|
|
19599
|
+
var _this41 = this;
|
|
19602
19600
|
var sortOpts = this.sortOpts;
|
|
19603
19601
|
var multiple = sortOpts.multiple,
|
|
19604
19602
|
remote = sortOpts.remote,
|
|
@@ -19624,14 +19622,14 @@ var Methods = {
|
|
|
19624
19622
|
order = confs.order;
|
|
19625
19623
|
var column = field;
|
|
19626
19624
|
if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(field)) {
|
|
19627
|
-
column =
|
|
19625
|
+
column = _this41.getColumnByField(field);
|
|
19628
19626
|
}
|
|
19629
19627
|
if (column && (column.sortable || column.remoteSort)) {
|
|
19630
19628
|
if (!firstSortColumn) {
|
|
19631
19629
|
firstSortColumn = column;
|
|
19632
19630
|
}
|
|
19633
19631
|
if (orders.indexOf(order) === -1) {
|
|
19634
|
-
order = getNextSortOrder(
|
|
19632
|
+
order = getNextSortOrder(_this41, column);
|
|
19635
19633
|
}
|
|
19636
19634
|
if (column.order !== order) {
|
|
19637
19635
|
column.order = order;
|
|
@@ -19733,7 +19731,7 @@ var Methods = {
|
|
|
19733
19731
|
* 判断指定列是否为筛选状态,如果为空则判断所有列
|
|
19734
19732
|
* @param {String} fieldOrColumn 字段名
|
|
19735
19733
|
*/
|
|
19736
|
-
|
|
19734
|
+
isActiveFilterByColumn: function isActiveFilterByColumn(fieldOrColumn) {
|
|
19737
19735
|
var column = handleFieldOrColumn(this, fieldOrColumn);
|
|
19738
19736
|
if (column) {
|
|
19739
19737
|
return column.filters && column.filters.some(function (option) {
|
|
@@ -19742,6 +19740,10 @@ var Methods = {
|
|
|
19742
19740
|
}
|
|
19743
19741
|
return this.getCheckedFilters().length > 0;
|
|
19744
19742
|
},
|
|
19743
|
+
// 已废弃
|
|
19744
|
+
isFilter: function isFilter(fieldOrColumn) {
|
|
19745
|
+
return this.isActiveFilterByColumn(fieldOrColumn);
|
|
19746
|
+
},
|
|
19745
19747
|
/**
|
|
19746
19748
|
* 判断展开行是否懒加载完成
|
|
19747
19749
|
* @param {Row} row 行对象
|
|
@@ -19751,7 +19753,7 @@ var Methods = {
|
|
|
19751
19753
|
return rest && rest.expandLoaded;
|
|
19752
19754
|
},
|
|
19753
19755
|
clearRowExpandLoaded: function clearRowExpandLoaded(row) {
|
|
19754
|
-
var
|
|
19756
|
+
var _this42 = this;
|
|
19755
19757
|
var expandOpts = this.expandOpts,
|
|
19756
19758
|
expandLazyLoadeds = this.expandLazyLoadeds,
|
|
19757
19759
|
fullAllDataRowMap = this.fullAllDataRowMap;
|
|
@@ -19760,7 +19762,7 @@ var Methods = {
|
|
|
19760
19762
|
if (lazy && rest) {
|
|
19761
19763
|
rest.expandLoaded = false;
|
|
19762
19764
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(expandLazyLoadeds, function (item) {
|
|
19763
|
-
return
|
|
19765
|
+
return _this42.eqRow(item, row);
|
|
19764
19766
|
});
|
|
19765
19767
|
}
|
|
19766
19768
|
return this.$nextTick();
|
|
@@ -19770,13 +19772,13 @@ var Methods = {
|
|
|
19770
19772
|
* @param {Row} row 行对象
|
|
19771
19773
|
*/
|
|
19772
19774
|
reloadRowExpand: function reloadRowExpand(row) {
|
|
19773
|
-
var
|
|
19775
|
+
var _this43 = this;
|
|
19774
19776
|
var expandOpts = this.expandOpts,
|
|
19775
19777
|
expandLazyLoadeds = this.expandLazyLoadeds;
|
|
19776
19778
|
var lazy = expandOpts.lazy;
|
|
19777
19779
|
if (lazy && this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
|
|
19778
19780
|
this.clearRowExpandLoaded(row).then(function () {
|
|
19779
|
-
return
|
|
19781
|
+
return _this43.handleAsyncRowExpand(row);
|
|
19780
19782
|
});
|
|
19781
19783
|
}
|
|
19782
19784
|
return this.$nextTick();
|
|
@@ -19845,25 +19847,25 @@ var Methods = {
|
|
|
19845
19847
|
return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
|
|
19846
19848
|
},
|
|
19847
19849
|
handleAsyncRowExpand: function handleAsyncRowExpand(row) {
|
|
19848
|
-
var
|
|
19850
|
+
var _this44 = this;
|
|
19849
19851
|
var rest = this.fullAllDataRowMap.get(row);
|
|
19850
19852
|
return new Promise(function (resolve) {
|
|
19851
|
-
|
|
19852
|
-
|
|
19853
|
-
$table:
|
|
19853
|
+
_this44.expandLazyLoadeds.push(row);
|
|
19854
|
+
_this44.expandOpts.loadMethod({
|
|
19855
|
+
$table: _this44,
|
|
19854
19856
|
row: row,
|
|
19855
|
-
rowIndex:
|
|
19856
|
-
$rowIndex:
|
|
19857
|
+
rowIndex: _this44.getRowIndex(row),
|
|
19858
|
+
$rowIndex: _this44.getVMRowIndex(row)
|
|
19857
19859
|
}).then(function () {
|
|
19858
19860
|
rest.expandLoaded = true;
|
|
19859
|
-
|
|
19861
|
+
_this44.rowExpandeds.push(row);
|
|
19860
19862
|
})["catch"](function () {
|
|
19861
19863
|
rest.expandLoaded = false;
|
|
19862
19864
|
})["finally"](function () {
|
|
19863
|
-
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(
|
|
19864
|
-
return
|
|
19865
|
+
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(_this44.expandLazyLoadeds, function (item) {
|
|
19866
|
+
return _this44.eqRow(item, row);
|
|
19865
19867
|
});
|
|
19866
|
-
resolve(
|
|
19868
|
+
resolve(_this44.$nextTick().then(_this44.recalculate));
|
|
19867
19869
|
});
|
|
19868
19870
|
});
|
|
19869
19871
|
},
|
|
@@ -19875,7 +19877,7 @@ var Methods = {
|
|
|
19875
19877
|
* @param {Boolean} expanded 是否展开
|
|
19876
19878
|
*/
|
|
19877
19879
|
setRowExpand: function setRowExpand(rows, expanded) {
|
|
19878
|
-
var
|
|
19880
|
+
var _this45 = this;
|
|
19879
19881
|
var fullAllDataRowMap = this.fullAllDataRowMap,
|
|
19880
19882
|
expandLazyLoadeds = this.expandLazyLoadeds,
|
|
19881
19883
|
expandOpts = this.expandOpts,
|
|
@@ -19904,17 +19906,17 @@ var Methods = {
|
|
|
19904
19906
|
columnIndex: columnIndex,
|
|
19905
19907
|
$columnIndex: $columnIndex,
|
|
19906
19908
|
row: row,
|
|
19907
|
-
rowIndex:
|
|
19908
|
-
$rowIndex:
|
|
19909
|
+
rowIndex: _this45.getRowIndex(row),
|
|
19910
|
+
$rowIndex: _this45.getVMRowIndex(row)
|
|
19909
19911
|
});
|
|
19910
19912
|
}) : rows;
|
|
19911
19913
|
if (expanded) {
|
|
19912
19914
|
validRows.forEach(function (row) {
|
|
19913
|
-
if (
|
|
19915
|
+
if (_this45.findRowIndexOf(rowExpandeds, row) === -1) {
|
|
19914
19916
|
var rest = fullAllDataRowMap.get(row);
|
|
19915
|
-
var isLoad = lazy && !rest.expandLoaded &&
|
|
19917
|
+
var isLoad = lazy && !rest.expandLoaded && _this45.findRowIndexOf(expandLazyLoadeds, row) === -1;
|
|
19916
19918
|
if (isLoad) {
|
|
19917
|
-
lazyRests.push(
|
|
19919
|
+
lazyRests.push(_this45.handleAsyncRowExpand(row));
|
|
19918
19920
|
} else {
|
|
19919
19921
|
rowExpandeds.push(row);
|
|
19920
19922
|
}
|
|
@@ -19922,12 +19924,12 @@ var Methods = {
|
|
|
19922
19924
|
});
|
|
19923
19925
|
} else {
|
|
19924
19926
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(rowExpandeds, function (row) {
|
|
19925
|
-
return
|
|
19927
|
+
return _this45.findRowIndexOf(validRows, row) > -1;
|
|
19926
19928
|
});
|
|
19927
19929
|
}
|
|
19928
19930
|
if (reserve) {
|
|
19929
19931
|
validRows.forEach(function (row) {
|
|
19930
|
-
return
|
|
19932
|
+
return _this45.handleRowExpandReserve(row, expanded);
|
|
19931
19933
|
});
|
|
19932
19934
|
}
|
|
19933
19935
|
}
|
|
@@ -19946,7 +19948,7 @@ var Methods = {
|
|
|
19946
19948
|
* 手动清空展开行状态,数据会恢复成未展开的状态
|
|
19947
19949
|
*/
|
|
19948
19950
|
clearRowExpand: function clearRowExpand() {
|
|
19949
|
-
var
|
|
19951
|
+
var _this46 = this;
|
|
19950
19952
|
var expandOpts = this.expandOpts,
|
|
19951
19953
|
rowExpandeds = this.rowExpandeds,
|
|
19952
19954
|
tableFullData = this.tableFullData;
|
|
@@ -19955,12 +19957,12 @@ var Methods = {
|
|
|
19955
19957
|
this.rowExpandeds = [];
|
|
19956
19958
|
if (reserve) {
|
|
19957
19959
|
tableFullData.forEach(function (row) {
|
|
19958
|
-
return
|
|
19960
|
+
return _this46.handleRowExpandReserve(row, false);
|
|
19959
19961
|
});
|
|
19960
19962
|
}
|
|
19961
19963
|
return this.$nextTick().then(function () {
|
|
19962
19964
|
if (isExists) {
|
|
19963
|
-
|
|
19965
|
+
_this46.recalculate();
|
|
19964
19966
|
}
|
|
19965
19967
|
});
|
|
19966
19968
|
},
|
|
@@ -20030,7 +20032,7 @@ var Methods = {
|
|
|
20030
20032
|
* @param {Row} row 行对象
|
|
20031
20033
|
*/
|
|
20032
20034
|
reloadTreeExpand: function reloadTreeExpand(row) {
|
|
20033
|
-
var
|
|
20035
|
+
var _this47 = this;
|
|
20034
20036
|
var treeOpts = this.treeOpts,
|
|
20035
20037
|
treeLazyLoadeds = this.treeLazyLoadeds;
|
|
20036
20038
|
var transform = treeOpts.transform,
|
|
@@ -20038,14 +20040,14 @@ var Methods = {
|
|
|
20038
20040
|
hasChild = treeOpts.hasChild;
|
|
20039
20041
|
if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
|
|
20040
20042
|
this.clearTreeExpandLoaded(row).then(function () {
|
|
20041
|
-
return
|
|
20043
|
+
return _this47.handleAsyncTreeExpandChilds(row);
|
|
20042
20044
|
}).then(function () {
|
|
20043
20045
|
if (transform) {
|
|
20044
|
-
|
|
20045
|
-
return
|
|
20046
|
+
_this47.handleVirtualTreeToList();
|
|
20047
|
+
return _this47.handleTableData();
|
|
20046
20048
|
}
|
|
20047
20049
|
}).then(function () {
|
|
20048
|
-
return
|
|
20050
|
+
return _this47.recalculate();
|
|
20049
20051
|
});
|
|
20050
20052
|
}
|
|
20051
20053
|
return this.$nextTick();
|
|
@@ -20112,7 +20114,7 @@ var Methods = {
|
|
|
20112
20114
|
}
|
|
20113
20115
|
},
|
|
20114
20116
|
handleAsyncTreeExpandChilds: function handleAsyncTreeExpandChilds(row) {
|
|
20115
|
-
var
|
|
20117
|
+
var _this48 = this;
|
|
20116
20118
|
var fullAllDataRowMap = this.fullAllDataRowMap,
|
|
20117
20119
|
treeExpandeds = this.treeExpandeds,
|
|
20118
20120
|
treeOpts = this.treeOpts,
|
|
@@ -20125,7 +20127,7 @@ var Methods = {
|
|
|
20125
20127
|
return new Promise(function (resolve) {
|
|
20126
20128
|
treeLazyLoadeds.push(row);
|
|
20127
20129
|
loadMethod({
|
|
20128
|
-
$table:
|
|
20130
|
+
$table: _this48,
|
|
20129
20131
|
row: row
|
|
20130
20132
|
}).then(function (childRecords) {
|
|
20131
20133
|
// 响应成功后则展开行,并将子节点挂载到该节点下
|
|
@@ -20137,17 +20139,17 @@ var Methods = {
|
|
|
20137
20139
|
childRecords = [];
|
|
20138
20140
|
}
|
|
20139
20141
|
if (childRecords) {
|
|
20140
|
-
return
|
|
20142
|
+
return _this48.loadTreeChildren(row, childRecords).then(function (childRows) {
|
|
20141
20143
|
if (childRows.length && treeExpandeds.indexOf(row) === -1) {
|
|
20142
20144
|
treeExpandeds.push(row);
|
|
20143
20145
|
}
|
|
20144
20146
|
// 如果当前节点已选中,则展开后子节点也被选中
|
|
20145
|
-
if (!checkStrictly &&
|
|
20146
|
-
|
|
20147
|
+
if (!checkStrictly && _this48.isCheckedByCheckboxRow(row)) {
|
|
20148
|
+
_this48.handleCheckedCheckboxRow(childRows, true, true);
|
|
20147
20149
|
}
|
|
20148
|
-
return
|
|
20150
|
+
return _this48.$nextTick().then(function () {
|
|
20149
20151
|
if (transform) {
|
|
20150
|
-
return
|
|
20152
|
+
return _this48.handleTableData();
|
|
20151
20153
|
}
|
|
20152
20154
|
});
|
|
20153
20155
|
});
|
|
@@ -20159,8 +20161,8 @@ var Methods = {
|
|
|
20159
20161
|
return item === row;
|
|
20160
20162
|
});
|
|
20161
20163
|
})["finally"](function () {
|
|
20162
|
-
|
|
20163
|
-
return
|
|
20164
|
+
_this48.$nextTick().then(function () {
|
|
20165
|
+
return _this48.recalculate();
|
|
20164
20166
|
}).then(function () {
|
|
20165
20167
|
return resolve();
|
|
20166
20168
|
});
|
|
@@ -20192,7 +20194,7 @@ var Methods = {
|
|
|
20192
20194
|
* @returns
|
|
20193
20195
|
*/
|
|
20194
20196
|
handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
|
|
20195
|
-
var
|
|
20197
|
+
var _this49 = this;
|
|
20196
20198
|
var fullAllDataRowMap = this.fullAllDataRowMap,
|
|
20197
20199
|
tableFullData = this.tableFullData,
|
|
20198
20200
|
treeExpandeds = this.treeExpandeds,
|
|
@@ -20236,7 +20238,7 @@ var Methods = {
|
|
|
20236
20238
|
var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1;
|
|
20237
20239
|
// 是否使用懒加载
|
|
20238
20240
|
if (isLoad) {
|
|
20239
|
-
result.push(
|
|
20241
|
+
result.push(_this49.handleAsyncTreeExpandChilds(row));
|
|
20240
20242
|
} else {
|
|
20241
20243
|
if (row[children] && row[children].length) {
|
|
20242
20244
|
treeExpandeds.push(row);
|
|
@@ -20251,7 +20253,7 @@ var Methods = {
|
|
|
20251
20253
|
}
|
|
20252
20254
|
if (reserve) {
|
|
20253
20255
|
validRows.forEach(function (row) {
|
|
20254
|
-
return
|
|
20256
|
+
return _this49.handleTreeExpandReserve(row, expanded);
|
|
20255
20257
|
});
|
|
20256
20258
|
}
|
|
20257
20259
|
return Promise.all(result).then(this.recalculate);
|
|
@@ -20263,12 +20265,12 @@ var Methods = {
|
|
|
20263
20265
|
* @returns
|
|
20264
20266
|
*/
|
|
20265
20267
|
handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
|
|
20266
|
-
var
|
|
20268
|
+
var _this50 = this;
|
|
20267
20269
|
return this.handleBaseTreeExpand(rows, expanded).then(function () {
|
|
20268
|
-
|
|
20269
|
-
return
|
|
20270
|
+
_this50.handleVirtualTreeToList();
|
|
20271
|
+
return _this50.handleTableData();
|
|
20270
20272
|
}).then(function () {
|
|
20271
|
-
return
|
|
20273
|
+
return _this50.recalculate();
|
|
20272
20274
|
});
|
|
20273
20275
|
},
|
|
20274
20276
|
/**
|
|
@@ -20307,7 +20309,7 @@ var Methods = {
|
|
|
20307
20309
|
* 手动清空树形节点的展开状态,数据会恢复成未展开的状态
|
|
20308
20310
|
*/
|
|
20309
20311
|
clearTreeExpand: function clearTreeExpand() {
|
|
20310
|
-
var
|
|
20312
|
+
var _this51 = this;
|
|
20311
20313
|
var treeOpts = this.treeOpts,
|
|
20312
20314
|
treeExpandeds = this.treeExpandeds,
|
|
20313
20315
|
tableFullData = this.tableFullData;
|
|
@@ -20317,17 +20319,17 @@ var Methods = {
|
|
|
20317
20319
|
this.treeExpandeds = [];
|
|
20318
20320
|
if (reserve) {
|
|
20319
20321
|
external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullData, function (row) {
|
|
20320
|
-
return
|
|
20322
|
+
return _this51.handleTreeExpandReserve(row, false);
|
|
20321
20323
|
}, treeOpts);
|
|
20322
20324
|
}
|
|
20323
20325
|
return this.handleTableData().then(function () {
|
|
20324
20326
|
if (transform) {
|
|
20325
|
-
|
|
20326
|
-
return
|
|
20327
|
+
_this51.handleVirtualTreeToList();
|
|
20328
|
+
return _this51.handleTableData();
|
|
20327
20329
|
}
|
|
20328
20330
|
}).then(function () {
|
|
20329
20331
|
if (isExists) {
|
|
20330
|
-
|
|
20332
|
+
_this51.recalculate();
|
|
20331
20333
|
}
|
|
20332
20334
|
});
|
|
20333
20335
|
},
|
|
@@ -20446,28 +20448,28 @@ var Methods = {
|
|
|
20446
20448
|
},
|
|
20447
20449
|
// 计算可视渲染相关数据
|
|
20448
20450
|
computeScrollLoad: function computeScrollLoad() {
|
|
20449
|
-
var
|
|
20451
|
+
var _this52 = this;
|
|
20450
20452
|
return this.$nextTick().then(function () {
|
|
20451
|
-
var sYOpts =
|
|
20452
|
-
sXOpts =
|
|
20453
|
-
scrollXLoad =
|
|
20454
|
-
scrollYLoad =
|
|
20455
|
-
scrollXStore =
|
|
20456
|
-
scrollYStore =
|
|
20453
|
+
var sYOpts = _this52.sYOpts,
|
|
20454
|
+
sXOpts = _this52.sXOpts,
|
|
20455
|
+
scrollXLoad = _this52.scrollXLoad,
|
|
20456
|
+
scrollYLoad = _this52.scrollYLoad,
|
|
20457
|
+
scrollXStore = _this52.scrollXStore,
|
|
20458
|
+
scrollYStore = _this52.scrollYStore;
|
|
20457
20459
|
// 计算 X 逻辑
|
|
20458
20460
|
if (scrollXLoad) {
|
|
20459
|
-
var _computeVirtualX3 = computeVirtualX(
|
|
20461
|
+
var _computeVirtualX3 = computeVirtualX(_this52),
|
|
20460
20462
|
visibleXSize = _computeVirtualX3.visibleSize;
|
|
20461
20463
|
var offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
|
|
20462
20464
|
scrollXStore.offsetSize = offsetXSize;
|
|
20463
20465
|
scrollXStore.visibleSize = visibleXSize;
|
|
20464
20466
|
scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
|
|
20465
|
-
|
|
20467
|
+
_this52.updateScrollXData();
|
|
20466
20468
|
} else {
|
|
20467
|
-
|
|
20469
|
+
_this52.updateScrollXSpace();
|
|
20468
20470
|
}
|
|
20469
20471
|
// 计算 Y 逻辑
|
|
20470
|
-
var _computeVirtualY = computeVirtualY(
|
|
20472
|
+
var _computeVirtualY = computeVirtualY(_this52),
|
|
20471
20473
|
rowHeight = _computeVirtualY.rowHeight,
|
|
20472
20474
|
visibleYSize = _computeVirtualY.visibleSize;
|
|
20473
20475
|
scrollYStore.rowHeight = rowHeight;
|
|
@@ -20476,12 +20478,12 @@ var Methods = {
|
|
|
20476
20478
|
scrollYStore.offsetSize = offsetYSize;
|
|
20477
20479
|
scrollYStore.visibleSize = visibleYSize;
|
|
20478
20480
|
scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
|
|
20479
|
-
|
|
20481
|
+
_this52.updateScrollYData();
|
|
20480
20482
|
} else {
|
|
20481
|
-
|
|
20483
|
+
_this52.updateScrollYSpace();
|
|
20482
20484
|
}
|
|
20483
|
-
|
|
20484
|
-
|
|
20485
|
+
_this52.rowHeight = rowHeight;
|
|
20486
|
+
_this52.$nextTick(_this52.updateStyle);
|
|
20485
20487
|
});
|
|
20486
20488
|
},
|
|
20487
20489
|
handleTableColumn: function handleTableColumn() {
|
|
@@ -20491,11 +20493,11 @@ var Methods = {
|
|
|
20491
20493
|
this.tableColumn = scrollXLoad ? visibleColumn.slice(scrollXStore.startIndex, scrollXStore.endIndex) : visibleColumn.slice(0);
|
|
20492
20494
|
},
|
|
20493
20495
|
updateScrollXData: function updateScrollXData() {
|
|
20494
|
-
var
|
|
20496
|
+
var _this53 = this;
|
|
20495
20497
|
// this.tableColumn = []
|
|
20496
20498
|
this.$nextTick(function () {
|
|
20497
|
-
|
|
20498
|
-
|
|
20499
|
+
_this53.handleTableColumn();
|
|
20500
|
+
_this53.updateScrollXSpace();
|
|
20499
20501
|
});
|
|
20500
20502
|
},
|
|
20501
20503
|
// 更新横向 X 可视渲染上下剩余空间大小
|
|
@@ -20546,11 +20548,11 @@ var Methods = {
|
|
|
20546
20548
|
}
|
|
20547
20549
|
},
|
|
20548
20550
|
updateScrollYData: function updateScrollYData() {
|
|
20549
|
-
var
|
|
20551
|
+
var _this54 = this;
|
|
20550
20552
|
// this.tableData = []
|
|
20551
20553
|
this.$nextTick(function () {
|
|
20552
|
-
|
|
20553
|
-
|
|
20554
|
+
_this54.handleTableData();
|
|
20555
|
+
_this54.updateScrollYSpace();
|
|
20554
20556
|
});
|
|
20555
20557
|
},
|
|
20556
20558
|
// 更新纵向 Y 可视渲染上下剩余空间大小
|
|
@@ -20591,7 +20593,7 @@ var Methods = {
|
|
|
20591
20593
|
* @param {Number} scrollTop 上距离
|
|
20592
20594
|
*/
|
|
20593
20595
|
scrollTo: function scrollTo(scrollLeft, scrollTop) {
|
|
20594
|
-
var
|
|
20596
|
+
var _this55 = this;
|
|
20595
20597
|
var $refs = this.$refs;
|
|
20596
20598
|
var tableBody = $refs.tableBody,
|
|
20597
20599
|
rightBody = $refs.rightBody,
|
|
@@ -20608,7 +20610,7 @@ var Methods = {
|
|
|
20608
20610
|
if (this.scrollXLoad || this.scrollYLoad) {
|
|
20609
20611
|
return new Promise(function (resolve) {
|
|
20610
20612
|
return setTimeout(function () {
|
|
20611
|
-
return resolve(
|
|
20613
|
+
return resolve(_this55.$nextTick());
|
|
20612
20614
|
}, 50);
|
|
20613
20615
|
});
|
|
20614
20616
|
}
|
|
@@ -20650,7 +20652,7 @@ var Methods = {
|
|
|
20650
20652
|
* @param {Row} row 行对象
|
|
20651
20653
|
*/
|
|
20652
20654
|
scrollToTreeRow: function scrollToTreeRow(row) {
|
|
20653
|
-
var
|
|
20655
|
+
var _this56 = this;
|
|
20654
20656
|
var tableFullData = this.tableFullData,
|
|
20655
20657
|
treeConfig = this.treeConfig,
|
|
20656
20658
|
treeOpts = this.treeOpts;
|
|
@@ -20662,14 +20664,14 @@ var Methods = {
|
|
|
20662
20664
|
if (matchObj) {
|
|
20663
20665
|
var nodes = matchObj.nodes;
|
|
20664
20666
|
nodes.forEach(function (row, index) {
|
|
20665
|
-
if (index < nodes.length - 1 && !
|
|
20666
|
-
rests.push(
|
|
20667
|
+
if (index < nodes.length - 1 && !_this56.isTreeExpandByRow(row)) {
|
|
20668
|
+
rests.push(_this56.setTreeExpand(row, true));
|
|
20667
20669
|
}
|
|
20668
20670
|
});
|
|
20669
20671
|
}
|
|
20670
20672
|
}
|
|
20671
20673
|
return Promise.all(rests).then(function () {
|
|
20672
|
-
return rowToVisible(
|
|
20674
|
+
return rowToVisible(_this56, row);
|
|
20673
20675
|
});
|
|
20674
20676
|
},
|
|
20675
20677
|
/**
|
|
@@ -20724,30 +20726,30 @@ var Methods = {
|
|
|
20724
20726
|
* 如果单元格配置了校验规则,则会进行校验
|
|
20725
20727
|
*/
|
|
20726
20728
|
updateStatus: function updateStatus(scope, cellValue) {
|
|
20727
|
-
var
|
|
20729
|
+
var _this57 = this;
|
|
20728
20730
|
var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
|
|
20729
20731
|
return this.$nextTick().then(function () {
|
|
20730
|
-
var $refs =
|
|
20731
|
-
editRules =
|
|
20732
|
-
validStore =
|
|
20732
|
+
var $refs = _this57.$refs,
|
|
20733
|
+
editRules = _this57.editRules,
|
|
20734
|
+
validStore = _this57.validStore;
|
|
20733
20735
|
if (scope && $refs.tableBody && editRules) {
|
|
20734
20736
|
var row = scope.row,
|
|
20735
20737
|
column = scope.column;
|
|
20736
20738
|
var type = 'change';
|
|
20737
|
-
if (
|
|
20738
|
-
var cell =
|
|
20739
|
+
if (_this57.hasCellRules(type, row, column)) {
|
|
20740
|
+
var cell = _this57.getCell(row, column);
|
|
20739
20741
|
if (cell) {
|
|
20740
|
-
return
|
|
20742
|
+
return _this57.validCellRules(type, row, column, cellValue).then(function () {
|
|
20741
20743
|
if (customVal && validStore.visible) {
|
|
20742
20744
|
setCellValue(row, column, cellValue);
|
|
20743
20745
|
}
|
|
20744
|
-
|
|
20746
|
+
_this57.clearValidate();
|
|
20745
20747
|
})["catch"](function (_ref8) {
|
|
20746
20748
|
var rule = _ref8.rule;
|
|
20747
20749
|
if (customVal) {
|
|
20748
20750
|
setCellValue(row, column, cellValue);
|
|
20749
20751
|
}
|
|
20750
|
-
|
|
20752
|
+
_this57.showValidTooltip({
|
|
20751
20753
|
rule: rule,
|
|
20752
20754
|
row: row,
|
|
20753
20755
|
column: column,
|
|
@@ -20767,13 +20769,13 @@ var Methods = {
|
|
|
20767
20769
|
* @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
|
|
20768
20770
|
*/
|
|
20769
20771
|
setMergeCells: function setMergeCells(merges) {
|
|
20770
|
-
var
|
|
20772
|
+
var _this58 = this;
|
|
20771
20773
|
if (this.spanMethod) {
|
|
20772
20774
|
errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
|
|
20773
20775
|
}
|
|
20774
20776
|
setMerges(this, merges, this.mergeList, this.afterFullData);
|
|
20775
20777
|
return this.$nextTick().then(function () {
|
|
20776
|
-
return
|
|
20778
|
+
return _this58.updateCellAreas();
|
|
20777
20779
|
});
|
|
20778
20780
|
},
|
|
20779
20781
|
/**
|
|
@@ -20781,13 +20783,13 @@ var Methods = {
|
|
|
20781
20783
|
* @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
|
|
20782
20784
|
*/
|
|
20783
20785
|
removeMergeCells: function removeMergeCells(merges) {
|
|
20784
|
-
var
|
|
20786
|
+
var _this59 = this;
|
|
20785
20787
|
if (this.spanMethod) {
|
|
20786
20788
|
errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
|
|
20787
20789
|
}
|
|
20788
20790
|
var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
|
|
20789
20791
|
return this.$nextTick().then(function () {
|
|
20790
|
-
|
|
20792
|
+
_this59.updateCellAreas();
|
|
20791
20793
|
return rest;
|
|
20792
20794
|
});
|
|
20793
20795
|
},
|
|
@@ -20808,23 +20810,23 @@ var Methods = {
|
|
|
20808
20810
|
this.setMergeFooterItems(this.mergeFooterItems);
|
|
20809
20811
|
},
|
|
20810
20812
|
setMergeFooterItems: function setMergeFooterItems(merges) {
|
|
20811
|
-
var
|
|
20813
|
+
var _this60 = this;
|
|
20812
20814
|
if (this.footerSpanMethod) {
|
|
20813
20815
|
errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
|
|
20814
20816
|
}
|
|
20815
20817
|
setMerges(this, merges, this.mergeFooterList, null);
|
|
20816
20818
|
return this.$nextTick().then(function () {
|
|
20817
|
-
return
|
|
20819
|
+
return _this60.updateCellAreas();
|
|
20818
20820
|
});
|
|
20819
20821
|
},
|
|
20820
20822
|
removeMergeFooterItems: function removeMergeFooterItems(merges) {
|
|
20821
|
-
var
|
|
20823
|
+
var _this61 = this;
|
|
20822
20824
|
if (this.footerSpanMethod) {
|
|
20823
20825
|
errLog('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
|
|
20824
20826
|
}
|
|
20825
20827
|
var rest = removeMerges(this, merges, this.mergeFooterList, null);
|
|
20826
20828
|
return this.$nextTick().then(function () {
|
|
20827
|
-
|
|
20829
|
+
_this61.updateCellAreas();
|
|
20828
20830
|
return rest;
|
|
20829
20831
|
});
|
|
20830
20832
|
},
|
|
@@ -20941,9 +20943,9 @@ var Methods = {
|
|
|
20941
20943
|
return cellLabel;
|
|
20942
20944
|
},
|
|
20943
20945
|
findRowIndexOf: function findRowIndexOf(list, row) {
|
|
20944
|
-
var
|
|
20946
|
+
var _this62 = this;
|
|
20945
20947
|
return row ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findIndexOf(list, function (item) {
|
|
20946
|
-
return
|
|
20948
|
+
return _this62.eqRow(item, row);
|
|
20947
20949
|
}) : -1;
|
|
20948
20950
|
},
|
|
20949
20951
|
eqRow: function eqRow(row1, row2) {
|
|
@@ -37063,6 +37065,8 @@ var VxeFormConfigItem = {
|
|
|
37063
37065
|
var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
|
|
37064
37066
|
var itemClassName = compConf ? compConf.itemClassName : '';
|
|
37065
37067
|
var itemStyle = compConf ? compConf.itemStyle : null;
|
|
37068
|
+
var itemContentClassName = compConf ? compConf.itemContentClassName : '';
|
|
37069
|
+
var itemContentStyle = compConf ? compConf.itemContentStyle : null;
|
|
37066
37070
|
var span = item.span || $xeform.span;
|
|
37067
37071
|
var align = item.align || $xeform.align;
|
|
37068
37072
|
var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
|
|
@@ -37150,7 +37154,8 @@ var VxeFormConfigItem = {
|
|
|
37150
37154
|
},
|
|
37151
37155
|
on: ons
|
|
37152
37156
|
}, renderTitle(h, $xeform, item)) : null, h('div', {
|
|
37153
|
-
"class": ['vxe-form--item-content', align ? "align--".concat(align) :
|
|
37157
|
+
"class": ['vxe-form--item-content', align ? "align--".concat(align) : '', itemContentClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName : ''],
|
|
37158
|
+
style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
|
|
37154
37159
|
}, contentVNs.concat([collapseNode ? h('div', {
|
|
37155
37160
|
"class": 'vxe-form--item-trigger-node',
|
|
37156
37161
|
on: {
|
|
@@ -37950,6 +37955,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
37950
37955
|
var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
|
|
37951
37956
|
var itemClassName = compConf ? compConf.itemClassName : '';
|
|
37952
37957
|
var itemStyle = compConf ? compConf.itemStyle : null;
|
|
37958
|
+
var itemContentClassName = compConf ? compConf.itemContentClassName : '';
|
|
37959
|
+
var itemContentStyle = compConf ? compConf.itemContentStyle : null;
|
|
37953
37960
|
var span = item.span || _vm.span;
|
|
37954
37961
|
var align = item.align || _vm.align;
|
|
37955
37962
|
var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
|
|
@@ -38022,7 +38029,8 @@ var renderItem = function renderItem(h, _vm, item, slots) {
|
|
|
38022
38029
|
},
|
|
38023
38030
|
on: ons
|
|
38024
38031
|
}, renderTitle(h, _vm, item)) : null, h('div', {
|
|
38025
|
-
"class": ['vxe-form--item-content', align ? "align--".concat(align) :
|
|
38032
|
+
"class": ['vxe-form--item-content', align ? "align--".concat(align) : '', itemContentClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName : ''],
|
|
38033
|
+
style: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
|
|
38026
38034
|
}, contentVNs.concat([collapseNode ? h('div', {
|
|
38027
38035
|
"class": 'vxe-form--item-trigger-node',
|
|
38028
38036
|
on: {
|