Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Aug 8, 2019
1 parent a4f0e4a commit 0c7cbb0
Show file tree
Hide file tree
Showing 52 changed files with 129 additions and 163 deletions.
2 changes: 1 addition & 1 deletion docs/index.html
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.0275e9e8.css rel=prefetch><link href=/vxe-table/static/css/base.c0ef2d47.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.edd89f38.css rel=prefetch><link href=/vxe-table/static/css/other.4f7f6e55.css rel=prefetch><link href=/vxe-table/static/css/table.de81d770.css rel=prefetch><link href=/vxe-table/static/js/api.41011a6b.js rel=prefetch><link href=/vxe-table/static/js/base.4bef4d60.js rel=prefetch><link href=/vxe-table/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.3f386816.js rel=prefetch><link href=/vxe-table/static/js/edit.8586c0c4.js rel=prefetch><link href=/vxe-table/static/js/excel.eeeebea8.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.3b72f0a4.js rel=prefetch><link href=/vxe-table/static/js/optimize.ad54a106.js rel=prefetch><link href=/vxe-table/static/js/other.60286c1e.js rel=prefetch><link href=/vxe-table/static/js/plugin.872baf95.js rel=prefetch><link href=/vxe-table/static/js/scroll.0ee3e355.js rel=prefetch><link href=/vxe-table/static/js/start.a4f7db80.js rel=prefetch><link href=/vxe-table/static/js/table.f2b10649.js rel=prefetch><link href=/vxe-table/static/js/tree.5a305751.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.e16a4e8d.css rel=preload as=style><link href=/vxe-table/static/css/index.1a621215.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.6b3e91ea.js rel=preload as=script><link href=/vxe-table/static/js/index.600686db.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.e16a4e8d.css rel=stylesheet><link href=/vxe-table/static/css/index.1a621215.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.6b3e91ea.js></script><script src=/vxe-table/static/js/index.600686db.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.c0ef2d47.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.edd89f38.css rel=prefetch><link href=/vxe-table/static/css/other.4f7f6e55.css rel=prefetch><link href=/vxe-table/static/css/table.de81d770.css rel=prefetch><link href=/vxe-table/static/js/api.a8edcd47.js rel=prefetch><link href=/vxe-table/static/js/base.e98a0609.js rel=prefetch><link href=/vxe-table/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.3f386816.js rel=prefetch><link href=/vxe-table/static/js/edit.44a64d06.js rel=prefetch><link href=/vxe-table/static/js/excel.80fef554.js rel=prefetch><link href=/vxe-table/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/static/js/grid.6f2a4bb6.js rel=prefetch><link href=/vxe-table/static/js/optimize.057eace0.js rel=prefetch><link href=/vxe-table/static/js/other.e9c3a2f3.js rel=prefetch><link href=/vxe-table/static/js/plugin.aab94f3e.js rel=prefetch><link href=/vxe-table/static/js/scroll.986b46c3.js rel=prefetch><link href=/vxe-table/static/js/start.d0b0562a.js rel=prefetch><link href=/vxe-table/static/js/table.9359e544.js rel=prefetch><link href=/vxe-table/static/js/tree.9a1e2d90.js rel=prefetch><link href=/vxe-table/static/css/chunk-vendors.e16a4e8d.css rel=preload as=style><link href=/vxe-table/static/css/index.1a621215.css rel=preload as=style><link href=/vxe-table/static/js/chunk-vendors.b5ccb9ae.js rel=preload as=script><link href=/vxe-table/static/js/index.ca880ab6.js rel=preload as=script><link href=/vxe-table/static/css/chunk-vendors.e16a4e8d.css rel=stylesheet><link href=/vxe-table/static/css/index.1a621215.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.b5ccb9ae.js></script><script src=/vxe-table/static/js/index.ca880ab6.js></script></body></html>

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion docs/static/js/index.600686db.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/js/index.ca880ab6.js

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion docs/static/js/plugin.872baf95.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/js/plugin.aab94f3e.js

Large diffs are not rendered by default.

File renamed without changes.
1 change: 0 additions & 1 deletion docs/static/js/start.a4f7db80.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/static/js/start.d0b0562a.js

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/v1/index.html
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/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.c0ef2d47.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.edd89f38.css rel=prefetch><link href=/vxe-table/v1/static/css/other.4f7f6e55.css rel=prefetch><link href=/vxe-table/v1/static/css/table.423c66b1.css rel=prefetch><link href=/vxe-table/v1/static/js/api.7b7f807d.js rel=prefetch><link href=/vxe-table/v1/static/js/base.7df9ba40.js rel=prefetch><link href=/vxe-table/v1/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.3f386816.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.b00e3a73.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.c0eb7dee.js rel=prefetch><link href=/vxe-table/v1/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.ebca7e0a.js rel=prefetch><link href=/vxe-table/v1/static/js/optimize.447dc31d.js rel=prefetch><link href=/vxe-table/v1/static/js/other.88b1720a.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.d6a5bb76.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.5b35c9bd.js rel=prefetch><link href=/vxe-table/v1/static/js/start.06b2391c.js rel=prefetch><link href=/vxe-table/v1/static/js/table.0b73fec2.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.b9095c3a.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.364efe9c.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.5a4d5735.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.08b58d97.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.6b9481e6.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.364efe9c.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.5a4d5735.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.08b58d97.js></script><script src=/vxe-table/v1/static/js/index.6b9481e6.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.c0ef2d47.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.edd89f38.css rel=prefetch><link href=/vxe-table/v1/static/css/other.4f7f6e55.css rel=prefetch><link href=/vxe-table/v1/static/css/table.423c66b1.css rel=prefetch><link href=/vxe-table/v1/static/js/api.9a47fdcc.js rel=prefetch><link href=/vxe-table/v1/static/js/base.eb0192ff.js rel=prefetch><link href=/vxe-table/v1/static/js/base~edit~excel~grid~other~plugin~scroll~start~table~tree.3f386816.js rel=prefetch><link href=/vxe-table/v1/static/js/edit.f6f5a742.js rel=prefetch><link href=/vxe-table/v1/static/js/excel.e201fbae.js rel=prefetch><link href=/vxe-table/v1/static/js/excel~other.ea9cbdaa.js rel=prefetch><link href=/vxe-table/v1/static/js/grid.7af58e30.js rel=prefetch><link href=/vxe-table/v1/static/js/optimize.53171084.js rel=prefetch><link href=/vxe-table/v1/static/js/other.cba0fc81.js rel=prefetch><link href=/vxe-table/v1/static/js/plugin.3f6a503a.js rel=prefetch><link href=/vxe-table/v1/static/js/scroll.4e83b82d.js rel=prefetch><link href=/vxe-table/v1/static/js/start.2eb25e35.js rel=prefetch><link href=/vxe-table/v1/static/js/table.dd5e7a27.js rel=prefetch><link href=/vxe-table/v1/static/js/tree.1861b3a9.js rel=prefetch><link href=/vxe-table/v1/static/css/chunk-vendors.364efe9c.css rel=preload as=style><link href=/vxe-table/v1/static/css/index.5a4d5735.css rel=preload as=style><link href=/vxe-table/v1/static/js/chunk-vendors.7568db3e.js rel=preload as=script><link href=/vxe-table/v1/static/js/index.37bf76d9.js rel=preload as=script><link href=/vxe-table/v1/static/css/chunk-vendors.364efe9c.css rel=stylesheet><link href=/vxe-table/v1/static/css/index.5a4d5735.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.7568db3e.js></script><script src=/vxe-table/v1/static/js/index.37bf76d9.js></script></body></html>

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions docs/v1/static/js/index.37bf76d9.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/v1/static/js/index.6b9481e6.js

This file was deleted.

File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions docs/v1/static/js/plugin.3f6a503a.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/v1/static/js/plugin.d6a5bb76.js

This file was deleted.

File renamed without changes.
1 change: 0 additions & 1 deletion docs/v1/static/js/start.06b2391c.js

This file was deleted.

1 change: 1 addition & 0 deletions docs/v1/static/js/start.2eb25e35.js

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
62 changes: 51 additions & 11 deletions examples/api/column.js
Original file line number Diff line number Diff line change
Expand Up @@ -210,30 +210,62 @@ const apis = [
list: [
{
name: 'name',
desc: '渲染组件的名称',
desc: '渲染器名称',
type: 'String',
enum: 'input, textarea',
enum: 'input, textarea, select',
defVal: '',
list: []
},
{
name: 'props',
desc: '渲染组件的参数(请查看目标组件的 Component Attributes)',
desc: '渲染的参数(请查看目标渲染的 Props)',
type: 'Object',
enum: '',
defVal: '',
list: []
},
{
name: 'options',
desc: '只对 name=select 有效,下拉选项列表',
type: 'Array',
enum: '',
defVal: '',
list: []
},
{
name: 'optionProps',
desc: '只对 name=select 有效,下拉选项属性参数配置',
type: 'Object',
enum: '',
defVal: '{ value, label }',
list: []
},
{
name: 'optionGroups',
desc: '只对 name=select 有效,下拉分组选项列表',
type: 'Array',
enum: '',
defVal: '',
list: []
},
{
name: 'optionGroupProps',
desc: '只对 name=select 有效,下拉分组选项属性参数配置',
type: 'Object',
enum: '',
defVal: '{ options, label }',
list: []
},
{
name: 'events',
desc: '渲染组件的事件(请查看目标渲染的 Events)',
type: 'Object',
enum: '',
defVal: '{row,rowIndex,$rowIndex,column,columnIndex,$columnIndex}, ...[目标渲染的 arguments]',
list: []
}
]
},
{
name: 'tree-node',
descKey: 'app.api.tableColumn.desc.treeNode',
type: 'Boolean',
enum: '',
defVal: 'false',
list: []
},
{
name: 'cell-render',
descKey: 'app.api.tableColumn.desc.cellRender',
Expand Down Expand Up @@ -388,6 +420,14 @@ const apis = [
}
]
},
{
name: 'tree-node',
descKey: 'app.api.tableColumn.desc.treeNode',
type: 'Boolean',
enum: '',
defVal: 'false',
list: []
},
{
name: 'params',
descKey: 'app.api.tableColumn.desc.params',
Expand Down
6 changes: 3 additions & 3 deletions examples/i18n/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ module.exports = {
filters: 'Configure filter conditions',
filterMultiple: '只对 filters 有效,筛选是否允许多选',
filterMethod: '只对 filters 有效,自定义筛选方法 Function({value, row, column})',
filterRender: 'Filter render configuration',
filterRender: '筛选渲染器配置项',
treeNode: '只对 tree-config 配置时有效,指定为树节点',
cellRender: '单元格渲染配置项',
editRender: '单元格编辑渲染配置项',
cellRender: '默认的渲染器配置项',
editRender: '可编辑渲染器配置项',
params: '额外的参数(自定义一些数据参数,对于某些特殊的场景可能会用到)'
}
},
Expand Down
6 changes: 3 additions & 3 deletions examples/i18n/lang/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ module.exports = {
filters: '配置筛选条件',
filterMultiple: '只对 filters 有效,筛选是否允许多选',
filterMethod: '只对 filters 有效,自定义筛选方法 Function({value, row, column})',
filterRender: '筛选渲染配置项',
filterRender: '筛选渲染器配置项',
treeNode: '只对 tree-config 配置时有效,指定为树节点',
cellRender: '单元格渲染配置项',
editRender: '单元格编辑渲染配置项',
cellRender: '默认的渲染器配置项',
editRender: '可编辑渲染器配置项',
params: '额外的参数(自定义一些数据参数,对于某些特殊的场景可能会用到)'
}
},
Expand Down
24 changes: 4 additions & 20 deletions examples/views/table/plugin/AntdFilter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,8 @@
<vxe-table-column field="sex" title="ASelect" :formatter="formatterSex" :filters="[{data: null}]" :filter-render="{name: 'ASelect', options: sexList, props: {placeholder: '请选择'}}"></vxe-table-column>
<vxe-table-column field="sex1" title="ASelect" :formatter="formatterSexs" :filters="[{data: []}]" :filter-render="{name: 'ASelect', options: sexList, props: {mode: 'multiple', placeholder: '请选择'}}"></vxe-table-column>
<vxe-table-column field="role" title="AAutoComplete" width="160" :filters="[{data: ''}]" :filter-render="{name: 'AAutoComplete', props: ACProps, events: {search: roleSearchEvent}}"></vxe-table-column>
<vxe-table-column field="flag" title="ASwitch" width="100" :filters="[{data: false}]" :filter-render="{name: 'ASwitch'}">
<template v-slot="{ row }">
<a-switch v-model="row.flag" disabled></a-switch>
</template>
</vxe-table-column>
<vxe-table-column field="rate" title="ARate" width="180" sortable :filters="[{data: 0}]" :filter-render="{name: 'ARate'}">
<template v-slot="{ row }">
<a-rate v-model="row.rate" disabled></a-rate>
</template>
</vxe-table-column>
<vxe-table-column field="flag" title="ASwitch" width="100" :filters="[{data: false}]" :filter-render="{name: 'ASwitch'}" :cell-render="{name: 'ASwitch', props: {disabled: true}}"></vxe-table-column>
<vxe-table-column field="rate" title="ARate" width="180" sortable :filters="[{data: 0}]" :filter-render="{name: 'ARate'}" :cell-render="{name: 'ARate', props: {disabled: true}}"></vxe-table-column>
</vxe-table>

<p class="demo-code">{{ $t('app.body.button.showCode') }}</p>
Expand Down Expand Up @@ -65,16 +57,8 @@ export default {
<vxe-table-column field="sex" title="ASelect" :formatter="formatterSex" :filters="[{data: null}]" :filter-render="{name: 'ASelect', options: sexList, props: {placeholder: '请选择'}}"></vxe-table-column>
<vxe-table-column field="sex1" title="ASelect" :formatter="formatterSexs" :filters="[{data: []}]" :filter-render="{name: 'ASelect', options: sexList, props: {mode: 'multiple', placeholder: '请选择'}}"></vxe-table-column>
<vxe-table-column field="role" title="AAutoComplete" width="160" :filters="[{data: ''}]" :filter-render="{name: 'AAutoComplete', props: ACProps, events: {search: roleSearchEvent}}"></vxe-table-column>
<vxe-table-column field="flag" title="ASwitch" width="100" :filters="[{data: false}]" :filter-render="{name: 'ASwitch'}">
<template v-slot="{ row }">
<a-switch v-model="row.flag" disabled></a-switch>
</template>
</vxe-table-column>
<vxe-table-column field="rate" title="ARate" width="180" sortable :filters="[{data: 0}]" :filter-render="{name: 'ARate'}">
<template v-slot="{ row }">
<a-rate v-model="row.rate" disabled></a-rate>
</template>
</vxe-table-column>
<vxe-table-column field="flag" title="ASwitch" width="100" :filters="[{data: false}]" :filter-render="{name: 'ASwitch'}" :cell-render="{name: 'ASwitch', props: {disabled: true}}"></vxe-table-column>
<vxe-table-column field="rate" title="ARate" width="180" sortable :filters="[{data: 0}]" :filter-render="{name: 'ARate'}" :cell-render="{name: 'ARate', props: {disabled: true}}"></vxe-table-column>
</vxe-table>
`,
`
Expand Down
Loading

0 comments on commit 0c7cbb0

Please sign in to comment.