From b779dfe360a62d54e451e87fd8b5c0757b2cc166 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Sun, 19 Dec 2021 16:14:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=84=91=E5=9B=BE=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E6=AD=A5=E9=AA=A4=E6=8F=90=E7=A4=BA=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=B3=E8=81=94=E7=BC=BA=E9=99=B7=20--bug=3D1008872?=
 =?UTF-8?q?=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E8=B7=9F=E8=B8=AA=E3=80=91=E8=84=91=E5=9B=BE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=AD=A5=E9=AA=A4=EF=BC=8C=E6=8F=90=E7=A4=BA=E2=80=9D?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=85=B3=E8=81=94=E7=BC=BA=E9=99=B7=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E2=80=9C=E3=80=90+github#8537=E3=80=91=20https://www.?=
 =?UTF-8?q?tapd.cn/55049933/s/1082862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/workspace/template/TemplateSelect.vue         | 3 ++-
 .../business/components/track/common/minder/minderUtils.js | 7 ++++---
 frontend/src/business/components/xpack                     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
index 0f7c63cabe..21b13bb180 100644
--- a/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
+++ b/frontend/src/business/components/settings/workspace/template/TemplateSelect.vue
@@ -11,6 +11,7 @@
 
 <script>
 import {getCurrentWorkspaceId} from "@/common/js/utils";
+import {LOCAL} from "@/common/js/constants";
 
 export default {
   name: "TemplateSelect",
@@ -59,7 +60,7 @@ export default {
                 break;
               }
             } else {
-              if (item.system && item.platform === 'metersphere' && item.name === 'default') {
+              if (item.system && item.platform === LOCAL && item.name === 'default') {
                 this.$set(this.data, this.prop, item.id);
                 break;
               }
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index bdff9ad3cd..7da402b5a7 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -544,9 +544,10 @@ export function handleMinderIssueDelete(commandName, isPlan) {
           isAllIssue = false;
         }
       });
-      Promise.all(promises).then(() => {
-        success(i18n.t('test_track.case.minder_create_tip'));
-      });
+      if (promises.length > 0)
+        Promise.all(promises).then(() => {
+          success(i18n.t('test_track.case.minder_issue_delete_tip'));
+        });
       return isAllIssue;
     }
   }
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 938171fa50..84bab3f25e 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 938171fa506d5b3d8fff9857cb21a83c8e31063e
+Subproject commit 84bab3f25eaef5b58f2928ae5aed6dd50cad3d29