Merge commit '36fbaddf318a3d3582454bdfc898f512cbcfbd2d'

# Conflicts:
#	package.json   resolved by main version
#	src/hooks/useConversation.js   resolved by main version
2.0/email-builder
Jimmy Liow 11 months ago
commit 379c64dade

@ -26,6 +26,7 @@ import ChatAssign from '@/views/Conversations/ChatAssign'
import DingdingLogin from '@/views/dingding/Login'
import DingdingQRCode from '@/views/dingding/QRCode'
import DingdingAuthCode from '@/views/dingding/AuthCode'
import useAuthStore from '@/stores/AuthStore'
import '@/assets/index.css'
@ -93,6 +94,7 @@ const router = createBrowserRouter([
{ path: 'dingding/logout', element: <DingdingLogout /> },
{ path: 'dingding/callback', element: <DingdingCallback /> },
{ path: 'dingding/qr-code', element: <DingdingQRCode /> },
{ path: 'dingding/auth-code', element: <DingdingAuthCode /> },
],
},
])

@ -0,0 +1,48 @@
import { Flex, Result, Input, Button } from 'antd'
import { useState, useEffect } from 'react'
import { useNavigate } from 'react-router-dom'
import { isNotEmpty } from '@/utils/commons'
import * as dd from 'dingtalk-jsapi'
import { handleNotification } from '@/channel/whatsappUtils'
//
// https://open.dingtalk.com/document/orgapp/jsapi-request-auth-code
function AuthCode() {
const [result, setResult] = useState('')
const [clientValue, setClientValue] = useState('dingwgdx6emlxr3fcrg8')
const handleRequest = () => {
dd.requestAuthCode({
clientId: clientValue,
corpId: 'ding48bce8fd3957c96b',
success: (res) => {
const { code } = res
setResult(code)
},
fail: (error) => {
setResult(JSON.stringify(error))
},
complete: () => {},
})
}
useEffect(() => {
const dingTalkPlatForm = dd.env.platform
setResult(dingTalkPlatForm)
}, [])
return (
<Flex justify='center' align='center' gap='middle' vertical>
<Result
status='success'
title={clientValue}
subTitle={result}
/>
<Input value={clientValue} onChange={e => setClientValue(e.currentTarget.value)} />
<Button type='primary' onClick={() => handleRequest()}>请求</Button>
</Flex>
)
}
export default AuthCode
Loading…
Cancel
Save