",
"description": "在窗口隐藏之前执行，可以返回 Error 阻止关闭，支持异步"
},
"vxe-form/data": {
@@ -1521,7 +1501,7 @@
},
"vxe-form/prevent-submit": {
"type": "boolean",
- "description": "禁用默认提交方式，禁用后配合 validate() 方法可以更加自由的控制提交逻辑"
+ "description": "是否禁用默认的回车提交方式，禁用后配合 validate() 方法可以更加自由的控制提交逻辑"
},
"vxe-form/valid-config": {
"type": "any",
@@ -1556,7 +1536,7 @@
"description": "是否可视"
},
"vxe-form-item/visible-method": {
- "type": "({ data }) => boolean",
+ "type": "function",
"description": "该方法的返回值用来决定该项是否显示"
},
"vxe-form-item/folding": {
diff --git a/helper/vetur/tags.json b/helper/vetur/tags.json
index eb319879a..31f879b25 100644
--- a/helper/vetur/tags.json
+++ b/helper/vetur/tags.json
@@ -47,7 +47,6 @@
"row-key",
"row-id",
"keep-source",
- "z-index",
"column-config",
"seq-config",
"sort-config",
@@ -62,6 +61,7 @@
"tree-config",
"menu-config",
"clip-config",
+ "fnr-config",
"mouse-config",
"keyboard-config",
"edit-config",
@@ -70,9 +70,6 @@
"empty-text",
"empty-render",
"custom-config",
- "animat",
- "cloak",
- "delay-hover",
"scroll-x",
"scroll-y",
"params"
@@ -188,7 +185,6 @@
"row-key",
"row-id",
"keep-source",
- "z-index",
"column-config",
"seq-config",
"sort-config",
@@ -203,6 +199,7 @@
"tree-config",
"menu-config",
"clip-config",
+ "fnr-config",
"mouse-config",
"keyboard-config",
"edit-config",
@@ -211,9 +208,6 @@
"empty-text",
"empty-render",
"custom-config",
- "animat",
- "cloak",
- "delay-hover",
"scroll-x",
"scroll-y",
"params",
@@ -453,6 +447,7 @@
"mask",
"mask-closable",
"esc-closable",
+ "show-zoom",
"resize",
"duration",
"width",
diff --git a/package.json b/package.json
index b3c12661e..ba6b99d0c 100644
--- a/package.json
+++ b/package.json
@@ -42,13 +42,14 @@
"@vue/eslint-config-typescript": "^5.0.2",
"ant-design-vue": "^2.0.0-rc.5",
"core-js": "^3.6.5",
- "element-plus": "^1.0.1-beta.8",
+ "element-plus": "^1.0.1-beta.11",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.0.0",
"eslint-plugin-vue": "^7.0.0-0",
+ "exceljs": "^4.2.0",
"font-awesome": "^4.7.0",
"gulp": "^4.0.2",
"gulp-autoprefixer": "^6.1.0",
diff --git a/packages/export/src/export-panel.ts b/packages/export/src/export-panel.ts
index 70d14d76d..ed8607dd0 100644
--- a/packages/export/src/export-panel.ts
+++ b/packages/export/src/export-panel.ts
@@ -38,7 +38,7 @@ export default defineComponent({
const computeShowSheet = computed(() => {
const { defaultOptions } = props
- return ['html', 'xml', 'xlsx'].indexOf(defaultOptions.type) > -1
+ return ['html', 'xml', 'xlsx', 'pdf'].indexOf(defaultOptions.type) > -1
})
const computeSupportMerge = computed(() => {
@@ -46,6 +46,11 @@ export default defineComponent({
return !defaultOptions.original && (storeData.isPrint || ['html', 'xlsx'].indexOf(defaultOptions.type) > -1)
})
+ const computeSupportStyle = computed(() => {
+ const { defaultOptions } = props
+ return !defaultOptions.original && ['xlsx'].indexOf(defaultOptions.type) > -1
+ })
+
const handleOptionCheck = (column: any) => {
const { storeData } = props
const matchObj = XEUtils.findTree(storeData.columns as any[], item => item === column)
@@ -106,7 +111,9 @@ export default defineComponent({
const { storeData, defaultOptions } = props
const checkedAll = computeCheckedAll.value
const columns = XEUtils.searchTree(storeData.columns, (column: any) => column.checked, { children: 'children', mapChildren: 'childNodes', original: true })
- return Object.assign({ columns }, defaultOptions, { isMerge: checkedAll ? defaultOptions.isMerge : false })
+ return Object.assign({ columns }, defaultOptions, {
+ isMerge: checkedAll ? defaultOptions.isMerge : false
+ })
}
const printEvent = () => {
@@ -151,6 +158,7 @@ export default defineComponent({
const checkedAll = computeCheckedAll.value
const showSheet = computeShowSheet.value
const supportMerge = computeSupportMerge.value
+ const supportStyle = computeSupportStyle.value
XEUtils.eachTree(storeData.columns, (column: any) => {
const colTitle = UtilTools.formatText(column.getTitle(), 1)
const isColGroup = column.children && column.children.length
@@ -364,6 +372,15 @@ export default defineComponent({
defaultOptions.isMerge = value
}
}),
+ isPrint ? createCommentVNode() : h(VxeCheckboxConstructor, {
+ modelValue: supportStyle ? defaultOptions.useStyle : false,
+ disabled: !supportStyle,
+ title: GlobalConfig.i18n('vxe.export.expUseStyleTitle'),
+ content: GlobalConfig.i18n('vxe.export.expOptUseStyle'),
+ 'onUpdate:modelValue' (value: any) {
+ defaultOptions.useStyle = value
+ }
+ }),
h(VxeCheckboxConstructor, {
modelValue: hasTree ? defaultOptions.isAllExpand : false,
disabled: !hasTree,
diff --git a/packages/export/src/hook.ts b/packages/export/src/hook.ts
index a91f53a44..1ae5b6493 100644
--- a/packages/export/src/hook.ts
+++ b/packages/export/src/hook.ts
@@ -87,6 +87,10 @@ function toTableBorder (border: any) {
return 'default'
}
+function getBooleanValue (cellValue: any) {
+ return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true
+}
+
function getHeaderTitle (opts: any, column: any) {
return (opts.original ? column.property : column.getTitle()) || ''
}
@@ -296,6 +300,10 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
return seqMethod ? seqMethod({ row, rowIndex, column, columnIndex }) : (seqOpts.startIndex + rowIndex + 1)
}
+ const toBooleanValue = (cellValue: any) => {
+ return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue
+ }
+
const getLabelData = (opts: any, columns: any[], datas: any[]) => {
const { isAllExpand } = opts
const { treeConfig } = props
@@ -337,12 +345,12 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
cellValue = getSeq(row, rowIndex, column, columnIndex)
break
case 'checkbox':
- cellValue = $xetable.isCheckedByCheckboxRow(row)
+ cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''
item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row })
break
case 'radio':
- cellValue = $xetable.isCheckedByRadioRow(row)
+ cellValue = toBooleanValue($xetable.isCheckedByRadioRow(row))
item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : ''
item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row })
break
@@ -392,12 +400,12 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
cellValue = getSeq(row, rowIndex, column, columnIndex)
break
case 'checkbox':
- cellValue = $xetable.isCheckedByCheckboxRow(row)
+ cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row))
item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : ''
item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row })
break
case 'radio':
- cellValue = $xetable.isCheckedByRadioRow(row)
+ cellValue = toBooleanValue($xetable.isCheckedByRadioRow(row))
item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : ''
item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row })
break
@@ -579,16 +587,16 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
}
classNames.push('vxe-table--tree-node')
if (column.type === 'radio') {
- return ` | `
+ return ` | `
} else if (column.type === 'checkbox') {
- return ` | `
+ return ` | `
}
return ` | `
}
if (column.type === 'radio') {
- return `${item._radioLabel} | `
+ return `${item._radioLabel} | `
} else if (column.type === 'checkbox') {
- return `${item._checkboxLabel} | `
+ return `${item._checkboxLabel} | `
}
return `${formatText(cellValue, true)} | `
}).join('') + ''
@@ -624,9 +632,9 @@ const tableExportHook: VxeGlobalHooksHandles.HookOptions = {
classNames.push(`col--${cellAlign}`)
}
if (column.type === 'radio') {
- return `${item._radioLabel} | `
+ return `${item._radioLabel} | `
} else if (column.type === 'checkbox') {
- return `${item._checkboxLabel} | `
+ return `${item._checkboxLabel} | `
}
return `${formatText(cellValue, true)} | `
}).join('') + ''
diff --git a/packages/input/src/input.ts b/packages/input/src/input.ts
index e2f42869f..30f3e4dcc 100644
--- a/packages/input/src/input.ts
+++ b/packages/input/src/input.ts
@@ -538,8 +538,9 @@ export default defineComponent({
inputMethods.dispatchEvent(evnt.type, { value: inputValue }, evnt)
}
- const emitUpdate = (value: VxeInputPropTypes.ModelValue, evnt: Event | { type: string }) => {
+ const emitModel = (value: VxeInputPropTypes.ModelValue, evnt: Event | { type: string }) => {
reactData.inputValue = value
+ inputMethods.dispatchEvent('input', { value }, evnt)
emit('update:modelValue', value)
if (XEUtils.toString(props.modelValue) !== value) {
inputMethods.dispatchEvent('change', { value }, evnt)
@@ -550,12 +551,12 @@ export default defineComponent({
const isDatePickerType = computeIsDatePickerType.value
const { immediate } = props
reactData.inputValue = value
- if (immediate) {
- if (!isDatePickerType) {
- emitUpdate(value, evnt)
+ if (!isDatePickerType) {
+ if (immediate) {
+ emitModel(value, evnt)
}
+ inputMethods.dispatchEvent('input', { value }, evnt)
}
- inputMethods.dispatchEvent('input', { value }, evnt)
}
const inputEvent = (evnt: Event & { type: 'input' }) => {
@@ -569,7 +570,7 @@ export default defineComponent({
if (immediate) {
triggerEvent(evnt)
} else {
- emitUpdate(reactData.inputValue, evnt)
+ emitModel(reactData.inputValue, evnt)
}
}
@@ -612,7 +613,7 @@ export default defineComponent({
const { disabled } = props
if (!disabled) {
if (DomTools.hasClass(evnt.currentTarget, 'is--clear')) {
- emitUpdate('', evnt)
+ emitModel('', evnt)
clearValueEvent(evnt, '')
} else {
const { inputValue } = reactData
@@ -669,7 +670,7 @@ export default defineComponent({
if (inputValue) {
const validValue = XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
if (inputValue !== validValue) {
- emitUpdate(validValue, { type: 'init' })
+ emitModel(validValue, { type: 'init' })
}
}
}
@@ -710,7 +711,7 @@ export default defineComponent({
const inpVal = XEUtils.toDateString(date, dateValueFormat)
dateCheckMonth(date)
if (!XEUtils.isEqual(modelValue, inpVal)) {
- emitUpdate(inpVal, { type: 'update' })
+ emitModel(inpVal, { type: 'update' })
}
}
@@ -731,7 +732,7 @@ export default defineComponent({
} else if (!vaildMaxNum(inpVal)) {
inpVal = max
}
- emitUpdate(getNumberValue(inpVal), { type: 'check' })
+ emitModel(getNumberValue(inpVal), { type: 'check' })
}
} else if (isDatePickerType) {
inpVal = inputValue
@@ -745,7 +746,7 @@ export default defineComponent({
if (type === 'time') {
inpVal = XEUtils.toDateString(inpVal, dateLabelFormat)
if (inputValue !== inpVal) {
- emitUpdate(inpVal, { type: 'check' })
+ emitModel(inpVal, { type: 'check' })
}
reactData.inputValue = inpVal
} else {
@@ -764,7 +765,7 @@ export default defineComponent({
dateRevert()
}
} else {
- emitUpdate('', { type: 'check' })
+ emitModel('', { type: 'check' })
}
}
}
@@ -774,7 +775,7 @@ export default defineComponent({
const { immediate } = props
const { inputValue } = reactData
if (!immediate) {
- emitUpdate(inputValue, evnt)
+ emitModel(inputValue, evnt)
}
afterCheckValue()
if (!reactData.visiblePanel) {
@@ -1317,8 +1318,11 @@ export default defineComponent({
}
const datePickerOpenEvent = (evnt: Event) => {
- evnt.preventDefault()
- showPanel()
+ const { readonly } = props
+ if (!readonly) {
+ evnt.preventDefault()
+ showPanel()
+ }
}
const clickEvent = (evnt: Event & { type: 'click' }) => {
@@ -1384,8 +1388,7 @@ export default defineComponent({
if (visiblePanel) {
dateOffsetEvent(evnt)
} else if (isUpArrow || isDwArrow) {
- evnt.preventDefault()
- showPanel()
+ datePickerOpenEvent(evnt)
}
}
}
@@ -1398,7 +1401,7 @@ export default defineComponent({
hidePanel()
}
} else if (isActivated) {
- showPanel()
+ datePickerOpenEvent(evnt)
}
}
} else if (isPgUp || isPgDn) {
diff --git a/packages/locale/lang/en-US.ts b/packages/locale/lang/en-US.ts
index eeee61e3d..4221b980e 100644
--- a/packages/locale/lang/en-US.ts
+++ b/packages/locale/lang/en-US.ts
@@ -207,10 +207,12 @@ export default {
expFooterTitle: 'Do you need the footer table',
expOptColgroup: 'Group header',
expColgroupTitle: 'If it exists, headers with grouping structure are supported',
- expOptMerge: 'Cell merge',
+ expOptMerge: 'Merge',
expMergeTitle: 'If it exists, cells with merged structures are supported',
- expOptAllExpand: 'Expand all nodes',
+ expOptAllExpand: 'Expand nodes',
expAllExpandTitle: 'If it exists, all data with tree structure can be expanded',
+ expOptUseStyle: 'Styles',
+ expUseStyleTitle: 'If it exists, cells with styles are supported',
expOptOriginal: 'Source data',
expOriginalTitle: 'If it is source data, import into the table is supported',
expPrint: 'Print',
diff --git a/packages/locale/lang/ja-JP.ts b/packages/locale/lang/ja-JP.ts
index 87df6375c..7e8750354 100644
--- a/packages/locale/lang/ja-JP.ts
+++ b/packages/locale/lang/ja-JP.ts
@@ -207,10 +207,12 @@ export default {
expFooterTitle: 'フッターをエクスポート',
expOptColgroup: '分组表头',
expColgroupTitle: '如果存在，则支持带有分组结构的表头',
- expOptMerge: '单元格合并',
+ expOptMerge: '合并',
expMergeTitle: '如果存在，则支持带有合并结构的单元格',
- expOptAllExpand: '展开所有层级',
+ expOptAllExpand: '展开层级',
expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
+ expOptUseStyle: '样式',
+ expUseStyleTitle: '如果存在，则支持带样式的单元格',
expOptOriginal: 'ソースデータ',
expOriginalTitle: '如果为源数据，则支持导入到表格中',
expPrint: '印刷',
diff --git a/packages/locale/lang/zh-CN.ts b/packages/locale/lang/zh-CN.ts
index cbc61055b..139553631 100644
--- a/packages/locale/lang/zh-CN.ts
+++ b/packages/locale/lang/zh-CN.ts
@@ -207,10 +207,12 @@ export default {
expFooterTitle: '是否需要表尾',
expOptColgroup: '分组表头',
expColgroupTitle: '如果存在，则支持带有分组结构的表头',
- expOptMerge: '单元格合并',
+ expOptMerge: '合并',
expMergeTitle: '如果存在，则支持带有合并结构的单元格',
- expOptAllExpand: '展开所有层级',
+ expOptAllExpand: '展开层级',
expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
+ expOptUseStyle: '样式',
+ expUseStyleTitle: '如果存在，则支持带样式的单元格',
expOptOriginal: '源数据',
expOriginalTitle: '如果为源数据，则支持导入到表格中',
expPrint: '打印',
diff --git a/packages/locale/lang/zh-TC.ts b/packages/locale/lang/zh-TC.ts
index 29130e963..9984e4964 100644
--- a/packages/locale/lang/zh-TC.ts
+++ b/packages/locale/lang/zh-TC.ts
@@ -207,10 +207,12 @@ export default {
expFooterTitle: '是否需要表尾',
expOptColgroup: '分组表头',
expColgroupTitle: '如果存在，則支持帶有分組結構的表頭',
- expOptMerge: '儲存格合併',
+ expOptMerge: '合併',
expMergeTitle: '如果存在，則支持帶有合併結構的儲存格',
- expOptAllExpand: '展開所有層級',
+ expOptAllExpand: '展開層級',
expAllExpandTitle: '如果存在，則支持將帶有樹結構的數據全部展開',
+ expOptUseStyle: '樣式',
+ expUseStyleTitle: '如果存在，則支持帶樣式的儲存格',
expOptOriginal: '源數據',
expOriginalTitle: '如果為源數據，則支持導入到表格中',
expPrint: '列印',
diff --git a/packages/menu/src/hooks.ts b/packages/menu/src/hooks.ts
index 2b9e9bcdc..f33a0af02 100644
--- a/packages/menu/src/hooks.ts
+++ b/packages/menu/src/hooks.ts
@@ -11,7 +11,7 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
setupTable ($xetable) {
const { xID, props, reactData, internalData, refMaps, computeMaps } = $xetable
const { refElem, refTableFilter, refTableMenu } = refMaps
- const { computeMouseOpts, computeMenuOpts } = computeMaps
+ const { computeMouseOpts, computeIsMenu, computeMenuOpts } = computeMaps
let menuMethods = {} as TableMenuMethods
let menuPrivateMethods = {} as TableMenuPrivateMethods
@@ -21,6 +21,7 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
*/
const openContextMenu = (evnt: any, type: 'header' | 'body' | 'footer', params: any) => {
const { ctxMenuStore } = reactData
+ const isMenu = computeIsMenu.value
const menuOpts = computeMenuOpts.value
const config = menuOpts[type]
const visibleMethod = menuOpts.visibleMethod
@@ -28,7 +29,7 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
const { options, disabled } = config
if (disabled) {
evnt.preventDefault()
- } else if (options && options.length) {
+ } else if (isMenu && options && options.length) {
params.options = options
$xetable.preventEvent(evnt, 'event.showMenu', params, null, () => {
if (!visibleMethod || visibleMethod(params)) {
diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts
index 19d68fc3e..2943933f8 100644
--- a/packages/table/src/table.ts
+++ b/packages/table/src/table.ts
@@ -210,6 +210,7 @@ export default defineComponent({
isColgroup: false,
isMerge: false,
isAllExpand: false,
+ useStyle: false,
original: false,
message: true,
isHeader: false,
@@ -417,10 +418,11 @@ export default defineComponent({
})
const computeIsMenu = computed(() => {
+ const menuOpts = computeMenuOpts.value
const headerMenu = computeHeaderMenu.value
const bodyMenu = computeBodyMenu.value
const footerMenu = computeFooterMenu.value
- return headerMenu.length || bodyMenu.length || footerMenu.length
+ return !!(props.menuConfig && isEnableConf(menuOpts) && (headerMenu.length || bodyMenu.length || footerMenu.length))
})
const computeMenuList = computed(() => {
@@ -533,6 +535,7 @@ export default defineComponent({
computeKeyboardOpts,
computeClipOpts,
computeFNROpts,
+ computeIsMenu,
computeMenuOpts,
computeExportOpts,
computeImportOpts,
@@ -1125,6 +1128,7 @@ export default defineComponent({
const containerList = ['main', 'left', 'right']
const emptyPlaceholderElem = refEmptyPlaceholder.value
const cellOffsetWidth = computeCellOffsetWidth.value
+ const mouseOpts = computeMouseOpts.value
const bodyWrapperElem = elemStore['main-body-wrapper']
if (emptyPlaceholderElem) {
emptyPlaceholderElem.style.top = `${headerHeight}px`
@@ -1326,7 +1330,7 @@ export default defineComponent({
if (currentRow) {
tableMethods.setCurrentRow(currentRow)
}
- if (mouseConfig && mouseConfig.selected && editStore.selected.row && editStore.selected.column) {
+ if (mouseConfig && mouseOpts.selected && editStore.selected.row && editStore.selected.column) {
$xetable.addCellSelectedClass()
}
return nextTick()
@@ -4934,11 +4938,26 @@ export default defineComponent({
if (props.treeConfig && checkboxOpts.range) {
UtilTools.error('vxe.error.noTree', ['checkbox-config.range'])
}
- if (mouseOpts.area && !$xetable.handleUpdateCellAreas) {
- return UtilTools.error('vxe.error.notProp', ['mouse-config.area'])
- }
- if (props.treeConfig && mouseOpts.area) {
- UtilTools.error('vxe.error.noTree', ['mouse-config.area'])
+
+ if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+ if (!$xetable.handleUpdateCellAreas) {
+ if (props.clipConfig) {
+ UtilTools.warn('vxe.error.notProp', ['clip-config'])
+ }
+ if (props.fnrConfig) {
+ UtilTools.warn('vxe.error.notProp', ['fnr-config'])
+ }
+ if (mouseOpts.area) {
+ UtilTools.error('vxe.error.notProp', ['mouse-config.area'])
+ return
+ }
+ }
+ if (mouseOpts.area && mouseOpts.selected) {
+ UtilTools.error('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected'])
+ }
+ if (props.treeConfig && mouseOpts.area) {
+ UtilTools.error('vxe.error.noTree', ['mouse-config.area'])
+ }
}
// 检查是否有安装需要的模块
diff --git a/packages/v-x-e-table/src/renderer.ts b/packages/v-x-e-table/src/renderer.ts
index 034bc0c5f..adb94ff8a 100644
--- a/packages/v-x-e-table/src/renderer.ts
+++ b/packages/v-x-e-table/src/renderer.ts
@@ -164,7 +164,6 @@ function getEditOns (renderOpts: any, params: any) {
const { $table, row, column } = params
const { model } = column
return getComponentOns(renderOpts, params, (cellValue: any) => {
- console.log(cellValue)
// 处理 model 值双向绑定
if (lazyInputComponents.indexOf(renderOpts.name) === -1 || isSyncCell(renderOpts, params)) {
UtilTools.setCellValue(row, column, cellValue)
diff --git a/types/export.d.ts b/types/export.d.ts
index d8f950685..424d6a93f 100644
--- a/types/export.d.ts
+++ b/types/export.d.ts
@@ -65,6 +65,16 @@ declare module './grid' {
declare module './table' {
interface VxeTableMethods extends TableExportMethods { }
interface VxeTablePrivateMethods extends TableExportPrivateMethods { }
+ namespace VxeTableDefines {
+ interface ExtortSheetMethodParams {
+ $table: VxeTableConstructor;
+ $grid?: VxeGridConstructor;
+ options: VxeTablePropTypes.ExportHandleOptions;
+ datas: any[];
+ columns: VxeTableDefines.ColumnInfo[];
+ colgroups: VxeTableDefines.ColumnInfo[][];
+ }
+ }
namespace VxeTablePropTypes {
/**
* 导入参数
@@ -112,7 +122,7 @@ declare module './table' {
export interface ImportHandleOptions extends ImportConfig {
data: any[];
columns: VxeTableDefines.ColumnInfo[];
- colgroups: VxeTableDefines.ColumnInfo[];
+ colgroups: VxeTableDefines.ColumnInfo[][];
}
interface ExportOrPrintColumnOption {
@@ -195,26 +205,31 @@ declare module './table' {
* 是否服务端导出
*/
remote?: boolean;
+ /**
+ * 只对 remote=html,xlsx 有效，是否使用样式
+ */
+ useStyle?: boolean;
+ sheetMethod?(params: VxeTableDefines.ExtortSheetMethodParams): void;
/**
* 只对 remote=true 有效，用于自定义导出逻辑
*/
exportMethod?(params: {
$table: VxeTableConstructor;
$grid?: VxeGridConstructor;
- options: VxeTablePropTypes.ExportHandleOptions;
+ options: ExportHandleOptions;
}): Promise;
beforeExportMethod?(params: {
- options: VxeTablePropTypes.ExportHandleOptions;
+ options: ExportHandleOptions;
}): void;
afterExportMethod?(params: {
- options: VxeTablePropTypes.ExportHandleOptions;
+ options: ExportHandleOptions;
}): void;
}
export interface ExportOpts extends ExportConfig { }
export interface ExportHandleOptions extends ExportConfig {
data: any[];
columns: VxeTableDefines.ColumnInfo[];
- colgroups: VxeTableDefines.ColumnInfo[];
+ colgroups: VxeTableDefines.ColumnInfo[][];
}
/**
diff --git a/types/table.d.ts b/types/table.d.ts
index 62509d987..f2e70ff18 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -62,6 +62,7 @@ export interface TablePrivateComputed {
computeKeyboardOpts: ComputedRef;
computeClipOpts: ComputedRef;
computeFNROpts: ComputedRef;
+ computeIsMenu: ComputedRef;
computeMenuOpts: ComputedRef;
computeExportOpts: ComputedRef;
computeImportOpts: ComputedRef;
@@ -854,6 +855,7 @@ export interface TableReactData {
type: any;
isColgroup: boolean;
isMerge: boolean;
+ useStyle: boolean;
original: boolean;
message: boolean;
isHeader: boolean;
diff --git a/types/v-x-e-table/interceptor.d.ts b/types/v-x-e-table/interceptor.d.ts
index fa4625504..3a87d5405 100644
--- a/types/v-x-e-table/interceptor.d.ts
+++ b/types/v-x-e-table/interceptor.d.ts
@@ -13,7 +13,7 @@ export namespace VxeGlobalInterceptorHandles {
export interface InterceptorKeydownParams extends InterceptorParams { }
export interface InterceptorExportParams extends InterceptorParams {
- options: VxeTablePropTypes.ExportConfig;
+ options: VxeTablePropTypes.ExportHandleOptions;
columns: VxeTableDefines.ColumnInfo[];
colgroups: VxeTableDefines.ColumnInfo[][];
datas: any[];
@@ -21,7 +21,7 @@ export namespace VxeGlobalInterceptorHandles {
export interface InterceptorImportParams extends InterceptorParams {
file: File;
- options: VxeTablePropTypes.ExportConfig;
+ options: VxeTablePropTypes.ExportHandleOptions;
columns: VxeTableDefines.ColumnInfo[];
datas: any[];
}