From 9c5a4a48e90d8e353d5cb4bff3502a2c8f8bf03a Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 29 Jul 2024 12:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/components/tableMain.vue |  1 +
 src/views/upgradation/index.vue             | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/homePage/components/tableMain.vue b/src/views/homePage/components/tableMain.vue
index 1ed952e..a1a9898 100644
--- a/src/views/homePage/components/tableMain.vue
+++ b/src/views/homePage/components/tableMain.vue
@@ -70,6 +70,7 @@
       </div>
     </div>
     <u-table
+      :data-changes-scroll-top="false"
       v-loading="tableLoaidng"
       id="ywTable"
       ref="ywMultipleTable"
diff --git a/src/views/upgradation/index.vue b/src/views/upgradation/index.vue
index 241550f..b0f74f3 100644
--- a/src/views/upgradation/index.vue
+++ b/src/views/upgradation/index.vue
@@ -243,16 +243,23 @@ export default {
       const titleName = file.name;
       console.log(titleName);
       // 正则表达式检查文件名是否符合模式
-      const regex = /^(mpapp|MpMaster)_v\d+\.\d+(\.\d+)?_rel_\d{8}\.apk$/;
+      // const regex =
+      //   /^(mpapp|MpMaster)_v\d+\.\d+(\.\d+)?_rel_\d{8}_([a-zA-Z0-9-]+)?\.apk$/;
+      const regex =
+        /^(mpapp|MpMaster)_v(\d+\.\d+(\.\d+)?)_rel_\d{8}(_([a-zA-Z0-9-]+))?\.apk$/;
 
       if (regex.test(titleName)) {
+        console.log(titleName);
         // 提取版本号（v后面的数字）
-        const versionMatch = titleName.match(/v(\d+\.\d+(\.\d+)?)/);
-        if (versionMatch && versionMatch[1]) {
+        const versionMatch = titleName.match(regex);
+        if (versionMatch) {
+          console.log(versionMatch);
           // 构造新的文件名（去掉V和_rel_日期部分）
           const baseName = titleName.startsWith("mpapp") ? "mpapp" : "mpmst"; // 注意：这里假设mpmaster应该改为mpmst
-          const version = versionMatch[1];
-          this.reportData.title = `${baseName}_v${version}`;
+          const version = versionMatch[2];
+          // 提取架构信息（如果存在）
+          const architecture = versionMatch[4] || ""; // 如果没有架构信息，则为空字符串
+          this.reportData.title = `${baseName}_v${version}${architecture}`;
         }
       } else {
         this.reportData.title = "";