This commit is contained in:
xuliangzhan
2019-09-30 13:10:18 +08:00
parent d5a22869dd
commit 40f83e804a
15 changed files with 138 additions and 113 deletions

View File

@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vue table 表格组件</title><link href=/vxe-table/static/css/advanced.f8b994e8.css rel=prefetch><link href=/vxe-table/static/css/api.c3ac3501.css rel=prefetch><link href=/vxe-table/static/css/base.69fbe158.css rel=prefetch><link href=/vxe-table/static/css/edit.b43d88c8.css rel=prefetch><link href=/vxe-table/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/static/css/module.2b63bd67.css rel=prefetch><link href=/vxe-table/static/css/optimize.a8ac9108.css rel=prefetch><link href=/vxe-table/static/css/other.4c0b8067.css rel=prefetch><link href=/vxe-table/static/js/advanced.f5724cf8.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree.5876e77c.js rel=prefetch><link href=/vxe-table/static/js/api.29b8f493.js rel=prefetch><link href=/vxe-table/static/js/base.8af6ebfe.js rel=prefetch><link href=/vxe-table/static/js/edit.b9f9b6d8.js rel=prefetch><link href=/vxe-table/static/js/excel.91c0e2a7.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.c7a19171.js rel=prefetch><link href=/vxe-table/static/js/module.2da3e27f.js rel=prefetch><link href=/vxe-table/static/js/optimize.38477e89.js rel=prefetch><link href=/vxe-table/static/js/other.bd1b0ba3.js rel=prefetch><link href=/vxe-table/static/js/plugin.90bfbe3d.js rel=prefetch><link href=/vxe-table/static/js/scroll.0d324988.js rel=prefetch><link href=/vxe-table/static/js/start.22ed15be.js rel=prefetch><link href=/vxe-table/static/js/tree.099238cc.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.cce7c562.css rel=preload as=style><link href=/vxe-table/static/css/index.f968c214.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.17ff2f90.js rel=preload as=script><link href=/vxe-table/static/js/index.9dda4e2a.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.cce7c562.css rel=stylesheet><link href=/vxe-table/static/css/index.f968c214.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.17ff2f90.js></script><script src=/vxe-table/static/js/index.9dda4e2a.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/favicon.ico><title>vue table 表格组件</title><link href=/vxe-table/static/css/advanced.f8b994e8.css rel=prefetch><link href=/vxe-table/static/css/api.c3ac3501.css rel=prefetch><link href=/vxe-table/static/css/base.69fbe158.css rel=prefetch><link href=/vxe-table/static/css/edit.b43d88c8.css rel=prefetch><link href=/vxe-table/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/static/css/module.2b63bd67.css rel=prefetch><link href=/vxe-table/static/css/optimize.a8ac9108.css rel=prefetch><link href=/vxe-table/static/css/other.4c0b8067.css rel=prefetch><link href=/vxe-table/static/js/advanced.f5724cf8.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree.5876e77c.js rel=prefetch><link href=/vxe-table/static/js/api.29b8f493.js rel=prefetch><link href=/vxe-table/static/js/base.8af6ebfe.js rel=prefetch><link href=/vxe-table/static/js/edit.b9f9b6d8.js rel=prefetch><link href=/vxe-table/static/js/excel.91c0e2a7.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.c7a19171.js rel=prefetch><link href=/vxe-table/static/js/module.2da3e27f.js rel=prefetch><link href=/vxe-table/static/js/optimize.38477e89.js rel=prefetch><link href=/vxe-table/static/js/other.bd1b0ba3.js rel=prefetch><link href=/vxe-table/static/js/plugin.90bfbe3d.js rel=prefetch><link href=/vxe-table/static/js/scroll.0d324988.js rel=prefetch><link href=/vxe-table/static/js/start.22ed15be.js rel=prefetch><link href=/vxe-table/static/js/tree.099238cc.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.cce7c562.css rel=preload as=style><link href=/vxe-table/static/css/index.f968c214.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.17ff2f90.js rel=preload as=script><link href=/vxe-table/static/js/index.fe4a67e0.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.cce7c562.css rel=stylesheet><link href=/vxe-table/static/css/index.f968c214.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/static/js/chunk-vendors.17ff2f90.js></script><script src=/vxe-table/static/js/index.fe4a67e0.js></script></body></html>

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/v1/favicon.ico><title>vue table 表格组件</title><link href=/vxe-table/v1/static/css/advanced.51ba780d.css rel=prefetch><link href=/vxe-table/v1/static/css/api.c3ac3501.css rel=prefetch><link href=/vxe-table/v1/static/css/base.69fbe158.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.b43d88c8.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/v1/static/css/module.2b63bd67.css rel=prefetch><link href=/vxe-table/v1/static/css/optimize.a8ac9108.css rel=prefetch><link href=/vxe-table/v1/static/css/other.26bc65b1.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.d5b35902.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree.378c4523.js rel=prefetch><link href=/vxe-table/v1/static/js/api.70023791.js rel=prefetch><link href=/vxe-table/v1/static/js/base.d8f1e355.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.d685fbb4.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.4b8557a4.js rel=prefetch><link href=/vxe-table/v1/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.744eba9f.js rel=prefetch><link href=/vxe-table/v1/static/js/module.ed36f195.js rel=prefetch><link href=/vxe-table/v1/static/js/optimize.6b86bef9.js rel=prefetch><link href=/vxe-table/v1/static/js/other.b65e4bdb.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.ea5b09a1.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.56be9834.js rel=prefetch><link href=/vxe-table/v1/static/js/start.19d147e0.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.b68144a8.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.b9e31b0a.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.220d0cf5.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.927c7c12.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.94ad2644.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.b9e31b0a.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.220d0cf5.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/v1/static/js/chunk-vendors.927c7c12.js></script><script src=/vxe-table/v1/static/js/index.94ad2644.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=Cache-Control content="no-cache, no-store, must-revalidate"><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><link rel=icon href=/vxe-table/v1/favicon.ico><title>vue table 表格组件</title><link href=/vxe-table/v1/static/css/advanced.51ba780d.css rel=prefetch><link href=/vxe-table/v1/static/css/api.c3ac3501.css rel=prefetch><link href=/vxe-table/v1/static/css/base.69fbe158.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.b43d88c8.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/v1/static/css/module.2b63bd67.css rel=prefetch><link href=/vxe-table/v1/static/css/optimize.a8ac9108.css rel=prefetch><link href=/vxe-table/v1/static/css/other.26bc65b1.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.d5b35902.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree.378c4523.js rel=prefetch><link href=/vxe-table/v1/static/js/api.70023791.js rel=prefetch><link href=/vxe-table/v1/static/js/base.d8f1e355.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.d685fbb4.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.4b8557a4.js rel=prefetch><link href=/vxe-table/v1/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.744eba9f.js rel=prefetch><link href=/vxe-table/v1/static/js/module.ed36f195.js rel=prefetch><link href=/vxe-table/v1/static/js/optimize.6b86bef9.js rel=prefetch><link href=/vxe-table/v1/static/js/other.b65e4bdb.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.ea5b09a1.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.56be9834.js rel=prefetch><link href=/vxe-table/v1/static/js/start.19d147e0.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.b68144a8.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.b9e31b0a.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.220d0cf5.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.927c7c12.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.cae11f6d.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.b9e31b0a.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.220d0cf5.css rel=stylesheet></head><body><noscript><strong>We're sorry but vxe-table doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/vxe-table/v1/static/js/chunk-vendors.927c7c12.js></script><script src=/vxe-table/v1/static/js/index.cae11f6d.js></script></body></html>

File diff suppressed because one or more lines are too long

View File

@@ -9347,34 +9347,14 @@ var Methods = {
return this.$nextTick();
},
scrollToRow: function scrollToRow(row, column, isDelay) {
var _this23 = this;
if (row && this.fullAllDataRowMap.has(row)) {
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this23.hasTreeExpand(row)) {
_this23.setTreeExpansion(row, true);
}
});
}
}
DomTools.rowToVisible(this, row);
}
return this.scrollToColumn(column, isDelay || xe_utils_amd_xe_utils_default.a.isBoolean(column));
},
scrollToColumn: function scrollToColumn(column, isDelay) {
var _this24 = this;
var _this23 = this;
if (column && this.fullColumnMap.has(column)) {
DomTools.colToVisible(this, column);
@@ -9383,13 +9363,36 @@ var Methods = {
if (isDelay && this.scrollYLoad) {
return new Promise(function (resolve) {
return setTimeout(function () {
return resolve(_this24.$nextTick());
return resolve(_this23.$nextTick());
}, 50);
});
}
return this.$nextTick();
},
scrollToTreeRow: function scrollToTreeRow(row) {
var _this24 = this;
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this24.hasTreeExpand(row)) {
_this24.setTreeExpansion(row, true);
}
});
}
}
return this.$nextTick();
},
clearScroll: function clearScroll() {
var _this25 = this;
@@ -17425,7 +17428,9 @@ function () {
}
};
if (treeConfig || scrollYLoad) {
if (treeConfig) {
_this2.scrollToTreeRow(params.row).then(finish);
} else if (scrollYLoad) {
_this2.scrollToRow(params.row, true).then(finish);
} else {
finish();

View File

@@ -9356,34 +9356,14 @@ var Methods = {
return this.$nextTick();
},
scrollToRow: function scrollToRow(row, column, isDelay) {
var _this23 = this;
if (row && this.fullAllDataRowMap.has(row)) {
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this23.hasTreeExpand(row)) {
_this23.setTreeExpansion(row, true);
}
});
}
}
DomTools.rowToVisible(this, row);
}
return this.scrollToColumn(column, isDelay || xe_utils_amd_xe_utils_default.a.isBoolean(column));
},
scrollToColumn: function scrollToColumn(column, isDelay) {
var _this24 = this;
var _this23 = this;
if (column && this.fullColumnMap.has(column)) {
DomTools.colToVisible(this, column);
@@ -9392,13 +9372,36 @@ var Methods = {
if (isDelay && this.scrollYLoad) {
return new Promise(function (resolve) {
return setTimeout(function () {
return resolve(_this24.$nextTick());
return resolve(_this23.$nextTick());
}, 50);
});
}
return this.$nextTick();
},
scrollToTreeRow: function scrollToTreeRow(row) {
var _this24 = this;
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this24.hasTreeExpand(row)) {
_this24.setTreeExpansion(row, true);
}
});
}
}
return this.$nextTick();
},
clearScroll: function clearScroll() {
var _this25 = this;
@@ -17434,7 +17437,9 @@ function () {
}
};
if (treeConfig || scrollYLoad) {
if (treeConfig) {
_this2.scrollToTreeRow(params.row).then(finish);
} else if (scrollYLoad) {
_this2.scrollToRow(params.row, true).then(finish);
} else {
finish();

2
lib/index.min.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -9356,34 +9356,14 @@ var Methods = {
return this.$nextTick();
},
scrollToRow: function scrollToRow(row, column, isDelay) {
var _this23 = this;
if (row && this.fullAllDataRowMap.has(row)) {
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this23.hasTreeExpand(row)) {
_this23.setTreeExpansion(row, true);
}
});
}
}
DomTools.rowToVisible(this, row);
}
return this.scrollToColumn(column, isDelay || xe_utils_amd_xe_utils_default.a.isBoolean(column));
},
scrollToColumn: function scrollToColumn(column, isDelay) {
var _this24 = this;
var _this23 = this;
if (column && this.fullColumnMap.has(column)) {
DomTools.colToVisible(this, column);
@@ -9392,13 +9372,36 @@ var Methods = {
if (isDelay && this.scrollYLoad) {
return new Promise(function (resolve) {
return setTimeout(function () {
return resolve(_this24.$nextTick());
return resolve(_this23.$nextTick());
}, 50);
});
}
return this.$nextTick();
},
scrollToTreeRow: function scrollToTreeRow(row) {
var _this24 = this;
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this24.hasTreeExpand(row)) {
_this24.setTreeExpansion(row, true);
}
});
}
}
return this.$nextTick();
},
clearScroll: function clearScroll() {
var _this25 = this;
@@ -17434,7 +17437,9 @@ function () {
}
};
if (treeConfig || scrollYLoad) {
if (treeConfig) {
_this2.scrollToTreeRow(params.row).then(finish);
} else if (scrollYLoad) {
_this2.scrollToRow(params.row, true).then(finish);
} else {
finish();

File diff suppressed because one or more lines are too long

View File

@@ -3048,34 +3048,14 @@ var Methods = {
return this.$nextTick();
},
scrollToRow: function scrollToRow(row, column, isDelay) {
var _this23 = this;
if (row && this.fullAllDataRowMap.has(row)) {
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = _xeUtils.default.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this23.hasTreeExpand(row)) {
_this23.setTreeExpansion(row, true);
}
});
}
}
_tools.DomTools.rowToVisible(this, row);
}
return this.scrollToColumn(column, isDelay || _xeUtils.default.isBoolean(column));
},
scrollToColumn: function scrollToColumn(column, isDelay) {
var _this24 = this;
var _this23 = this;
if (column && this.fullColumnMap.has(column)) {
_tools.DomTools.colToVisible(this, column);
@@ -3084,13 +3064,36 @@ var Methods = {
if (isDelay && this.scrollYLoad) {
return new Promise(function (resolve) {
return setTimeout(function () {
return resolve(_this24.$nextTick());
return resolve(_this23.$nextTick());
}, 50);
});
}
return this.$nextTick();
},
scrollToTreeRow: function scrollToTreeRow(row) {
var _this24 = this;
var tableFullData = this.tableFullData,
treeConfig = this.treeConfig;
if (treeConfig) {
var matchObj = _xeUtils.default.findTree(tableFullData, function (item) {
return item === row;
}, treeConfig);
if (matchObj) {
var nodes = matchObj.nodes;
nodes.forEach(function (row, index) {
if (index < nodes.length - 1 && !_this24.hasTreeExpand(row)) {
_this24.setTreeExpansion(row, true);
}
});
}
}
return this.$nextTick();
},
clearScroll: function clearScroll() {
var _this25 = this;

File diff suppressed because one or more lines are too long

View File

@@ -175,7 +175,9 @@ var _default = {
}
};
if (treeConfig || scrollYLoad) {
if (treeConfig) {
_this2.scrollToTreeRow(params.row).then(finish);
} else if (scrollYLoad) {
_this2.scrollToRow(params.row, true).then(finish);
} else {
finish();

File diff suppressed because one or more lines are too long

View File

@@ -2195,18 +2195,6 @@ const Methods = {
},
scrollToRow (row, column, isDelay) {
if (row && this.fullAllDataRowMap.has(row)) {
let { tableFullData, treeConfig } = this
if (treeConfig) {
let matchObj = XEUtils.findTree(tableFullData, item => item === row, treeConfig)
if (matchObj) {
let nodes = matchObj.nodes
nodes.forEach((row, index) => {
if (index < nodes.length - 1 && !this.hasTreeExpand(row)) {
this.setTreeExpansion(row, true)
}
})
}
}
DomTools.rowToVisible(this, row)
}
return this.scrollToColumn(column, isDelay || XEUtils.isBoolean(column))
@@ -2220,6 +2208,21 @@ const Methods = {
}
return this.$nextTick()
},
scrollToTreeRow (row) {
let { tableFullData, treeConfig } = this
if (treeConfig) {
let matchObj = XEUtils.findTree(tableFullData, item => item === row, treeConfig)
if (matchObj) {
let nodes = matchObj.nodes
nodes.forEach((row, index) => {
if (index < nodes.length - 1 && !this.hasTreeExpand(row)) {
this.setTreeExpansion(row, true)
}
})
}
}
return this.$nextTick()
},
clearScroll () {
this.lastScrollLeft = 0
this.lastScrollTop = 0

View File

@@ -115,7 +115,9 @@ export default {
reject(args)
}
}
if (treeConfig || scrollYLoad) {
if (treeConfig) {
this.scrollToTreeRow(params.row).then(finish)
} else if (scrollYLoad) {
this.scrollToRow(params.row, true).then(finish)
} else {
finish()