Skip to content

Commit

Permalink
releases 3.13.21
Browse files Browse the repository at this point in the history
  • Loading branch information
@xuliangzhan
xuliangzhan committed Mar 7, 2025
1 parent 18ff6d7 commit 934dffc
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 225 deletions.
289 changes: 82 additions & 207 deletions examples/views/grid/GridTest.vue
View file
Original file line number Diff line number Diff line change
@@ -1,229 +1,104 @@
<template>
<div>
<vxe-button @click="loadData(5000)">加载5k条</vxe-button>
<vxe-button @click="loadData(10000)">加载1w条</vxe-button>
<vxe-button @click="loadData(50000)">加载5w条</vxe-button>
<vxe-grid v-bind="gridOptions">
<template #status="{ row }">
<vxe-tag v-if="row.status === '2'" status="error">驳回</vxe-tag>
<vxe-tag v-else-if="row.status === '1'" status="primary">待处理</vxe-tag>
<vxe-tag v-else status="success">已完成</vxe-tag>
</template>

<template #action>
<vxe-button mode="text" status="primary">编辑</vxe-button>
<vxe-button mode="text" status="error">删除</vxe-button>
</template>
</vxe-grid>
<vxe-button status="success" @click="revertAllEvent">恢复全部</vxe-button>
<vxe-button status="success" @click="revertRow(tableData[1])">恢复Test2</vxe-button>
<vxe-table
border
show-overflow
keep-source
height="400"
ref="tableRef"
:edit-config="editConfig"
:data="tableData">
<vxe-column type="seq" width="70"></vxe-column>
<vxe-column field="name" title="Name" :edit-render="{name: 'input'}"></vxe-column>
<vxe-column field="sex" title="Sex" :edit-render="{name: 'input'}"></vxe-column>
<vxe-column field="age" title="Age" :edit-render="{name: 'input'}"></vxe-column>
<vxe-column field="action" title="操作" width="240">
<template #default="{ row }">
<vxe-button mode="text" status="primary" @click="updateRow1(row)">修改1</vxe-button>
<vxe-button mode="text" status="primary" @click="updateRow2(row)">修改2</vxe-button>
<vxe-button mode="text" status="error" @click="removeRow(row)">删除</vxe-button>
<vxe-button mode="text" status="success" @click="revertRow(row)">恢复</vxe-button>
</template>
</vxe-column>
</vxe-table>
</div>
</template>

<script>
import { VxeUI } from '../../../packages'
export default {
data () {
const flag1CellRender = {
name: 'VxeSwitch'
}
const imgUrlCellRender = {
name: 'VxeImage',
props: {
width: 36,
height: 36
}
}
const imgList1CellRender = {
name: 'VxeUpload',
props: {
mode: 'image',
readonly: true,
moreConfig: {
maxCount: 2
},
imageConfig: {
width: 40,
height: 40
}
}
}
const gridOptions = {
border: true,
showFooter: true,
showOverflow: true,
showHeaderOverflow: true,
showFooterOverflow: true,
loading: false,
height: 800,
columnConfig: {
resizable: true
},
scrollX: {
enabled: true,
gt: 0
},
scrollY: {
enabled: true,
gt: 0
},
columns: [
{ type: 'checkbox', width: 60, fixed: 'left' },
{ title: '列0', field: 'col0', width: 100, fixed: 'left' },
{ title: '列1', field: 'imgUrl', width: 80, fixed: 'left', cellRender: imgUrlCellRender },
{ title: '状态', field: 'status', width: 90, slots: { default: 'status' } },
{ title: '列3', field: 'col3', width: 200 },
{ title: '列4', field: 'col4', width: 140 },
{ title: '列5', field: 'col5', width: 300 },
{ title: '列6', field: 'col6', width: 160 },
{ title: '列7', field: 'col7', width: 120 },
{ title: '列8', field: 'col8', width: 400 },
{ title: '列9', field: 'col9', width: 160 },
{ title: '列10', field: 'col10', width: 160 },
{ title: '列11', field: 'col11', width: 180 },
{ title: '列12', field: 'col12', width: 160 },
{ title: '列13', field: 'col13', width: 80 },
{ title: '列14', field: 'col14', width: 120 },
{ title: '列15', field: 'col15', width: 360 },
{ title: '列16', field: 'col16', width: 150 },
{ title: '列17', field: 'col17', width: 380 },
{ title: '列18', field: 'col18', width: 100 },
{ title: '列19', field: 'col19', width: 290 },
{ title: '列20', field: 'col20', width: 80 },
{ title: '列21', field: 'col21', width: 100 },
{ title: '列22', field: 'col22', width: 120 },
{ title: '列23', field: 'col23', width: 270 },
{ title: '列24', field: 'col24', width: 330 },
{ title: '列25', field: 'col25', width: 460 },
{ title: '列26', field: 'col26', width: 280 },
{ title: '列27', field: 'col27', width: 220 },
{ title: '列28', field: 'col28', width: 120 },
{ title: '列29', field: 'col29', width: 180 },
{ title: '列30', field: 'col30', width: 500 },
{ title: '列31', field: 'col31', width: 600 },
{ title: '列32', field: 'col32', width: 100 },
{ title: '列33', field: 'col33', width: 490 },
{ title: '列34', field: 'col34', width: 100 },
{ title: '列35', field: 'col35', width: 150 },
{ title: '列36', field: 'col36', width: 800 },
{ title: '列37', field: 'col37', width: 400 },
{ title: '列38', field: 'col38', width: 800 },
{ title: '列39', field: 'col39', width: 360 },
{ title: '列40', field: 'col40', width: 420 },
{ title: '列41', field: 'col41', width: 100 },
{ title: '列42', field: 'col42', width: 120 },
{ title: '列43', field: 'col43', width: 280 },
{ title: '列44', field: 'col44', width: 170 },
{ title: '列45', field: 'col45', width: 370 },
{ title: '列46', field: 'col46', width: 420 },
{ title: '列47', field: 'col47', width: 170 },
{ title: '列48', field: 'col48', width: 400 },
{ title: '列49', field: 'col49', width: 220 },
{ title: '列50', field: 'col50', width: 170 },
{ title: '列51', field: 'col51', width: 160 },
{ title: '列52', field: 'col52', width: 500 },
{ title: '列53', field: 'col53', width: 280 },
{ title: '列54', field: 'col54', width: 170 },
{ title: '列55', field: 'col55', width: 370 },
{ title: '列56', field: 'col56', width: 120 },
{ title: '列57', field: 'col57', width: 170 },
{ title: '列58', field: 'col58', width: 400 },
{ title: '列59', field: 'col59', width: 220 },
{ title: '列60', field: 'col60', width: 650 },
{ title: '列61', field: 'col61', width: 600 },
{ title: '列62', field: 'col62', width: 100 },
{ title: '列63', field: 'col63', width: 490 },
{ title: '列64', field: 'col64', width: 100 },
{ title: '列65', field: 'col65', width: 150 },
{ title: '列66', field: 'col66', width: 800 },
{ title: '列67', field: 'col67', width: 400 },
{ title: '列68', field: 'col68', width: 800 },
{ title: '列69', field: 'col69', width: 360 },
{ title: '列70', field: 'col70', width: 650 },
{ title: '列71', field: 'col71', width: 600 },
{ title: '列72', field: 'col72', width: 100 },
{ title: '列73', field: 'col73', width: 490 },
{ title: '列74', field: 'col74', width: 100 },
{ title: '列75', field: 'col75', width: 150 },
{ title: '列76', field: 'col76', width: 800 },
{ title: '列77', field: 'col77', width: 400 },
{ title: '列78', field: 'col78', width: 800 },
{ title: '列79', field: 'col79', width: 360 },
{ title: '列80', field: 'col80', width: 650 },
{ title: '列81', field: 'col81', width: 600 },
{ title: '列82', field: 'col82', width: 100 },
{ title: '列83', field: 'col83', width: 490 },
{ title: '列84', field: 'col84', width: 100 },
{ title: '列85', field: 'col85', width: 150 },
{ title: '列86', field: 'col86', width: 800 },
{ title: '列87', field: 'col87', width: 400 },
{ title: '列88', field: 'col88', width: 800 },
{ title: '列89', field: 'col89', width: 360 },
{ title: '列90', field: 'col90', width: 650 },
{ title: '列91', field: 'col91', width: 600 },
{ title: '列92', field: 'col92', width: 100 },
{ title: '列93', field: 'col93', width: 490 },
{ title: '列94', field: 'col94', width: 100 },
{ title: '列95', field: 'col95', width: 150 },
{ title: '列96', field: 'col96', width: 800 },
{ title: '列97', field: 'col97', width: 400 },
{ title: '列98', field: 'col98', width: 70, fixed: 'right' },
{ title: '列99', field: 'imgList1', width: 120, fixed: 'right', cellRender: imgList1CellRender },
{ title: '列100', field: 'flag1', width: 100, fixed: 'right', cellRender: flag1CellRender },
{ title: '操作', field: 'action', width: 120, fixed: 'right', slots: { default: 'action' } }
],
data: [],
footerData: [
{ checkbox: '均值', col0: '45', col1: '56', col3: '67', col5: '78', col7: '94', col97: '37', imgList1: '83' },
{ checkbox: '合计', col0: '222', col1: '333', col3: '444', col5: '888', col7: '555', col97: '444', imgList1: '777' }
]
const tableData = [
{ id: 10001, name: 'Test1', role: 'Develop', sex: 'Man', age: 28, address: 'test abc' },
{ id: 10002, name: 'Test2', role: 'Test', sex: 'Women', age: 22, address: 'Guangzhou' },
{ id: 10003, name: 'Test3', role: 'PM', sex: 'Man', age: 32, address: 'Shanghai' },
{ id: 10004, name: 'Test4', role: 'Designer', sex: 'Women', age: 24, address: 'Shanghai' }
]
const editConfig = {
trigger: 'click',
mode: 'cell',
showStatus: true
}
return {
gridOptions,
flag1CellRender,
imgUrlCellRender,
imgList1CellRender
tableData,
editConfig
}
},
methods: {
// 模拟行数据
loadData (rowSize) {
this.gridOptions.loading = true
setTimeout(() => {
const dataList = []
for (let i = 0; i < rowSize; i++) {
const item = {
id: 10000 + i,
status: i % 3 === 0 ? '1' : (i % 2 === 0 ? '2' : '0'),
imgUrl: i % 3 === 0 ? 'https://vxeui.com/resource/img/546.gif' : 'https://vxeui.com/resource/img/673.gif',
imgList1: i % 4 === 0
? [
{ name: 'fj577.jpg', url: 'https://vxeui.com/resource/img/fj577.jpg' }
]
: [
{ name: 'fj573.jpeg', url: 'https://vxeui.com/resource/img/fj573.jpeg' },
{ name: 'fj562.png', url: 'https://vxeui.com/resource/img/fj562.png' }
],
flag1: i % 5 === 0
}
for (let j = 0; j < 120; j++) {
item[`col${j}`] = `值_${i}_${j}`
}
dataList.push(item)
async removeRow (row) {
const $table = this.$refs.tableRef
if ($table) {
$table.remove(row)
VxeUI.modal.message({
content: '数据已删除',
status: 'success'
})
}
},
updateRow1 (row) {
row.name = `Name_${new Date().getTime()}`
},
updateRow2 (row) {
row.age++
},
revertRow (row) {
const $table = this.$refs.tableRef
if ($table) {
if ($table.isUpdateByRow(row) || $table.isRemoveByRow(row)) {
$table.revertData(row)
VxeUI.modal.message({
content: '数据已恢复',
status: 'success'
})
} else {
VxeUI.modal.message({
content: '数据未改动',
status: 'info'
})
}
const startTime = Date.now()
this.gridOptions.data = dataList
this.gridOptions.loading = false
this.$nextTick(() => {
}
},
revertAllEvent () {
const $table = this.$refs.tableRef
if ($table) {
const updateRecords = $table.getUpdateRecords()
const removeRecords = $table.getRemoveRecords()
if (updateRecords.length > 0 || removeRecords.length > 0) {
$table.revertData()
VxeUI.modal.message({
content: `加载时间 ${Date.now() - startTime} 毫秒`,
content: '数据已恢复',
status: 'success'
})
})
}, 350)
} else {
VxeUI.modal.message({
content: '数据未改动',
status: 'info'
})
}
}
}
},
created () {
this.loadData(200)
}
}
</script>
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "3.13.20",
"version": "3.13.21",
"description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down
21 changes: 13 additions & 8 deletions packages/grid/src/grid.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,21 +665,26 @@ export default {

const { isZMax } = reactData
const el = $xeGrid.$refs.refElem as HTMLDivElement
const formWrapper = $xeGrid.$refs.refFormWrapper as HTMLDivElement
const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper as HTMLDivElement
const topWrapper = $xeGrid.$refs.refTopWrapper as HTMLDivElement
const bottomWrapper = $xeGrid.$refs.refBottomWrapper as HTMLDivElement
const pagerWrapper = $xeGrid.$refs.refPagerWrapper as HTMLDivElement
const parentPaddingSize = isZMax ? 0 : getPaddingTopBottomSize(el.parentNode as HTMLElement)
return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper)
if (el) {
const formWrapper = $xeGrid.$refs.refFormWrapper as HTMLDivElement
const toolbarWrapper = $xeGrid.$refs.refToolbarWrapper as HTMLDivElement
const topWrapper = $xeGrid.$refs.refTopWrapper as HTMLDivElement
const bottomWrapper = $xeGrid.$refs.refBottomWrapper as HTMLDivElement
const pagerWrapper = $xeGrid.$refs.refPagerWrapper as HTMLDivElement
const parentEl = el.parentElement as HTMLElement
const parentPaddingSize = isZMax ? 0 : (parentEl ? getPaddingTopBottomSize(parentEl) : 0)
return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper)
}
return 0
},
getParentHeight () {
const $xeGrid = this
const reactData = $xeGrid as GridReactData

const el = $xeGrid.$refs.refElem as HTMLDivElement
if (el) {
return (reactData.isZMax ? getDomNode().visibleHeight : XEUtils.toNumber(getComputedStyle(el.parentNode as HTMLElement).height)) - $xeGrid.getExcludeHeight()
const parentEl = el.parentElement as HTMLElement
return (reactData.isZMax ? getDomNode().visibleHeight : (parentEl ? XEUtils.toNumber(getComputedStyle(parentEl).height) : 0)) - $xeGrid.getExcludeHeight()
}
return 0
},
Expand Down
Loading

0 comments on commit 934dffc

Please sign in to comment.