agilebuilder-ui 1.0.69 → 1.0.71

package/src/api/sso-service.js

@@ -1,6 +1,7 @@
 import request from '../utils/request'
 import {getLanguage, getTheme} from '../utils/auth'
 import * as Vue from 'vue'
+import { isMobileBrowser } from '../utils/common-util'
 function login(username, password, language) {
   const usernamePasswordToken = {
     username,
@@ -60,22 +61,26 @@ function logout() {
 }
 
 function getCurrentUserPermissionsBySystem(loginName, systemCode) {
-  if (!systemCode) {
-    if (window.$vueApp.config.globalProperties.customSystem) {
-      systemCode = window.$vueApp.config.globalProperties.customSystem
-    } else {
-      systemCode = window.$vueApp.config.globalProperties.systemCode
+  if(isMobileBrowser()){
+    return getCurrentUserMobilePermissions(loginName)
+  } else {
+    if (!systemCode) {
+      if (window.$vueApp.config.globalProperties.customSystem) {
+        systemCode = window.$vueApp.config.globalProperties.customSystem
+      } else {
+        systemCode = window.$vueApp.config.globalProperties.systemCode
+      }
     }
+    return request.get(
+      window.$vueApp.config.globalProperties.baseAPI +
+        '/sso/current-users/permissions/with-system?loginName=' +
+        encodeURI(loginName) +
+        '&systemCode=' +
+        systemCode +
+        '&_t=' +
+        new Date().getTime()
+    )
   }
-  return request.get(
-    window.$vueApp.config.globalProperties.baseAPI +
-      '/sso/current-users/permissions/with-system?loginName=' +
-      encodeURI(loginName) +
-      '&systemCode=' +
-      systemCode +
-      '&_t=' +
-      new Date().getTime()
-  )
 }
 
 function isPasswordExpired(username, password) {
@@ -212,6 +217,12 @@ function getDevPlatformPermissions(roleCodes) {
   )
 }
 
+
+
+function getCurrentUserMobilePermissions (loginName) {
+  return request.get(Vue.prototype.baseAPI + '/sso/current-users/mobile-permissions?loginName=' + encodeURI(loginName) + '&_t=' + new Date().getTime())
+}
+
 export default {
   login,
   getCurrentUser,

package/src/i18n/langs/cn.js

@@ -81,7 +81,8 @@ const cn = {
         asyncExport: '正在异步导出，请等待消息通知!',
         selectedWorkingGroup: '已选工作组',
         forbiddenExceptionLinkUrl: '请点击进行权限申请',
-        forbiddenExceptionLinkUser: '如有疑问请联系'
+        forbiddenExceptionLinkUser: '如有疑问请联系',
+        uploadFileTip: '上传的文件不超过{fileSize}M'
     },
     // 列表组件
     superGrid: {

package/src/i18n/langs/en.js

@@ -83,7 +83,8 @@ const en = {
         asyncExport: 'Asynchronous export, please wait for message notification!',
         selectedWorkingGroup: 'Selected working group',
         forbiddenExceptionLinkUrl: 'please click to apply',
-        forbiddenExceptionLinkUser: 'if you have any questions,please contact'
+        forbiddenExceptionLinkUser: 'if you have any questions,please contact',
+        uploadFileTip: 'The file size should lower {fileSize}M'
     },
     superGrid: {
         columnConfig: 'Column Config',

package/src/styles/theme/green/sidebar.scss

@@ -284,14 +284,25 @@
   .router-link-active >.is-active{
     color: $--menu-dont-color;
   }
+
   .el-menu-item{
-    color: #FFFFFF;
+    color: $--menu-dont-color;
   }
+
   .el-menu-item:hover{
     background-color: $--menu-hove-background-color;
     color: #FFFFFF;
   }
 
+  .el-menu-item.is-active {
+    color: $--menu-dont-color;
+  }
+
+  .el-menu-item.is-active:hover {
+    background-color: $--menu-hove-background-color;
+    color: #FFFFFF;
+  }
+
   .el-sub-menu .el-sub-menu__title{
     color: #FFFFFF;
   }

package/src/utils/common-util.js

@@ -2,6 +2,7 @@ import * as Vue from 'vue'
 import authApi from './auth-api'
 import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 import { v4 as uuidv4 } from 'uuid'
+import {getCookieCache} from './auth'
 /**
  * 获得相对地址
  */
@@ -22,9 +23,7 @@ export function getRelativeBaseUrl(originalBaseUrl) {
       if (baseUrls.length >= 3) {
         const baseUrlPrefix = baseUrls[0] + '//' + baseUrls[2]
         //  console.log('getRelativeBaseUrl---baseUrlPrefix=',baseUrlPrefix)
-        baseUrlSuffix = originalBaseUrl.substring(
-          originalBaseUrl.indexOf(baseUrlPrefix) + baseUrlPrefix.length
-        )
+        baseUrlSuffix = originalBaseUrl.substring(originalBaseUrl.indexOf(baseUrlPrefix) + baseUrlPrefix.length)
         //  console.log('getRelativeBaseUrl---baseUrlSuffix=',baseUrlSuffix)
       }
       if (relativeUrl.lastIndexOf('/') === relativeUrl.length - 1) {
@@ -83,19 +82,14 @@ export function replacePrefix(originalUrl) {
     // console.log('replacePrefix---locationPrefixUrl=',locationPrefixUrl)
     if (orginalPrefixUrl !== locationPrefixUrl) {
       // 获得/demo/#/notice/task需要替换为http://127.0.0.1/demo/#/notice/task
-      let suffixUrl = originalUrl.substring(
-        originalUrl.indexOf(orginalPrefixUrl) + orginalPrefixUrl.length
-      )
+      let suffixUrl = originalUrl.substring(originalUrl.indexOf(orginalPrefixUrl) + orginalPrefixUrl.length)
       if (suffixUrl.indexOf('/') !== 0) {
         suffixUrl = '/' + suffixUrl
       }
       // console.log('replacePrefix---suffixUrl=',suffixUrl)
       if (locationPrefixUrl.lastIndexOf('/') === locationPrefixUrl.length - 1) {
         // 表示以“/”结尾，去掉最后一个“/”
-        locationPrefixUrl = locationPrefixUrl.substring(
-          0,
-          locationPrefixUrl.lastIndexOf('/')
-        )
+        locationPrefixUrl = locationPrefixUrl.substring(0, locationPrefixUrl.lastIndexOf('/'))
       }
       // console.log('replacePrefix---locationPrefixUrl2=',locationPrefixUrl)
       newUrl = locationPrefixUrl + suffixUrl
@@ -132,12 +126,7 @@ export function getLoginUrl() {
     }
     getPortalFrontendUrl()
       .then((portalUrl) => {
-        let loginUrl =
-          portalUrl +
-          '#/login?systemPath=' +
-          systemPath +
-          '&routerPath=' +
-          routerPath
+        let loginUrl = portalUrl + '#/login?systemPath=' + systemPath + '&routerPath=' + routerPath
         if (param) {
           loginUrl += '&' + param
         }
@@ -171,8 +160,7 @@ export function isShowSystemMenu() {
 export function getSystemFrontendUrl(frontendUrl) {
   if (
     window.$vueApp.config.globalProperties.projectModel &&
-    window.$vueApp.config.globalProperties.projectModel ===
-      'developing.model' &&
+    window.$vueApp.config.globalProperties.projectModel === 'developing.model' &&
     window.$vueApp.config.globalProperties.frontUrl
   ) {
     return window.$vueApp.config.globalProperties.frontUrl
@@ -184,8 +172,7 @@ export function getSystemFrontendUrl(frontendUrl) {
 export function getSystemBackendUrl(backendUrl) {
   if (
     window.$vueApp.config.globalProperties.projectModel &&
-    window.$vueApp.config.globalProperties.projectModel ===
-      'developing.model' &&
+    window.$vueApp.config.globalProperties.projectModel === 'developing.model' &&
     window.$vueApp.config.globalProperties.baseURL
   ) {
     return window.$vueApp.config.globalProperties.baseURL
@@ -263,16 +250,12 @@ export function getTimeZone() {
   const dateStr = new Date() + ''
   let timeZone = ''
   if (dateStr.indexOf('GMT') > 0) {
-    const timeZoneSuffix = dateStr
-      .substring(dateStr.indexOf('GMT') + 3, dateStr.indexOf('('))
-      .trim()
+    const timeZoneSuffix = dateStr.substring(dateStr.indexOf('GMT') + 3, dateStr.indexOf('(')).trim()
     const partPrefix = timeZoneSuffix.substring(0, timeZoneSuffix.length - 2)
     const partSuffix = timeZoneSuffix.substring(timeZoneSuffix.length - 2)
     timeZone = 'UTC' + partPrefix + ':' + partSuffix
   } else if (dateStr.indexOf('UTC') > 0) {
-    timeZone =
-      'UTC' +
-      dateStr.substring(dateStr.indexOf('UTC') + 3, dateStr.indexOf('(')).trim()
+    timeZone = 'UTC' + dateStr.substring(dateStr.indexOf('UTC') + 3, dateStr.indexOf('(')).trim()
   }
   return timeZone
 }
@@ -286,8 +269,7 @@ export function setCustomSystemBackendUrl(customSystem) {
     // 表示是生产环境时，需要根据数据库配置获得对应的后端地址
     const backendUrl = window.$authApi.getSystemCacheUrlByCode(customSystem)
     if (backendUrl) {
-      window.$vueApp.config.globalProperties.baseURL =
-        getRelativeBaseUrl(backendUrl)
+      window.$vueApp.config.globalProperties.baseURL = getRelativeBaseUrl(backendUrl)
     }
   }
 }
@@ -305,13 +287,13 @@ export function pushCustomControlValidatorRef(pageCode, refName, ref) {
   pageCustomControlRef.set(refName, ref)
 }
 
-export function removeCustomControlValidatorRef (pageCode, refName) {
-	if (window.customValidatorRef) {
-		const pageCustomControlRef = window.customValidatorRef.get(pageCode)
-		if (pageCustomControlRef) {
-			pageCustomControlRef.delete(refName)
-		}
-	}
+export function removeCustomControlValidatorRef(pageCode, refName) {
+  if (window.customValidatorRef) {
+    const pageCustomControlRef = window.customValidatorRef.get(pageCode)
+    if (pageCustomControlRef) {
+      pageCustomControlRef.delete(refName)
+    }
+  }
 }
 
 export function isMobileBrowser() {
@@ -379,33 +361,28 @@ export function cacheAllLanguagesUtil(http) {
         setAllLanguages(cookieCacheLangs)
         resolve()
       } else {
-        http
-          .get(
-            window.$vueApp.config.globalProperties.baseAPI +
-              '/component/all-languages'
-          )
-          .then((langList) => {
-            const langResult = {}
-            if (langList) {
-              langList.forEach((item) => {
-                // 例如：zh_CN、en_US
-                const lang = item.value
-                let langShort
-                if (lang.indexOf('_') > 0) {
-                  langShort = lang.substring(0, lang.indexOf('_'))
-                }
-                if (langShort && langShort === 'zh') {
-                  // 中文处理，为了兼容历史逻辑
-                  langShort = 'cn'
-                }
-                if (langShort) {
-                  langResult[langShort] = lang
-                }
-              })
-            }
-            cacheLangs(langResult)
-            resolve()
-          })
+        http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/all-languages').then((langList) => {
+          const langResult = {}
+          if (langList) {
+            langList.forEach((item) => {
+              // 例如：zh_CN、en_US
+              const lang = item.value
+              let langShort
+              if (lang.indexOf('_') > 0) {
+                langShort = lang.substring(0, lang.indexOf('_'))
+              }
+              if (langShort && langShort === 'zh') {
+                // 中文处理，为了兼容历史逻辑
+                langShort = 'cn'
+              }
+              if (langShort) {
+                langResult[langShort] = lang
+              }
+            })
+          }
+          cacheLangs(langResult)
+          resolve()
+        })
       }
     } else {
       resolve()
@@ -437,8 +414,8 @@ export function windowOpenUrl(url, projectModel) {
     // _systemName_参数用于设置浏览器页签名的，国际化使用，在imatrix ui的beforeEach中有使用这个参数
     if (param) {
       jumpUrl += '&' + param
-		}
-		if (jumpUrl.indexOf('_systemName_=') === -1) {
+    }
+    if (jumpUrl.indexOf('_systemName_=') === -1) {
       jumpUrl += '&_systemName_=' + systemName
     }
     window.open(jumpUrl)
@@ -455,14 +432,13 @@ export function windowOpenUrl(url, projectModel) {
   }
 }
 
-
 // 首次加载业务系统时，缓存当前用户语言
 export function cacheCurrentLanguageUtil(http) {
   return new Promise((resolve, reject) => {
     const token = getToken()
     if (token) {
       const currentLanguage = getLanguage()
-      if (currentLanguage && currentLanguage!=='undefined') {
+      if (currentLanguage && currentLanguage !== 'undefined') {
         resolve(currentLanguage)
       } else {
         http.get(window.$vueApp.config.globalProperties.baseAPI + '/acs/user-languages').then((currentLanguage) => {
@@ -476,63 +452,118 @@ export function cacheCurrentLanguageUtil(http) {
   })
 }
 export function setProjectSetting() {
-		const projectSettingCache = Cookies.get("PROJECT_SETTINGS")
-		let projectSettings = null
-		if(projectSettingCache){
-			projectSettings = JSON.parse(projectSettingCache)
-			this.setLogoUrl(projectSettings)
-		} else {
-			this.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
-				Cookies.set("PROJECT_SETTINGS", JSON.stringify(data))
-				projectSettings = data
-			})
-		}
-		if (projectSettings.browserImageUuid) {
-				const linkElement = document.getElementById('ambBrowserIcon');
-				if (linkElement) {
-					linkElement.href = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon'
-				} 
-		}
+  const projectSettingCache = Cookies.get('PROJECT_SETTINGS')
+  let projectSettings = null
+  if (projectSettingCache) {
+    projectSettings = JSON.parse(projectSettingCache)
+    this.setLogoUrl(projectSettings)
+  } else {
+    this.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
+      Cookies.set('PROJECT_SETTINGS', JSON.stringify(data))
+      projectSettings = data
+    })
+  }
+  if (projectSettings.browserImageUuid) {
+    const linkElement = document.getElementById('ambBrowserIcon')
+    if (linkElement) {
+      linkElement.href = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon'
+    }
+  }
 }
 
 // 动态加载css
 export function loadCSS() {
   var theme
-    if(!theme){
-        theme = localStorage.getItem('CURRENT_THEME')
-    }
-    if(!theme){
-      console.error('皮肤主题为空!')
-      return
-    }
-    const baseAPI = localStorage.getItem('_baseAPI_')
-    if(baseAPI){
-      const href = replacePrefix(baseAPI) + '/component/theme/load-theme?theme=' + theme + '&_t_=' + new Date().getTime()
-      let isHasLink = true
-      let cssLink = document.getElementById('_loadTheme_')
-      if(!cssLink){
-        cssLink = document.createElement("link")
-        isHasLink = false
-      }
-      cssLink.rel = "stylesheet";
-      cssLink.type = "text/css";
-      cssLink.id="_loadTheme_"
-      cssLink.href = href;
-      if(!isHasLink){
-        document.getElementsByTagName("head")[0].appendChild(cssLink)
-      }
+  if (!theme) {
+    theme = localStorage.getItem('CURRENT_THEME')
+  }
+  if (!theme) {
+    console.error('皮肤主题为空!')
+    return
+  }
+  const baseAPI = localStorage.getItem('_baseAPI_')
+  if (baseAPI) {
+    const href = replacePrefix(baseAPI) + '/component/theme/load-theme?theme=' + theme + '&_t_=' + new Date().getTime()
+    let isHasLink = true
+    let cssLink = document.getElementById('_loadTheme_')
+    if (!cssLink) {
+      cssLink = document.createElement('link')
+      isHasLink = false
     }
-    const body = document.querySelector('body')
-    if(body){
-      body.setAttribute('class', theme)
+    cssLink.rel = 'stylesheet'
+    cssLink.type = 'text/css'
+    cssLink.id = '_loadTheme_'
+    cssLink.href = href
+    if (!isHasLink) {
+      document.getElementsByTagName('head')[0].appendChild(cssLink)
     }
   }
+  const body = document.querySelector('body')
+  if (body) {
+    body.setAttribute('class', theme)
+  }
+}
 
-
-  /**
+/**
  * 获取UUID,去掉破折号
  * @returns
  */
 export function getUuidv4() {
   return uuidv4().replace(/-/g, '')
+}
+
+export function replacePlaceholders(template, ...args) {
+  return template.replace(/{(\d+)}/g, (match, index) => {
+    return typeof args[index] !== 'undefined' ? args[index] : match
+  })
+}
+
+
+function isOpenMobileGateway () {
+  // 系统参数设置中配置的是否开启移动网关，没有配置默认是开启的
+  let isOpenMobileGatewayCache = getCookieCache('IS_OPEN_MOBILE_GATEWAY')
+  if (isOpenMobileGatewayCache === undefined || isOpenMobileGatewayCache === null) {
+    isOpenMobileGatewayCache = 'true'
+  }
+  return isOpenMobileGatewayCache
+}
+/**
+ * 获得替换域名后的url
+ * @param {*} url
+ * @returns
+ */
+export function getReplaceUrlDomain (url) {
+  const isOpenMobileGatewayCache = isOpenMobileGateway()
+  console.log('===getReplaceUrlDomain==isOpenMobileGatewayCache=', isOpenMobileGatewayCache)
+  if (isOpenMobileGatewayCache === 'true' && url !== undefined && Vue.prototype.replaceUrl) {
+    // 表示需要替换url中的"https://域名"
+    const baseApi = Vue.prototype.baseAPI
+    if ((url + '').indexOf(Vue.prototype.replaceUrl + '/') < 0 && (url + '').indexOf('://') > 0) {
+      // 表示路径还未替换
+      console.log('===getReplaceUrlDomain==url.indexOf(Vue.prototype.replaceUrl) !== 0')
+      const prefixUrl1 = baseApi.substring(0, baseApi.indexOf('://'))
+      const urlSuffix1 = baseApi.substring(baseApi.indexOf('://') + 3)
+      const domainUrl1 = urlSuffix1.substring(0, urlSuffix1.indexOf('/'))
+      const prefixUrlBase = prefixUrl1 + '://' + domainUrl1
+      const prefixUrl2 = baseApi.substring(0, baseApi.indexOf('://'))
+      let urlSuffix = url.substring(url.indexOf('://') + 3)
+      const domainUrl2 = urlSuffix.substring(0, urlSuffix.indexOf('/'))
+      const prefixUrl = prefixUrl2 + '://' + domainUrl2
+      if (prefixUrl === prefixUrlBase) {
+        urlSuffix = urlSuffix.substring(urlSuffix.indexOf('/'))
+        url = Vue.prototype.replaceUrl + urlSuffix
+        console.log('===getReplaceUrlDomain==url=', url)
+      }
+    } else {
+      console.log('===getReplaceUrlDomain==has-replace-url=', url)
+    }
+  }
+  return url
+}
+
+export function formatFileName (fileName) {
+  if (fileName) {
+    fileName = fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
+  }
+  return fileName
 }

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

@@ -5,7 +5,7 @@ import {
   getEntityFieldValue,
   setEntityFieldValue,
 } from './util'
-import { getSystemFrontendUrl, getUuidv4 } from './common-util'
+import { getSystemFrontendUrl, getUuidv4, isMobileBrowser } from './common-util'
 // 解析初始化条件，api方法;additionalParamMap是上个页面传过来的附加参数集合
 export function initialization(
   jumpPage,
@@ -365,6 +365,7 @@ function jumpToPageTwo(
     if (!jumpPageUrl) {
       return
     }
+    const isMobile = isMobileBrowser()
     if (jumpPageUrl.indexOf('page:') === 0) {
       // 表示是自定义系统跳转页面编码
       jumpWithSuperPage(
@@ -374,7 +375,8 @@ function jumpToPageTwo(
         jumpPageSetting,
         ids,
         buttonCode,
-        isHasIdParam
+        isHasIdParam,
+        isMobile
       ).then((openPageParams) => {
         resolve(openPageParams)
       })
@@ -398,7 +400,8 @@ function jumpToPageTwo(
         path = frontendUrl + '/#' + path
       }
       const systemName = getSystemNameWithLanguage(system)
-      jumpToPageWithFullPath(
+      // 移动端时会有返回值
+      const fullPath = jumpToPageWithFullPath(
         dataId,
         path,
         additionalParameterStr,
@@ -406,9 +409,14 @@ function jumpToPageTwo(
         ids,
         buttonCode,
         isHasIdParam,
-        systemName
+        systemName,
+        isMobile
       )
-      resolve()
+      if(fullPath){
+        // 移动端时返回的全路径
+        jumpPageSetting._path = fullPath
+      }
+      resolve(jumpPageSetting)
     }
   })
 }
@@ -427,7 +435,8 @@ function jumpToPageWithFullPath(
   ids,
   buttonCode,
   isHasIdParam,
-  systemName
+  systemName,
+  isMobile
 ) {
   path = packagePathParams(
     dataId,
@@ -451,6 +460,10 @@ function jumpToPageWithFullPath(
       path += additionalParameterStr + systemNameParam
     }
   }
+  if(isMobile){
+    // 如果是移动端返回全路径即可
+    return path
+  }
   let jumpMode = 'refresh'
   if (jumpPage) {
     if (jumpPage.jumpPageOpenMode) {
@@ -574,7 +587,8 @@ function jumpWithSuperPage(
   jumpPageSetting,
   ids,
   buttonCode,
-  isHasIdParam
+  isHasIdParam,
+  isMobile
 ) {
   return new Promise((resolve, reject) => {
     // 表示是自定义系统跳转页面编码
@@ -587,10 +601,8 @@ function jumpWithSuperPage(
     )
     const pageCode = getPageCode(jumpPageUrl)
     let jumpMode = 'refresh'
-    if (jumpPageSetting) {
-      if (jumpPageSetting.jumpPageOpenMode) {
+    if (jumpPageSetting && jumpPageSetting.jumpPageOpenMode) {
         jumpMode = jumpPageSetting.jumpPageOpenMode
-      }
     }
     const jumpJsonData = {
       jumpMode: jumpMode,
@@ -626,6 +638,7 @@ function jumpWithSuperPage(
         popPageSetting.isRefreshWhenClosePopup = jumpPageSetting.isRefreshWhenClosePopup
       } 
       popPageSetting._path = path
+      popPageSetting.customSystem = system.code
       resolve(popPageSetting)
     } else if (jumpMode === 'newTab') {
       // 新页签打开
@@ -642,8 +655,16 @@ function jumpWithSuperPage(
         ) +
         '&_t_=' +
         new Date().getTime()
-      window.open(path)
-      resolve()
+        const popPageSetting = {
+          _path: path,
+          pageCode: pageCode,
+          customSystem: system.code
+        }
+      if(!isMobile){
+        // 不是移动端时直接open打开pc新页签
+        window.open(path)
+      }
+      resolve(popPageSetting)
     } else {
       // 刷新页面
       const queryParam = {
@@ -651,7 +672,7 @@ function jumpWithSuperPage(
         customSystem: system.code,
         jumpMode: jumpMode,
         buttonCode: buttonCode,
-        ids: ids ? ids.join(',') : '',
+        ids: ids ? ids.join(',') : ''
       }
       if (
         jumpPageSetting.isNeedId === undefined ||