agilebuilder-ui 1.0.79-temp2 → 1.0.80-tmp1

package/packages/super-grid/src/utils.js

@@ -87,7 +87,7 @@ const ArrowKeyAction = {
         return null
       }
     }
-  }
+  },
 }
 export { ArrowKeyAction }
 
@@ -101,7 +101,10 @@ export function setCurrentRow(rowIndex, listCode) {
     // 新建时会传过来比记录条数大的行号
     if (gridParams.isMulitiSelect) {
       gridParams.superGrid.clearSelection()
-      gridParams.superGrid.toggleRowSelection(gridParams.gridData[rowIndex], true)
+      gridParams.superGrid.toggleRowSelection(
+        gridParams.gridData[rowIndex],
+        true
+      )
     } else {
       gridParams.superGrid.setCurrentRow(gridParams.gridData[rowIndex])
     }
@@ -157,11 +160,17 @@ export function isLastEditRowSave(listCode) {
     // 表示有正在编辑的行，不能编辑其他行
     return false
   }
-  if (typeof gridParams.$rowIndex === 'undefined' || gridParams.$rowIndex === null) {
+  if (
+    typeof gridParams.$rowIndex === 'undefined' ||
+    gridParams.$rowIndex === null
+  ) {
     // 表示没有在该列表编辑任何行，可以编辑行
     return true
   }
-  if (typeof gridParams.$lastSaveRowIndex === 'undefined' || gridParams.$lastSaveRowIndex === null) {
+  if (
+    typeof gridParams.$lastSaveRowIndex === 'undefined' ||
+    gridParams.$lastSaveRowIndex === null
+  ) {
     // 表示没有在该列表保存任何行，可以编辑行
     return true
   }
@@ -188,7 +197,10 @@ export function isCanRefreshGrid(listCode) {
     return false
   }
 
-  if (typeof gridParams.isCreateRow !== 'undefined' && gridParams.isCreateRow === true) {
+  if (
+    typeof gridParams.isCreateRow !== 'undefined' &&
+    gridParams.isCreateRow === true
+  ) {
     // 说明刚刚新建的行还没有保存 或 撤销编辑，表示当前列表中有编辑行，不能刷新列表数据
     return false
   }
@@ -225,12 +237,16 @@ export function isDisableEdit(prop, listCode, row) {
     const fieldPermissions = gridParams.options.validateRules
     if (fieldPermissions) {
       const fieldRule = fieldPermissions.filter(
-        (item) => item.name && (item.name === prop || item.name === 'all_fields')
+        (item) =>
+          item.name && (item.name === prop || item.name === 'all_fields')
       )
       let canEdit = true
       if (fieldRule && fieldRule.length > 0) {
         for (let i = 0; i < fieldRule.length; i++) {
-          if (fieldRule[i].rowIndexes === undefined || fieldRule[i].rowIndexes === null) {
+          if (
+            fieldRule[i].rowIndexes === undefined ||
+            fieldRule[i].rowIndexes === null
+          ) {
             canEdit = fieldRule[i].canEdit
           } else if (fieldRule[i].rowIndexes.indexOf(rowId) >= 0) {
             canEdit = fieldRule[i].canEdit
@@ -326,7 +342,10 @@ export function isHasEditOption(event, listCode) {
     listCode = store.get('_list_code')
   }
   const gridParams = store.get(listCode)
-  if (gridParams.options.lineEditOptions && gridParams.options.lineEditOptions[event]) {
+  if (
+    gridParams.options.lineEditOptions &&
+    gridParams.options.lineEditOptions[event]
+  ) {
     return true
   }
   return false
@@ -337,7 +356,10 @@ export function isEditOptionFunction(event, listCode) {
     listCode = store.get('_list_code')
   }
   const gridParams = store.get(listCode)
-  if (gridParams.options.lineEditOptions && typeof gridParams.options.lineEditOptions[event] === 'function') {
+  if (
+    gridParams.options.lineEditOptions &&
+    typeof gridParams.options.lineEditOptions[event] === 'function'
+  ) {
     return true
   }
   return false
@@ -402,7 +424,7 @@ export function getGridParams() {
       isRestoreByEsc: true, // 点击ESC时，是否撤销编辑,
       aftersaveIsCancelEditState: true, // 保存后，是否取消编辑状态
       afterRestoreIsCancelEditState: true, // 撤销编辑后，是否取消编辑状态
-      input: function () {} // 数据改变时触发
+      input: function () {}, // 数据改变时触发
       // 'beforeSave': function() { return true }, // 保存行数据前的回调
       // 'saveSuccess': function() {}, // 保存行数据成功的回调
       // 'saveError': function() {}, // 保存行数据发生异常的回调
@@ -429,7 +451,7 @@ export function getGridParams() {
         // urlToSaveRow:'', // 保存行记录的url，如果设置了以该设置的为准
         // isEnableValidate: true, // 保存行记录时，是否启用必填验证
         // saveRow: function(){return new Promise((resolve, reject) => {...resolve(data)})} // 需要返回的是保存后的行记录的值
-      }
+      },
       // 自定义行编辑
       // customFormatter: {
       // },
@@ -494,7 +516,7 @@ export function getGridParams() {
       // actionPermission: { 'canAdd': true, 'canUpdate': true, 'canDelete': true }, // 列表行编辑时控制按钮的权限
       // formData: {}, // 主表单的实体信息
       // hiddenColumns:['operation','xx]
-    }
+    },
   }
   return Vue.reactive(gridParams)
 }
@@ -577,7 +599,7 @@ export function getTableHeight(superGrid, listCode, pageHeight) {
     topDivHeight = 0
   }
   let totalHeight = pageHeight - topDivHeight
-  if (superGrid) {
+  if(superGrid){
     totalHeight = pageHeight - superGrid.$el.offsetTop - topDivHeight
   }
   // const cur = document.querySelectorAll("div[class='grid-area']")
@@ -612,7 +634,7 @@ export function getTableHeight(superGrid, listCode, pageHeight) {
 
 export function getExtraParam(searchParam, gridParams) {
   const param = {
-    searchParam: searchParam
+    searchParam: searchParam,
   }
   param.withDataPermission = gridParams.options.isWithDataPermission
   param.isWorkflowEntity = gridParams.options.isWorkflowEntity
@@ -653,17 +675,25 @@ export function analysisFileSetObj(fileSetObj, isSql) {
   }
   return {
     showName: showName,
-    serverPath: serverPath
+    serverPath: serverPath,
   }
 }
 
-export function otherFilesToStandard(fileSetObj, keyValueParam, files, filesStringData) {
+export function otherFilesToStandard(
+  fileSetObj,
+  keyValueParam,
+  files,
+  filesStringData
+) {
   const standardFiles = []
   if (files) {
     if (files && files.length > 0) {
       for (var i = 0; i < files.length; i++) {
         const file = files[i]
-        const standardFile = packageFile(file[keyValueParam.showName], file[keyValueParam.serverPath])
+        const standardFile = packageFile(
+          file[keyValueParam.showName],
+          file[keyValueParam.serverPath]
+        )
         standardFiles.push(standardFile)
       }
     }
@@ -690,15 +720,31 @@ export function packageFile(showName, serverPath) {
   standardFile.showName = showName
   standardFile.serverPath = serverPath
 
-  if (standardFile.showName && /\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(showName)) {
+  if (
+    standardFile.showName &&
+    /\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(
+      showName
+    )
+  ) {
     standardFile.isImg = true
   }
   const token = getToken()
-  let url = window.$vueApp.config.globalProperties.baseURL + '/common/super-form/downloads?jwt=' + token
+  let url =
+    window.$vueApp.config.globalProperties.baseURL +
+    '/common/super-form/downloads?jwt=' +
+    token
   if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-    url = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/downloads?jwt=' + token
-  }
-  const src = url + '&showName=' + encodeURI(standardFile.showName) + '&serverPath=' + standardFile.serverPath
+    url =
+      window.$vueApp.config.globalProperties.baseAPI +
+      '/component/super-form/downloads?jwt=' +
+      token
+  }
+  const src =
+    url +
+    '&showName=' +
+    encodeURI(standardFile.showName) +
+    '&serverPath=' +
+    standardFile.serverPath
   standardFile.src = src
   return standardFile
 }
@@ -708,7 +754,8 @@ export function getFileList(row, column, isSql) {
   if (
     column.fileSet &&
     column.fileSet !== '' &&
-    (column.componentType === 'annex' || column.componentType === 'multipartUpload')
+    (column.componentType === 'annex' ||
+      column.componentType === 'multipartUpload')
   ) {
     const fileSetObj = JSON.parse(column.fileSet)
     const keyValueParam = analysisFileSetObj(fileSetObj, isSql)
@@ -717,13 +764,23 @@ export function getFileList(row, column, isSql) {
         // const lowerStr = fileSetObj.childAnnexDataTableCode.toLowerCase()
         const fileArr = row[column.prop]
         // 子表
-        fileList = otherFilesToStandard(fileSetObj, keyValueParam, fileArr, null)
+        fileList = otherFilesToStandard(
+          fileSetObj,
+          keyValueParam,
+          fileArr,
+          null
+        )
       } else {
         const filesStringData = {
           showName: getEntityFieldValue(row, keyValueParam.showName),
-          serverPath: getEntityFieldValue(row, keyValueParam.serverPath)
+          serverPath: getEntityFieldValue(row, keyValueParam.serverPath),
         }
-        fileList = otherFilesToStandard(fileSetObj, keyValueParam, null, filesStringData)
+        fileList = otherFilesToStandard(
+          fileSetObj,
+          keyValueParam,
+          null,
+          filesStringData
+        )
       }
     } else {
       const showName = getEntityFieldValue(row, keyValueParam.showName)
@@ -737,7 +794,10 @@ export function getFileList(row, column, isSql) {
 export function getDynamicDataSourceOptions(column, isSql, additionalParamMap) {
   let additionalParameter
   if (additionalParamMap) {
-    console.log('getDynamicDataSourceOptions--additionalParamMap=', additionalParamMap)
+    console.log(
+      'getDynamicDataSourceOptions--additionalParamMap=',
+      additionalParamMap
+    )
     if (additionalParamMap && typeof additionalParamMap === 'object') {
       additionalParameter = JSON.stringify(additionalParamMap)
     } else if (additionalParamMap && additionalParamMap !== '') {
@@ -746,7 +806,7 @@ export function getDynamicDataSourceOptions(column, isSql, additionalParamMap) {
   }
   const options = {
     isSql: isSql,
-    additionalParameter: additionalParameter
+    additionalParameter: additionalParameter,
   }
   // 如果是多选文件类型，需要解析（需要设置临时字段，判断文件还是图片，图片需要预览）
   if (column.valueSetOptions) {
@@ -754,7 +814,10 @@ export function getDynamicDataSourceOptions(column, isSql, additionalParamMap) {
     if (valueSetOptionsObj && valueSetOptionsObj.valueSetOptions) {
       options.valueSetOptions = valueSetOptionsObj.valueSetOptions
     }
-    if (valueSetOptionsObj.dynamicDataSourceCode && valueSetOptionsObj.dynamicDataSourceCode !== '') {
+    if (
+      valueSetOptionsObj.dynamicDataSourceCode &&
+      valueSetOptionsObj.dynamicDataSourceCode !== ''
+    ) {
       options.dynamicDataSourceCode = valueSetOptionsObj.dynamicDataSourceCode
     }
   }
@@ -763,7 +826,11 @@ export function getDynamicDataSourceOptions(column, isSql, additionalParamMap) {
 
 // 值设置是否是动态数据源类型的数据源
 export function isDynamicDataSourceSource(column) {
-  if (column.valueSet && column.valueSet.length > 0 && column.valueSet[0].value === 'dynamicDataSource') {
+  if (
+    column.valueSet &&
+    column.valueSet.length > 0 &&
+    column.valueSet[0].value === 'dynamicDataSource'
+  ) {
     return true
   } else {
     return false
@@ -773,7 +840,11 @@ export function isDynamicDataSourceSource(column) {
 export function getLastPageNum(total, rowsPerPage) {
   if (total === undefined || total === null || total === 0) {
     return 1
-  } else if (rowsPerPage === undefined || rowsPerPage === null || rowsPerPage === 0) {
+  } else if (
+    rowsPerPage === undefined ||
+    rowsPerPage === null ||
+    rowsPerPage === 0
+  ) {
     return 1
   } else {
     return Math.ceil(total / rowsPerPage)
@@ -781,20 +852,31 @@ export function getLastPageNum(total, rowsPerPage) {
 }
 // 纵向滚动条滚动最底部功能
 export function scrollYToBottom(listCode) {
-  const scrollDivElement = document.querySelector('.' + listCode + ' .el-table--scrollable-y .el-table__body-wrapper')
+  const scrollDivElement = document.querySelector(
+    '.' + listCode + ' .el-table--scrollable-y .el-table__body-wrapper'
+  )
   console.log('scrollDivElement==', scrollDivElement)
   if (scrollDivElement && scrollDivElement !== null) {
     // 表示有滚动条，需要将滚动条滚动最底部
-    console.log('scrollDivElement==scrollDivElement.scrollHeight=', scrollDivElement.scrollHeight)
+    console.log(
+      'scrollDivElement==scrollDivElement.scrollHeight=',
+      scrollDivElement.scrollHeight
+    )
     scrollDivElement.scrollTop = scrollDivElement.scrollHeight
   }
 }
 
 export function getAdditionalParamMap(gridParams) {
   let additionalParamMap = null
-  if (gridParams.additionalParamMap && typeof gridParams.additionalParamMap === 'object') {
+  if (
+    gridParams.additionalParamMap &&
+    typeof gridParams.additionalParamMap === 'object'
+  ) {
     additionalParamMap = gridParams.additionalParamMap
-  } else if (gridParams.additionalParamMap && gridParams.additionalParamMap !== '') {
+  } else if (
+    gridParams.additionalParamMap &&
+    gridParams.additionalParamMap !== ''
+  ) {
     additionalParamMap = JSON.parse(gridParams.additionalParamMap)
   }
   return additionalParamMap
@@ -802,7 +884,7 @@ export function getAdditionalParamMap(gridParams) {
 
 // 获得控件的配置信息，例如：自定义控件的附加配置等
 export function getControlConfig(column) {
-  let controlConfig = {}
+  let controlConfig
   if (column && column.controlConfig) {
     controlConfig = JSON.parse(column.controlConfig)
   }

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

@@ -577,6 +577,8 @@ export default {
 		},
 		fetchData(searchParam, isSearch) {
 			return new Promise((resolve, reject) => {
+				// 刷新页面数据时，把选中集合清空
+				this.clearSelections()
 				// 获得各属性对应的字段配置
 				this.getPropColumns()
 				this.isLoading = true

package/packages/workflow-button/src/workflow-button.vue

@@ -18,7 +18,7 @@
 		      :key="buttonIndex"
 		      v-permission="button.permission"
 		      :class="button.code ? button.code : ''"
-		      :disabled="preventReclick"
+		      :disabled="disabled?disabled:preventReclick"
 		      :type="button.type"
 
 		      @click="button.clickFun"
@@ -60,6 +60,11 @@ export default {
 			type: String,
 			default: null,
 		},
+		// 是否禁用按钮组所有按钮
+		disabled: {
+			type: Boolean,
+			default: false
+		},
 	},
 	data() {
 		const buttonsPermission = this.getButtonsPermission()

package/src/permission.js

@@ -8,7 +8,8 @@ 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, isPlateSys } from './utils/common-util'
+import { getSystemCode } from './utils/permissionAuth'
 
 // 首次加载业务系统时，获得用户的语言
 function initUserLanguage() {
@@ -148,7 +149,9 @@ router.beforeEach((to, from, next) => {
                 .then((user) => {
                   console.log('router.beforeEach-getCurrentUser')
                   const devpRoleCodes = authApi.getSessionCache(runCurrentRoleKey)
-                  if (!isDevp && devpRoleCodes) {
+                  const systemCode = getSystemCode()
+                  // console.log('router.beforeEach-getCurrentUser----systemCode=', systemCode, 'isPlateSys(systemCode)=', isPlateSys(systemCode))
+                  if (!isDevp && devpRoleCodes && systemCode && isPlateSys(systemCode)) {
                     // 表示是开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码，对应运行平台的岗位编码
                     // console.log('开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码时，!isDevp && devpRoleCodes')
                     return store.dispatch('getDevPlatformPermissions', devpRoleCodes)

package/src/utils/calculator/calculator-util.js

@@ -3,6 +3,20 @@ import { getAbstractUserFactoryWf } from './calculator-factory-wf'
 import { getPropValue, getEntityFieldValue } from '../util'
 export function executeExpression(leftValue, operator, rightValue, dataType) {
   const Calculator = getAbstractUserFactory(dataType)
+  if (dataType === 'DATE' || dataType === 'TIME') {
+    return executeDateExpression(leftValue, operator, rightValue, Calculator)
+  }
+  const calculatorObj = new Calculator(leftValue, operator, rightValue)
+  return calculatorObj.result
+}
+
+function executeDateExpression(leftValue, operator, rightValue, Calculator) {
+  if (rightValue && typeof (rightValue) === 'string') {
+    rightValue = new Date(rightValue).getTime()
+  }
+  if (leftValue && typeof (leftValue) === 'string') {
+    leftValue = new Date(leftValue).getTime()
+  }
   const calculatorObj = new Calculator(leftValue, operator, rightValue)
   return calculatorObj.result
 }

package/src/utils/permission.js

@@ -1,5 +1,5 @@
 import 'nprogress/nprogress.css' // Progress 进度条样式
-import { getTotalPermissions } from './permissionAuth'
+import { getTotalPermissions, isDevpAccess } from './permissionAuth'
 
 /**
  * @param {String} permission 多个资源编码以逗号隔开
@@ -7,6 +7,12 @@ import { getTotalPermissions } from './permissionAuth'
  */
 export default function checkPermission(permission) {
   if (permission) {
+    // 是否是预览项目时开发平台用户
+    const isDevpPermission= isDevpAccess()
+    // console.log('checkPermission---------permission=', permission, 'isDevpPermission=', isDevpPermission)
+    if(isDevpPermission){
+      return true
+    }
     let hasPermission = false
     const storeCurrentUserPermissions = getTotalPermissions()
     if (

package/src/utils/permissionAuth.js

@@ -1,5 +1,5 @@
 import * as Vue from 'vue'
-import {getSessionCache, getRunInfoKey} from './auth'
+import {getSessionCache, getRunInfoKey, getUsername, getRunCurrentRole} from './auth'
 import { isMobileBrowser } from './common-util'
 
 const permissionKey = 'PERMISSION-'
@@ -196,4 +196,50 @@ export function removeAllSystemPermissions() {
     localStorage.removeItem(key)
   })
   removePermissionSystemKey()
+}
+// 开发平台项目负责人角色编码
+const DEV_ROLE_PROJECT_ADMIN_CODE = "PROJECT_ADMIN"
+// 开发平台项目开发者角色编码
+const DEV_ROLE_PROJECT_DEVELOPER_CODE = "PROJECT_DEVELOPER"
+// 开发平台项目观察者角色编码
+const DEV_ROLE_PROJECT_VIEWER_CODE = "PROJECT_VIEWER"
+
+/**
+     * 预览项目时查询应用权限使用。
+     * 负责人岗位和观察者岗位
+     * @return
+     */
+export function isDevpAccess() {
+    const username = getUsername()
+    // console.log("isDevpAccess-----username=",username);
+    const DEVP_APP_ID = "0bba9791-d4f1-47ca-b5e6-1fc840b54f3a"
+    if(username && username === DEVP_APP_ID){
+        // 开发环境的角色编码，运行环境中是岗位
+        const postManagementCodes = getPostManagementCodes()
+        // console.log("isDevAccess----postManagementCodes=",postManagementCodes);
+        if(postManagementCodes && postManagementCodes.indexOf(DEV_ROLE_PROJECT_ADMIN_CODE) >= 0 ||
+                postManagementCodes.contains(DEV_ROLE_PROJECT_VIEWER_CODE) >= 0){
+            // 表示是项目负责人岗位或观察者岗位或平台管理员，且当前登录用户是 devp的应用id
+          return true
+        }
+    }
+    return false
+}
+
+function getPostManagementCodes() {
+  const devpPostManagements = getRunCurrentRole()
+  if(devpPostManagements){
+    let postCodes = [];
+    const devpCodes = devpPostManagements.split(",");
+    devpCodes.forEach(code=>{
+      let roleCode = code
+      if(code === DEV_ROLE_PROJECT_ADMIN_CODE || code === DEV_ROLE_PROJECT_DEVELOPER_CODE ){
+        roleCode = DEV_ROLE_PROJECT_ADMIN_CODE
+      }
+      if(postCodes.indexOf(roleCode) < 0) {
+        postCodes.push(roleCode)
+      }
+    })
+    return postCodes
+  }
 }