This commit is contained in:
xuliangzhan
2024-02-22 08:31:23 +08:00
parent c9dbaf0935
commit 05bb31a310
5 changed files with 8 additions and 6 deletions

View File

@@ -92,7 +92,7 @@ export default {
tabs: '多页签切换',
keepAlives: '显示隐藏 + keep-alive',
grid: '高级表格',
grid: '配置式表格',
reverse: '反转表格',
proxy: '数据代理',
proxyPage: '数据代理 + 分页',

View File

@@ -84,7 +84,7 @@ import pulldownAPI from '../../api/pulldown'
// ['vxe-table', tableAPI, { subtags: ['vxe-colgroup', 'vxe-column'], description: '基础表格' }],
// ['vxe-colgroup', colgroupAPI, { subtags: ['vxe-column'], description: '基础表格 - 分组列' }],
// ['vxe-column', columnAPI, { description: '基础表格 - 列' }],
// ['vxe-grid', gridAPI, { description: '高级表格' }],
// ['vxe-grid', gridAPI, { description: '配置式表格' }],
// ['vxe-toolbar', toolbarAPI, { description: '工具栏' }],
// ['vxe-pager', pagerAPI, { description: '分页' }],
// ['vxe-radio', radioAPI, { description: '单选框' }],

View File

@@ -1,7 +1,7 @@
<template>
<div>
<p class="tip">
<grid-api-link name="vxe-grid"/> 高级表格一个包含表单工具栏基础表格分页...等全功能的组件<br>
<grid-api-link name="vxe-grid"/> 配置式表格一个包含表单工具栏基础表格分页...等全功能的组件<br>
</p>
<vxe-grid v-bind="gridOptions1">

View File

@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.5.20-beta.1",
"version": "4.5.20",
"description": "一个基于 vue 的 PC 端表单/表格组件支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",

View File

@@ -2836,7 +2836,8 @@ export default defineComponent({
}
XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
const rowid = getRowid($xetable, childRow)
const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent, level: parentLevel + nodes.length }
const parentRow = parent || parentRest.row
const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent: parentRow, level: parentLevel + nodes.length }
fullDataRowIdData[rowid] = rest
fullAllDataRowIdData[rowid] = rest
}, { children: childrenField })
@@ -3164,7 +3165,8 @@ export default defineComponent({
rowid = getRowid($xetable, rowOrRowid)
}
if (rowid) {
return fullDataRowIdData[rowid] ? fullDataRowIdData[rowid].parent : null
const rest = fullDataRowIdData[rowid]
return rest ? rest.parent : null
}
}
return null