From 01cf3af5a11fd91225358496a650841ca443ad1e Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期三, 24 七月 2024 11:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/inherit/list.vue | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/pages/inherit/list.vue b/src/pages/inherit/list.vue
index 6e98240..109c6f9 100644
--- a/src/pages/inherit/list.vue
+++ b/src/pages/inherit/list.vue
@@ -286,7 +286,8 @@
if (dataList && dataList.length) {
const G6Data = dataList.map((f) => {
return {
- id: f.name,
+ id: f.value + "-" + f.name,
+ name: f.name,
personId: f.personId,
relationInfo: f?.relationInfo?.relation
? f.relationInfo.relation
@@ -307,6 +308,7 @@
const data = {
isRoot: true,
id: this.dataList.name,
+ name:this.dataList.name,
style: {
fill: "red"
},
@@ -324,14 +326,6 @@
linkCenter: true,
modes: {
default: [
- // {
- // type: "collapse-expand",
- // onChange: function onChange(item, collapsed) {
- // const data = item.get("model");
- // data.collapsed = collapsed;
- // return true;
- // },
- // },
"drag-canvas",
"zoom-canvas"
]
@@ -374,7 +368,7 @@
fill: node.relationType ? "#EDF4FF" : "#FCEFE3",
stroke: node.relationType ? "#5E7AA7" : "#D3791E"
},
- label: node.id,
+ label: node.name,
labelCfg: {
position: "center",
offset: 5,
--
Gitblit v1.9.1