From 0147a3efd0e3294130c183fe63bb43258e75820e Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Mon, 28 Oct 2024 19:07:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/XPackDisplaySettingDialog.vue          |  2 +-
 ui/src/views/authentication/component/EditModal.vue  |  8 +++++---
 ui/src/views/authentication/component/SCAN.vue       |  2 +-
 ui/src/views/login/components/dingtalkQrCode.vue     | 12 +++++++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue b/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue
index 4acd0fa29..67f7c2882 100644
--- a/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue
+++ b/ui/src/views/application-overview/component/XPackDisplaySettingDialog.vue
@@ -5,7 +5,7 @@
     v-model="dialogVisible"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
-    destroy-on-close
+    :destroy-on-close="true"
     align-center
     class="display-setting-dialog"
   >
diff --git a/ui/src/views/authentication/component/EditModal.vue b/ui/src/views/authentication/component/EditModal.vue
index 6c429485c..3c0a7b478 100644
--- a/ui/src/views/authentication/component/EditModal.vue
+++ b/ui/src/views/authentication/component/EditModal.vue
@@ -1,6 +1,6 @@
 template
 <template>
-  <el-drawer v-model="visible" size="60%" :append-to-body="true" destroy-on-close>
+  <el-drawer v-model="visible" size="60%" :append-to-body="true" :destroy-on-close="true">
     <template #header>
       <div class="flex align-center" style="margin-left: -8px">
         <h4>{{ currentPlatform.name + '设置' }}</h4>
@@ -112,11 +112,13 @@ const open = async (platform: Platform) => {
 
   // 设置默认的 callback_url
   let defaultCallbackUrl = window.location.origin
-
-  // 根据平台设置特定的 callback_url
   switch (platform.key) {
     case 'wecom':
     case 'dingtalk':
+      if (currentPlatform.config.agent_id) {
+        currentPlatform.config.corp_id = currentPlatform.config.agent_id
+        delete currentPlatform.config.agent_id
+      }
       currentPlatform.config.callback_url = defaultCallbackUrl
       break
     case 'lark':
diff --git a/ui/src/views/authentication/component/SCAN.vue b/ui/src/views/authentication/component/SCAN.vue
index eee5efe2c..49c1a61b5 100644
--- a/ui/src/views/authentication/component/SCAN.vue
+++ b/ui/src/views/authentication/component/SCAN.vue
@@ -130,8 +130,8 @@ function createPlatform(key: string, name: string): Platform {
   }
 
   const config = {
+    ...(key === 'dingtalk' ? { corp_id: '' } : {}),
     ...(key === 'wecom' ? { corp_id: '', agent_id: '' } : { app_key: '' }),
-    ...(key === 'dingtalk' ? { agent_id: '' } : {}),
     app_secret: '',
     callback_url: ''
   }
diff --git a/ui/src/views/login/components/dingtalkQrCode.vue b/ui/src/views/login/components/dingtalkQrCode.vue
index be29e4d80..2e2897e25 100644
--- a/ui/src/views/login/components/dingtalkQrCode.vue
+++ b/ui/src/views/login/components/dingtalkQrCode.vue
@@ -13,6 +13,7 @@ import { useRouter } from 'vue-router'
 import { useScriptTag } from '@vueuse/core'
 import { defineProps, onMounted, ref } from 'vue'
 import useStore from '@/stores'
+import { MsgError } from '@/utils/message'
 
 // 声明 DTFrameLogin 和 QRLogin 的类型
 declare global {
@@ -65,6 +66,7 @@ const props = defineProps<{
   config: {
     app_secret: string
     app_key: string
+    agent_id?: string
   }
 }>()
 
@@ -82,8 +84,10 @@ const initActive = async () => {
 
     const data = {
       appKey: props.config.app_key,
-      appSecret: props.config.app_secret
+      appSecret: props.config.app_secret,
+      agent_id: props.config.agent_id
     }
+    console.log(props.config)
 
     const redirectUri = encodeURIComponent(window.location.origin)
 
@@ -99,7 +103,9 @@ const initActive = async () => {
         scope: 'openid',
         response_type: 'code',
         state: 'fit2cloud-ding-qr',
-        prompt: 'consent'
+        prompt: 'consent',
+        exclusiveLogin: 'true',
+        exclusiveCorpId: 'ding7fd29779c8cf3e0224f2f5cc6abecb85'
       },
       (loginResult) => {
         const authCode = loginResult.authCode
@@ -108,7 +114,7 @@ const initActive = async () => {
         })
       },
       (errorMsg: string) => {
-        console.error(errorMsg)
+        MsgError(errorMsg)
       }
     )
   } catch (error) {