agilebuilder-ui 1.1.45 → 1.1.46-sit2

package/src/utils/common-util.js

@@ -8,6 +8,9 @@ import i18nUtil from './i18n-util'
  * 获得相对地址
  */
 export function getRelativeBaseUrl(originalBaseUrl) {
+  if(!originalBaseUrl){
+    return originalBaseUrl
+  }
   if (
     window.$vueApp.config.globalProperties.projectModel === undefined ||
     window.$vueApp.config.globalProperties.projectModel !== 'developing.model'
@@ -231,8 +234,12 @@ export function isPlateSys(systemCode) {
 export function getServerConfigUtil(http) {
   return new Promise((resolve, reject) => {
     let timestamp = '1'
-    if(__BUILD_TIME__) {
-      timestamp = __BUILD_TIME__
+    try {
+      if(__BUILD_TIME__) {
+        timestamp = __BUILD_TIME__
+      }
+    } catch (error) {
+      console.log('__BUILD_TIME__ not define')
     }
     http.get('./server-config.json?t='+timestamp).then((result) => {
       const config = result
@@ -247,16 +254,60 @@ export function getServerConfigUtil(http) {
       )
       localStorage.setItem('_baseAPI_', window.$vueApp.config.globalProperties.baseAPI)
       localStorage.setItem('_amb_projectModel_', window.$vueApp.config.globalProperties.projectModel)
-      if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
-      }
-      if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
-      }
+      // 插入图标css样式文件
+      insertFontIconCss(config)
+      // 第3方集成js
+      insertThirdLoginJs(config)
       resolve()
     })
   })
 }
+
+export function insertFontIconCss(config){
+  if(!window.insertCssFile){
+      return
+    }
+  if(!config){
+    config = window.$vueApp.config.globalProperties
+  }
+  let timestamp = '1'
+  try {
+    if(__BUILD_TIME__) {
+      timestamp = __BUILD_TIME__
+    }
+  } catch (error) {
+    console.log('__BUILD_TIME__ not define')
+  }
+  if (config.fontIconAddress && window.insertCssFile) {
+    window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
+  }
+  if (config.fontIconAddress && window.insertCssFile) {
+    window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
+  }
+}
+
+export function insertThirdLoginJs(config){
+    if(!window.insertJsFile ){
+      return
+    }
+    if(!config){
+      config = window.$vueApp.config.globalProperties
+    }
+    if(!config  || (config.systemCode !== 'portal' && config.systemCode !== 'devp')){
+      return
+    }
+    // 只有portal和devp需要动态添加这些js
+    // userName,dingtalk,feishu,qiwei
+    if (!config.loginMethod || config.loginMethod.indexOf('dingtalk')>=0) {
+      window.insertJsFile(`https://g.alicdn.com/dingding/h5-dingtalk-login/0.21.0/ddlogin.js`)
+    }
+    if (!config.loginMethod || config.loginMethod.indexOf('feishu')>=0) {
+      window.insertJsFile(`https://lf-package-cn.feishucdn.com/obj/feishu-static/lark/passport/qrcode/LarkSSOSDKWebQRCode-1.0.3.js`)
+    }
+    if (!config.loginMethod || config.loginMethod.indexOf('qiwei')>=0) {
+      window.insertJsFile(`https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-2.3.1.js`)
+    }
+}
 /**
  * postmessage跨域传message时获得orign路径使用
  * @returns orign路径
@@ -748,3 +799,22 @@ export function cacheSystemUrl() {
 export function getAuthSource() {
   return window.localStorage.getItem('auth_source')
 }
+/**
+ * 把路径中的参数转为对象
+ * @param {*} fullPath 全路径。例如：hash路径：http://xx:8090/#/sss/dd?p1=1&p2=2 或 普通路径：http://xx:8090/sss/dd?p1=1&p2=2
+ * @returns 
+ */
+export function getURLSearchParamObj(fullPath) {
+  try{
+    // 提取hash部分 
+    const hash = fullPath.includes('#') ? fullPath.split('#')[1] : fullPath; 
+    // 提取查询参数 
+    const queryString = hash.includes('?') ? hash.split('?')[1] : hash; 
+    // 解析参数 
+    const params = new URLSearchParams(queryString); 
+    // 转换为普通对象
+    return Object.fromEntries(params)
+  }catch(error){
+    console.error('error===',error)
+  }
+}

package/src/utils/insert_css.js

@@ -15,7 +15,6 @@ if (!window.insertCssFile) {
         if (!cssUrl || window.insertedCssFiles.has(cssUrl)) {
             return;
         }
-        const timestamp = new Date().getTime();
         const link = document.createElement('link');
         link.rel = 'stylesheet';
         link.href = cssUrl;
@@ -29,6 +28,20 @@ if (!window.insertCssFile) {
     }
 }
 
+
+if (!window.insertJsFile) {
+    window.insertJsFile = (jsUrl) => {
+        if (!jsUrl || window.insertedCssFiles.has(jsUrl)) {
+            return;
+        }
+        const link = document.createElement('script');
+        link.src = jsUrl;
+        link.onload = function () {
+            window.insertedCssFiles.add(jsUrl);
+        };
+        document.head.appendChild(link);
+    }
+}
 // if (window.insertCssFile) {
 //     window.insertCssFile(window.defaultCssUrl);
 // }

package/src/utils/jump-page-utils.js

@@ -73,6 +73,7 @@ export function initialization(
           if (jumpPageResult && jumpPageResult.visible) {
             const res = { ...jumpPageResult }
             res.jumpPageSetting = JSON.stringify(jumpPageItem.jumpPageSetting)
+            res.jumpPageItem = jumpPageItem
             return res
           }
         }
@@ -228,7 +229,10 @@ export function jumpToPage(
     }
     getSystem(system, jumpPageSetting.jumpPageUrl, jumpPageSetting.isNewPage, jumpPageSetting)
       .then((system) => {
-        if ((jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) || (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${')>=0)) {
+        if (
+          (jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) ||
+          (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${') >= 0)
+        ) {
           // 发送请求，获取附加参数，并存入缓存
           const paramPath =
             window.$vueApp.config.globalProperties.baseAPI + '/component/super-pages/parsing-additional-parameters'
@@ -242,7 +246,7 @@ export function jumpToPage(
           if (!pageData) {
             pageData = {}
           }
-          if(!additionalParamMap){
+          if (!additionalParamMap) {
             additionalParamMap = {}
           }
           Object.assign(additionalParamMap, pageData)
@@ -593,11 +597,11 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
       // 移动端时，获得移动端打开方式
       jumpMode = jumpPageSetting.jumpPageMobileOpenMode
     }
-    if(!jumpMode && jumpPageSetting) {
+    if (!jumpMode && jumpPageSetting) {
       // 移动端没有配置则以 打开方式为准
       jumpMode = jumpPageSetting.jumpPageOpenMode
     }
-    if(!jumpMode){
+    if (!jumpMode) {
       // 默认是刷新页面
       jumpMode = 'refresh'
     }

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

@@ -53,6 +53,7 @@ import AppLink from './Link.vue'
 import * as Vue from 'vue'
 import tabJs from '../../../api/tab'
 import { getI18nName } from '../../../utils/menu'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 // import { SidebarItemChild } from './SidebarItemChild.vue'
 export default {
   name: 'SidebarItem',
@@ -171,6 +172,11 @@ export default {
             url = url.substring(0, url.lastIndexOf('&'))
           }
         }
+        const paramObj = getURLSearchParamObj(url)
+        if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+          // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+          url = getRelativeBaseUrl(url)
+        }
         window.open(url, toPathObj.query._menuName)
       } else {
         // 刷新页签打开菜单

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

@@ -35,6 +35,7 @@
 <script>
 import * as Vue from 'vue'
 import { mapGetters } from 'vuex'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 export default {
   name: 'TabContent',
   data() {
@@ -158,6 +159,11 @@ export default {
       ) {
         path = path.substring(0, path.lastIndexOf('&'))
       }
+      const paramObj = getURLSearchParamObj(path)
+      if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+        // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+        path = getRelativeBaseUrl(path)
+      }
       return path
     },
     recieveMessage(event) {