From d813e447654540d881d8c17e71ed76aaf9c2156a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 15 Jan 2024 16:23:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=A4=BE=E5=8C=BA=E7=89=88=E6=97=A0lic?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |  1 +
 core/core-frontend/src/permission.ts          |  2 +-
 core/core-frontend/src/router/index.ts        |  7 +++++
 .../src/views/chart/ChartView.vue             | 29 +++++++++++++++++++
 core/core-frontend/src/views/login/index.vue  |  3 +-
 de-xpack                                      |  2 +-
 6 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 core/core-frontend/src/views/chart/ChartView.vue

diff --git a/core/core-backend/src/main/resources/application.yml b/core/core-backend/src/main/resources/application.yml
index f838d5d272..87a0091da2 100644
--- a/core/core-backend/src/main/resources/application.yml
+++ b/core/core-backend/src/main/resources/application.yml
@@ -46,6 +46,7 @@ quartz:
 
 dataease:
   version: '@project.version@'
+  origin-list: http://192.168.2.70:9080
   apisix-api:
     domain: http://192.168.0.121:9180
     key: edd1c9f034335f136f87ad84b625c8f1
diff --git a/core/core-frontend/src/permission.ts b/core/core-frontend/src/permission.ts
index 550d8bf2a1..62d0c28fb5 100644
--- a/core/core-frontend/src/permission.ts
+++ b/core/core-frontend/src/permission.ts
@@ -18,7 +18,7 @@ const { start, done } = useNProgress()
 
 const { loadStart, loadDone } = usePageLoading()
 
-const whiteList = ['/login', '/de-link'] // 不重定向白名单
+const whiteList = ['/login', '/de-link', '/chart-view'] // 不重定向白名单
 
 router.beforeEach(async (to, from, next) => {
   start()
diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts
index 41a64f11bf..a6d785a921 100644
--- a/core/core-frontend/src/router/index.ts
+++ b/core/core-frontend/src/router/index.ts
@@ -112,6 +112,13 @@ export const routes: AppRouteRecordRaw[] = [
         meta: { hidden: true }
       }
     ]
+  },
+  {
+    path: '/chart-view',
+    name: 'chart-view',
+    hidden: true,
+    meta: {},
+    component: () => import('@/views/chart/ChartView.vue')
   }
 ]
 
diff --git a/core/core-frontend/src/views/chart/ChartView.vue b/core/core-frontend/src/views/chart/ChartView.vue
new file mode 100644
index 0000000000..27a7d039c7
--- /dev/null
+++ b/core/core-frontend/src/views/chart/ChartView.vue
@@ -0,0 +1,29 @@
+<script lang="ts" setup>
+import ViewWrapper from '@/pages/panel/ViewWrapper.vue'
+import { useRoute } from 'vue-router'
+import { onBeforeMount } from 'vue'
+const route = useRoute()
+const init = () => {
+  const busiFlag = route.query.busiFlag
+  const dvId = route.query.dvId
+  const chartId = route.query.chartId
+  const embeddedToken = route.query.embeddedToken
+  console.log(busiFlag)
+  console.log(dvId)
+  console.log(chartId)
+  console.log(embeddedToken)
+  window.DataEaseBi = {
+    token: embeddedToken,
+    chartId: chartId,
+    dvId: dvId,
+    busiFlag: busiFlag
+  }
+}
+onBeforeMount(() => {
+  init()
+})
+</script>
+
+<template>
+  <view-wrapper />
+</template>
diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index 342c7344a6..a4929ba14d 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -173,7 +173,8 @@ const showLoginErrorMsg = () => {
 onMounted(() => {
   checkPlatform()
   if (localStorage.getItem('DE-GATEWAY-FLAG')) {
-    loginErrorMsg.value = localStorage.getItem('DE-GATEWAY-FLAG')
+    const msg = localStorage.getItem('DE-GATEWAY-FLAG')
+    loginErrorMsg.value = decodeURIComponent(msg)
     showLoginErrorMsg()
     localStorage.removeItem('DE-GATEWAY-FLAG')
     logoutHandler(true)
diff --git a/de-xpack b/de-xpack
index 3f66b69a1b..c46269ec58 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 3f66b69a1b4f4607d8030d3ee87d6cec45a374ee
+Subproject commit c46269ec581913e102d21ded8690ed387509db87