fix(menu): 菜单显示组织&应用包类型判断调整

frontend/src/App.vue

@@ -53,7 +53,7 @@
     try {
       appStore.initSystemVersion(); // 初始化系统版本
       // 企业版才校验license
-      if (appStore.packageType === 'enterprise') {
+      if (appStore.getPackageType === 'enterprise') {
         licenseStore.getValidateLicense();
       }
       if (licenseStore.hasLicense()) {
@@ -96,6 +96,7 @@
           setLongType('LARK');
           setLoginExpires();
         } catch (err) {
+          // eslint-disable-next-line no-console
           console.log(err);
         }
       }
@@ -107,6 +108,7 @@
           setLongType('LARK_SUITE');
           setLoginExpires();
         } catch (err) {
+          // eslint-disable-next-line no-console
           console.log(err);
         }
       }

frontend/src/components/business/ms-menu/index.vue

@@ -221,11 +221,11 @@
       }
 
       watch(
-        () => xPack.value,
+        () => [xPack.value, appStore.getPackageType],
-        async (val) => {
+        async ([val, packageType]) => {
           if (val) {
             personalMenus.value = [...copyPersonalMenus.value];
-            if (appStore.packageType === 'enterprise' && licenseStore.hasLicense()) {
+            if (packageType === 'enterprise') {
               getOrgList();
             }
           } else {
@@ -248,7 +248,7 @@
 
       watchEffect(() => {
         if (switchOrgVisible.value || menuSwitchOrgVisible.value) {
-          if (appStore.packageType === 'enterprise' && licenseStore.hasLicense()) {
+          if (appStore.getPackageType === 'enterprise' && licenseStore.hasLicense()) {
             getOrgList();
           }
           nextTick(() => {
@@ -424,13 +424,17 @@
               ) : (
                 t(element?.meta?.locale || '')
               )}
-              <a-tooltip content={currentOrgName.value} position="right">
+              {xPack.value ? (
-                <div
+                <a-tooltip content={currentOrgName.value} position="right">
-                  class={collapsed.value ? 'hidden' : 'current-org-tag'} // 菜单折叠时隐藏切换组织按钮
+                  <div
-                >
+                    class={collapsed.value ? 'hidden' : 'current-org-tag'} // 菜单折叠时隐藏切换组织按钮
-                  {currentOrgName.value.substring(0, 1)}
+                  >
-                </div>
+                    {currentOrgName.value.substring(0, 1)}
-              </a-tooltip>
+                  </div>
+                </a-tooltip>
+              ) : (
+                ''
+              )}
             </div>
           </a-menu-item>
         ) : (

frontend/src/components/business/ms-top-menu/index.vue

@@ -36,7 +36,7 @@
 
   function checkAuthMenu() {
     const topMenus = appStore.getTopMenus;
-    if (appStore.packageType === 'community') {
+    if (appStore.getPackageType === 'community') {
       appStore.setTopMenus(topMenus.filter((item) => item.name !== RouteEnum.SETTING_SYSTEM_AUTHORIZED_MANAGEMENT));
     } else {
       appStore.setTopMenus(topMenus);
@@ -120,7 +120,7 @@
     () => appStore.currentOrgId,
     async () => {
       await appStore.initSystemPackage();
-      if (appStore.packageType === 'enterprise') {
+      if (appStore.getPackageType === 'enterprise') {
         licenseStore.getValidateLicense();
       }
     },
@@ -130,8 +130,8 @@
   );
 
   watch(
-    () => appStore.packageType,
+    () => appStore.getPackageType,
-    (val) => {
+    () => {
       checkAuthMenu();
     }
   );

frontend/src/store/modules/app/index.ts

@@ -116,6 +116,9 @@ const useAppStore = defineStore('app', {
     getLoginLoadingStatus(state: AppState): boolean {
       return state.loginLoading;
     },
+    getPackageType(state: AppState): string {
+      return state.packageType;
+    },
   },
   actions: {
     /**