From 8b00bff78ba86989df613fcc7b09e7f64e135a52 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/Tree.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/admin/src/components/common/Tree.vue b/admin/src/components/common/Tree.vue
index d162b27..6a6275a 100644
--- a/admin/src/components/common/Tree.vue
+++ b/admin/src/components/common/Tree.vue
@@ -18,11 +18,12 @@
<div class="tree">
<div v-for="(item, index) in list" :key="index" @click.stop="clickIten(item)">
<div class="tree_item">
- <i class="el-icon-caret-bottom" :class="{ 'activeColor': item.status }" v-show="item.status === 1 && item.childList.length > 0"></i>
- <i class="el-icon-caret-right color" v-show="item.childList.length > 0 && item.status === 0"></i>
- <div class="tree_item_label long-title-style" :title="item.name" :class="{ 'activeColor': item.status === 1 && item.childList.length === 0 }">{{ item.name }}</div>
+ <i class="el-icon-caret-bottom" :class="{ 'activeColor': item.fsStatus === 1 }" v-show="item.fsStatus === 1 && item.childList.length > 0"></i>
+ <i class="el-icon-caret-right color" v-show="item.childList.length > 0 && (item.fsStatus === 0 || !item.fsStatus)"></i>
+ <div class="tree_item_label long-title-style" :title="item.name" :class="{ 'activeColor': item.fsDate === 1 && item.childList.length === 0 }">{{ item.name }}</div>
</div>
- <div class="tree_childern" v-show="item.status === 1">
+<!-- v-show="item.status === 1"-->
+ <div class="tree_childern" v-show="item.fsStatus === 1">
<tree
:list="item.childList"
:defaultProps="defaultProps"
@@ -68,7 +69,10 @@
// 鐐瑰嚮褰撳墠椤�
clickIten (item) {
this.recursion(this.list)
- item.status === 0 ? item.status = 1 : item.status = 0
+ item.fsDate === 0 || !item.fsDate ? item.fsDate = 1 : item.fsDate = 0
+ if (item.childList.length > 0) {
+ item.fsStatus === 0 || !item.fsStatus ? item.fsStatus = 1 : item.fsStatus = 0
+ }
// item[this.defaultProps.status] = !item[this.defaultProps.status]
// this.list.forEach(subItem => {
// if ((subItem[this.defaultProps.id] !== item[this.defaultProps.id] && subItem[this.defaultProps.status]) || (this.list.length === 1 && subItem[this.defaultProps.status] === false)) {
@@ -98,7 +102,7 @@
// }
// })
children.forEach(item => {
- item.status = 0
+ item.fsDate = 0
if (item.childList.length > 0) {
this.recursion(item.childList)
}
--
Gitblit v1.9.3