agilebuilder-ui 1.1.45 → 1.1.47

package/src/utils/common-util.js

@@ -231,8 +231,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 +251,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路径

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);
 // }