Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuliangzhan
xuliangzhan committed Jun 22, 2019
1 parent e5d29f8 commit 5416451
Show file tree
Hide file tree
Showing 39 changed files with 541 additions and 256 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
View file
Original file line number Diff line number Diff line change
@@ -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.665885fc.css rel=prefetch><link href=/vxe-table/static/css/base.5a9faa20.css rel=prefetch><link href=/vxe-table/static/css/other.620c0202.css rel=prefetch><link href=/vxe-table/static/css/table.5b9301a0.css rel=prefetch><link href=/vxe-table/static/js/api.b11d2be5.js rel=prefetch><link href=/vxe-table/static/js/base.330051c2.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.56eeb3f2.js rel=prefetch><link href=/vxe-table/static/js/excel.99e7a808.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.37f569bf.js rel=prefetch><link href=/vxe-table/static/js/other.8123a491.js rel=prefetch><link href=/vxe-table/static/js/plugin.90c600ce.js rel=prefetch><link href=/vxe-table/static/js/scroll.449401af.js rel=prefetch><link href=/vxe-table/static/js/start.0edbf198.js rel=prefetch><link href=/vxe-table/static/js/table.40593ec0.js rel=prefetch><link href=/vxe-table/static/js/tree.f7f28335.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.de2df6d8.css rel=preload as=style><link href=/vxe-table/static/css/index.8f18f213.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.e95f6784.js rel=preload as=script><link href=/vxe-table/static/js/index.caf342e3.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.de2df6d8.css rel=stylesheet><link href=/vxe-table/static/css/index.8f18f213.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.e95f6784.js></script><script src=/vxe-table/static/js/index.caf342e3.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.5a9faa20.css rel=prefetch><link href=/vxe-table/static/css/other.620c0202.css rel=prefetch><link href=/vxe-table/static/css/table.688df247.css rel=prefetch><link href=/vxe-table/static/js/api.f7b63a74.js rel=prefetch><link href=/vxe-table/static/js/base.ea365880.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.56eeb3f2.js rel=prefetch><link href=/vxe-table/static/js/excel.99e7a808.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.37f569bf.js rel=prefetch><link href=/vxe-table/static/js/other.8123a491.js rel=prefetch><link href=/vxe-table/static/js/plugin.90c600ce.js rel=prefetch><link href=/vxe-table/static/js/scroll.449401af.js rel=prefetch><link href=/vxe-table/static/js/start.0edbf198.js rel=prefetch><link href=/vxe-table/static/js/table.40593ec0.js rel=prefetch><link href=/vxe-table/static/js/tree.f7f28335.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.de2df6d8.css rel=preload as=style><link href=/vxe-table/static/css/index.8f18f213.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.e95f6784.js rel=preload as=script><link href=/vxe-table/static/js/index.445d917a.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.de2df6d8.css rel=stylesheet><link href=/vxe-table/static/css/index.8f18f213.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.e95f6784.js></script><script src=/vxe-table/static/js/index.445d917a.js></script></body></html>
1 change: 1 addition & 0 deletions docs/static/css/api.0275e9e8.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.api-table .api-disabled{color:#cb2431}.api-table .disabled-line-through{text-decoration:line-through}
1 change: 0 additions & 1 deletion docs/static/css/api.665885fc.css
View file

This file was deleted.

0 docs/static/css/table.5b9301a0.css → docs/static/css/table.688df247.css
View file
File renamed without changes.
1 change: 0 additions & 1 deletion docs/static/js/api.b11d2be5.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/js/api.f7b63a74.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/static/js/base.330051c2.js → docs/static/js/base.ea365880.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/static/js/index.445d917a.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/static/js/index.caf342e3.js
View file

This file was deleted.

6 changes: 6 additions & 0 deletions examples/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,12 @@ export default {
name: 'TableHeader'
}
},
{
label: 'app.aside.nav.headerHighlight',
locat: {
name: 'TableHeaderHighlight'
}
},
{
label: 'app.aside.nav.resizable',
demoUrl: 'https://jsrun.net/5AXKp',
Expand Down
4 changes: 2 additions & 2 deletions examples/api/column.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ const apis = [
{
name: 'width',
descKey: 'app.api.tableColumn.desc.width',
type: 'Number,String',
type: 'Number, String',
enum: '数值px，数值%',
defVal: '默认均匀分配',
list: []
},
{
name: 'min-width',
descKey: 'app.api.tableColumn.desc.minWidth',
type: 'Number,String',
type: 'Number, String',
enum: '数值px，数值%',
defVal: '',
list: []
Expand Down
56 changes: 28 additions & 28 deletions examples/api/table.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@ const apis = [
{
name: 'height',
descKey: 'app.api.table.desc.height',
type: 'Number,String',
type: 'Number, String',
enum: 'auto（铺满父容器高度），数值px',
defVal: '',
list: []
},
{
name: 'max-height',
descKey: 'app.api.table.desc.maxHeight',
type: 'Number,String',
type: 'Number, String',
enum: '数值px',
defVal: '',
list: []
Expand Down Expand Up @@ -255,47 +255,47 @@ const apis = [
{
name: 'row-class-name',
descKey: 'app.api.table.desc.rowClassName',
type: 'String,Function',
type: 'String, Function',
enum: '',
defVal: '',
list: []
},
{
name: 'cell-class-name',
descKey: 'app.api.table.desc.cellClassName',
type: 'String,Function',
type: 'String, Function',
enum: '',
defVal: '',
list: []
},
{
name: 'header-row-class-name',
descKey: 'app.api.table.desc.headerRowClassName',
type: 'String,Function',
type: 'String, Function',
enum: '',
defVal: '',
list: []
},
{
name: 'header-cell-class-name',
descKey: 'app.api.table.desc.headerCellClassName',
type: 'String,Function',
type: 'String, Function',
enum: '',
defVal: '',
list: []
},
{
name: 'footer-row-class-name',
descKey: 'app.api.table.desc.footerRowClassName',
type: 'String,Function',
type: 'String, Function',
enum: '',
defVal: '',
list: []
},
{
name: 'footer-cell-class-name',
descKey: 'app.api.table.desc.footerCellClassName',
type: 'String,Function',
type: 'String, Function',
enum: '',
defVal: '',
list: []
Expand Down Expand Up @@ -327,7 +327,7 @@ const apis = [
{
name: 'show-overflow',
descKey: 'app.api.table.desc.showOverflow',
type: 'Boolean,String',
type: 'Boolean, String',
enum: 'ellipsis（只显示省略号）,title（并且显示为原生 title）,tooltip（并且显示为 tooltip 提示）',
defVal: '',
list: []
Expand All @@ -344,7 +344,7 @@ const apis = [
{
name: 'show-header-overflow',
descKey: 'app.api.table.desc.showHeaderOverflow',
type: 'Boolean,String',
type: 'Boolean, String',
enum: 'ellipsis（只显示省略号）,title（并且显示为原生 title）,tooltip（并且显示为 tooltip 提示）',
defVal: '',
list: []
Expand Down Expand Up @@ -377,7 +377,7 @@ const apis = [
{
name: 'row-key',
descKey: 'app.api.table.desc.rowKey',
type: 'Number,String',
type: 'Number, String',
enum: '',
defVal: '',
list: []
Expand Down Expand Up @@ -818,7 +818,7 @@ const apis = [
name: 'type',
desc: '数据校验的类型',
type: 'String',
enum: 'number,string',
enum: 'Number, String',
defVal: 'string',
list: []
},
Expand Down Expand Up @@ -1199,19 +1199,19 @@ const apis = [
list: []
},
{
name: 'insertAt(records,row)',
name: 'insertAt(records, row)',
desc: '往表格插入数据，从指定位置插入一行或多行；第二个参数：row 指定位置、null 从第一行插入、-1 从最后插入',
type: 'Promise<{row, rows}>',
enum: '',
defVal: 'records,row',
defVal: 'records, row',
list: []
},
{
name: 'revert(rows,prop)',
name: 'revert(rows, prop)',
desc: '还原更改，还原指定行 row 或者整个表格的数据',
type: 'Promise',
enum: '',
defVal: 'rows?,prop?',
defVal: 'rows?, prop?',
list: []
},
{
Expand Down Expand Up @@ -1303,11 +1303,11 @@ const apis = [
list: []
},
{
name: 'hasRowChange(row,prop)',
name: 'hasRowChange(row, prop)',
desc: '检查行或列数据是否发生改变',
type: 'Boolean',
enum: '',
defVal: 'row,prop?',
defVal: 'row, prop?',
list: []
},
{
Expand All @@ -1319,27 +1319,27 @@ const apis = [
list: []
},
{
name: 'setActiveCell(row,prop)',
name: 'setActiveCell(row, prop)',
desc: '激活单元格编辑',
type: 'Promise',
enum: '',
defVal: 'row,prop',
defVal: 'row, prop',
list: []
},
{
name: 'setSelectCell(row,prop)',
name: 'setSelectCell(row, prop)',
desc: '只对 trigger!=manual 有效，选中单元格',
type: 'Promise',
enum: '',
defVal: 'row,prop',
defVal: 'row, prop',
list: []
},
{
name: 'setRowExpansion(rows,checked)',
name: 'setRowExpansion(rows, checked)',
desc: '设置展开行，二个参数设置这一行展开与否',
type: 'Promise',
enum: '',
defVal: 'rows,checked',
defVal: 'rows, checked',
list: []
},
{
Expand All @@ -1351,11 +1351,11 @@ const apis = [
list: []
},
{
name: 'setTreeExpansion(rows,checked)',
name: 'setTreeExpansion(rows, checked)',
desc: '设置展开树形节点，二个参数设置这一行展开与否',
type: 'Promise',
enum: '',
defVal: 'rows,checked',
defVal: 'rows, checked',
list: []
},
{
Expand Down Expand Up @@ -1383,11 +1383,11 @@ const apis = [
list: []
},
{
name: 'setSelection(rows,checked)',
name: 'setSelection(rows, checked)',
desc: '用于多选表格，设置行为选中状态，第二个参数为选中与否',
type: 'Promise',
enum: '',
defVal: 'rows,checked',
defVal: 'rows, checked',
list: []
},
{
Expand Down
27 changes: 26 additions & 1 deletion examples/api/toolbar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,32 @@ const apis = [
type: '',
enum: '',
defVal: '',
list: []
list: [
{
name: 'hideColumn(column)',
desc: '隐藏指定列',
type: '',
enum: '',
defVal: 'column',
list: []
},
{
name: 'showColumn(column)',
desc: '显示指定列，如果不传参数则显示所有列',
type: '',
enum: '',
defVal: 'column?',
list: []
},
{
name: 'updateSetting()',
desc: '更新列设置',
type: '',
enum: '',
defVal: '',
list: []
}
]
}
]

Expand Down
5 changes: 3 additions & 2 deletions examples/i18n/lang/en.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
border: 'Border',
style: 'Cell style',
hideHead: 'Hidden header',
headerHighlight: '高亮显示选中列',
resizable: 'Resizable',
fluidHeight: 'Fluid-height',
resize: 'Resize height and width',
Expand Down Expand Up @@ -179,8 +180,8 @@ module.exports = {
spanMethod: '合并行或列，该函数 Function({seq, row, rowIndex, column, columnIndex, data}) 返回计算后的值',
showOverflow: 'Sets all content to appear as ellipses if it is too long',
showHeaderOverflow: 'Sets the header to show ellipsis when all content is too long',
showAllOverflow: '已废弃，请使用 show-overflow',
showHeaderAllOverflow: '已废弃，请使用 show-header-overflow',
showAllOverflow: '在 v2.0 中废弃，请使用 show-overflow',
showHeaderAllOverflow: '在 v2.0 中废弃，请使用 show-header-overflow',
remoteSort: '所有列是否使用服务端排序，如果设置为 true 则所有列不会对数据进行处理',
remoteFilter: '是否使用服务端筛选，如果设置为 true 则不会对数据进行处理',
rowKey: 'Key of row data, corresponding to the Key attribute of virtual DOM in row rendering (not required for non-exceptional cases)',
Expand Down
5 changes: 3 additions & 2 deletions examples/i18n/lang/zh-CN.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = {
border: '边框',
style: '单元格样式',
hideHead: '隐藏头部',
headerHighlight: '高亮显示选中列',
resizable: '列宽拖动',
fluidHeight: '流体高度',
resize: '响应式宽高',
Expand Down Expand Up @@ -179,8 +180,8 @@ module.exports = {
spanMethod: '合并行或列，该函数 Function({seq, row, rowIndex, column, columnIndex, data}) 返回计算后的值',
showOverflow: '设置所有内容过长时显示为省略号（如果是固定列建议设置该值，提升渲染速度）',
showHeaderOverflow: '设置表头所有内容过长时显示为省略号',
showAllOverflow: '已废弃，请使用 show-overflow',
showHeaderAllOverflow: '已废弃，请使用 show-header-overflow',
showAllOverflow: '在 v2.0 中废弃，请使用 show-overflow',
showHeaderAllOverflow: '在 v2.0 中废弃，请使用 show-header-overflow',
remoteSort: '所有列是否使用服务端排序，如果设置为 true 则不会对数据进行处理',
remoteFilter: '是否使用服务端筛选，如果设置为 true 则不会对数据进行处理',
rowKey: '行数据的 Key，对应行渲染中虚拟 DOM 的 key 属性（非特殊情况下不需要使用）',
Expand Down
6 changes: 6 additions & 0 deletions examples/router.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const TableStripe = () => import(/* webpackChunkName: "base" */ './views/table/b
const TableBorder = () => import(/* webpackChunkName: "base" */ './views/table/base/Border.vue')
const TableStyle = () => import(/* webpackChunkName: "base" */ './views/table/base/Style.vue')
const TableHeader = () => import(/* webpackChunkName: "base" */ './views/table/base/Header.vue')
const TableHeaderHighlight = () => import(/* webpackChunkName: "base" */ './views/table/base/HeaderHighlight.vue')
const TableResizable = () => import(/* webpackChunkName: "base" */ './views/table/base/Resizable.vue')
const TableMaxHeight = () => import(/* webpackChunkName: "base" */ './views/table/base/MaxHeight.vue')
const TableHeight = () => import(/* webpackChunkName: "base" */ './views/table/base/Height.vue')
Expand Down Expand Up @@ -186,6 +187,11 @@ export default new Router({
name: 'TableHeader',
component: TableHeader
},
{
path: '/table/base/highlight',
name: 'TableHeaderHighlight',
component: TableHeaderHighlight
},
{
path: '/table/base/resizable',
name: 'TableResizable',
Expand Down
Loading

0 comments on commit 5416451

Please sign in to comment.