agilebuilder-ui 1.0.70 → 1.0.71-tmp1

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/permission.js

@@ -8,17 +8,17 @@ import { ElMessage as Message } from 'element-plus'
 import * as Vue from 'vue'
 import authApi from './utils/auth-api'
 
-import {cacheAllLanguagesUtil, getLocaleByLang, cacheCurrentLanguageUtil} from './utils/common-util'
+import { cacheAllLanguagesUtil, getLocaleByLang, cacheCurrentLanguageUtil } from './utils/common-util'
 
 // 首次加载业务系统时，获得用户的语言
 function initUserLanguage() {
   return new Promise((resolve, reject) => {
-      cacheCurrentLanguageUtil(window.$http).then((lang) => {
-              const locale = getLocaleByLang(lang)
-              // i18n.locale = locale // 关键语句
-              window.$locale = locale
-              resolve()
-          })
+    cacheCurrentLanguageUtil(window.$http).then((lang) => {
+      const locale = getLocaleByLang(lang)
+      // i18n.locale = locale // 关键语句
+      window.$locale = locale
+      resolve()
+    })
   })
 }
 
@@ -27,13 +27,7 @@ function cacheAllLanguages() {
   return cacheAllLanguagesUtil(window.$http)
 }
 
-const whiteList = [
-  '/login',
-  '/update-password',
-  '/forget-password',
-  '/reset-password',
-  '/redirect',
-] // 不重定向白名单
+const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
 
 let devpJWTKey = '_devpJWT'
 let runDevpJWTKey = '_runDevpJWT'
@@ -59,12 +53,12 @@ router.beforeEach((to, from, next) => {
   let token
   // 是否是开发环境功能
   let isDevp = isDevpSystem()
-  if(authApi.getSessionCache(runDevpJWTKey)) {
+  if (authApi.getSessionCache(runDevpJWTKey)) {
     // setToken(authApi.getSessionCache(runDevpJWTKey))
     token = authApi.getSessionCache(runDevpJWTKey)
     console.log('router.beforeEach-authApi.getSessionCache(_runDevpJWT)=', authApi.getSessionCache(runDevpJWTKey))
   }
-  if(!token) {
+  if (!token) {
     token = getToken()
   }
   console.log('router.beforeEach-token=', token)
@@ -100,14 +94,9 @@ router.beforeEach((to, from, next) => {
   }
   console.log('iMatrix-router.beforeEach2-isNeedMenu==', isNeedMenu)
   if (
-      ([
-            '/update-password',
-            '/forget-password',
-            '/reset-password',
-            '/redirect',
-          ].indexOf(to.path) === -1 ||
-          store.getters.whiteList.indexOf(to.path) !== -1) &&
-      token
+    (['/update-password', '/forget-password', '/reset-password', '/redirect'].indexOf(to.path) === -1 ||
+      store.getters.whiteList.indexOf(to.path) !== -1) &&
+    token
   ) {
     if (to.path === '/login') {
       next({ path: '/', query: to.query })
@@ -118,101 +107,87 @@ router.beforeEach((to, from, next) => {
         // 表示刷新了页面（例如点击了一级菜单）后，会重新走该方法
         console.log('router.beforeEach-store.getters.name === ""')
         store
-            .dispatch('isLoginTimeOut')
-            .then((result) => {
-              if (result === true) {
-                store.dispatch('clearToken').then(() => {
-                  next({ path: '/', replace: true })
-                  NProgress.done()
-                })
-              } else {
-                store
-                    .dispatch('getCurrentUser')
-                    .then((user) => {
-                      return new Promise((resolve, reject) => {
-                        initUserLanguage().then(()=>{
-                          resolve(user)
-                        })
-                      })
-                    }).then((user)=>{
-                      return new Promise((resolve, reject) => {
-                        cacheAllLanguages().then(()=>{
-                          resolve(user)
-                        })
-                      })
-                    }).then((user)=>{
-                      console.log('router.beforeEach-getCurrentUser')
-                      const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
-                      if(!isDevp && devpRoleCodes){
-                          // 表示是开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码，对应运行平台的岗位编码
-                      // console.log('开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码时，!isDevp && devpRoleCodes')
-                          return store.dispatch(
-                            'getDevPlatformPermissions',
-                            devpRoleCodes
-                          )
-                      } else {
-                        // 开发平台本身的功能或直接平台功能时
-                      // console.log('开发平台本身的功能或直接平台功能时')
-                        return store.dispatch(
-                            'getCurrentUserPermissions',
-                            user.loginName
-                        )
-                      }
-                    })
-                    .then((permissions) => {
-                      return store.dispatch('generateRoutes', permissions)
-                    })
-                    .then(() => {                      
-                      if (isNeedMenu) {
-                        // 需要显示左侧菜单 并 不是开发平台时，开发平台的菜单需要在设计项目时获得
-                        console.log('iMatrix-router.beforeEach2-getPermissionMenus')
-                        return store.dispatch('getPermissionMenus', window.$vueApp.config.globalProperties.currentSystem)
-                      } else {
-                        return new Promise((resolve, reject) => {
-                          resolve()
-                        })
-                      }
+          .dispatch('isLoginTimeOut')
+          .then((result) => {
+            if (result === true) {
+              store.dispatch('clearToken').then(() => {
+                next({ path: '/', replace: true })
+                NProgress.done()
+              })
+            } else {
+              store
+                .dispatch('getCurrentUser')
+                .then((user) => {
+                  return new Promise((resolve, reject) => {
+                    initUserLanguage().then(() => {
+                      resolve(user)
                     })
-                    .then(() => {
-                      // 根据roles权限生成可访问的路由表
-                      console.log(
-                          'router.beforeEach-generateRoutes==to=',
-                          to,
-                          ',from=',
-                          from
-                      )
-                      store.getters.protectedRouters.forEach(item =>{
-                        router.addRoute(item)
-                      })
-                      // 404等错误路由一定要放到受权限保护的路由之后
-                      // router.addRoutes(errorRouterMap)
-                      window.sessionStorage.setItem(
-                          new Date().getTime() + '-name=null-from~~toPath',
-                          from.path + '~~' + to.path
-                      )
-                      next({ ...to, replace: true })
+                  })
+                })
+                .then((user) => {
+                  return new Promise((resolve, reject) => {
+                    cacheAllLanguages().then(() => {
+                      resolve(user)
                     })
-                    .catch((err) => {
-                      store.dispatch('clearToken').then(() => {
-                        Message.error(
-                            err || 'Verification failed, please login again'
-                        )
-                        next({ path: '/' })
-                      })
+                  })
+                })
+                .then((user) => {
+                  console.log('router.beforeEach-getCurrentUser')
+                  const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
+                  if (!isDevp && devpRoleCodes) {
+                    // 表示是开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码，对应运行平台的岗位编码
+                    // console.log('开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码时，!isDevp && devpRoleCodes')
+                    return store.dispatch('getDevPlatformPermissions', devpRoleCodes)
+                  } else {
+                    // 开发平台本身的功能或直接平台功能时
+                    // console.log('开发平台本身的功能或直接平台功能时')
+                    return store.dispatch('getCurrentUserPermissions', user.loginName)
+                  }
+                })
+                .then((permissions) => {
+                  return store.dispatch('generateRoutes', permissions)
+                })
+                .then(() => {
+                  if (isNeedMenu) {
+                    // 需要显示左侧菜单 并 不是开发平台时，开发平台的菜单需要在设计项目时获得
+                    console.log('iMatrix-router.beforeEach2-getPermissionMenus')
+                    return store.dispatch('getPermissionMenus', window.$vueApp.config.globalProperties.currentSystem)
+                  } else {
+                    return new Promise((resolve, reject) => {
+                      resolve()
                     })
-              }
-            })
-            .catch((err) => {
-              store.dispatch('clearToken').then(() => {
-                Message.error(err || 'Verification failed, please login again')
-                next({ path: '/' })
-              })
+                  }
+                })
+                .then(() => {
+                  // 根据roles权限生成可访问的路由表
+                  console.log('router.beforeEach-generateRoutes==to=', to, ',from=', from)
+                  store.getters.protectedRouters.forEach((item) => {
+                    router.addRoute(item)
+                  })
+                  // 404等错误路由一定要放到受权限保护的路由之后
+                  // router.addRoutes(errorRouterMap)
+                  window.sessionStorage.setItem(
+                    new Date().getTime() + '-name=null-from~~toPath',
+                    from.path + '~~' + to.path
+                  )
+                  next({ ...to, replace: true })
+                })
+                .catch((err) => {
+                  store.dispatch('clearToken').then(() => {
+                    Message.error(err || 'Verification failed, please login again')
+                    next({ path: '/' })
+                  })
+                })
+            }
+          })
+          .catch((err) => {
+            store.dispatch('clearToken').then(() => {
+              Message.error(err || 'Verification failed, please login again')
+              next({ path: '/' })
             })
+          })
       } else {
-        console.log(
-            'router.beforeEach-store.getters.name ==',
-            store.getters.name
-        )
+        console.log('router.beforeEach-store.getters.name ==', store.getters.name)
         if (isNeedMenu) {
           // 需要显示左侧菜单
           let systemCode = window.$vueApp.config.globalProperties.currentSystem
@@ -228,10 +203,7 @@ router.beforeEach((to, from, next) => {
       }
     }
   } else {
-    if (
-        whiteList.indexOf(to.path) !== -1 ||
-        store.getters.whiteList.indexOf(to.path) !== -1
-    ) {
+    if (whiteList.indexOf(to.path) !== -1 || store.getters.whiteList.indexOf(to.path) !== -1) {
       next()
     } else {
       // 必须使用to.fullPath，fullPath是带有参数的，to.path没有参数，会导致跳转到的页面参数丢失

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