Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuliangzhan
xuliangzhan committed Jul 24, 2019
1 parent 4da7695 commit 0598501
Show file tree
Hide file tree
Showing 12 changed files with 117 additions and 188 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
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>vxe-table 表格</title><link href=/vxe-table/static/css/api.0275e9e8.css rel=prefetch><link href=/vxe-table/static/css/base.77f42f9a.css rel=prefetch><link href=/vxe-table/static/css/edit.d43a7aa7.css rel=prefetch><link href=/vxe-table/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/static/css/optimize.a38f7a43.css rel=prefetch><link href=/vxe-table/static/css/other.e70bd07f.css rel=prefetch><link href=/vxe-table/static/css/table.de81d770.css rel=prefetch><link href=/vxe-table/static/js/api.46480a0c.js rel=prefetch><link href=/vxe-table/static/js/base.f6bc2070.js rel=prefetch><link href=/vxe-table/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.1e06d962.js rel=prefetch><link href=/vxe-table/static/js/edit.278d80cd.js rel=prefetch><link href=/vxe-table/static/js/excel.855d5012.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.b0fef3c8.js rel=prefetch><link href=/vxe-table/static/js/optimize.210a3128.js rel=prefetch><link href=/vxe-table/static/js/other.bff8c174.js rel=prefetch><link href=/vxe-table/static/js/plugin.e10aad18.js rel=prefetch><link href=/vxe-table/static/js/scroll.a810846f.js rel=prefetch><link href=/vxe-table/static/js/start.49f54533.js rel=prefetch><link href=/vxe-table/static/js/table.6e0742ef.js rel=prefetch><link href=/vxe-table/static/js/tree.c456cbe8.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.c76a4c1c.css rel=preload as=style><link href=/vxe-table/static/css/index.82e9c758.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.ec7e5a20.js rel=preload as=script><link href=/vxe-table/static/js/index.cc381a02.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.c76a4c1c.css rel=stylesheet><link href=/vxe-table/static/css/index.82e9c758.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.ec7e5a20.js></script><script src=/vxe-table/static/js/index.cc381a02.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>vxe-table 表格</title><link href=/vxe-table/static/css/api.0275e9e8.css rel=prefetch><link href=/vxe-table/static/css/base.77f42f9a.css rel=prefetch><link href=/vxe-table/static/css/edit.d43a7aa7.css rel=prefetch><link href=/vxe-table/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/static/css/optimize.a38f7a43.css rel=prefetch><link href=/vxe-table/static/css/other.e70bd07f.css rel=prefetch><link href=/vxe-table/static/css/table.de81d770.css rel=prefetch><link href=/vxe-table/static/js/api.46480a0c.js rel=prefetch><link href=/vxe-table/static/js/base.f6bc2070.js rel=prefetch><link href=/vxe-table/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.1e06d962.js rel=prefetch><link href=/vxe-table/static/js/edit.278d80cd.js rel=prefetch><link href=/vxe-table/static/js/excel.855d5012.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.b0fef3c8.js rel=prefetch><link href=/vxe-table/static/js/optimize.210a3128.js rel=prefetch><link href=/vxe-table/static/js/other.bff8c174.js rel=prefetch><link href=/vxe-table/static/js/plugin.e10aad18.js rel=prefetch><link href=/vxe-table/static/js/scroll.a810846f.js rel=prefetch><link href=/vxe-table/static/js/start.49f54533.js rel=prefetch><link href=/vxe-table/static/js/table.6e0742ef.js rel=prefetch><link href=/vxe-table/static/js/tree.c456cbe8.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.c76a4c1c.css rel=preload as=style><link href=/vxe-table/static/css/index.82e9c758.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.ec7e5a20.js rel=preload as=script><link href=/vxe-table/static/js/index.e3e9959b.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.c76a4c1c.css rel=stylesheet><link href=/vxe-table/static/css/index.82e9c758.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.ec7e5a20.js></script><script src=/vxe-table/static/js/index.e3e9959b.js></script></body></html>
2 changes: 1 addition & 1 deletion docs/static/js/index.cc381a02.js → docs/static/js/index.e3e9959b.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/v1/index.html
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>vxe-table 表格</title><link href=/vxe-table/v1/static/css/api.0275e9e8.css rel=prefetch><link href=/vxe-table/v1/static/css/base.77f42f9a.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.d43a7aa7.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/v1/static/css/optimize.a38f7a43.css rel=prefetch><link href=/vxe-table/v1/static/css/other.e70bd07f.css rel=prefetch><link href=/vxe-table/v1/static/css/table.de81d770.css rel=prefetch><link href=/vxe-table/v1/static/js/api.52978df7.js rel=prefetch><link href=/vxe-table/v1/static/js/base.d5450de2.js rel=prefetch><link href=/vxe-table/v1/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.1e06d962.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.b938dbe5.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.fdb99452.js rel=prefetch><link href=/vxe-table/v1/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.b8fe7514.js rel=prefetch><link href=/vxe-table/v1/static/js/optimize.9d51408b.js rel=prefetch><link href=/vxe-table/v1/static/js/other.6032ea2c.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.7df610b2.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.6ea1b818.js rel=prefetch><link href=/vxe-table/v1/static/js/start.a54156d2.js rel=prefetch><link href=/vxe-table/v1/static/js/table.5eead1e4.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.2c290885.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.107c4dc7.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.e17f63bf.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.df1d7675.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.35626d64.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.107c4dc7.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.e17f63bf.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.df1d7675.js></script><script src=/vxe-table/v1/static/js/index.35626d64.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>vxe-table 表格</title><link href=/vxe-table/v1/static/css/api.0275e9e8.css rel=prefetch><link href=/vxe-table/v1/static/css/base.77f42f9a.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.d43a7aa7.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.b620cd41.css rel=prefetch><link href=/vxe-table/v1/static/css/optimize.a38f7a43.css rel=prefetch><link href=/vxe-table/v1/static/css/other.e70bd07f.css rel=prefetch><link href=/vxe-table/v1/static/css/table.de81d770.css rel=prefetch><link href=/vxe-table/v1/static/js/api.52978df7.js rel=prefetch><link href=/vxe-table/v1/static/js/base.d5450de2.js rel=prefetch><link href=/vxe-table/v1/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.1e06d962.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.b938dbe5.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.fdb99452.js rel=prefetch><link href=/vxe-table/v1/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.b8fe7514.js rel=prefetch><link href=/vxe-table/v1/static/js/optimize.9d51408b.js rel=prefetch><link href=/vxe-table/v1/static/js/other.6032ea2c.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.7df610b2.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.6ea1b818.js rel=prefetch><link href=/vxe-table/v1/static/js/start.a54156d2.js rel=prefetch><link href=/vxe-table/v1/static/js/table.5eead1e4.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.2c290885.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.107c4dc7.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.e17f63bf.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.df1d7675.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.346a1366.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.107c4dc7.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.e17f63bf.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.df1d7675.js></script><script src=/vxe-table/v1/static/js/index.346a1366.js></script></body></html>
2 changes: 1 addition & 1 deletion docs/v1/static/js/index.35626d64.js → docs/v1/static/js/index.346a1366.js
View file

Large diffs are not rendered by default.

55 changes: 21 additions & 34 deletions lib/body/src/body.js
View file
Expand Up @@ -15,9 +15,29 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de

function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }

function renderBorder(h, type) {
return h('div', {
class: "vxe-table-".concat(type, "ed-borders"),
ref: "".concat(type, "Borders")
}, [h('span', {
class: 'vxe-table-border-top',
ref: "".concat(type, "Top")
}), h('span', {
class: 'vxe-table-border-right',
ref: "".concat(type, "Right")
}), h('span', {
class: 'vxe-table-border-bottom',
ref: "".concat(type, "Bottom")
}), h('span', {
class: 'vxe-table-border-left',
ref: "".concat(type, "Left")
})]);
}
/**
* 渲染列
*/


function renderColumn(h, _vm, $table, $seq, seq, fixedType, rowLevel, row, rowIndex, $rowIndex, column, columnIndex, $columnIndex) {
var _ref2;

Expand Down Expand Up @@ -445,9 +465,6 @@ var _default = {

return h('div', {
class: ['vxe-table--body-wrapper', fixedType ? "fixed-".concat(fixedType, "--wrapper") : 'body--wrapper'],
attrs: {
fixed: fixedType
},
on: {
mouseleave: $table.clearHoverRow
}
Expand Down Expand Up @@ -490,37 +507,7 @@ var _default = {
*/
!fixedType && (mouseConfig.checked || keyboardConfig.isCut) ? h('div', {
class: 'vxe-table--borders'
}, [mouseConfig.checked ? h('div', {
class: 'vxe-table-checked-borders',
ref: 'checkBorders'
}, [h('span', {
class: 'vxe-table-border-top',
ref: 'checkTop'
}), h('span', {
class: 'vxe-table-border-right',
ref: 'checkRight'
}), h('span', {
class: 'vxe-table-border-bottom',
ref: 'checkBottom'
}), h('span', {
class: 'vxe-table-border-left',
ref: 'checkLeft'
})]) : null, keyboardConfig.isCut ? h('div', {
class: 'vxe-table-copyed-borders',
ref: 'copyBorders'
}, [h('span', {
class: 'vxe-table-border-top',
ref: 'copyTop'
}), h('span', {
class: 'vxe-table-border-right',
ref: 'copyRight'
}), h('span', {
class: 'vxe-table-border-bottom',
ref: 'copyBottom'
}), h('span', {
class: 'vxe-table-border-left',
ref: 'copyLeft'
})]) : null]) : null, !fixedType && !tableData.length ? h('div', {
}, [mouseConfig.checked ? renderBorder(h, 'check') : null, keyboardConfig.isCut ? renderBorder(h, 'copy') : null]) : null, !fixedType && !tableData.length ? h('div', {
class: 'vxe-table--empty-block',
ref: 'emptyBlock'
}, [h('span', {
Expand Down

0 comments on commit 0598501

Please sign in to comment.