From 4f67556adefa3fb5f8296d2a498c3722d53610a6 Mon Sep 17 00:00:00 2001
From: "34701892@qq.com" <34701892@qq.com>
Date: Fri, 14 Nov 2025 11:50:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(richedit):=20=E4=BF=AE=E5=A4=8D=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=E8=A7=84=E5=88=99=E9=80=89=E6=8B=A9=E5=99=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BA=92=E6=96=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除禁用选择器的互斥逻辑，改为在选项级别禁用已选择的规则
同时取消信号规则变更时自动清空另一选择器的值
---
 src/views/pages/richedit/all.vue   | 14 ++++++--------
 src/views/pages/richedit/index.vue | 19 ++++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/views/pages/richedit/all.vue b/src/views/pages/richedit/all.vue
index eafeb3a..b398789 100644
--- a/src/views/pages/richedit/all.vue
+++ b/src/views/pages/richedit/all.vue
@@ -33,17 +33,15 @@
 
 					<div class="colHeader-right-2" style="gap: 10px">
 						<span>信号规则：</span>
-						<el-select v-model="form.includeRuleIds" :disabled="excludeRuleIds?.length > 0" clearable
-							placeholder="含任一信号规则" multiple size="large" style="width: 180px" filterable
-							@change="signalChange($event, 1)">
+						<el-select v-model="form.includeRuleIds" clearable placeholder="含任一信号规则" multiple size="large"
+							style="width: 180px" filterable @change="signalChange($event, 1)">
 							<el-option v-for="item in signalRulesList" :key="item.id" :value="item.id"
-								:label="item.ruleName"></el-option>
+								:disabled="form.excludeRuleIds?.includes(item.id)" :label="item.ruleName"></el-option>
 						</el-select>
-						<el-select v-model="form.excludeRuleIds" :disabled="includeRuleIds?.length > 0" clearable
-							placeholder="不含任一信号规则" multiple size="large" style="width: 180px" filterable
-							@change="signalChange($event, 2)">
+						<el-select v-model="form.excludeRuleIds" clearable placeholder="不含任一信号规则" multiple size="large"
+							style="width: 180px" filterable @change="signalChange($event, 2)">
 							<el-option v-for="item in signalRulesList" :key="item.id" :value="item.id"
-								:label="item.ruleName"></el-option>
+								:disabled="form.includeRuleIds?.includes(item.id)" :label="item.ruleName"></el-option>
 						</el-select>
 
 						<span>报道时间：</span>
diff --git a/src/views/pages/richedit/index.vue b/src/views/pages/richedit/index.vue
index 88f160a..c42a4a1 100644
--- a/src/views/pages/richedit/index.vue
+++ b/src/views/pages/richedit/index.vue
@@ -97,18 +97,15 @@
 
 					<div class="colHeader-right-2" style="gap: 10px">
 						<span>信号规则：</span>
-						<el-select v-model="form.includeRuleIds" :disabled="excludeRuleIds?.length > 0" clearable
-							placeholder="含任一信号规则" multiple size="large" style="width: 180px" filterable
-							@change="signalChange($event, 1)">
+						<el-select v-model="form.includeRuleIds" clearable placeholder="含任一信号规则" multiple size="large"
+							style="width: 180px" filterable @change="signalChange($event, 1)">
 							<el-option v-for="item in signalRulesList" :key="item.id" :value="item.id"
-								:label="item.ruleName"></el-option>
+								:disabled="form.excludeRuleIds?.includes(item.id)" :label="item.ruleName"></el-option>
 						</el-select>
-
-						<el-select v-model="form.excludeRuleIds" :disabled="includeRuleIds?.length > 0" clearable
-							placeholder="不含任一信号规则" multiple size="large" style="width: 180px" filterable
-							@change="signalChange($event, 2)">
+						<el-select v-model="form.excludeRuleIds" clearable placeholder="不含任一信号规则" multiple size="large"
+							style="width: 180px" filterable @change="signalChange($event, 2)">
 							<el-option v-for="item in signalRulesList" :key="item.id" :value="item.id"
-								:label="item.ruleName"></el-option>
+								:disabled="form.includeRuleIds?.includes(item.id)" :label="item.ruleName"></el-option>
 						</el-select>
 						<span>报道时间：</span>
 						<div>
@@ -1006,11 +1003,11 @@ function signalChange(event, type) {
 	if (type == 1) {
 		// form.value.signalId1 = signalId1.value;
 		includeRuleIds.value = event.join(',');
-		excludeRuleIds.value = null;
+		// excludeRuleIds.value = null;
 	} else {
 		// form.value.signalId2 = signalId2.value;
 		excludeRuleIds.value = event.join(',');
-		includeRuleIds.value = null;
+		// includeRuleIds.value = null;
 	}
 
 	getData();