agilebuilder-ui 1.1.38 → 1.1.39-sit2

package/packages/workflow-history-list/src/workflow-history-list.vue

@@ -15,7 +15,7 @@
     row-key="uuid"
     style="width: 100%"
   >
-    <el-table-column :label="$t('workflowHistoryList.index')" align="left" width="80px">
+    <el-table-column :label="$t('workflowHistoryList.index')" align="center" width="80">
       <template v-slot="scope">
         {{ scope.$index + 1 }}
       </template>
@@ -35,13 +35,13 @@
         }}</span>
       </template>
     </el-table-column>
-    <el-table-column :label="$t('workflowHistoryList.operator')" align="left" width="250">
+    <el-table-column :label="$t('workflowHistoryList.operator')" align="left" width="120">
       <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.creatorName }}</span>
       </template>
     </el-table-column>
-    <el-table-column :label="$t('workflowHistoryList.operatorLg')" align="left" width="250">
+    <el-table-column :label="$t('workflowHistoryList.operatorLg')" align="left" width="160">
       <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
         <span v-else>{{ scope.row.creator }}</span>
@@ -59,6 +59,28 @@
         <span v-else>{{ scope.row.formatCreatedTime }}</span>
       </template>
     </el-table-column>
+    <el-table-column :label="$t('workflowHistoryList.taskState')" align="left" width="100">
+      <template v-slot="scope">
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
+        <el-tag v-else-if="scope.row.current" type="warning">{{$t('workflowHistoryList.taskStateDoing')}}</el-tag>
+        <el-tag v-else type="success">{{$t('workflowHistoryList.taskStateDone')}}</el-tag>
+      </template>
+    </el-table-column>
+    <el-table-column :label="$t('workflowHistoryList.processingDuration')" align="center" width="120">
+      <template v-slot="scope">
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
+        <span v-else-if="!scope.row.copyTask">{{ scope.row.processingDuration }}</span>
+      </template>
+    </el-table-column>
+    <el-table-column :label="$t('workflowHistoryList.isOverdue')" align="center" width="100">
+      <template v-slot="scope">
+        <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
+        <span v-else>
+          <div v-if="scope.row.overdueDuration && scope.row.overdueDuration > 0" class="red-circle"/>
+          <div v-else class="green-circle"/>
+        </span>
+      </template>
+    </el-table-column>
     <el-table-column :label="$t('workflowHistoryList.operation')" align="left" width="400">
       <template v-slot="scope">
         <span v-if="scope.row.historyType && scope.row.historyType === 'PROCESS_END'" />
@@ -286,3 +308,19 @@ export default {
   }
 }
 </script>
+<style scoped>
+.red-circle {
+  width: 20px;         /* 圆圈的宽度 */
+  height: 20px;        /* 圆圈的高度 */
+  background-color: red; /* 背景色设置为红色 */
+  border-radius: 50%;   /* 边框半径设置为50%，使元素变为圆形 */
+  display: inline-block; /* 确保元素以块级元素显示 */
+}
+.green-circle {
+  width: 20px;         /* 圆圈的宽度 */
+  height: 20px;        /* 圆圈的高度 */
+  background-color: rgb(11, 177, 121); /* 背景色设置为红色 */
+  border-radius: 50%;   /* 边框半径设置为50%，使元素变为圆形 */
+  display: inline-block; /* 确保元素以块级元素显示 */
+}
+</style>

package/src/api/sso-service.js

@@ -61,7 +61,7 @@ function logout() {
 }
 
 function getCurrentUserPermissionsBySystem(loginName, systemCode) {
-  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, isMobileBrowser())
+  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, 'isMobile=',isMobileBrowser(),'systemCode=',systemCode)
   if(isMobileBrowser()){
     return getCurrentUserMobilePermissions(loginName)
   } else {
@@ -72,6 +72,7 @@ function getCurrentUserPermissionsBySystem(loginName, systemCode) {
         systemCode = window.$vueApp.config.globalProperties.systemCode
       }
     }
+    console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, 'systemCode222=',systemCode)
     return request.get(
       window.$vueApp.config.globalProperties.baseAPI +
         '/sso/current-users/permissions/with-system?loginName=' +

package/src/directives/permission/permission.js

@@ -6,9 +6,15 @@ export default {
 
     if (value) {
       // console.log('-----v-permission---init----')
+      let permissionCodes = value
+      let systemCode
+      if(value instanceof Object) {
+        permissionCodes = value.codes
+        systemCode = value.systemCode
+      }
       // 页面组件预览时不需要权限控制，系统中使用页面组件时需要使用权限控制，所以当是预览是资源编码传'true'
       // 工作流按钮组件中也使用了资源编码为'true'的情况
-      if (value !== 'true' && !checkPermission(value)) {
+      if (permissionCodes !== 'true' && !checkPermission(permissionCodes, systemCode)) {
         el.parentNode && el.parentNode.removeChild(el)
       }
     } else {

package/src/i18n/langs/cn.js

@@ -83,7 +83,8 @@ const cn = {
     forbiddenExceptionLinkUser: '如有疑问请联系',
     uploadFileTip: '上传的文件不超过{fileSize}M',
     asyncExportJumpMsg: '或点击我跳转到下载页面',
-    mustFill: '{label} 必须填写'
+    mustFill: '{label} 必须填写',
+    filePathNotFound: '文件UUID未找到，请检查配置',
   },
   // 列表组件
   superGrid: {
@@ -134,7 +135,8 @@ const cn = {
     fold: '收起',
     prevRow: '上一行',
     nextRow: '下一行',
-    detail: '详情'
+    detail: '详情',
+    searchEmpty:'查询空值'
   },
   // 部门树组件
   departmentTree: {},
@@ -255,7 +257,12 @@ const cn = {
     operationTime: '操作时间',
     history_draw_dept_task: '{key_1}领取了部门[{key_2}]的任务',
     history_abandon_draw_dept_task: '{key_1}放弃领取部门[{key_2}]的任务',
-    remark: '备注'
+    remark: '备注',
+    taskState: '节点状态',
+    processingDuration: '处理时长(H)',
+    isOverdue: '是否超期',
+    taskStateDoing: '进行中',
+    taskStateDone: '已完成'
   },
   gateway: {
     timeout: '接口调用超时',

package/src/i18n/langs/en.js

@@ -84,7 +84,8 @@ const en = {
     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'
+    mustFill: '{label} must fill',
+    filePathNotFound: 'File UUID not found, please check the configuration'
   },
   superGrid: {
     editablePlaceholder: 'Please click to input',
@@ -134,7 +135,8 @@ const en = {
     fold: 'Fold',
     prevRow: 'Prev Row',
     nextRow: 'Next Row',
-    detail: 'Detail'
+    detail: 'Detail',
+    searchEmpty:'Search Empty'
   },
   departmentTree: {},
   departmentTreeInline: {
@@ -254,7 +256,12 @@ const en = {
     operationTime: 'Operation Time',
     history_draw_dept_task: '{key_1} Received tasks from department [{key_2}]',
     history_abandon_draw_dept_task: '{key_1} Abandon the task of receiving department [{key_2}]',
-    remark: 'remark'
+    remark: 'remark',
+    taskState: 'Task State',
+    processingDuration: 'Processing Duration(H)',
+    isOverdue: 'Is Overdue',
+    taskStateDoing: 'Doing',
+    taskStateDone: 'Done'
   },
   gateway: {
     timeout: 'Interface call timeout',

package/src/permission.js

@@ -157,10 +157,11 @@ router.beforeEach((to, from, next) => {
                     // 开发平台本身的功能或直接平台功能时
                     // console.log('开发平台本身的功能或直接平台功能时')
                     let systemCode = to.query ? to.query.customSystem: null
+                    console.log('getCurrentUserPermissions---systemCode111=', systemCode)
                     if (!systemCode) {
                       systemCode = window.$vueApp.config.globalProperties.currentSystem
                     }
-                    console.log('3333systemCode=', systemCode)
+                    console.log('getCurrentUserPermissions---systemCode222=', systemCode)
                     return store.dispatch('getCurrentUserPermissions', {loginName:user.loginName, systemCode})
                   }
                 })

package/src/store/modules/user.js

@@ -238,7 +238,7 @@ const user = {
         const loginName = param.loginName
         const systemCode = param.systemCode
         let storePermissions = getPermissions(systemCode)
-        console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions=', storePermissions)
+        console.log('getCurrentUserPermissions-----systemCode=', systemCode)
         // 这个判断会导致资源不会重新加载？？
         if (
           typeof storePermissions === 'undefined' ||
@@ -248,6 +248,7 @@ const user = {
           ssoService
             .getCurrentUserPermissionsBySystem(loginName, systemCode)
             .then((permissions) => {
+              console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'permissions[0]=', permissions && permissions.length>0?permissions[0]: null )
               let currentPermissions = ['index']
               currentPermissions = currentPermissions.concat(permissions)
               storePermissions = setPermissions(currentPermissions, systemCode)
@@ -257,6 +258,8 @@ const user = {
               reject(error)
             })
         } else {
+          let keys = Object.keys(storePermissions)
+          console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions[1]=', keys && keys.length>1?keys[1]: null )
           resolve(storePermissions)
         }
       })

package/src/styles/table.scss

@@ -4,13 +4,14 @@
       background-color: $th-background-color;
     }
 
-    &.is-scrolling-left, &.is-scrolling-right, &.is-scrolling-none {
-      th.el-table-fixed-column--right{
-        background-color: $th-background-color;
+    // 修改 Element Plus 表格滚动条颜色为 #aaaaaa
+    .el-scrollbar {
+      &__bar {
+        .el-scrollbar__thumb {
+          background-color: #aaaaaa;
+          opacity: 1;
+        }
       }
-      th.el-table-fixed-column--left{
-        background-color: $th-background-color;
-      }  
-    }
+    } 
   }
 }

package/src/utils/common-util.js

@@ -589,7 +589,7 @@ export function loadCSS() {
     console.error('皮肤主题为空!')
     return
   }
-  const baseAPI = window.$vueApp.config.globalProperties.baseAPI?window.$vueApp.config.globalProperties.baseAPI:localStorage.getItem('_baseAPI_')
+  const baseAPI = localStorage.getItem('_baseAPI_')
   if (baseAPI) {
     const href = replacePrefix(baseAPI) + '/component/theme/load-theme?theme=' + theme + '&_t_=' + new Date().getTime()
     let isHasLink = true

package/src/utils/file-util.ts

@@ -4,21 +4,25 @@ const iconList = [
   'amb-color-icon-XLSX',
   'amb-color-icon-DOC',
   'amb-color-icon-DOCX',
+  'amb-color-icon-PPT',
   'amb-color-icon-PDF',
   'amb-color-icon-TXT',
   'amb-color-icon-JPG',
   'amb-color-icon-PNG',
   'amb-color-icon-ZIP',
-  'amb-color-icon-unknown'
+  'amb-color-icon-AVI',
+  'amb-color-icon-MP4',
+  'amb-color-icon-qita'
 ]
 // 列表_5215278368.xls
 export function getFileIconByName(fileName: string): string {
+  const qitaIcon = 'amb-color-icon-qita'
   if (!fileName) {
-    return 'amb-color-icon-unknown'
+    return qitaIcon
   }
   let fileType = fileName.substring(fileName.lastIndexOf('.') + 1) // 获取文件名
   if (!fileType) {
-    return 'amb-color-icon-unknown'
+    return qitaIcon
   }
   switch (fileType) {
     case 'xlsx':
@@ -28,5 +32,9 @@ export function getFileIconByName(fileName: string): string {
       fileType = 'DOC'
       break
   }
-  return 'amb-color-icon-' + fileType.toUpperCase()
+  const finalIconName = 'amb-color-icon-' + fileType.toUpperCase()
+  if (iconList.includes(finalIconName)) {
+    return finalIconName
+  }
+  return qitaIcon
 }

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

@@ -79,6 +79,7 @@ export function initialization(
       }
       return { visible: false }
     } else {
+      result.displayTextJudge = jumpPage.displayTextJudge
       if (jumpPage.displayTextJudge) {
         // 例如：${obj.menu_code}-#-#${input.---}-#-#${context.currentTransactor}
         const label = analysisValue(

package/src/utils/permission.js

@@ -5,7 +5,7 @@ import { getTotalPermissions, isDevpAccess } from './permissionAuth'
  * @param {String} permission 多个资源编码以逗号隔开
  * @returns {Boolean}
  */
-export default function checkPermission(permission) {
+export default function checkPermission(permission, systemCode) {
   if (permission) {
     // 是否是预览项目时开发平台用户
     const isDevpPermission= isDevpAccess()
@@ -14,7 +14,7 @@ export default function checkPermission(permission) {
       return true
     }
     let hasPermission = false
-    const storeCurrentUserPermissions = getTotalPermissions()
+    const storeCurrentUserPermissions = getTotalPermissions(systemCode)
     if (
       typeof storeCurrentUserPermissions !== 'undefined' &&
       storeCurrentUserPermissions !== null

package/src/utils/permissionAuth.js

@@ -26,7 +26,7 @@ export function getSystemCode() {
 
 export function getPermissions(systemCode) {
   let totalPermissions = null
-  if(!systemCode){
+  if(!systemCode || systemCode+''==='null'){
     systemCode = getSystemCode()
   }
   let permissions = localStorage.getItem(permissionKey + systemCode)
@@ -50,7 +50,7 @@ export function getPermissions(systemCode) {
   return totalPermissions
 }
 
-export function getTotalPermissions() {
+export function getTotalPermissions(systemCode) {
   const a = new Date().getTime()
   let runPermissionsObj
   const runPermissions = getSessionCache(_RUN_PERMISSION)
@@ -58,7 +58,9 @@ export function getTotalPermissions() {
     runPermissionsObj = JSON.parse(runPermissions)
   }
   let sysetemPermissionsObj
-  const systemCode = getSystemCode()
+  if (!systemCode || systemCode+''==='null') {
+    systemCode = getSystemCode()
+  }
   const sysetemPermissions = localStorage.getItem(permissionKey + systemCode)
   if (sysetemPermissions) {
     sysetemPermissionsObj = JSON.parse(sysetemPermissions)
@@ -91,17 +93,19 @@ export function getTotalPermissions() {
 }
 
 export function setPermissions(permissions, systemCode) {
+  console.log('setPermissions==========systemCode=', systemCode,'isHasPlatPermission----permissions[0]=',permissions && permissions.length > 0 ?permissions[0]: null)
   const isMobile = isMobileBrowser()
   let key
   const permissionObjs = getPermissionObjs(permissions)
   if(isMobile){
     key = mobilePermissionKey
   } else {
-    if (!systemCode) {
+    if (!systemCode || systemCode+''==='null') {
       systemCode = getSystemCode()
     }
     key = permissionKey + systemCode
   }
+  console.log('setPermissions==========systemCode=', systemCode,'key=',key)
   localStorage.setItem(key, JSON.stringify(permissionObjs))
   setPermissionAllSystemKey(key)
   return permissionObjs
@@ -121,7 +125,7 @@ function getPermissionObjs(permissions){
 
 
 export function getMenus(systemCode) {
-  if (!systemCode) {
+  if (!systemCode || systemCode+''==='null') {
     systemCode = getSystemCode()
   } 
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
@@ -136,7 +140,7 @@ export function getMenus(systemCode) {
 
 export function setMenus(menus, systemCode) {
   if (menus) {
-    if (!systemCode) {
+    if (!systemCode || systemCode+''==='null') {
       systemCode = getSystemCode()
     }
     const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
@@ -148,7 +152,7 @@ export function setMenus(menus, systemCode) {
 }
 
 export function removeMenus(systemCode) {
-  if (!systemCode) {
+  if (!systemCode || systemCode+''==='null') {
     systemCode = getSystemCode()
   }
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)

package/src/utils/util.js

@@ -620,6 +620,25 @@ function getAdditionalParamMap(pageContext) {
   }
 }
 
+export function formatCustomParams(customParams, pageContext, row) {
+  const formatCustomParams = {}
+  if (customParams && customParams.length > 0) {
+    customParams.forEach((param) => {
+      if (param.paramValue && param.paramValue.indexOf('${') === 0) {
+        // 表示是动态变量
+        const dynamicValue = getPropValueNew(param.paramValue, pageContext, row)
+        if (dynamicValue !== undefined && dynamicValue !== null) {
+          formatCustomParams[param.paramName] = dynamicValue
+        } else {
+          formatCustomParams[param.paramName] = null
+        }
+      } else {
+        formatCustomParams[param.paramName] = param.paramValue
+      }
+    })
+  }
+  return formatCustomParams
+}
 export function getPropValueNew(propValue, pageContext, row) {
   let value = null
   if (propValue && propValue !== null && propValue !== '') {

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

@@ -21,11 +21,16 @@ export default defineComponent({
     isRoot: {
       type: Boolean,
       default: false
+    },
+    menuLayer: {
+      type: Number,
+      default: null
     }
   },
   render(props) {
-    const { title, hasChildren, isRoot } = props
+    const { title, hasChildren, isRoot} = props
     const icon = props.icon
+    const menuLayer = props.menuLayer
     const vnodes = []
     let iconsData = [h('i', { class: 'amb-iconfont amb-icon-meun_post' })]
     // let iconsData = [h('i', { class: 'amb-color-iconfont amb-color-icon-goal-jichuweihu super-icon' })]
@@ -41,12 +46,18 @@ export default defineComponent({
       //   iconsData = [h('i', { class: icon + ' svg-icon' })]
       // }
     }
-    vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    let titleClass = ['smb-sidebar-menu-item-title']
+    if(!menuLayer || menuLayer <= 2) {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    } else {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-no-icon'] }))
+      titleClass.push('smb-sidebar-menu-item-no-icon-title')
+    }
     if (title) {
       if (isRoot) {
         // 是否是根目录，没有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -59,7 +70,7 @@ export default defineComponent({
       } else {
         // 有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -77,8 +88,8 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.super-icon {
-  width: 16px;
-  height: 16px;
+:deep(.super-icon) {
+  width: 20px !important;
+  height: 20px !important;
 }
 </style>

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

@@ -7,7 +7,7 @@
           class="smb-sidebar-menu-item"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
-          <item :icon="item.iconName" :title="getI18nName(item)" :is-root="true" />
+          <item  :menu-layer="item.layer" :icon="item.iconName" :title="getI18nName(item)" :is-root="true" />
         </el-menu-item>
       </app-link>
     </template>
@@ -22,6 +22,7 @@
     >
       <template v-slot:title>
         <item
+          :menu-layer="item.layer"
           :icon="item.iconName"
           :title="getI18nName(item)"
           :has-children="item.children.length > 0 ? true : false"
@@ -37,7 +38,7 @@
         />
         <app-link v-else :to="toPath(child)" @click="clickMenu(toPath(child))">
           <el-menu-item :index="resolvePath(child.code, child.path, child.pageType, child.newPage)" class="smb-sidebar-menu-item">
-            <item :icon="child.iconName" :title="getI18nName(child)" />
+            <item :menu-layer="child.layer" :icon="child.iconName" :title="getI18nName(child)" />
           </el-menu-item>
         </app-link>
       </template>
@@ -213,6 +214,10 @@ export default {
     width: var(--admin-layout-left-menu-collapse, 54px);
     font-size: 16px;
   }
+
+  :deep(.smb-sidebar-menu-item-no-icon) {
+    width: 20px;
+  }
   :deep(.smb-sidebar-menu-item-title) {
     flex: 0 0 calc(100% - var(--admin-layout-left-menu-collapse, 54px) - 35px);
     overflow: hidden;
@@ -226,6 +231,9 @@ export default {
       text-overflow: ellipsis;
     }
   }
+  :deep(.smb-sidebar-menu-item-no-icon-title) {
+    flex: 0 0 calc(100% - 20px - 20px);
+  }
 }
 </style>
 

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

@@ -71,11 +71,9 @@ export default {
 					this.firstLeafMenu.pageType === 'iframe'
 			) {
 				const iframeSrc = this.firstLeafMenu.fullPath
-				const path = this.firstLeafMenu.path
 				const query = {
 					src: iframeSrc,
 					customSystem: this.systemCode,
-					path: path,
 					_menuCode: this.firstLeafMenu.code,
 					_menuName: getI18nName(this.firstLeafMenu),
 					isNewPage: this.firstLeafMenu.newPage

package/src/views/layout/components/Menubar/Item.vue

@@ -30,23 +30,34 @@ export default defineComponent({
     backlogTotal: {
       type: Number,
       default: 0
+    },
+    menuLayer: {
+      type: Number,
+      default: null
     }
   },
   render(props) {
     const { title, hasChildren, isRoot, code, backlogTotal } = props
     const icon = props.icon
+    const menuLayer = props.menuLayer
     const vnodes = []
     // let iconsData = [h(SvgIcon,{'icon-class': 'meun_post' })]
     let iconsData = [h('i', { class: 'amb-iconfont amb-icon-meun_post' })]
     if (icon) {
       iconsData = [h(SuperIcon, { iconValue: icon })]
     }
-    vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    let titleClass = ['smb-sidebar-menu-item-title']
+    if(!menuLayer || menuLayer <= 2) {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-icon'] }, iconsData))
+    } else {
+      vnodes.push(h('div', { class: ['smb-sidebar-menu-item-no-icon'] }))
+      titleClass.push('smb-sidebar-menu-item-no-icon-title')
+    }
     if (title) {
       if (isRoot) {
         // 是否是根目录，没有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -59,7 +70,7 @@ export default defineComponent({
       } else if (code === 'undoneTask') {
         // 有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {
@@ -88,3 +99,9 @@ export default defineComponent({
   }
 })
 </script>
+<style lang="scss" scoped>
+:deep(.super-icon) {
+  width: 20px !important;
+  height: 20px !important;
+}
+</style>