From f87bef89c37329d8fc97668df134f1d91c73a41a Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Mon, 10 Apr 2023 09:41:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9Eoauth2=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/iframe/index.vue | 4 +- src/views/oauth/index.vue | 305 +++++++++++++++++++++++++++++++++++++ yarn.lock | 20 ++- 3 files changed, 325 insertions(+), 4 deletions(-) create mode 100644 src/views/oauth/index.vue diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue index f808a3bf..003e5fa4 100644 --- a/src/views/iframe/index.vue +++ b/src/views/iframe/index.vue @@ -22,11 +22,11 @@ const handle = async (appId: string, url: string) => { if (res.status === 200) { // console.log(res.result); if (res.result.page.routeType === 'hash') { - menuUrl = `${url}`; + menuUrl = `/%23/${url}`; } if (res.result.provider === 'internal-standalone') { //{baseUrl}/api/application/sso/{appId}/login?redirect={menuUrl} - const urlStandalone = `${res.result.page.baseUrl}/#/api/application/sso/${appId}/login?redirect=${menuUrl}&layout=false`; + const urlStandalone = `${res.result.page.baseUrl}/api/application/sso/${appId}/login?redirect=${menuUrl}?layout=false`; iframeUrl.value = urlStandalone; // console.log(urlStandalone); } else if (res.result.provider === 'internal-integrated') { diff --git a/src/views/oauth/index.vue b/src/views/oauth/index.vue new file mode 100644 index 00000000..2faf9de5 --- /dev/null +++ b/src/views/oauth/index.vue @@ -0,0 +1,305 @@ + + + + + \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 83423fab..f23ed7c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1233,6 +1233,14 @@ resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.12.0.tgz" integrity sha512-9oJ9MM9lFLlmvxXUqsR1wLt1uF7EVbP5iYaHJYqk+G2PbMjY6EXvZeTjbdO89HgoF5cI6z49o2zT/jD9SVoNpQ== +"@vueuse/router@^9.13.0": + version "9.13.0" + resolved "http://47.108.170.157:9013/@vueuse%2frouter/-/router-9.13.0.tgz#cfc757fa89c654ab749c60bc2445f945cbb86b32" + integrity sha512-lcL6auSUGMGZMdDzZJb02QDe909AChzMXoxqFS3gL2E8mHmIx0SrNor+33UkqvvBPi18vXpDq/R7tPd9fxWwTg== + dependencies: + "@vueuse/shared" "9.13.0" + vue-demi "*" + "@vueuse/shared@7.7.1": version "7.7.1" resolved "https://registry.jetlinks.cn/@vueuse%2fshared/-/shared-7.7.1.tgz" @@ -1247,6 +1255,13 @@ dependencies: vue-demi "*" +"@vueuse/shared@9.13.0": + version "9.13.0" + resolved "http://47.108.170.157:9013/@vueuse%2fshared/-/shared-9.13.0.tgz#089ff4cc4e2e7a4015e57a8f32e4b39d096353b9" + integrity sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw== + dependencies: + vue-demi "*" + JSONStream@^1.0.4: version "1.3.5" resolved "https://registry.npmmirror.com/JSONStream/-/JSONStream-1.3.5.tgz" @@ -3700,10 +3715,11 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.5: version "1.0.5" - resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#bcf2ccab91dd64355bbe6528501d37f85f503161" - integrity sha512-yUN47hmOjDryn2CBrAL7IRMdyJsuKn7wG+OwLD9Jpii/8obUfIYT2nKoxihUzWjIrBmhP1WmD94C0AwaCN1hxw== + resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#dd86644756d6044c4842193ea72335688cfa77d5" + integrity sha512-NFjJRwFuluUEAuFguyLYidgFy3tDuh1lKg10uBR//zFxmIzRaGPNN1r9nt/hp3BIGdQLJHUKgDJXQX6fZmfARg== dependencies: "@vueuse/core" "^9.12.0" + "@vueuse/router" "^9.13.0" ant-design-vue "^3.2.15" colorpicker-v3 "^2.10.2" lodash-es "^4.17.21"