Skip to content

Commit 50e900b

Browse files
committed
fix: 修复了ruleEditorPanel不能正常从选区绑定消息的问题
1 parent ba628cd commit 50e900b

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

src/components/panels/RuleEditorPanel.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,11 @@
214214
<label>
215215
选区快捷绑定
216216
<span
217-
v-if="filterStore.hasSelection"
217+
v-if="activeSelection.hasSelection"
218218
class="inline-hint"
219219
>
220-
已选 {{ filterStore.selectedMessagesCount }} 条
220+
已选
221+
{{ activeSelection.selectedMessagesCount }} 条
221222
</span>
222223
</label>
223224
<div class="form-row two-col">
@@ -253,7 +254,7 @@
253254

254255
<script setup lang="ts">
255256
import { ChevronRight, Eye, EyeOff, Plus, Trash2 } from '@lucide/vue';
256-
import { ref } from 'vue';
257+
import { ref, computed } from 'vue';
257258
import { useStyleStore } from '@/stores/styleStore';
258259
import { useLogStore } from '@/stores/logStore';
259260
import { useFilter } from '@/composables/useFilter';
@@ -264,8 +265,12 @@ import { useWindowStore } from '@/stores/windowStore';
264265
265266
const styleStore = useStyleStore();
266267
const logStore = useLogStore();
267-
const filterStore = useFilter();
268268
const windowStore = useWindowStore();
269+
const activeViewId = computed(() => {
270+
const view = windowStore.currentActiveView;
271+
return view.originalId || view.windowId;
272+
});
273+
const activeSelection = useFilter(activeViewId.value);
269274
const expandedRules = ref<Set<string>>(new Set());
270275
271276
function toggleExpand(ruleId: string) {
@@ -355,7 +360,7 @@ function getAffectedMessageCount(rule: ColorRule) {
355360
}
356361
357362
function bindSelectedIds(rule: ColorRule) {
358-
const selectedMsgs = filterStore.selectedMessages.value;
363+
const selectedMsgs = activeSelection.selectedMessages.value;
359364
if (selectedMsgs.length === 0) return;
360365
361366
const targetIds = selectedMsgs.map((m) => m.messageId);

0 commit comments

Comments
 (0)