From a046c0ec4526f2e6768213316bf84646a8a94f0a Mon Sep 17 00:00:00 2001
From: thsrite <thsrite@gmail.com>
Date: Wed, 6 Nov 2024 09:27:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AF=BC=E5=85=A5=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=A7=84=E5=88=99=20&&=20=E4=BC=98=E5=85=88=E7=BA=A7?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E7=BB=84=E6=97=B6=E4=BF=9D=E7=95=99=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/AccountSettingRule.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/setting/AccountSettingRule.vue b/src/views/setting/AccountSettingRule.vue
index 54f5adfd..482ec25d 100644
--- a/src/views/setting/AccountSettingRule.vue
+++ b/src/views/setting/AccountSettingRule.vue
@@ -184,8 +184,8 @@ watchEffect(() => {
   // 导入代码需要json格式
   try {
     if (importCodeType.value === 'custom') {
-      // 将导入的代码转换为规则卡片
-      customRules.value = JSON.parse(importCodeString.value).map((item: any) => {
+      // 将导入的代码转换为规则卡片，并追加到已有的 customRules
+      const newCustomRules = JSON.parse(importCodeString.value).map((item: any) => {
         return {
           id: item.id,
           name: item.name,
@@ -196,9 +196,10 @@ watchEffect(() => {
           size_range: item.size_range,
         }
       })
+      customRules.value = [...customRules.value, ...newCustomRules] // 合并已有的和新导入的规则
     } else if (importCodeType.value === 'group') {
-      // 将导入的代码转换为规则卡片
-      filterRuleGroups.value = JSON.parse(importCodeString.value).map((item: any) => {
+      // 将导入的代码转换为规则卡片，并追加到已有的 filterRuleGroups
+      const newFilterRuleGroups = JSON.parse(importCodeString.value).map((item: any) => {
         return {
           name: item.name,
           rule_string: item.rule_string,
@@ -206,6 +207,7 @@ watchEffect(() => {
           category: item.category,
         }
       })
+      filterRuleGroups.value = [...filterRuleGroups.value, ...newFilterRuleGroups] // 合并已有的和新导入的规则
     }
   } catch (error) {
     $toast.error('规则导入失败！')