Merge branch 'develop' of https://gitea.gentronhealth.com/wangyizhe/his into develop

# Conflicts:
#	openhis-ui-vue3/src/router/index.js

openhis-ui-vue3/src/layout/components/Sidebar/SidebarItem.vue

@@ -9,7 +9,7 @@
       </app-link>
     </template>
 
-    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>
+    <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)">
       <template v-if="item.meta" #title>
         <svg-icon v-if="item.meta.icon" :icon-class="item.meta.icon" />
         <span class="menu-title" :title="hasTitle(item.meta.title)">{{ item.meta.title }}</span>

openhis-ui-vue3/src/layout/components/Sidebar/index.vue

@@ -58,7 +58,7 @@ const isCollapse = computed(() => !appStore.sidebar.opened);
 
 const activeMenu = computed(() => {
   const { meta, path } = route;
-  // if set path, the sidebar will highlight the path you set
+  // if set path, sidebar will highlight the path you set
   if (meta.activeMenu) {
     return meta.activeMenu;
   }
@@ -183,4 +183,4 @@ const activeMenu = computed(() => {
     }
   }
 }
-</style>
+</style>