agilebuilder-ui 1.1.39 → 1.1.40-sit1

package/packages/super-grid/src/super-grid.vue

@@ -76,6 +76,7 @@
         :height="hasTableHeight"
         :class="tableClass"
         :tree-props="getTreeProps(parentProp, isSql, isLazy, dataSourceType)"
+        :scrollbar-always-on="scrollbarAlwaysOn"
         class="super-grid-main-table-view"
         @sort-change="handleSortChange"
         @select="selectRecord"
@@ -599,6 +600,18 @@ export default {
       } else {
         return this.gridData
       }
+    },
+    scrollbarAlwaysOn() {
+      // 检查全局 Vue 应用配置中是否有 scrollbarAlwaysOn 属性
+      if (window.$vueApp && 
+          window.$vueApp.config && 
+          window.$vueApp.config.globalProperties && 
+          window.$vueApp.config.globalProperties.scrollbarAlwaysOn !== undefined) {
+        // 返回全局配置的值
+        return window.$vueApp.config.globalProperties.scrollbarAlwaysOn;
+      }
+      // 默认返回 false
+      return false;
     }
     // ,
     // hasLoadMainTable() {

package/packages/utils/organization.ts

@@ -1,5 +1,5 @@
 // 将选中的部门节点添加到结果集合中
-export function addSelectedUserInfo (selectNodeInfo, userData, containBranch) {
+export function addSelectedUserInfo(selectNodeInfo, userData, containBranch) {
   if (selectNodeInfo.userIds.indexOf(userData.id) < 0) {
     // 表示集合中不存在该用户
     selectNodeInfo.userIds.push(userData.id)
@@ -28,7 +28,7 @@ export function addSelectedUserInfo (selectNodeInfo, userData, containBranch) {
     selectNodeInfo.userEnNames.push(userData.enName ? userData.enName : '')
   }
 }
-export function packageSelectResult (user, containBranch) {
+export function packageSelectResult(user, containBranch) {
   let name = user.name
   if (user.enName && user.enName.trim() !== '') {
     name = name + '(' + user.enName + ')'
@@ -47,29 +47,42 @@ export function packageSelectResult (user, containBranch) {
     containBranch: containBranch,
     user: user,
     enName: user.enName ? user.enName : '',
-    subCompanyName: user.subCompanyName
+    subCompanyName: user.subCompanyName,
+    divisionManager: user.divisionManager,
+    divisionManagerName: user.divisionManagerName
   }
   // 表示是勾选单选按钮或 选中树节点
   return selectNodeInfo
 }
 // 根据指定用户信息获得用户集合
-function getSelectUsers (searchField, selectUserInfo, separator) {
+function getSelectUsers(searchField, selectUserInfo, separator) {
   return new Promise((resolve, reject) => {
     if (!searchField) {
       resolve([])
     } else if (!selectUserInfo) {
       resolve([])
     } else {
-      window['$vueApp'].config.globalProperties.$http.get(window['$vueApp'].config.globalProperties.baseAPI + '/component/organization-trees/select-users-mobile?searchField=' + searchField + '&selectUserInfo=' + selectUserInfo + '&separator=' + separator).then(users => {
-        resolve(users)
-      }).catch(error => {
-        reject(error)
-      })
+      window['$vueApp'].config.globalProperties.$http
+        .get(
+          window['$vueApp'].config.globalProperties.baseAPI +
+            '/component/organization-trees/select-users-mobile?searchField=' +
+            searchField +
+            '&selectUserInfo=' +
+            selectUserInfo +
+            '&separator=' +
+            separator
+        )
+        .then((users) => {
+          resolve(users)
+        })
+        .catch((error) => {
+          reject(error)
+        })
     }
   })
 }
 // 部门人员树选中了组织结构树的根节点
-function packageAllUser () {
+function packageAllUser() {
   // 表示集合中不存在该用户，则封装该用户
   const tenantNodeId = -1
   var allUser = {
@@ -79,7 +92,7 @@ function packageAllUser () {
   return allUser
 }
 // 工作组人员树选中了组织结构树的根节点
-function packageAllWgUser () {
+function packageAllWgUser() {
   // 表示集合中不存在该用户，则封装该用户
   const tenantNodeId = -1
   var allUser = {
@@ -88,7 +101,7 @@ function packageAllWgUser () {
   }
   return allUser
 }
-export function initSelectUsers (searchField, selectUserInfo, separator) {
+export function initSelectUsers(searchField, selectUserInfo, separator) {
   return new Promise((resolve, reject) => {
     const selectDepts = []
     if (selectUserInfo) {
@@ -101,11 +114,13 @@ export function initSelectUsers (searchField, selectUserInfo, separator) {
         resolve(selectDepts)
       } else {
         // 表示不是选择的所有用户
-        getSelectUsers(searchField, selectUserInfo, separator).then(users => {
-          resolve(users)
-        }).catch(error => {
-          reject(error)
-        })
+        getSelectUsers(searchField, selectUserInfo, separator)
+          .then((users) => {
+            resolve(users)
+          })
+          .catch((error) => {
+            reject(error)
+          })
       }
     } else {
       resolve(selectDepts)
@@ -113,9 +128,8 @@ export function initSelectUsers (searchField, selectUserInfo, separator) {
   })
 }
 
-
 // import {getLanguageWithLocale} from '../../../src/utils/util'
-export function resizeScrollTargetHeightUtil () {
+export function resizeScrollTargetHeightUtil() {
   const pagePadding = 16
   let height = window.innerHeight - pagePadding
   const header = document.querySelector('.el-page-header')
@@ -129,29 +143,31 @@ export function resizeScrollTargetHeightUtil () {
   return height
 }
 
-
-export function  getUserMainDeptName (user) {
-let deptShowName = ''
-if (user && user.data) {
-  const userData = JSON.parse(user.data)
-  if (userData.mainDepartmentEnName && userData.mainDepartmentEnName !== '' && window['$locale'] && window['$locale'] !== 'cn') {
-    deptShowName = userData.mainDepartmentEnName
-  } else {
-    if (userData.mainDepartmentName && userData.mainDepartmentName !== '') {
-      deptShowName = userData.mainDepartmentName
+export function getUserMainDeptName(user) {
+  let deptShowName = ''
+  if (user && user.data) {
+    const userData = JSON.parse(user.data)
+    if (
+      userData.mainDepartmentEnName &&
+      userData.mainDepartmentEnName !== '' &&
+      window['$locale'] &&
+      window['$locale'] !== 'cn'
+    ) {
+      deptShowName = userData.mainDepartmentEnName
+    } else {
+      if (userData.mainDepartmentName && userData.mainDepartmentName !== '') {
+        deptShowName = userData.mainDepartmentName
+      }
     }
   }
-}
-return deptShowName
+  return deptShowName
 }
 
-
-
-export function  getDeptNamePath (dept) {
-let deptShowName = ''
-if (dept && dept.data) {
-  const deptData = JSON.parse(dept.data)
-  deptShowName = deptData.namePath
-}
-return deptShowName
+export function getDeptNamePath(dept) {
+  let deptShowName = ''
+  if (dept && dept.data) {
+    const deptData = JSON.parse(dept.data)
+    deptShowName = deptData.namePath
+  }
+  return deptShowName
 }

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/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/styles/mixin.scss

@@ -9,13 +9,13 @@
 
 @mixin scrollBar {
   ::-webkit-scrollbar-track-piece {
-    background: #d3dce6;
+    background: rgba(157, 165, 183, 0.7);
   }
   ::-webkit-scrollbar {
     width: 6px;
   }
   ::-webkit-scrollbar-thumb {
-    background: #99a9bf;
+    background: #aaaaaa;
     border-radius: 20px;
   }
 }

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/styles/theme/dark-blue/scrollbar-style.scss

@@ -8,7 +8,7 @@
 
   // 默认下滚动条的样式
   ::-webkit-scrollbar-thumb {
-    background: #eaeaea;
+    background: #aaaaaa;
     border: none;
     border-radius: 4px;
   }
@@ -26,7 +26,7 @@
 
   // 鼠标悬停在滚动条时 滚动条区域 空白地方的样式
   ::-webkit-scrollbar-track:hover {
-    background-color: #eaeaea;
+    background-color: #ccc;
     border: none;
   }
 }

package/src/styles/theme/gray/scrollbar-style.scss

@@ -8,7 +8,7 @@
 
   // 默认下滚动条的样式
   ::-webkit-scrollbar-thumb {
-    background: #eaeaea;
+    background: #aaaaaa;
     border: none;
     border-radius: 4px;
   }
@@ -26,7 +26,7 @@
 
   // 鼠标悬停在滚动条时 滚动条区域 空白地方的样式
   ::-webkit-scrollbar-track:hover {
-    background-color: #eaeaea;
+    background-color: #aaaaaa;
     border: none;
   }
 }

package/src/styles/theme/green/scrollbar-style.scss

@@ -8,7 +8,7 @@
 
   // 默认下滚动条的样式
   ::-webkit-scrollbar-thumb {
-    background: #eaeaea;
+    background: #aaaaaa;
     border: none;
     border-radius: 4px;
   }
@@ -26,7 +26,7 @@
 
   // 鼠标悬停在滚动条时 滚动条区域 空白地方的样式
   ::-webkit-scrollbar-track:hover {
-    background-color: #eaeaea;
+    background-color: #ccc;
     border: none;
   }
 }

package/src/styles/theme/ocean-blue/scrollbar-style.scss

@@ -8,7 +8,7 @@
 
   // 默认下滚动条的样式
   ::-webkit-scrollbar-thumb {
-    background: #eaeaea;
+    background: #aaaaaa;
     border: none;
     border-radius: 4px;
   }
@@ -26,7 +26,7 @@
 
   // 鼠标悬停在滚动条时 滚动条区域 空白地方的样式
   ::-webkit-scrollbar-track:hover {
-    background-color: #eaeaea;
+    background-color: #ccc;
     border: none;
   }
 }

package/src/styles/theme/tiffany-blue-mobile/scrollbar-style.scss

@@ -8,7 +8,7 @@
 
   // 默认下滚动条的样式
   ::-webkit-scrollbar-thumb {
-    background: #eaeaea;
+    background: #aaaaaa;
     border: none;
     border-radius: 4px;
   }
@@ -26,7 +26,7 @@
 
   // 鼠标悬停在滚动条时 滚动条区域 空白地方的样式
   ::-webkit-scrollbar-track:hover {
-    background-color: #eaeaea;
+    background-color: #ccc;
     border: none;
   }
 }

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

@@ -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)

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

@@ -88,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/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

@@ -99,3 +99,9 @@ export default defineComponent({
   }
 })
 </script>
+<style lang="scss" scoped>
+:deep(.super-icon) {
+  width: 20px !important;
+  height: 20px !important;
+}
+</style>