agilebuilder-ui 1.0.621 → 1.0.962

package/src/i18n/langs/cn.js

@@ -81,7 +81,10 @@ const cn = {
         asyncExport: '正在异步导出，请等待消息通知!',
         selectedWorkingGroup: '已选工作组',
         forbiddenExceptionLinkUrl: '请点击进行权限申请',
-        forbiddenExceptionLinkUser: '如有疑问请联系'
+        forbiddenExceptionLinkUser: '如有疑问请联系',
+        uploadFileTip: '上传的文件不超过{fileSize}M',
+        asyncExportJumpMsg: '或点击我跳转到下载页面',
+        mustFill: '{label} 必须填写'
     },
     // 列表组件
     superGrid: {
@@ -123,7 +126,10 @@ const cn = {
         previewTitleWhenNotImg: '非图片格式，使用其它方式预览',
         refresh: '刷新',
         open: '展开',
-        fold: '收起'
+        fold: '收起',
+        prevRow: '上一行',
+        nextRow: '下一行',
+        detail: '详情'
     },
     // 部门树组件
     departmentTree: {},
@@ -162,7 +168,14 @@ const cn = {
         removeUser: '移除用户',
         email: '邮箱',
         loginName: '登录名',
-    		superiorDeptNameFullPath: '组织全路径'
+        superiorDeptNameFullPath: '组织全路径',
+        user: '用户',
+        groupName: '名称',
+        groupForm: '群组表单',
+        groupList: '群组维护',
+        group: '群组',
+        orgTree: '组织树',
+        groupNameNotEmpty: '群组名称必填'
     },
     // 工作组树
     workgroupTree: {
@@ -173,6 +186,7 @@ const cn = {
         workingGroupName: '工作组名称',
         workingGroupNumber: '工作组编号',
         workgroupDescription: '工作组描述',
+        selectResultInfo: '{num}个工作组'
     },
     // 流程按钮组件。save、submit等属性名不能随便改，和后台的ButtonType枚举名保持一致
     workflowButton: {
@@ -257,6 +271,8 @@ const cn = {
         operating: '操作',
         uploadSucceeded: '上传成功',
         theNumberOfUploadsExceedsTheLimitTheLimitIs: '上传数量超过限制,限制数量为',
+        image: '图片',
+        video: '视频'
     },
     messageVideo: {
         attemptingToIdentify: '正在尝试识别....',

package/src/i18n/langs/en.js

@@ -83,7 +83,10 @@ 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',
+        asyncExportJumpMsg: 'Or click me to jump to download page.',
+        mustFill: '{label} must fill'
     },
     superGrid: {
         columnConfig: 'Column Config',
@@ -128,6 +131,9 @@ const en = {
         refresh: 'Refresh',
         open: 'Open',
         fold: 'Fold',
+        prevRow: 'Prev Row',
+        nextRow: 'Next Row',
+        detail: 'Detail'
     },
     departmentTree: {},
     departmentTreeInline: {
@@ -164,7 +170,14 @@ const en = {
         removeUser: 'Remove User',
         email: 'Email',
         loginName: 'Login Name',
-    		superiorDeptNameFullPath: 'Department full path'
+        superiorDeptNameFullPath: 'Department full path',
+        user: 'User',
+        groupName: 'Name',
+        groupForm: 'Group Form',
+        groupList: 'Group List',
+        group: 'Group',
+        orgTree: 'Organization Tree',
+        groupNameNotEmpty: 'Group name is required'
     },
     // 工作组树
     workgroupTree: {
@@ -175,6 +188,7 @@ const en = {
         workingGroupName: 'Working Group Name',
         workingGroupNumber: 'Working Group Number',
         workgroupDescription: 'Workgroup Description',
+        selectResultInfo: '{num} workgroups'
     },
     // 流程按钮组件。save、submit等属性名不能随便改，和后台的ButtonType枚举名保持一致
     workflowButton: {
@@ -267,6 +281,8 @@ const en = {
         uploadSucceeded: 'Upload succeeded',
         theNumberOfUploadsExceedsTheLimitTheLimitIs:
             'The number of uploads exceeds the limit. The limit is',
+        image: 'Image',
+        video: 'Video'
     },
     messageVideo: {
         attemptingToIdentify: 'Attempting to identify',

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)
@@ -83,10 +77,15 @@ router.beforeEach((to, from, next) => {
       setToken(token)
     }
   }
-  if (to.query && to.query._systemName_) {
-    // 表示需要设置浏览器页签名
-    window.top.document.title = to.query._systemName_
-  }
+  // if (to.query) {
+  //   if (to.query._systemName_) {
+  //     window.top.document.title = to.query._systemName_
+  //   }
+  //   if (to.query.customSystem) {
+  //     window.$vueApp.config.globalProperties.currentSystem = to.query.customSystem
+  //   }
+  //   // 表示需要设置浏览器页签名
+  // }
   // console.log('router.beforeEach-getToken()=', token)
   // 表示需要显示菜单。为了控制是否需要走获得有权限的菜单集合的接口。单点登录跳转到表单页面时不需要请求菜单，提高页面显示速度。
   let isNeedMenu
@@ -100,14 +99,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 })
@@ -115,104 +109,105 @@ router.beforeEach((to, from, next) => {
     } else {
       console.log('router.beforeEach-to.path!=login')
       if (store.getters.name === '') {
+        if (to.query) {
+          if (to.query._systemName_) {
+            window.top.document.title = to.query._systemName_
+          }
+          if (to.query.customSystem && to.query.customSystem !== 'undefined' && to.query.customSystem !== 'null') {
+            window.$vueApp.config.globalProperties.currentSystem = to.query.customSystem
+          }
+          // 表示需要设置浏览器页签名
+        }
         // 表示刷新了页面（例如点击了一级菜单）后，会重新走该方法
         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')
+                    console.log('getDevPlatformPermissions---devpRoleCodes=', devpRoleCodes)
+                    return store.dispatch('getDevPlatformPermissions', devpRoleCodes)
+                  } else {
+                    // 开发平台本身的功能或直接平台功能时
+                    // console.log('开发平台本身的功能或直接平台功能时')
+                    let systemCode = to.query ? to.query.customSystem: null
+                    if (!systemCode) {
+                      systemCode = window.$vueApp.config.globalProperties.currentSystem
+                    }
+                    console.log('3333systemCode=', systemCode)
+                    return store.dispatch('getCurrentUserPermissions', {loginName:user.loginName, systemCode})
+                  }
+                })
+                .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 +223,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/store/modules/user.js

@@ -1,19 +1,13 @@
 import ssoService from '../../api/sso-service'
 import {
   getUsername,
-  removeAllLanguages,
+  setUsername, removeUsername, removeCurrentUser, clearPermission,
   removeAllThemes,
-  removeCurrentUser,
   removeDevpPermissions,
-  removeLanguage,
   removeTheme,
-  removePublishControl,
-  removeToken,
-  removeUsername,
   setCurrentUser,
   setLanguage,
   setToken,
-  setUsername,
   removeProjectSettings,
   removeProjectCode,
   setTheme
@@ -22,10 +16,9 @@ import {
 import {
   getMenus,
   getPermissions,
-  removeMenus,
-  removePermissions,
   setMenus,
-  setPermissions
+  setPermissions,
+  removeAllSystemPermissions
 } from '../../utils/permissionAuth'
 
 import {isPlateSys} from '../../utils/common-util'
@@ -53,6 +46,8 @@ const user = {
   actions: {
     // 登录
     login({ commit }, userInfo) {
+      // 登录时先清除缓存的登录信息和权限信息
+      clearPermission()
       const username = userInfo.username.trim()
       return new Promise((resolve, reject) => {
         ssoService
@@ -86,6 +81,7 @@ const user = {
     },
     // 登录
     loginWithValidateCode({ commit }, userInfo) {
+      console.log('loginWithValidateCode----userInfo=', userInfo)
       const username = userInfo.username.trim()
       return new Promise((resolve, reject) => {
         ssoService
@@ -97,6 +93,7 @@ const user = {
             userInfo.imageCodeKey
           )
           .then((data) => {
+            console.log('loginWithValidateCode2222----data=', data)
             // const data = response.data
             setToken(data.jwt)
             setLanguage(data.language)
@@ -140,6 +137,8 @@ const user = {
           })
         }
         if (loginName) {
+          // 登录时清除缓存的资源
+          removeAllSystemPermissions()
           // setToken(tokenInfo.jwt)
           // commit('setToken', tokenInfo.jwt)
           ssoService
@@ -198,20 +197,11 @@ const user = {
           .logout(state.token)
           .then((data) => {
             commit('setToken', '')
-            removeToken()
-            removeLanguage()
             removeTheme()
-            removeAllLanguages()
             removeAllThemes()
 
             commit('setName', '')
-            removeUsername()
-            removeCurrentUser()
-
-            removePermissions()
-  
-            removeMenus()
-            removePublishControl()
+            clearPermission()
             removeDevpPermissions()
             removeProjectSettings()
             removeProjectCode()
@@ -227,20 +217,11 @@ const user = {
     clearToken({ commit }) {
       return new Promise((resolve) => {
         commit('setToken', '')
-        removeToken()
-        removeLanguage()
         removeTheme()
-        removeAllLanguages()
         removeAllThemes()
 
         commit('setName', '')
-        removeUsername()
-        removeCurrentUser()
-
-        removePermissions()
-
-        removeMenus()
-        removePublishControl()
+        clearPermission()
         removeDevpPermissions()
         removeProjectSettings()
         removeProjectCode()
@@ -250,9 +231,12 @@ const user = {
     },
 
     // 获得当前用户权限集合
-    getCurrentUserPermissions({ commit }, loginName, systemCode) {
+    getCurrentUserPermissions({ commit }, param) {
       return new Promise((resolve, reject) => {
-        let storePermissions = getPermissions()
+        const loginName = param.loginName
+        const systemCode = param.systemCode
+        let storePermissions = getPermissions(systemCode)
+        console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions=', storePermissions)
         // 这个判断会导致资源不会重新加载？？
         if (
           typeof storePermissions === 'undefined' ||
@@ -264,7 +248,7 @@ const user = {
             .then((permissions) => {
               let currentPermissions = ['index']
               currentPermissions = currentPermissions.concat(permissions)
-              storePermissions = setPermissions(currentPermissions)
+              storePermissions = setPermissions(currentPermissions, systemCode)
               resolve(storePermissions)
             })
             .catch((error) => {
@@ -323,6 +307,21 @@ const user = {
       })
     },
 
+    // 判断当前用户密码是否过期
+    isPasswordExpiredWithValidateCode({ commit }, userInfo) {
+      const username = userInfo.username.trim()
+      return new Promise((resolve, reject) => {
+        ssoService
+          .isPasswordExpiredWithValidateCode(username, userInfo.password, userInfo.validCode, userInfo.imageCodeKey )
+          .then((message) => {
+            resolve(message)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+
     updatePassword({ commit }, map) {
       return new Promise((resolve, reject) => {
         ssoService

package/src/styles/index.scss

@@ -16,6 +16,7 @@
 @import './theme/green/index.scss';
 @import './theme/green/sidebar.scss';
 @import './display-layout.scss';
+@import "./table.scss";
 
 body {
   overflow: hidden;

package/src/styles/table.scss

@@ -0,0 +1,12 @@
+.ocean-blue,.green,.dark-blue{
+  .el-table th.el-table__cell {
+    background-color: transparent;
+  }
+  .el-table.is-scrolling-right th.el-table-fixed-column--right{
+    background-color: transparent;
+  }
+  .el-table.is-scrolling-left th.el-table-fixed-column--left{
+    background-color: transparent;
+  }
+}
+

package/src/styles/theme/dark-blue/button.scss

@@ -78,10 +78,10 @@
 
   //page-runtime 头部按钮样式
   .page-runtime-header-btn{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     display: inline-block;
   }
   .page-runtime-header-btn + .page-runtime-header-btn{
-    margin-left: 10px;
+    margin-left: 5px;
   }
 }

package/src/styles/theme/dark-blue/index.scss

@@ -99,7 +99,7 @@
   .app-container {
     // padding: 20px;
     // padding: 0px;
-    padding: 20px 24px;
+    padding: 10px 12px;
     background: #FFFFFF;
     border-radius: 6px;
     box-shadow: 0px 1px 8px 0px #00000019;

package/src/styles/theme/dark-blue/sidebar.scss

@@ -265,4 +265,14 @@
       }
     }
   }
+
+  运行时工具栏样式
+  .amb-widget-tools-parent{
+    margin-bottom: 20px;
+  }
+  .amb-widget-container-tool{
+    display: flex;
+    overflow-x: auto;
+    padding: 10px 0;
+  }
 }