1
0
mirror of synced 2025-11-06 11:20:40 +08:00

releases 4.7.28

This commit is contained in:
xuliangzhan
2024-06-20 17:30:07 +08:00
parent f02e18fc12
commit 7ea3415d01
6 changed files with 26 additions and 20 deletions

View File

@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.7.27",
"version": "4.7.28",
"description": "一个基于 vue 的 PC 端表格组件支持增删改查、虚拟树、列拖拽懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
"style": "lib/style.css",
"typings": "types/index.d.ts",
"dependencies": {
"vxe-pc-ui": "^4.0.24"
"vxe-pc-ui": "^4.0.25"
},
"devDependencies": {
"@types/resize-observer-browser": "^0.1.11",

View File

@@ -17,7 +17,7 @@ const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents,
const tableComponentPropKeys = Object.keys(tableComponentProps as any)
const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'focus', 'blur', 'connect']
const tableComponentMethodKeys: (keyof VxeTableMethods)[] = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'createData', 'createRow', 'revertData', 'clearData', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getData', 'getCheckboxRecords', 'getParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'isCheckedByCheckboxRow', 'isIndeterminateByCheckboxRow', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'setRadioRow', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'getPendingRecords', 'clearPendingRow', 'sort', 'clearSort', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'scrollTo', 'scrollToRow', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'openTooltip', 'getCellLabel', 'getCellElement', 'focus', 'blur', 'connect']
const gridComponentEmits: VxeGridEmits = [
...tableComponentEmits,

View File

@@ -942,11 +942,17 @@ hooks.add('tableExportModule', {
const hasTree = treeConfig
const customOpts = computeCustomOpts.value
const selectRecords = $xeTable.getCheckboxRecords()
const proxyOpts = $xeGrid ? $xeGrid.getComputeMaps().computeProxyOpts.value : {}
const hasFooter = !!footerTableData.length
const hasMerge = !hasTree && mergeList.length
const defOpts = Object.assign({ message: true, isHeader: showHeader, isFooter: showFooter }, options)
const defOpts = Object.assign({
message: true,
isHeader: showHeader,
isFooter: showFooter,
modes: ['current', 'selected'].concat(proxyOpts.ajax && proxyOpts.ajax.queryAll ? ['all'] : [])
}, options)
const types: string[] = defOpts.types || XEUtils.keys(exportOpts._typeMaps)
const modes: string[] = defOpts.modes
const modes: string[] = defOpts.modes || []
const checkMethod = customOpts.checkMethod
const exportColumns = collectColumn.slice(0)
const { columns } = defOpts
@@ -1304,9 +1310,11 @@ hooks.add('tableExportModule', {
const defOpts = Object.assign({
mode: 'insert',
message: true,
types: XEUtils.keys(importOpts._typeMaps)
types: XEUtils.keys(importOpts._typeMaps),
modes: ['insert', 'covering']
}, importOpts, options)
const { types } = defOpts
const types = defOpts.types || []
const modes = defOpts.modes || []
const isTree = !!treeConfig
if (isTree) {
if (defOpts.message) {
@@ -1320,13 +1328,13 @@ hooks.add('tableExportModule', {
errLog('vxe.error.reqProp', ['import-config'])
}
// 处理类型
const typeList = types.map((value: any) => {
const typeList = types.map((value) => {
return {
value,
label: `vxe.export.types.${value}`
}
})
const modeList = defOpts.modes.map((value: any) => {
const modeList = modes.map((value) => {
return {
value,
label: `vxe.import.modes.${value}`

View File

@@ -280,7 +280,6 @@ export const Cell = {
}
if (!trigger || trigger === 'default') {
ons.onClick = (evnt: Event) => {
evnt.stopPropagation()
$table.triggerTreeExpandEvent(evnt, params)
}
}
@@ -375,7 +374,6 @@ export const Cell = {
ons = {
onClick (evnt: Event) {
if (!isDisabled && isVisible) {
evnt.stopPropagation()
$table.triggerRadioRowEvent(evnt, params)
}
}
@@ -436,7 +434,6 @@ export const Cell = {
ons = {
onClick (evnt: MouseEvent) {
if (!isAllCheckboxDisabled) {
evnt.stopPropagation()
$table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected)
}
}
@@ -497,7 +494,6 @@ export const Cell = {
ons = {
onClick (evnt: MouseEvent) {
if (!isDisabled && isVisible) {
evnt.stopPropagation()
$table.triggerCheckRowEvent(evnt, params, !isChecked)
}
}
@@ -566,7 +562,6 @@ export const Cell = {
ons = {
onClick (evnt: MouseEvent) {
if (!isDisabled && isVisible) {
evnt.stopPropagation()
$table.triggerCheckRowEvent(evnt, params, !isChecked)
}
}
@@ -645,7 +640,6 @@ export const Cell = {
'is--active': isAceived
}],
onClick (evnt: MouseEvent) {
evnt.stopPropagation()
$table.triggerRowExpandEvent(evnt, params)
}
}, [

View File

@@ -6002,6 +6002,7 @@ export default defineComponent({
if (trigger === 'manual') {
return
}
evnt.stopPropagation()
if (checkboxOpts.isShiftKey && evnt.shiftKey && !props.treeConfig) {
const checkboxRecords = tableMethods.getCheckboxRecords()
if (checkboxRecords.length) {
@@ -6036,6 +6037,9 @@ export default defineComponent({
if (trigger === 'manual') {
return
}
if (evnt) {
evnt.stopPropagation()
}
handleCheckAllEvent(evnt, value)
},
/**
@@ -6049,6 +6053,7 @@ export default defineComponent({
if (trigger === 'manual') {
return
}
evnt.stopPropagation()
let newValue = row
let isChange = oldValue !== newValue
if (isChange) {
@@ -6084,6 +6089,7 @@ export default defineComponent({
if (trigger === 'manual') {
return
}
evnt.stopPropagation()
const rowid = getRowid($xeTable, row)
if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
const expanded = !tableMethods.isRowExpandByRow(row)
@@ -6112,6 +6118,7 @@ export default defineComponent({
if (trigger === 'manual') {
return
}
evnt.stopPropagation()
const rowid = getRowid($xeTable, row)
if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
const expanded = !tableMethods.isTreeExpandByRow(row)

View File

@@ -109,8 +109,7 @@ VxeUI.setConfig({
html: 1,
xml: 1,
txt: 1
},
modes: ['insert', 'covering']
}
},
exportConfig: {
_typeMaps: {
@@ -118,11 +117,9 @@ VxeUI.setConfig({
html: 1,
xml: 1,
txt: 1
},
modes: ['current', 'selected']
}
},
printConfig: {
modes: ['current', 'selected']
},
mouseConfig: {
extension: true