Merge remote-tracking branch 'origin/main' into multi-tenant

src/layouts/BasicLayout.vue

@@ -59,7 +59,7 @@ watch(
     // 路由地址含有内嵌地址标识又是隐藏菜单需要处理打开高亮菜单栏
     if (v.path.includes(MENU_PATH_INLINE) && v.meta.hideInMenu) {
       const idx = v.path.lastIndexOf(MENU_PATH_INLINE);
-      layoutState.openKeys.splice(-1);
+      layoutState.openKeys = layoutState.selectedKeys.slice(0, -1);
       layoutState.selectedKeys[matched.length - 1] = v.path.slice(0, idx);
     }
   },
@@ -435,7 +435,8 @@ onUnmounted(() => {
   }
 
   & #serverTimeDom {
-    color: #00000085;
+    color: inherit;
+    opacity: 0.85;
     transition: all 0.3s;
   }
 }

src/layouts/components/RightContent.vue

@@ -64,16 +64,6 @@ function fnClickAlarm() {
   router.push({ name: 'ActiveAlarm_2088' });
 }
 
-/**系统使用手册跳转 */
-function fnClickHelpDoc(language?: string) {
-  const routeData = router.resolve({ name: 'HelpDoc' });
-  let href = routeData.href;
-  if (language) {
-    href = `${routeData.href}?language=${language}`;
-  }
-  window.open(href, '_blank');
-}
-
 /**改变多语言 */
 function fnChangeLocale(e: any) {
   changeLocale(e.key);
@@ -82,23 +72,23 @@ function fnChangeLocale(e: any) {
 
 <template>
   <a-space :size="12" align="center">
-    <a-button
-      type="text"
-      style="color: inherit"
-      @click="fnClickAlarm"
-      v-roles:has="[TENANTADMIN_ROLE_KEY]"
-    >
-      <template #icon>
-        <a-badge
-          :count="useAlarmStore().activeAlarmTotal"
-          :overflow-count="99"
-          status="warning"
-          style="color: inherit"
-        >
-          <BellOutlined />
-        </a-badge>
-      </template>
-    </a-button>
+    <span v-roles:has="[TENANTADMIN_ROLE_KEY]">
+      <a-tooltip placement="bottom">
+        <template #title>{{ t('loayouts.rightContent.alarm') }}</template>
+        <a-button type="text" style="color: inherit" @click="fnClickAlarm">
+          <template #icon>
+            <a-badge
+              :count="useAlarmStore().activeAlarmTotal"
+              :overflow-count="99"
+              status="warning"
+              style="color: inherit"
+            >
+              <BellOutlined />
+            </a-badge>
+          </template>
+        </a-button>
+      </a-tooltip>
+    </span>
 
     <!-- 锁屏操作 -->
     <span v-perms:has="['system:setting:lock']">
@@ -138,23 +128,6 @@ function fnChangeLocale(e: any) {
       </a-tooltip>
     </span>
 
-    <!-- 用户帮助手册 -->
-    <span v-perms:has="['system:setting:doc']">
-      <a-tooltip placement="bottom">
-        <template #title>{{ t('loayouts.rightContent.helpDoc') }}</template>
-        <a-button
-          type="text"
-          style="color: inherit"
-          @click="fnClickHelpDoc()"
-          v-roles:has="[TENANTADMIN_ROLE_KEY]"
-        >
-          <template #icon>
-            <QuestionCircleOutlined />
-          </template>
-        </a-button>
-      </a-tooltip>
-    </span>
-
     <a-tooltip placement="bottom">
       <template #title>{{ t('loayouts.rightContent.fullscreen') }}</template>
       <a-button type="text" style="color: inherit" @click="toggle">