From 93fd50d4705b441125a05439b20a8531a2e453f7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 10 Dec 2025 09:05:15 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v9.0/9.0.1' into feature/v9.0/9.0.2
---
src/views/layerManagement/components/leftList.vue | 108 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 81 insertions(+), 27 deletions(-)
diff --git a/src/views/layerManagement/components/leftList.vue b/src/views/layerManagement/components/leftList.vue
index 533a188..eaa3306 100644
--- a/src/views/layerManagement/components/leftList.vue
+++ b/src/views/layerManagement/components/leftList.vue
@@ -57,7 +57,7 @@
node-key="id"
default-expand-all
:expand-on-click-node="false"
- :check-on-click-node="false"
+ :check-on-click-node="false"
:filter-node-method="filterNode"
highlight-current
@check="handleCheck"
@@ -78,10 +78,13 @@
icon="el-icon-location"
@click.stop="handleLocation(node)"
:disabled="node.data.level === 2 && (!node.data.children || node.data.children.length === 0)"
- class="location-btn"
+ class="location-btn"
></el-button>
<el-button icon="el-icon-edit" link @click.stop="handleEdit(node)"></el-button>
- <el-button icon="el-icon-delete" link @click.stop="handleDelete(node)"></el-button>
+ <el-button icon="el-icon-delete" :class="isDisabledColor ? 'location-btn' : ''" link @click.stop="handleDelete(node)"
+ :disabled="!!formData.dkbh.trim() && node.data.level === 2 && props.activeName !== '国土空间规划' && (
+ filteredShowNodeIds.has(node.data.id) || isNodeOrChildrenMatch(node.data, formData.dkbh.trim())
+ )"></el-button>
</div>
</div>
</template>
@@ -121,12 +124,17 @@
const loading = ref(false);
const treeData = ref([]);
const treeAllData = ref([]);
+// 存储过滤后显示的节点ID（返回true的节点）
+const filteredShowNodeIds = ref(new Set());
+const isDisabledColor = ref(false)
// 获取数据
const gettreeDataApi = async () => {
try {
loading.value = true;
- const res = await treeDataApi();
+ const res = await treeDataApi({filterExpired:false});
treeAllData.value = res.data.data;
+ // 加载数据后立即清空标记
+ filteredShowNodeIds.value.clear();
if(coverData.value.length===0){
checkedKeys.value = [];
checkedNodes.value = [];
@@ -197,7 +205,7 @@
checkedNodes.value = allFenceNodes;
coverData.value = allFenceNodes;
emit('update:coverData', coverData.value);
-
+
}
}
@@ -228,10 +236,10 @@
const childrenIds = folderChildren.map(child => child.id);
const newChildrenIds = childrenIds.filter(id => !currentCheckedKeys.includes(id));
const newChildrenNodes = folderChildren.filter(child => newChildrenIds.includes(child.id));
-
+
const newCheckedKeys = [...new Set([...currentCheckedKeys, ...newChildrenIds])];
const newCheckedNodes = [...currentCheckedNodes, ...newChildrenNodes];
-
+
treeRef.value.setCheckedKeys(newCheckedKeys);
checkedKeys.value = newCheckedKeys;
checkedNodes.value = newCheckedNodes;
@@ -265,10 +273,10 @@
coverData.value = [];
layerParams.value.editNest = true;
layerParams.value.decideWhetherToAddOrEdit = 2;
- if (props.activeName === '自定义识别区') {
+ if (props.activeName === '自定义识别区') {
layerParams.value.fenceType = 1; // 电子围栏类型标识
} else if (props.activeName === '自定义禁飞区') {
- layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
+ layerParams.value.fenceType = 2; // 自定义禁飞区类型标识
}
emit('update:deitData', node.data);
}
@@ -301,7 +309,7 @@
}
})
.catch(() => {
- ElMessage.warning('已取消删除');
+
});
};
// 新增围栏
@@ -345,19 +353,65 @@
}
function search() {
- treeRef.value?.filter(formData.value.dkbh);
+ const keyword = formData.value.dkbh.trim();
+ // 有搜索词时才过滤，无则清空标记
+ if (keyword) {
+ treeRef.value?.filter(keyword);
+ isDisabledColor.value = true
+ } else {
+ filteredShowNodeIds.value.clear();
+ treeRef.value?.filter('');
+ }
}
function reset() {
+ isDisabledColor.value = false
formData.value.dkbh = '';
- treeRef.value?.filter('');
+ filteredShowNodeIds.value.clear();
+ nextTick(() => {
+ treeRef.value?.filter('');
+ });
}
-function filterNode(value, data) {
- if (props.activeName === '国土空间规划') {
- if (!value) return data.level === 2 || data.level === 1;
- return (data.level === 2 || data.level === 1) && data.name.includes(value);
+const isNodeOrChildrenMatch = (nodeData, keyword) => {
+ // 无关键词时直接返回false
+ if (!keyword || keyword.trim() === '') return false;
+ // 自身包含关键词
+ if (nodeData.name.includes(keyword)) return true;
+ // 遍历子节点，判断是否有子节点包含
+ if (nodeData.children && nodeData.children.length) {
+ return nodeData.children.some(child => isNodeOrChildrenMatch(child, keyword));
}
- if (!value) return true;
- return data.name.includes(value);
+ return false;
+};
+function filterNode(value, data) {
+ let isShow = false;
+ const keyword = value?.trim() || '';
+
+ if (props.activeName === '国土空间规划') {
+ if (!keyword) {
+ isShow = data.level === 2 || data.level === 1;
+ } else {
+ isShow = (data.level === 2 || data.level === 1) && data.name.includes(keyword);
+ }
+ } else {
+ if (!keyword) {
+ isShow = true;
+ } else {
+ // 非国土空间规划：节点自身/子节点匹配则显示
+ isShow = isNodeOrChildrenMatch(data, keyword);
+ }
+ }
+ // 仅当有搜索词时，才更新标记（无搜索词清空）
+ if (keyword) {
+ if (isShow && data.id) {
+ filteredShowNodeIds.value.add(data.id);
+ } else if (data.id) {
+ filteredShowNodeIds.value.delete(data.id);
+ }
+ } else {
+ filteredShowNodeIds.value.clear();
+ }
+
+ return isShow;
}
// 同步信息
@@ -397,10 +451,10 @@
() => props.resetCheck,
(newVal) => {
if (newVal !== undefined) {
- checkedKeys.value = [];
- checkedNodes.value = [];
- coverData.value = [];
- treeRef.value?.setCheckedKeys([]);
+ checkedKeys.value = [];
+ checkedNodes.value = [];
+ coverData.value = [];
+ treeRef.value?.setCheckedKeys([]);
}
},
{ immediate: true }
@@ -500,20 +554,20 @@
.tree-node-actions {
display: flex;
// gap: 8px;
-
+
button {
- padding: 0;
- color: #fff;
+ padding: 0;
+ color: #fff;
width: 17px;
height: 17px;
// color: #409eff;
// &:hover {
- // color: #409eff;
+ // color: #409eff;
// }
}
}
::v-deep(.location-btn.el-button.is-link.is-disabled) {
- color: #999 !important;
+ color: #999 !important;
}
}
</style>
--
Gitblit v1.9.3