feat: 更新 React, Router, Ant Design 版本;判断是否是钉钉环境

2.0/email-builder
Jimmy Liow 1 year ago
parent ace4b1c57a
commit 307dc32d37

@ -11,19 +11,19 @@
},
"dependencies": {
"@vonage/client-sdk": "^1.6.0",
"antd": "^5.14.0",
"antd": "^5.21.0",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.10",
"dayjs": "^1.11.13",
"dingtalk-jsapi": "^3.0.38",
"emoji-picker-react": "^4.8.0",
"react": "^18.2.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.26.2",
"zustand": "^4.5.5",
"react-chat-elements": "^12.0.11",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.1",
"rxjs": "^7.8.1",
"uuid": "^9.0.1",
"vite-plugin-pwa": "^0.19.6",
"zustand": "^4.5.0"
"vite-plugin-pwa": "^0.19.6"
},
"devDependencies": {
"@types/react": "^18.2.15",

@ -1,20 +1,22 @@
import { Flex, Result, Spin } from 'antd'
import { isNotEmpty } from '@/utils/commons'
// import * as dd from 'dingtalk-jsapi'
import * as dd from 'dingtalk-jsapi'
function Login() {
const urlSearch = new URLSearchParams(location.search)
const originUrl = urlSearch.get('origin_url')
// dd.ready(function() {
// console.info('dd.ready()')
// })
if (isNotEmpty(originUrl)) {
window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D' + originUrl + '&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent'
if (dd.env.platform === 'notInDingTalk') {
if (isNotEmpty(originUrl)) {
window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D' + originUrl + '&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent'
} else {
window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent'
}
} else {
window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent'
dd.ready(function() {
console.info('dd.ready()')
})
}
return (

Loading…
Cancel
Save