Merge branch 'master' into dev_230517

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="app">
+  <div>
     <div class="app-bg"></div>
 
     <!--    <div class="safe-area-inset-bottom">
@@ -49,22 +49,24 @@ onMounted(() => {});
 const componentNameList: any = ref([]);
 getKeepAlive(router.options.routes as object[]);
 
-// console.log("componentNameList",componentNameList)
+console.log("componentNameList", componentNameList);
 
 function getKeepAlive(routesArr: object[]) {
-  // console.log(routesArr)
+  // console.log(routesArr);
   routesArr.forEach((item: any) => {
     if (
       !item.meta ||
       item.meta.notKeepAlive === undefined ||
       item.meta.notKeepAlive === false
     ) {
-      // console.warn('item',item)
-      // console.warn('item.component',item.component)
+      // console.warn("item", item);
+      // console.warn("item.component", item.component);
       if (item.component) {
-        componentNameList.value.push(
-          getComponentName(item.component.toString())
-        );
+        const name = getComponentName(item.component.toString());
+        name &&
+          componentNameList.value.push(
+            getComponentName(item.component.toString())
+          );
       }
     }
     // 是否有子级
@@ -75,14 +77,14 @@ function getKeepAlive(routesArr: object[]) {
 }
 
 // 获取组件名
-function getComponentName(url: string) {
-  const regex = /\/([^\/]+)\.(?=[^\/]*$)/;
-  const match = regex.exec(url); // 执行正则匹配
+function getComponentName(str: string) {
+  const hasLegacy = str.includes("legacy");
+  const regex = hasLegacy ? /\/(.+?)-legacy\./ : /\/([^\/]+)\.(?=[^\/]*$)/;
+  const match = regex.exec(str); // 执行正则匹配
   if (match) {
     const name = match[1]; // 获取第一个捕获组的值
     return name;
   }
-  return "";
 }
 </script>