From ef5e9206d5c63bd76058ab3417332ecf6421167b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 20 May 2024 09:53:41 +0800
Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=85=8D=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/permission.ts         | 4 ++--
 core/core-frontend/src/views/login/index.vue | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/permission.ts b/core/core-frontend/src/permission.ts
index bee8270353..cc00868bab 100644
--- a/core/core-frontend/src/permission.ts
+++ b/core/core-frontend/src/permission.ts
@@ -7,7 +7,7 @@ import { usePermissionStoreWithOut, pathValid, getFirstAuthMenu } from '@/store/
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import { getRoleRouters } from '@/api/common'
 import { useCache } from '@/hooks/web/useCache'
-import { isMobile, checkPlatform } from '@/utils/utils'
+import { isMobile, checkPlatform, isLarkPlatform, isPlatformClient } from '@/utils/utils'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
 import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
 import { useEmbedded } from '@/store/modules/embedded'
@@ -34,7 +34,7 @@ router.beforeEach(async (to, from, next) => {
     loadDone()
     if (to.name === 'link') {
       window.location.href = window.origin + '/mobile.html#' + to.path
-    } else {
+    } else if (!isPlatformClient() && !isLarkPlatform()) {
       window.location.href = window.origin + '/mobile.html#/index'
     }
   }
diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index d1309ecba0..530c31ec21 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -256,7 +256,13 @@ onMounted(() => {
       </div>
       <div class="login-form-content" v-loading="loading">
         <div class="login-form-center">
-          <el-form ref="formRef" :model="state.loginForm" :rules="rules" size="default">
+          <el-form
+            ref="formRef"
+            :model="state.loginForm"
+            :rules="rules"
+            size="default"
+            :disabled="preheat"
+          >
             <div class="login-logo">
               <Icon
                 v-if="!loginLogoUrl && axiosFinished"