From 0f33e58836b4693a21d437a3f00c723cd5b23ef0 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Sat, 8 Jul 2023 19:58:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dhash=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E5=8F=82=E6=95=B0=E6=8B=BF=E4=B8=8D=E5=88=B0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docker/docker-compose.yaml | 8 --- cloud/bigscreen-design/package.json | 1 + cloud/bigscreen-design/src/router.js | 15 +++++- cloud/bigscreen-design/yarn.lock | 49 +++++++++++++++++++ 4 files changed, 64 insertions(+), 9 deletions(-) diff --git a/cloud/bigscreen-design/docker/docker-compose.yaml b/cloud/bigscreen-design/docker/docker-compose.yaml index aaf3b7c..d937782 100644 --- a/cloud/bigscreen-design/docker/docker-compose.yaml +++ b/cloud/bigscreen-design/docker/docker-compose.yaml @@ -10,13 +10,5 @@ services: restart: always container_name: bigscreen-design image: bigscreen-design - networks: - - docker-cloud_default - external_links: - - kicc-gateway ports: - 8085:8085 - -networks: - docker-cloud_default: - external: true diff --git a/cloud/bigscreen-design/package.json b/cloud/bigscreen-design/package.json index f66c486..d19df21 100755 --- a/cloud/bigscreen-design/package.json +++ b/cloud/bigscreen-design/package.json @@ -19,6 +19,7 @@ "mockjs": "^1.1.0", "monaco-editor": "^0.34.1", "nprogress": "^0.2.0", + "qs": "^6.11.2", "vite-plugin-mock": "^2.9.4", "vue": "^3.2.40", "vue-i18n": "^9.1.9", diff --git a/cloud/bigscreen-design/src/router.js b/cloud/bigscreen-design/src/router.js index fe9ba55..5b47e16 100644 --- a/cloud/bigscreen-design/src/router.js +++ b/cloud/bigscreen-design/src/router.js @@ -1,4 +1,6 @@ import { createRouter, createWebHashHistory } from 'vue-router' +import qs from 'qs' + const vueRouter = createRouter({ base: import.meta.env.VITE_APP_BASE, history: createWebHashHistory(), @@ -50,9 +52,20 @@ const vueRouter = createRouter({ vueRouter.beforeEach((to, from, next) => { // 获取当前路由的查询参数 - const queryParams = to.query + const queryParams = parseUrlParams() + console.log(queryParams) queryParams.token && (window.$glob.header['Authorization'] = `Bearer ${queryParams.token}`) next() }) +/** 解析路由hash模式下url参数 */ +const hashUrlParamsRegex = /(?:\?|&)([^=&]+)(?:=([^&]*))?/g +export function parseUrlParams() { + const qsOptions = { ignoreQueryPrefix: true, allowDots: true, skipNulls: true } + const params = Object.assign( + qs.parse(String(location.hash).match(hashUrlParamsRegex)?.join(''), qsOptions), + qs.parse(location.search, qsOptions)) + return params +} + export default vueRouter; diff --git a/cloud/bigscreen-design/yarn.lock b/cloud/bigscreen-design/yarn.lock index a695d17..23af34b 100644 --- a/cloud/bigscreen-design/yarn.lock +++ b/cloud/bigscreen-design/yarn.lock @@ -449,6 +449,14 @@ builtin-modules@^3.3.0: resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz" integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== +call-bind@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" @@ -797,6 +805,16 @@ function-bind@^1.1.1: resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +get-intrinsic@^1.0.2: + version "1.2.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-proto "^1.0.1" + has-symbols "^1.0.3" + glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz" @@ -814,6 +832,16 @@ has-flag@^4.0.0: resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-proto@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" + integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== + +has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + has@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" @@ -997,6 +1025,11 @@ nprogress@^0.2.0: resolved "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz" integrity sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA== +object-inspect@^1.9.0: + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz" @@ -1052,6 +1085,13 @@ postcss@^8.1.10, postcss@^8.4.13: picocolors "^1.0.0" source-map-js "^1.0.2" +qs@^6.11.2: + version "6.11.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== + dependencies: + side-channel "^1.0.4" + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" @@ -1111,6 +1151,15 @@ scule@^0.3.2: resolved "https://registry.npmjs.org/scule/-/scule-0.3.2.tgz" integrity sha512-zIvPdjOH8fv8CgrPT5eqtxHQXmPNnV/vHJYffZhE43KZkvULvpCTvOt1HPlFaCZx287INL9qaqrZg34e8NgI4g== +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + sortablejs@1.14.0: version "1.14.0" resolved "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"