diff --git a/examples/api/column.js b/examples/api/column.js index 629ee753b..e63ed6654 100644 --- a/examples/api/column.js +++ b/examples/api/column.js @@ -319,7 +319,7 @@ const apis = [ name: 'filter-method', descKey: 'app.api.tableColumn.desc.filterMethod', version: '', - type: 'Function', + type: '({ value, cellValue, row, column }) => boolean', enum: '', defVal: '', list: [] diff --git a/examples/api/table.js b/examples/api/table.js index 69f8c687a..78db962b6 100644 --- a/examples/api/table.js +++ b/examples/api/table.js @@ -1112,7 +1112,7 @@ const apis = [ name: 'filterMethod', desc: '全局筛选方法,当触发筛选时会调用该函数返回是否有效', version: '', - type: '(params: { options, values, row, column }) => boolean', + type: '(params: { options, values, cellValue, row, column }) => boolean', enum: '', defVal: '', list: [] @@ -2064,8 +2064,8 @@ const apis = [ list: [] }, { - name: 'isCalcValue', - desc: '只对 extendByCopy 启用后有效,当选取大于两行或两列时,扩展区域时将自动识别数字规则进行计算(同时按住 ctrl 键可取消值自动识别数字功能)', + name: 'extendByCalc', + desc: '只对 mouse-config.extension 启用后有效,当选取大于两行或两列时,自动识别最近两行或两列数据运算规则进行计算(同时按住 ctrl 键可取消值自动识别数字功能)', version: 'pro', type: 'boolean', enum: '', @@ -2074,7 +2074,7 @@ const apis = [ }, { name: 'extendCalcMethod', - desc: '只对 isCalcValue 启用后有效,重写单元格扩展区域计算值的方法', + desc: '只对 extendByCalc 启用后有效,重写单元格扩展区域计算值的方法', version: 'pro', type: '(params: { rows, cols, targetValues, targetRows, targetCols, extendRows, extendCols, direction }) => any[][]', enum: '', diff --git a/examples/views/print/Print.vue b/examples/views/print/Print.vue index 449d0ee0c..0c75d9e60 100644 --- a/examples/views/print/Print.vue +++ b/examples/views/print/Print.vue @@ -100,6 +100,21 @@ {{ demoCodes[8] }} {{ demoCodes[9] }} + + + + + + + +

{{ $t('app.body.button.showCode') }}

+ +
+      {{ demoCodes[10] }}
+      {{ demoCodes[11] }}
+    
@@ -589,6 +604,28 @@ export default { } } } + `, + ` + + + + + + `, + ` + export default { + methods: { + printEvent6 () { + const imgEl = document.getElementById('myPrint6') + this.$XPrint({ + sheetName: '打印图片', + content: \`\` + }) + } + } + } ` ] } @@ -827,6 +864,13 @@ export default { sheetName: '打印下面区域', content: divEl.innerHTML }) + }, + printEvent6 () { + const imgEl = document.getElementById('myPrint6') + this.$XPrint({ + sheetName: '打印图片', + content: `` + }) } } } diff --git a/package.json b/package.json index 48a401844..caddc213e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "3.2.6", + "version": "3.2.7", "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、模态窗口、自定义模板、渲染器、贼灵活的配置项、扩展接口等...", "scripts": { "serve": "vue-cli-service serve", diff --git a/public/static/other/invoice.png b/public/static/other/invoice.png new file mode 100644 index 000000000..980094f8f Binary files /dev/null and b/public/static/other/invoice.png differ