diff --git a/examples/App.vue b/examples/App.vue
index c0e1f3606..fdd57a383 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -18,7 +18,7 @@
-
Memory used: {{ usedJSHeapSize }} MB.
+
Memory used: {{ usedJSHeapSize }} MB.
{{ $t('app.body.label.translations') }}:
@@ -201,7 +201,7 @@ export default {
selectStableVersion: null,
stableVersionList: [],
version: '3',
- usedJSHeapSize: 0,
+ usedJSHeapSize: '0',
tableList: [
{
label: 'app.aside.nav.start',
diff --git a/examples/api/table.js b/examples/api/table.js
index 371cfbac9..8fbca5310 100644
--- a/examples/api/table.js
+++ b/examples/api/table.js
@@ -3828,7 +3828,7 @@ const apis = [
},
{
name: 'exportData(options)',
- desc: '将表格数据导出(只支持基本数据结构,目前不支持分组、合并等;树结构和虚拟滚动只允许导出数据源)',
+ desc: '将表格数据导出(树结构和虚拟滚动只允许导出数据源)',
version: '',
type: 'Promise',
enum: '',
diff --git a/examples/views/table/advanced/Export.vue b/examples/views/table/advanced/Export.vue
index 8662e525a..1c6ffd05c 100644
--- a/examples/views/table/advanced/Export.vue
+++ b/examples/views/table/advanced/Export.vue
@@ -5,7 +5,7 @@
默认会排除 field 为空和 type 相关的功能列,可以通过自定义 和 导出数据
对于 csv 等特殊类型,可以通过设置 将数值类型转为字符串类型
如果是服务端导出,通过设置 和 开启服务端自定义导出
- (注:只支持基本数据结构,目前不支持分组、合并等;树结构和虚拟滚动只允许导出数据源,前端导出的数据量有限,建议使用后端导出)
+ (注:树结构和虚拟滚动只允许导出数据源,前端导出的数据量有限,建议使用后端导出)
diff --git a/examples/views/table/advanced/Print.vue b/examples/views/table/advanced/Print.vue
index 1a8567256..b7c8db5eb 100644
--- a/examples/views/table/advanced/Print.vue
+++ b/examples/views/table/advanced/Print.vue
@@ -18,15 +18,19 @@
show-footer
ref="xTable"
height="500"
- :export-config="{}"
+ :print-config="{}"
:footer-method="footerMethod"
:data="tableData">
-
-
-
-
+
+
+
+
+
+
+
+
{{ $t('app.body.button.showCode') }}
@@ -62,15 +66,19 @@ export default {
show-footer
ref="xTable"
height="500"
- :export-config="{}"
+ :print-config="{}"
:footer-method="footerMethod"
:data="tableData">
-
-
-
-
+
+
+
+
+
+
+
+
`,
`
diff --git a/examples/views/table/advanced/Toolbar.vue b/examples/views/table/advanced/Toolbar.vue
index 104b19f7b..55d458f17 100644
--- a/examples/views/table/advanced/Toolbar.vue
+++ b/examples/views/table/advanced/Toolbar.vue
@@ -10,7 +10,7 @@
@@ -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 {
@@ -133,7 +133,7 @@ export default {
border
ref="xTable"
height="300"
- :export-config="{}"
+ :print-config="{}"
:loading="loading"
:data="tableData"
@custom="toolbarCustomEvent">
diff --git a/examples/views/table/edit/Select.vue b/examples/views/table/edit/Select.vue
index 791d27cbd..5195de75f 100644
--- a/examples/views/table/edit/Select.vue
+++ b/examples/views/table/edit/Select.vue
@@ -21,8 +21,8 @@
{{ $t('app.body.button.showCode') }}
- {{ demoCodes[0] }}
- {{ demoCodes[1] }}
+ {{ demoCodes[0] }}
+ {{ demoCodes[1] }}
diff --git a/examples/views/table/grid/Toolbar.vue b/examples/views/table/grid/Toolbar.vue
index 203e3413c..27bfd6a91 100644
--- a/examples/views/table/grid/Toolbar.vue
+++ b/examples/views/table/grid/Toolbar.vue
@@ -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"
diff --git a/examples/views/table/grid/ToolbarIcon.vue b/examples/views/table/grid/ToolbarIcon.vue
index 03f2d86fd..5516b51a9 100644
--- a/examples/views/table/grid/ToolbarIcon.vue
+++ b/examples/views/table/grid/ToolbarIcon.vue
@@ -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"
diff --git a/examples/views/table/tree/Toolbar.vue b/examples/views/table/tree/Toolbar.vue
index 7f1268f51..b69fa2b32 100644
--- a/examples/views/table/tree/Toolbar.vue
+++ b/examples/views/table/tree/Toolbar.vue
@@ -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"
diff --git a/package.json b/package.json
index 61ee0c7b8..85f83b83e 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/packages/table/src/table.js b/packages/table/src/table.js
index 00ec5ddad..9c7ec522e 100644
--- a/packages/table/src/table.js
+++ b/packages/table/src/table.js
@@ -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