From 107edc1584cd8e89a0f85b8fdc120194d1858934 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 25 四月 2024 15:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue | 76 +------------------------------------
1 files changed, 3 insertions(+), 73 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue
index 13e0693..2e4dc1f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-TreeTable.vue
@@ -115,80 +115,10 @@
prop: 'comment'
}
],
- rowKey: 'id',
- rowParentKey: 'parentId',
-
+ rowKey: this.componentVO.treeTableDefineVO.treeCurrentField || 'oid',
+ rowParentKey: this.componentVO.treeTableDefineVO.treeParentField || 'parentOid',
},
- TreeData: [
- {
- id: 10,
- event: '浜嬩欢1',
- timeLine: 50,
- comment: '鏃�'
- },
- {
- id: 1,
- event: '浜嬩欢1',
- timeLine: 100,
- comment: '鏃�',
- children: [
- {
- parentId: 1,
- id: 2,
- event: '浜嬩欢2',
- timeLine: 10,
- comment: '鏃�'
- },
- {
- parentId: 1,
- id: 3,
- event: '浜嬩欢3',
- timeLine: 90,
- comment: '鏃�',
- children: [
- {
- parentId: 3,
- id: 4,
- event: '浜嬩欢4',
- timeLine: 5,
- comment: '鏃�'
- },
- {
- parentId: 3,
- id: 5,
- event: '浜嬩欢5',
- timeLine: 10,
- comment: '鏃�'
- }
- ]
- }
- ]
- },
- {
- id: 10,
- event: '浜嬩欢3',
- timeLine: 50,
- comment: '鏃�'
- },
- {
- id: 10,
- event: '浜嬩欢4',
- timeLine: 50,
- comment: '鏃�'
- },
- {
- id: 10,
- event: '浜嬩欢5',
- timeLine: 50,
- comment: '鏃�'
- },
- {
- id: 10,
- event: '浜嬩欢6',
- timeLine: 50,
- comment: '鏃�'
- },
- ],
+ TreeData: [],
TreeSelectList: [],
// 琛ㄥ崟鏁版嵁
formList: [
--
Gitblit v1.9.3