lxm_front/vxe-table
1
0
Fork 0
mirror of https://gitee.com/xuliangzhan_admin/vxe-table.git synced 2026-01-21 05:27:57 +08:00
Code Issues Projects Releases Wiki Activity

修复已知问题

Browse Source
This commit is contained in:
xuliangzhan
2020-10-12 18:17:29 +08:00
parent 0c3d8a0ad4
commit f37dfcb407
11 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/App.vue
View File

@@ -18,7 +18,7 @@
</div>
<div class="right">
<div class="content">
<span v-if="usedJSHeapSize" class="performance">Memory used: {{ usedJSHeapSize }} MB.</span>
<span v-if="usedJSHeapSize && usedJSHeapSize !== '0'" class="performance">Memory used: {{ usedJSHeapSize }} MB.</span>
<span>{{ $t('app.body.label.translations') }}:</span>
<vxe-select class="locale-switch" size="mini" v-model="$i18n.locale">
<vxe-option value="zh_CN" label="中文"></vxe-option>
@@ -201,7 +201,7 @@ export default {
selectStableVersion: null,
stableVersionList: [],
version: '3',
usedJSHeapSize: 0,
usedJSHeapSize: '0',
tableList: [
{
label: 'app.aside.nav.start',

2
examples/api/table.js
View File

@@ -3828,7 +3828,7 @@ const apis = [
},
{
name: 'exportData(options)',
desc: '将表格数据导出（只支持基本数据结构，目前不支持分组、合并等；树结构和虚拟滚动只允许导出数据源）',
desc: '将表格数据导出（树结构和虚拟滚动只允许导出数据源）',
version: '',
type: 'Promise',
enum: '',

2
examples/views/table/advanced/Export.vue
View File

@@ -5,7 +5,7 @@
默认会排除 field 为空和 type 相关的功能列，可以通过自定义 <table-api-link prop="data"/> 和 <table-api-link prop="columns"/> 导出数据<br>
对于 csv 等特殊类型，可以通过设置 <table-column-api-link prop="cell-type"/> 将数值类型转为字符串类型<br>
如果是服务端导出，通过设置 <table-api-link prop="remote"/> 和 <table-api-link prop="exportMethod"/> 开启服务端自定义导出<br>
<span class="red">（注：只支持基本数据结构，目前不支持分组、合并等；树结构和虚拟滚动只允许导出数据源，前端导出的数据量有限，建议使用后端导出）</span>
<span class="red">（注：树结构和虚拟滚动只允许导出数据源，前端导出的数据量有限，建议使用后端导出）</span>
</p>
<vxe-toolbar>

28
examples/views/table/advanced/Print.vue
View File

@@ -18,15 +18,19 @@
show-footer
ref="xTable"
height="500"
:export-config="{}"
:print-config="{}"
:footer-method="footerMethod"
:data="tableData">
<vxe-table-column type="checkbox" width="60"></vxe-table-column>
<vxe-table-column type="seq" width="60"></vxe-table-column>
<vxe-table-column field="name" title="Name"></vxe-table-column>
<vxe-table-column field="role" title="Role"></vxe-table-column>
<vxe-table-column field="age" title="Age"></vxe-table-column>
<vxe-table-column field="date12" title="Date"></vxe-table-column>
<vxe-table-colgroup title="Group1">
<vxe-table-column field="name" title="Name"></vxe-table-column>
<vxe-table-colgroup title="Group2">
<vxe-table-column field="role" title="Role"></vxe-table-column>
<vxe-table-column field="age" title="Age"></vxe-table-column>
</vxe-table-colgroup>
<vxe-table-column field="date12" title="Date"></vxe-table-column>
</vxe-table-colgroup>
</vxe-table>
<p class="demo-code">{{ $t('app.body.button.showCode') }}</p>
@@ -62,15 +66,19 @@ export default {
show-footer
ref="xTable"
height="500"
:export-config="{}"
:print-config="{}"
:footer-method="footerMethod"
:data="tableData">
<vxe-table-column type="checkbox" width="60"></vxe-table-column>
<vxe-table-column type="seq" width="60"></vxe-table-column>
<vxe-table-column field="name" title="Name"></vxe-table-column>
<vxe-table-column field="role" title="Role"></vxe-table-column>
<vxe-table-column field="age" title="Age"></vxe-table-column>
<vxe-table-column field="date12" title="Date"></vxe-table-column>
<vxe-table-colgroup title="Group1">
<vxe-table-column field="name" title="Name"></vxe-table-column>
<vxe-table-colgroup title="Group2">
<vxe-table-column field="role" title="Role"></vxe-table-column>
<vxe-table-column field="age" title="Age"></vxe-table-column>
</vxe-table-colgroup>
<vxe-table-column field="date12" title="Date"></vxe-table-column>
</vxe-table-colgroup>
</vxe-table>
`,
`

8
examples/views/table/advanced/Toolbar.vue
View File

@@ -10,7 +10,7 @@
<vxe-table
border
height="300"
:export-config="{}"
:print-config="{}"
:data="tableData1">
<vxe-table-column type="seq" width="60"></vxe-table-column>
<vxe-table-colgroup title="分组信息">
@@ -53,7 +53,7 @@
border
ref="xTable"
height="300"
:export-config="{}"
:print-config="{}"
:loading="loading"
:data="tableData"
@custom="toolbarCustomEvent">
@@ -100,7 +100,7 @@ export default {
<vxe-table
border
height="300"
:export-config="{}"
:print-config="{}"
:data="tableData1">
<vxe-table-column type="seq" width="60"></vxe-table-column>
<vxe-table-colgroup title="分组信息">
@@ -133,7 +133,7 @@ export default {
border
ref="xTable"
height="300"
:export-config="{}"
:print-config="{}"
:loading="loading"
:data="tableData"
@custom="toolbarCustomEvent">

4
examples/views/table/edit/Select.vue
View File

@@ -21,8 +21,8 @@
<p class="demo-code">{{ $t('app.body.button.showCode') }}</p>
<pre>
<pre-codecode class="xml">{{ demoCodes[0] }}</pre-codecode>
<pre-codecode class="javascript">{{ demoCodes[1] }}</pre-codecode>
<pre-code class="xml">{{ demoCodes[0] }}</pre-code>
<pre-code class="javascript">{{ demoCodes[1] }}</pre-code>
</pre>
</div>
</template>

2
examples/views/table/grid/Toolbar.vue
View File

@@ -9,6 +9,7 @@
ref="xGrid"
id="toolbar_demo_1"
height="530"
:print-config="{}"
:import-config="{}"
:export-config="{}"
:columns="tableColumn"
@@ -77,6 +78,7 @@ export default {
ref="xGrid"
id="toolbar_demo_1"
height="530"
:print-config="{}"
:import-config="{}"
:export-config="{}"
:columns="tableColumn"

2
examples/views/table/grid/ToolbarIcon.vue
View File

@@ -7,6 +7,7 @@
resizable
keep-source
height="500"
:print-config="{}"
:import-config="{}"
:export-config="{}"
:pager-config="tablePage"
@@ -92,6 +93,7 @@ export default {
resizable
keep-source
height="500"
:print-config="{}"
:import-config="{}"
:export-config="{}"
:pager-config="tablePage"

2
examples/views/table/tree/Toolbar.vue
View File

@@ -18,6 +18,7 @@
keep-source
ref="xTree"
row-id="id"
:print-config="{}"
:export-config="{}"
:loading="loading"
:tree-config="treeConfig"
@@ -67,6 +68,7 @@ export default {
keep-source
ref="xTree"
row-id="id"
:print-config="{}"
:export-config="{}"
:loading="loading"
:tree-config="treeConfig"

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "3.0.0-beta.5",
"version": "3.0.0-beta.6",
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、模态窗口、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
"scripts": {
"serve": "vue-cli-service serve",

4
packages/table/src/table.js
View File

@@ -954,9 +954,9 @@ export default {
}
}) : _e(),
/**
* 导出
* 导出/打印
*/
initStore.export && this.exportConfig ? h('vxe-export-panel', {
initStore.export && (this.exportConfig || this.printConfig) ? h('vxe-export-panel', {
props: {
defaultOptions: this.exportParams,
storeData: this.exportStore