优化重构

This commit is contained in:
xuliangzhan
2020-04-27 22:30:23 +08:00
parent 2fe4571e5d
commit d44d8581c6
10 changed files with 38 additions and 26 deletions

View File

@@ -13,4 +13,4 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
})();</script><link href=/vxe-table/static/css/advanced.494c8a78.css rel=prefetch><link href=/vxe-table/static/css/api.b4a8e07d.css rel=prefetch><link href=/vxe-table/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/static/css/edit.dc1a434e.css rel=prefetch><link href=/vxe-table/static/css/grid.ff4f2cc4.css rel=prefetch><link href=/vxe-table/static/css/module.300ea7d7.css rel=prefetch><link href=/vxe-table/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/static/css/scroll.c0725010.css rel=prefetch><link href=/vxe-table/static/css/start.5d992dc3.css rel=prefetch><link href=/vxe-table/static/css/tree.5f6af821.css rel=prefetch><link href=/vxe-table/static/css/virtual-tree.da294a30.css rel=prefetch><link href=/vxe-table/static/js/advanced.30b942b2.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.a19c7168.js rel=prefetch><link href=/vxe-table/static/js/api.7dfaf7c9.js rel=prefetch><link href=/vxe-table/static/js/base.8f4fd0ac.js rel=prefetch><link href=/vxe-table/static/js/edit.36c809db.js rel=prefetch><link href=/vxe-table/static/js/excel.a3b83606.js rel=prefetch><link href=/vxe-table/static/js/grid.4dc355f1.js rel=prefetch><link href=/vxe-table/static/js/module.1d631baa.js rel=prefetch><link href=/vxe-table/static/js/other.18d11a79.js rel=prefetch><link href=/vxe-table/static/js/plugin.f8dbc83a.js rel=prefetch><link href=/vxe-table/static/js/scroll.226a08a8.js rel=prefetch><link href=/vxe-table/static/js/start.0ee3f921.js rel=prefetch><link href=/vxe-table/static/js/tree.8129d19d.js rel=prefetch><link href=/vxe-table/static/js/virtual-tree.86161818.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.57b6f764.css rel=preload as=style><link href=/vxe-table/static/css/index.4c2600c0.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.f9a36809.js rel=preload as=script><link href=/vxe-table/static/js/index.44fa4a17.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.57b6f764.css rel=stylesheet><link href=/vxe-table/static/css/index.4c2600c0.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.f9a36809.js></script><script src=/vxe-table/static/js/index.44fa4a17.js></script></body></html>
})();</script><link href=/vxe-table/static/css/advanced.494c8a78.css rel=prefetch><link href=/vxe-table/static/css/api.b4a8e07d.css rel=prefetch><link href=/vxe-table/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/static/css/edit.dc1a434e.css rel=prefetch><link href=/vxe-table/static/css/grid.ff4f2cc4.css rel=prefetch><link href=/vxe-table/static/css/module.300ea7d7.css rel=prefetch><link href=/vxe-table/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/static/css/scroll.c0725010.css rel=prefetch><link href=/vxe-table/static/css/start.5d992dc3.css rel=prefetch><link href=/vxe-table/static/css/tree.5f6af821.css rel=prefetch><link href=/vxe-table/static/css/virtual-tree.da294a30.css rel=prefetch><link href=/vxe-table/static/js/advanced.30b942b2.js rel=prefetch><link href=/vxe-table/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.a19c7168.js rel=prefetch><link href=/vxe-table/static/js/api.7dfaf7c9.js rel=prefetch><link href=/vxe-table/static/js/base.8f4fd0ac.js rel=prefetch><link href=/vxe-table/static/js/edit.36c809db.js rel=prefetch><link href=/vxe-table/static/js/excel.a3b83606.js rel=prefetch><link href=/vxe-table/static/js/grid.4dc355f1.js rel=prefetch><link href=/vxe-table/static/js/module.1d631baa.js rel=prefetch><link href=/vxe-table/static/js/other.18d11a79.js rel=prefetch><link href=/vxe-table/static/js/plugin.f8dbc83a.js rel=prefetch><link href=/vxe-table/static/js/scroll.226a08a8.js rel=prefetch><link href=/vxe-table/static/js/start.0ee3f921.js rel=prefetch><link href=/vxe-table/static/js/tree.8129d19d.js rel=prefetch><link href=/vxe-table/static/js/virtual-tree.86161818.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.57b6f764.css rel=preload as=style><link href=/vxe-table/static/css/index.4c2600c0.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.f9a36809.js rel=preload as=script><link href=/vxe-table/static/js/index.eff465ac.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.57b6f764.css rel=stylesheet><link href=/vxe-table/static/css/index.4c2600c0.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.f9a36809.js></script><script src=/vxe-table/static/js/index.eff465ac.js></script></body></html>

File diff suppressed because one or more lines are too long

View File

@@ -13,4 +13,4 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
})();</script><link href=/vxe-table/v1/static/css/advanced.494c8a78.css rel=prefetch><link href=/vxe-table/v1/static/css/api.c7b35ffb.css rel=prefetch><link href=/vxe-table/v1/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.5ed65c61.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.ff4f2cc4.css rel=prefetch><link href=/vxe-table/v1/static/css/module.300ea7d7.css rel=prefetch><link href=/vxe-table/v1/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v1/static/css/scroll.c0725010.css rel=prefetch><link href=/vxe-table/v1/static/css/start.5d992dc3.css rel=prefetch><link href=/vxe-table/v1/static/css/tree.5f6af821.css rel=prefetch><link href=/vxe-table/v1/static/css/virtual-tree.da294a30.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.b91f23a5.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.a19c7168.js rel=prefetch><link href=/vxe-table/v1/static/js/api.a20076b7.js rel=prefetch><link href=/vxe-table/v1/static/js/base.2804a458.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.0fda900f.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.fe877321.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.786d60fb.js rel=prefetch><link href=/vxe-table/v1/static/js/module.653e411b.js rel=prefetch><link href=/vxe-table/v1/static/js/other.cbfa8e16.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.4152ff43.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.a67c9e30.js rel=prefetch><link href=/vxe-table/v1/static/js/start.2e3d6988.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.8fbc9234.js rel=prefetch><link href=/vxe-table/v1/static/js/virtual-tree.7297cd2e.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.487c3c2d.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.8dda375d.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.400422d8.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.acf268cd.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.487c3c2d.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.8dda375d.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.400422d8.js></script><script src=/vxe-table/v1/static/js/index.acf268cd.js></script></body></html>
})();</script><link href=/vxe-table/v1/static/css/advanced.494c8a78.css rel=prefetch><link href=/vxe-table/v1/static/css/api.c7b35ffb.css rel=prefetch><link href=/vxe-table/v1/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v1/static/css/edit.5ed65c61.css rel=prefetch><link href=/vxe-table/v1/static/css/grid.ff4f2cc4.css rel=prefetch><link href=/vxe-table/v1/static/css/module.300ea7d7.css rel=prefetch><link href=/vxe-table/v1/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v1/static/css/scroll.c0725010.css rel=prefetch><link href=/vxe-table/v1/static/css/start.5d992dc3.css rel=prefetch><link href=/vxe-table/v1/static/css/tree.5f6af821.css rel=prefetch><link href=/vxe-table/v1/static/css/virtual-tree.da294a30.css rel=prefetch><link href=/vxe-table/v1/static/js/advanced.b91f23a5.js rel=prefetch><link href=/vxe-table/v1/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.a19c7168.js rel=prefetch><link href=/vxe-table/v1/static/js/api.a20076b7.js rel=prefetch><link href=/vxe-table/v1/static/js/base.2804a458.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.0fda900f.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.fe877321.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.786d60fb.js rel=prefetch><link href=/vxe-table/v1/static/js/module.653e411b.js rel=prefetch><link href=/vxe-table/v1/static/js/other.cbfa8e16.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.4152ff43.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.a67c9e30.js rel=prefetch><link href=/vxe-table/v1/static/js/start.2e3d6988.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.8fbc9234.js rel=prefetch><link href=/vxe-table/v1/static/js/virtual-tree.7297cd2e.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.487c3c2d.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.8dda375d.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.400422d8.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.c49585a6.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.487c3c2d.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.8dda375d.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.400422d8.js></script><script src=/vxe-table/v1/static/js/index.c49585a6.js></script></body></html>

File diff suppressed because one or more lines are too long

View File

@@ -13,4 +13,4 @@
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
}
})();</script><link href=/vxe-table/v2/static/css/advanced.494c8a78.css rel=prefetch><link href=/vxe-table/v2/static/css/api.c7b35ffb.css rel=prefetch><link href=/vxe-table/v2/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v2/static/css/edit.dc1a434e.css rel=prefetch><link href=/vxe-table/v2/static/css/grid.ff4f2cc4.css rel=prefetch><link href=/vxe-table/v2/static/css/module.300ea7d7.css rel=prefetch><link href=/vxe-table/v2/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v2/static/css/scroll.c0725010.css rel=prefetch><link href=/vxe-table/v2/static/css/start.5d992dc3.css rel=prefetch><link href=/vxe-table/v2/static/css/tree.5f6af821.css rel=prefetch><link href=/vxe-table/v2/static/css/virtual-tree.da294a30.css rel=prefetch><link href=/vxe-table/v2/static/js/advanced.0c23b4b0.js rel=prefetch><link href=/vxe-table/v2/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.d13562ac.js rel=prefetch><link href=/vxe-table/v2/static/js/api.683d28d9.js rel=prefetch><link href=/vxe-table/v2/static/js/base.c4d59b1f.js rel=prefetch><link href=/vxe-table/v2/static/js/edit.f07e1496.js rel=prefetch><link href=/vxe-table/v2/static/js/excel.3b931274.js rel=prefetch><link href=/vxe-table/v2/static/js/grid.37139125.js rel=prefetch><link href=/vxe-table/v2/static/js/module.86d3c625.js rel=prefetch><link href=/vxe-table/v2/static/js/other.67de3052.js rel=prefetch><link href=/vxe-table/v2/static/js/plugin.6db0405b.js rel=prefetch><link href=/vxe-table/v2/static/js/scroll.2a3f9b12.js rel=prefetch><link href=/vxe-table/v2/static/js/start.daf21b94.js rel=prefetch><link href=/vxe-table/v2/static/js/tree.90486257.js rel=prefetch><link href=/vxe-table/v2/static/js/virtual-tree.e23d3864.js rel=prefetch><link href=/vxe-table/v2/static/css/chunk-vendors.4bf3795c.css rel=preload as=style><link href=/vxe-table/v2/static/css/index.bfc10907.css rel=preload as=style><link href=/vxe-table/v2/static/js/chunk-vendors.dc73d353.js rel=preload as=script><link href=/vxe-table/v2/static/js/index.8f198b6e.js rel=preload as=script><link href=/vxe-table/v2/static/css/chunk-vendors.4bf3795c.css rel=stylesheet><link href=/vxe-table/v2/static/css/index.bfc10907.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/v2/static/js/chunk-vendors.dc73d353.js></script><script src=/vxe-table/v2/static/js/index.8f198b6e.js></script></body></html>
})();</script><link href=/vxe-table/v2/static/css/advanced.494c8a78.css rel=prefetch><link href=/vxe-table/v2/static/css/api.c7b35ffb.css rel=prefetch><link href=/vxe-table/v2/static/css/base.66df2255.css rel=prefetch><link href=/vxe-table/v2/static/css/edit.dc1a434e.css rel=prefetch><link href=/vxe-table/v2/static/css/grid.ff4f2cc4.css rel=prefetch><link href=/vxe-table/v2/static/css/module.300ea7d7.css rel=prefetch><link href=/vxe-table/v2/static/css/other.68b39f76.css rel=prefetch><link href=/vxe-table/v2/static/css/scroll.c0725010.css rel=prefetch><link href=/vxe-table/v2/static/css/start.5d992dc3.css rel=prefetch><link href=/vxe-table/v2/static/css/tree.5f6af821.css rel=prefetch><link href=/vxe-table/v2/static/css/virtual-tree.da294a30.css rel=prefetch><link href=/vxe-table/v2/static/js/advanced.0c23b4b0.js rel=prefetch><link href=/vxe-table/v2/static/js/advanced~base~edit~excel~grid~module~other~plugin~scroll~start~tree~virtual-tree.d13562ac.js rel=prefetch><link href=/vxe-table/v2/static/js/api.683d28d9.js rel=prefetch><link href=/vxe-table/v2/static/js/base.c4d59b1f.js rel=prefetch><link href=/vxe-table/v2/static/js/edit.f07e1496.js rel=prefetch><link href=/vxe-table/v2/static/js/excel.3b931274.js rel=prefetch><link href=/vxe-table/v2/static/js/grid.37139125.js rel=prefetch><link href=/vxe-table/v2/static/js/module.86d3c625.js rel=prefetch><link href=/vxe-table/v2/static/js/other.67de3052.js rel=prefetch><link href=/vxe-table/v2/static/js/plugin.6db0405b.js rel=prefetch><link href=/vxe-table/v2/static/js/scroll.2a3f9b12.js rel=prefetch><link href=/vxe-table/v2/static/js/start.daf21b94.js rel=prefetch><link href=/vxe-table/v2/static/js/tree.90486257.js rel=prefetch><link href=/vxe-table/v2/static/js/virtual-tree.e23d3864.js rel=prefetch><link href=/vxe-table/v2/static/css/chunk-vendors.4bf3795c.css rel=preload as=style><link href=/vxe-table/v2/static/css/index.bfc10907.css rel=preload as=style><link href=/vxe-table/v2/static/js/chunk-vendors.dc73d353.js rel=preload as=script><link href=/vxe-table/v2/static/js/index.52ed741e.js rel=preload as=script><link href=/vxe-table/v2/static/css/chunk-vendors.4bf3795c.css rel=stylesheet><link href=/vxe-table/v2/static/css/index.bfc10907.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/v2/static/js/chunk-vendors.dc73d353.js></script><script src=/vxe-table/v2/static/js/index.52ed741e.js></script></body></html>

File diff suppressed because one or more lines are too long

View File

@@ -3,6 +3,7 @@ import GlobalConfig from '../../conf'
import VxeModal from '../../modal/src/modal'
import VxeInput from '../../input/src/input'
import VxeCheckbox from '../../checkbox/src/checkbox'
import { UtilTools } from '../../tools'
export default {
name: 'VxeCustomPanel',
@@ -40,7 +41,7 @@ export default {
const checkMethod = $xetable ? $xetable.customOpts.checkMethod : null
const cols = []
XEUtils.eachTree(collectColumn, column => {
const colTitle = column.getTitle()
const colTitle = UtilTools.formatText(column.getTitle(), 1)
const isColGroup = column.children && column.children.length
const isDisabled = checkMethod ? !checkMethod({ column }) : false
cols.push(

View File

@@ -5,6 +5,7 @@ import VxeInput from '../../input/src/input'
import VxeCheckbox from '../../checkbox/src/checkbox'
import VxeSelect from '../../select/src/select'
import VxeOption from '../../select/src/option'
import { UtilTools } from '../../tools'
export default {
name: 'VxeExportPanel',
@@ -38,7 +39,7 @@ export default {
const { _e, isAll, isIndeterminate, showSheet, defaultOptions, storeData } = this
const cols = []
XEUtils.eachTree(storeData.columns, column => {
const colTitle = column.getTitle()
const colTitle = UtilTools.formatText(column.getTitle(), 1)
const isColGroup = column.children && column.children.length
cols.push(
h('li', {

View File

@@ -4,7 +4,7 @@ import VXETable from '../../v-x-e-table'
import { UtilTools, DomTools } from '../../tools'
// 默认导出或打印的 HTML 样式
const defaultHtmlStyle = 'body{margin:0}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border:0;border-collapse:separate;table-layout:fixed;text-align:left;font-size:14px;border-spacing:0}.vxe-table.is--print{width:100%}td,thead tr:last-child th{border-bottom:1px solid #e8eaec}.vxe-table:not(.b--style-none) thead tr:first-child th,.vxe-table:not(.show--head):not(.b--style-none) tbody tr:first-child td{border-top:1px solid #e8eaec}.vxe-table:not(.b--style-none) tr td:first-child,.vxe-table:not(.b--style-none) tr th:first-child{border-left:1px solid #e8eaec}.vxe-table:not(.t--border){border-width:1px}.vxe-table.t--border:not(.b--style-none) td,table.t--border:not(.b--style-none) th{border-right:1px solid #e8eaec}.vxe-table:not(.b--style-none) thead{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:.5em .4em}.col--center{text-align:center}.col--right{text-align:right}.col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-icon{position:absolute;left:0;top:.3em;width:0;height:0;border-style:solid;border-width:.5em;border-top-color:#939599;border-right-color:transparent;border-bottom-color:transparent;border-left-color:transparent}.vxe-table--tree-cell{display:block;padding-left:1.5em}'
const defaultHtmlStyle = 'body{margin:0;}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border:0;border-collapse:separate;text-align:left;font-size:14px;border-spacing:0}.vxe-table:not(.is--print ){table-layout:fixed;}.vxe-table.is--print{width:100%}.vxe-table.border--default,.vxe-table.border--full,.vxe-table.border--outer{border-top:1px solid #e8eaec;}.vxe-table.border--default,vxe-table.border--full,.vxe-table.border--outer{border-left:1px solid #e8eaec;}.vxe-table.border--outer,.vxe-table.border--default th,.vxe-table.border--default td,.vxe-table.border--full th,.vxe-table.border--full td,.vxe-table.border--outer th,.vxe-table.border--inner th,.vxe-table.border--inner td{border-bottom:1px solid #e8eaec}.vxe-table.border--default,.vxe-table.border--outer,.vxe-table.border--full th,.vxe-table.border--full td{border-right:1px solid #e8eaec}.vxe-table.border--default th,.vxe-table.border--full th,.vxe-table.border--outer th{background-color:#f8f8f9;}.vxe-table td>div,.vxe-table th>div{padding:.5em .4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table:not(.is--print ) .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-icon{position:absolute;left:0;top:.3em;width:0;height:0;border-style:solid;border-width:.5em;border-top-color:#939599;border-right-color:transparent;border-bottom-color:transparent;border-left-color:transparent}.vxe-table--tree-cell{display:block;padding-left:1.5em}'
// 导入
let fileForm
@@ -30,6 +30,16 @@ function getSeq ($xetable, row, rowIndex, column, columnIndex) {
return seqMethod ? seqMethod({ row, rowIndex, column, columnIndex }) : (seqOpts.startIndex + rowIndex + 1)
}
function toTableBorder (border) {
if (border === true) {
return 'full'
}
if (border) {
return border
}
return 'default'
}
function getLabelData ($xetable, opts, columns, datas) {
const { treeConfig, treeOpts, scrollXLoad, scrollYLoad } = $xetable
if (treeConfig) {
@@ -209,11 +219,11 @@ function hasEllipsis ($xetable, column, property, allColumnOverflow) {
function toHtml ($xetable, opts, columns, datas) {
const { id, border, treeConfig, treeOpts, isAllSelected, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = $xetable
const isPrint = opts.print
const clss = [
'vxe-table',
border ? 't--border' : '',
border === 'none' ? 'b--style-none' : '',
opts.print ? 'is--print' : '',
`border--${toTableBorder(border)}`,
isPrint ? 'is--print' : '',
opts.isHeader ? 'show--head' : ''
].filter(cls => cls)
let html = [
@@ -235,9 +245,9 @@ function toHtml ($xetable, opts, columns, datas) {
classNames.push(`col--${headAlign}`)
}
if (column.type === 'checkbox') {
return `<td class="${classNames.join(' ')}"><div style="width: ${column.renderWidth}px"><input type="checkbox" ${isAllSelected ? 'checked' : ''}></div></td>`
return `<td class="${classNames.join(' ')}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><input type="checkbox" ${isAllSelected ? 'checked' : ''}></div></td>`
}
return `<th class="${classNames.join(' ')}" title="${cellTitle}"><div style="width: ${column.renderWidth}px">${cellTitle}</div></th>`
return `<th class="${classNames.join(' ')}" title="${cellTitle}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${cellTitle}</div></th>`
}).join('')}</tr></thead>`
}
if (datas.length) {
@@ -258,18 +268,18 @@ function toHtml ($xetable, opts, columns, datas) {
}
classNames.push('vxe-table--tree-node')
if (column.type === 'radio') {
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div style="width: ${column.renderWidth}px"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${row._level * treeOpts.indent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell"><input type="radio" name="radio_${id}" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></div></div></td>`
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${row._level * treeOpts.indent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell"><input type="radio" name="radio_${id}" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></div></div></td>`
} else if (column.type === 'checkbox') {
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div style="width: ${column.renderWidth}px"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${row._level * treeOpts.indent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell"><input type="checkbox" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></div></div></td>`
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${row._level * treeOpts.indent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell"><input type="checkbox" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></div></div></td>`
}
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div style="width: ${column.renderWidth}px"><div class="vxe-table--tree-node-wrapper" style="padding-left: ${row._level * treeOpts.indent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell">${cellValue}</div></div></div></td>`
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><div class="vxe-table--tree-node-wrapper" style="padding-left: ${row._level * treeOpts.indent}px"><div class="vxe-table--tree-icon-wrapper">${treeIcon}</div><div class="vxe-table--tree-cell">${cellValue}</div></div></div></td>`
}
if (column.type === 'radio') {
return `<td class="${classNames.join(' ')}"><div style="width: ${column.renderWidth}px"><input type="radio" name="radio_${id}" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
return `<td class="${classNames.join(' ')}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><input type="radio" name="radio_${id}" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
} else if (column.type === 'checkbox') {
return `<td class="${classNames.join(' ')}"><div style="width: ${column.renderWidth}px"><input type="checkbox" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
return `<td class="${classNames.join(' ')}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><input type="checkbox" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
}
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div style="width: ${column.renderWidth}px">${cellValue}</div></td>`
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${cellValue}</div></td>`
}).join('') + '</tr>'
})
} else {
@@ -282,11 +292,11 @@ function toHtml ($xetable, opts, columns, datas) {
classNames.push(`col--${cellAlign}`)
}
if (column.type === 'radio') {
return `<td class="${classNames.join(' ')}"><div style="width: ${column.renderWidth}px"><input type="radio" name="radio_${id}" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
return `<td class="${classNames.join(' ')}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><input type="radio" name="radio_${id}" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
} else if (column.type === 'checkbox') {
return `<td class="${classNames.join(' ')}"><div style="width: ${column.renderWidth}px"><input type="checkbox" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
return `<td class="${classNames.join(' ')}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}><input type="checkbox" ${cellValue === true || cellValue === 'true' ? 'checked' : ''}></div></td>`
}
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div style="width: ${column.renderWidth}px">${cellValue}</div></td>`
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${cellValue}</div></td>`
}).join('') + '</tr>'
})
}
@@ -305,7 +315,7 @@ function toHtml ($xetable, opts, columns, datas) {
if (footAlign) {
classNames.push(`col--${footAlign}`)
}
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div style="width: ${column.renderWidth}px">${cellValue}</div></td>`
return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${cellValue}</div></td>`
}).join('')}</tr>`
})
html += '</tfoot>'

View File

@@ -86,11 +86,11 @@ function renderCustoms (h, _vm) {
customBtnOns.click = _vm.handleClickSettingEvent
}
XEUtils.eachTree(collectColumn, (column) => {
const colTitle = column.getTitle()
const colTitle = UtilTools.formatText(column.getTitle(), 1)
const colKey = column.getKey()
const isColGroup = column.children && column.children.length
const isDisabled = checkMethod ? !checkMethod({ column }) : false
if (isColGroup || (colTitle && colKey)) {
if (isColGroup || colKey) {
cols.push(
h('li', {
class: ['vxe-custom--option', `level--${column.level}`, {