From 38d5b81cd0038ff8c76f852642e0468a569c1552 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Sat, 4 Jul 2020 18:42:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=93=BE=E6=8E=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/TableAction/LeftSide.vue | 2 +-
 src/i18n/langs/cn.json                            | 3 ++-
 src/i18n/langs/en.json                            | 3 ++-
 src/views/xpack                                   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/ListTable/TableAction/LeftSide.vue b/src/components/ListTable/TableAction/LeftSide.vue
index e393c70d3..e310b47ff 100644
--- a/src/components/ListTable/TableAction/LeftSide.vue
+++ b/src/components/ListTable/TableAction/LeftSide.vue
@@ -152,7 +152,7 @@ export default {
         return v.id
       })
       const data = await createSourceIdCache(ids)
-      const url = `${this.tableUrl}?spm=` + data.spm
+      const url = (this.tableUrl.indexOf('?') === -1) ? `${this.tableUrl}?spm=` + data.spm : `${this.tableUrl}&spm=` + data.spm
       return this.$axios.delete(url)
     },
     handleBulkUpdate({ selectedRows }) {
diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index ac30557ff..fd3d056e3 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -859,7 +859,8 @@
       "ReleasedCount": "已释放",
       "DateSync": "同步日期",
       "Status": "状态",
-      "Log": "日志"
+      "Log": "日志",
+      "DeleteReleasedAssets": "删除已释放资产"
     },
     "Corporation": "公司",
     "Edition": "版本",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 17bf914c0..7d9529181 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -858,7 +858,8 @@
       "ReleasedCount": "Released count",
       "DateSync": "Date sync",
       "Status": "Status",
-      "Log": "Log"
+      "Log": "Log",
+      "DeleteReleasedAssets": "Delete released assets"
     },
     "Corporation": "Corporation",
     "Edition": "Edition",
diff --git a/src/views/xpack b/src/views/xpack
index d247da036..41069df32 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit d247da036f22261afa2bd89523e552cb6407327d
+Subproject commit 41069df320e2c718bf6f3159c1d3efb0b2b1f4ef