agilebuilder-ui 1.1.57-sit3 → 1.1.58-sit1

package/src/utils/request.js

@@ -1,9 +1,9 @@
 import axios from 'axios'
 import { ElMessage as Message } from 'element-plus'
-import { getToken, removeToken, getRunCurrentRole } from './auth'
+import { getToken, getRunCurrentRole, setSessionCache } from './auth'
 import store from '../store'
 import { getI18n } from './util'
-import { getRelativeBaseUrl, getTimeZone, setCustomSystemBackendUrl } from './common-util'
+import { getLoginTimeoutUrlInfo, getRelativeBaseUrl, getTimeZone, setCustomSystemBackendUrl } from './common-util'
 // 创建axios实例
 const service = axios.create({
   // baseURL: process.env.VUE_APP_BASE_API, // api 的 base_url
@@ -64,20 +64,26 @@ service.interceptors.response.use(
       if (error.response.status === 401) {
         // LoginException(401)
         // 清除window.sessionStorage中的jwt，否则无法转到login页面
-        removeToken()
-        const isInIframe = window.$vueApp.config.globalProperties.$isInIframe()
-        // console.log('isInIframe==========', isInIframe, 'getToken()=', getToken())
-        if (isInIframe === true) {
-          // 在iframe中时，出现了401错误时，需要进入平台的登录页面，并需要登录后还是进入出错的原页面，而不是永远进入门户页面。
-          // 所以使用了跨域发送消息来实现，子页面给父页面发消息，父页面接收该消息，并处理
-          // console.log('isInIframe111==========', window.location.href)
-          window.parent.postMessage('{"loginTimeout":"' + window.location.href + '"}', '*')
-        } else {
-          // 当前出错的页面不是在子页面iframe内，需要跳转到子系统的登录页面。跳转到业务系统的登录页面，此处不自动跳转了，因为会导致无法跳转到指定页面
-          // getLoginUrl().then(loginUrl => {
-          //   window.location.href = loginUrl
-          // })
-        }
+        store.dispatch('clearToken').then(()=>{
+          let msgObj = getLoginTimeoutUrlInfo()
+          const isInIframe = window.$vueApp.config.globalProperties.$isInIframe()
+          // console.log('isInIframe==========', isInIframe, 'getToken()=', getToken())
+          if (isInIframe === true) {
+            // 在iframe中时，出现了401错误时，需要进入平台的登录页面，并需要登录后还是进入出错的原页面，而不是永远进入门户页面。
+            // 所以使用了跨域发送消息来实现，子页面给父页面发消息，父页面接收该消息，并处理
+            // console.log('isInIframe111==========', window.location.href)
+            msgObj.isIframe = true
+            const msgJson = JSON.stringify(msgObj)
+            // alert('inIframe---msgJson='+msgJson)
+            setSessionCache('loginTimeoutInIframeSrc', msgJson)
+            window.parent.postMessage(msgJson, '*')
+          } else {
+            msgObj.isIframe = false
+            const msgJson = JSON.stringify(msgObj)
+            // alert('noIframe---msgJson='+msgJson)
+            setSessionCache('loginTimeoutInIframeSrc', msgJson)
+          }
+        })
       } else if (error.response.status === 403) {
         // ForbiddenException(403) 403没权限
         let message = ''

package/src/views/dsc-component/Sidebar/index.vue

@@ -112,12 +112,16 @@ export default {
 		getDefaultActive() {
 			if (this.firstLeafMenu && this.firstLeafMenu.pageType !== 'iframe') {
 				const pageCode = this.firstLeafMenu.path
-				return '/dsc/' + this.firstLeafMenu.code + '~~' + pageCode + '~~' + this.firstLeafMenu.newPage
+				const activeIndex = '/dsc/' + this.firstLeafMenu.code + '~~' + pageCode + '~~' + this.firstLeafMenu.newPage
+				this.selectMenu(activeIndex)
+				return activeIndex
 			} else if (
 					this.firstLeafMenu &&
 					this.firstLeafMenu.pageType === 'iframe'
 			) {
-				return '/dsc/' + this.firstLeafMenu.code + '~~pageCode' + '~~' + this.firstLeafMenu.newPage
+				const activeIndex =  '/dsc/' + this.firstLeafMenu.code + '~~pageCode' + '~~' + this.firstLeafMenu.newPage
+				this.selectMenu(activeIndex)
+				return activeIndex
 			} else {
 				return ''
 			}

package/src/views/dsc-component/tabs/tab-content.vue

@@ -1,16 +1,12 @@
 <template>
-  <el-tabs v-if="openTab && openTab.length > 0"
+  <el-tabs
+    v-if="openTab && openTab.length > 0"
     v-model="activeIndex"
     class="nav-tab menu-tab-container"
     closable
     @tab-remove="closeSelectedTag"
   >
-    <el-tab-pane
-      v-for="tag in openTab"
-      :key="tag.code"
-      :label="tag.name"
-      :name="tag.code"
-    >
+    <el-tab-pane v-for="tag in openTab" :key="tag.code" :label="tag.name" :name="tag.code">
       <iframe
         ref="tabMainContent"
         :src="getFullPath(tag)"
@@ -41,23 +37,17 @@ export default {
   data() {
     let defaultPageTip = window.$vueApp.config.globalProperties.defaultPageTip
     if (!defaultPageTip) {
-      defaultPageTip =
-        '欢迎访问Agile Builder/Welcome to Agile Builder'
+      defaultPageTip = '欢迎访问Agile Builder/Welcome to Agile Builder'
     }
     let defaultPageTipCn = defaultPageTip
     let defaultPageTipEn
     if (defaultPageTip && defaultPageTip.indexOf('/') > 0) {
-      defaultPageTipCn = defaultPageTip.substring(
-        0,
-        defaultPageTip.lastIndexOf('/')
-      )
-      defaultPageTipEn = defaultPageTip.substring(
-        defaultPageTip.lastIndexOf('/') + 1
-      )
+      defaultPageTipCn = defaultPageTip.substring(0, defaultPageTip.lastIndexOf('/'))
+      defaultPageTipEn = defaultPageTip.substring(defaultPageTip.lastIndexOf('/') + 1)
     }
     return {
       defaultPageTipCn,
-      defaultPageTipEn,
+      defaultPageTipEn
     }
   },
   computed: {
@@ -68,38 +58,29 @@ export default {
       },
       set(val) {
         this.$store.commit('set_active_index', val)
-      },
-    },
+      }
+    }
   },
   created() {
     // 登录超时，给父iframe发送信号
     window.addEventListener('message', this.recieveMessage)
   },
   unmounted() {
-		// 移除监听
-		window.removeEventListener('message', this.recieveMessage);
-	},
+    // 移除监听
+    window.removeEventListener('message', this.recieveMessage)
+  },
   methods: {
     closeSelectedTag(tagName) {
-      const index = this.$store.state.tabContent.openTab.findIndex(
-        (item) => item.code === tagName
-      )
+      const index = this.$store.state.tabContent.openTab.findIndex((item) => item.code === tagName)
       const view = this.$store.state.tabContent.openTab[index]
       this.$store.commit('delete_tabs', view)
       if (tagName === this.activeIndex) {
         // 表示删除的是当前选中的菜单，选中前面的菜单
-        this.toLastView(
-          this.$store.state.tabContent.openTab,
-          index > 0 ? index - 1 : 0
-        )
+        this.toLastView(this.$store.state.tabContent.openTab, index > 0 ? index - 1 : 0)
       }
     },
     toLastView(visitedViews, lastIndex) {
-      if (
-        visitedViews &&
-        visitedViews.length > 0 &&
-        visitedViews.length > lastIndex
-      ) {
+      if (visitedViews && visitedViews.length > 0 && visitedViews.length > lastIndex) {
         const latestView = visitedViews[lastIndex]
         if (latestView) {
           this.$store.commit('set_active_index', latestView.code)
@@ -118,7 +99,7 @@ export default {
           if (orgPath && orgPath.indexOf('?') > 0) {
             const orgParamsStr = orgPath.substring(orgPath.indexOf('?') + 1)
             const orgParamsArr = orgParamsStr.split('&')
-            orgParamsArr.forEach(item => {
+            orgParamsArr.forEach((item) => {
               orgParams.push(item.substring(0, item.indexOf('=')))
             })
           }
@@ -152,35 +133,30 @@ export default {
           }
         }
       }
-      if (
-        path &&
-        path.length > 0 &&
-        path.lastIndexOf('&') === path.length - 1
-      ) {
+      if (path && path.length > 0 && path.lastIndexOf('&') === path.length - 1) {
         path = path.substring(0, path.lastIndexOf('&'))
       }
       const paramObj = getURLSearchParamObj(path)
-      if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+      if (paramObj && paramObj._isThird && paramObj._isThird === 'false') {
         // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
         path = getRelativeBaseUrl(path)
       }
       return path
     },
     recieveMessage(event) {
-      if (
-        event &&
-        typeof event.data === 'string' &&
-        event.data.indexOf('loginTimeout') >= 0
-      ) {
+      if (event && typeof event.data === 'string' && event.data.indexOf('loginTimeout') >= 0) {
         // 表示iframe中的页面发送了登录超时的信号，将信号传给最外层window
-        console.log(
-          'tab-content-接收到登录超时的信息---event.data=',
-          event.data
-        )
-        window.parent.postMessage(event.data, '*')
+        console.log('tab-content-接收到登录超时的信息---event.data=', event.data)
+        try {
+          const messageData = JSON.parse(event.data)
+          messageData.isInTab = 'true'
+          window.parent.postMessage(JSON.stringify(messageData), '*')
+        } catch (error) {
+          console.error('dsc tab-content.vue中登录超时，json转换失败,event.data=',event.data)
+        }
       }
-    },
-  },
+    }
+  }
 }
 </script>
 
@@ -189,40 +165,41 @@ iframe.tab-main-content {
   width: 100%;
   height: calc(100vh - 48px);
 }
-.ocean-blue{
-		:deep(.el-tabs__header .el-tabs__item.is-active) {
-				color: #0089BA;
-		}
+.ocean-blue {
+  :deep(.el-tabs__header .el-tabs__item.is-active) {
+    color: #0089ba;
+  }
 }
 
-:deep(.el-tabs__nav-scroll){
-		background: #FFFFFF;
-		box-shadow: 0px 0px 30px 0px rgba(204,204,204,0.2);
+:deep(.el-tabs__nav-scroll) {
+  background: #ffffff;
+  box-shadow: 0px 0px 30px 0px rgba(204, 204, 204, 0.2);
 }
 
 :deep(.el-tabs__header .el-tabs__item) {
-		background-image: url("../../../assets/tab-selectWhite.png") !important;
-		background-position: center;
-		background-size: 160% 100px;
-		padding: 0 20px 0 10px !important;
+  background-image: url('../../../assets/tab-selectWhite.png') !important;
+  background-position: center;
+  background-size: 160% 100px;
+  padding: 0 20px 0 10px !important;
 }
 /* 去除table选中下划线 */
 :deep(.el-tabs__active-bar) {
-		display: none;
+  display: none;
 }
 
 :deep(.el-tabs__item) {
-		padding: 0;
+  padding: 0;
+  font-size: 16px;
 }
 
 /* 去掉tab横线 */
 :deep(.el-tabs__nav-wrap::after) {
-		width: 0;
+  width: 0;
 }
 
 /* 去掉卡片和tab表头的距离 */
 :deep(.el-tabs__header) {
-		margin: 0;
+  margin: 0;
 }
 </style>
 

package/src/views/layout/components/tabs/tab-content.vue

@@ -170,7 +170,13 @@ export default {
           'tab-content-接收到登录超时的信息---event.data=',
           event.data
         )
-        window.parent.postMessage(event.data, '*')
+        try {
+          const messageData = JSON.parse(event.data)
+          messageData.isInTab = 'true'
+          window.parent.postMessage(JSON.stringify(messageData), '*')
+        } catch (error) {
+          console.error('平台 tab-content.vue中登录超时，json转换失败,event.data=',event.data)
+        }
       } else if (
         event &&
         typeof event.data === 'string' &&

package/lib/architecture-O4VJ6CD3-ZoZ2IAk2-4df08933.js

@@ -1,11 +0,0 @@
-import { A as a, e as s } from "./mermaid-parser.core-CH9ryA1K-bf0875cb.js";
-import "./index-0ed2fd1d.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-6c0f2e5c.js";
-import "./_baseUniq-BXtq6_NW-225b437f.js";
-import "./min-BngCxx8g-43ed7f04.js";
-import "./clone-CEJtuQzg-d9ba41f8.js";
-export {
-  a as ArchitectureModule,
-  s as createArchitectureServices
-};

package/lib/gitGraph-ZV4HHKMB-BSmtVGRu-f5711898.js

@@ -1,11 +0,0 @@
-import { G, f as s } from "./mermaid-parser.core-CH9ryA1K-bf0875cb.js";
-import "./index-0ed2fd1d.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-6c0f2e5c.js";
-import "./_baseUniq-BXtq6_NW-225b437f.js";
-import "./min-BngCxx8g-43ed7f04.js";
-import "./clone-CEJtuQzg-d9ba41f8.js";
-export {
-  G as GitGraphModule,
-  s as createGitGraphServices
-};

package/lib/info-63CPKGFF-C8sYWczU-6af95050.js

@@ -1,11 +0,0 @@
-import { I as c, c as f } from "./mermaid-parser.core-CH9ryA1K-bf0875cb.js";
-import "./index-0ed2fd1d.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-6c0f2e5c.js";
-import "./_baseUniq-BXtq6_NW-225b437f.js";
-import "./min-BngCxx8g-43ed7f04.js";
-import "./clone-CEJtuQzg-d9ba41f8.js";
-export {
-  c as InfoModule,
-  f as createInfoServices
-};

package/lib/packet-HUATNLJX-bfFWFja0-5b720ab3.js

@@ -1,11 +0,0 @@
-import { P as c, a as s } from "./mermaid-parser.core-CH9ryA1K-bf0875cb.js";
-import "./index-0ed2fd1d.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-6c0f2e5c.js";
-import "./_baseUniq-BXtq6_NW-225b437f.js";
-import "./min-BngCxx8g-43ed7f04.js";
-import "./clone-CEJtuQzg-d9ba41f8.js";
-export {
-  c as PacketModule,
-  s as createPacketServices
-};

package/lib/pie-WTHONI2E-QPrWs3SR-436ddd74.js

@@ -1,11 +0,0 @@
-import { b as s, d as c } from "./mermaid-parser.core-CH9ryA1K-bf0875cb.js";
-import "./index-0ed2fd1d.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-6c0f2e5c.js";
-import "./_baseUniq-BXtq6_NW-225b437f.js";
-import "./min-BngCxx8g-43ed7f04.js";
-import "./clone-CEJtuQzg-d9ba41f8.js";
-export {
-  s as PieModule,
-  c as createPieServices
-};

package/lib/radar-NJJJXTRR-BnUCJhQL-2afb3d31.js

@@ -1,11 +0,0 @@
-import { R as d, g as s } from "./mermaid-parser.core-CH9ryA1K-bf0875cb.js";
-import "./index-0ed2fd1d.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-6c0f2e5c.js";
-import "./_baseUniq-BXtq6_NW-225b437f.js";
-import "./min-BngCxx8g-43ed7f04.js";
-import "./clone-CEJtuQzg-d9ba41f8.js";
-export {
-  d as RadarModule,
-  s as createRadarServices
-};

package/lib/treemap-75Q7IDZK-B2atdfMH-b96fa422.js

@@ -1,11 +0,0 @@
-import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-bf0875cb.js";
-import "./index-0ed2fd1d.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-6c0f2e5c.js";
-import "./_baseUniq-BXtq6_NW-225b437f.js";
-import "./min-BngCxx8g-43ed7f04.js";
-import "./clone-CEJtuQzg-d9ba41f8.js";
-export {
-  s as TreemapModule,
-  T as createTreemapServices
-};