agilebuilder-ui 1.0.86 → 1.0.87-temp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.86",
+  "version": "1.0.87-temp2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",
@@ -28,7 +28,7 @@
     "axios": "^1.5.1",
     "element-plus": "^2.4.1",
     "nprogress": "^0.2.0",
-    "sass": "^1.69.4",
+    "sass": "1.69.4",
     "vite": "^4.4.5",
     "vite-plugin-require-transform": "^1.0.21",
     "vite-plugin-svg-icons": "^2.0.1",

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

@@ -1224,6 +1224,26 @@ const apis = {
     })
     return result
   },
+    // 获得该列表中，下拉选是选项组的字段信息，返回的key是属性名，value是选项集合
+    getTableSelectOptions(listCode) {
+      const result = {}
+      if (!listCode) {
+        listCode = store.get('_list_code')
+      }
+      const gridParams = store.get(listCode)
+      const columns = gridParams.columns
+      columns.forEach(col => {
+        const prop = col.prop
+        const isDynamicDataSource = isDynamicDataSourceSource(col)
+        if (!isDynamicDataSource && col.valueSet && col.valueSet.length > 0) {
+          result[prop] = {
+            options: col.valueSet,
+            column: col
+          }
+        }
+      })
+      return result
+    },
   // 取消列表的编辑状态
   restoreGridEdit(listCode) {
     if (!listCode) {
@@ -1387,6 +1407,12 @@ const apis = {
       })
     }
     return defaultValueColumnsMap
+  },
+  // 重新刷新子表数据
+  reloadSubTableData(listCode) {
+    const gridParams = store.get(listCode)
+    gridParams.options['subTableData'] = null
+    this.fetchListData()
   }
 }
 export default apis

package/packages/super-grid/src/custom-formatter.js

@@ -269,14 +269,14 @@ const customFormatter = {
       }
       if (isPromise(canClick)) {
         canClick.then((result) => {
-          this.doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams)
+          this.doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams, column)
         })
       } else {
-        this.doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams)
+        this.doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams, column)
       }
     }
   },
-  doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams) {
+  doClickHyperLink(row, listCode, rowIndex, jumpPageSetting, gridParams, column) {
     let parentFormData = null
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
@@ -311,6 +311,8 @@ const customFormatter = {
         openPageParams._rowIndex = rowIndex
         // 行编辑的记录
         openPageParams.row = row
+        // 列点击时列属性名
+        openPageParams._columnProp = column.prop
         // 通知父页面弹出页面
         $emit(this, 'open-page', openPageParams)
       }

package/packages/super-grid/src/normal-column-content.vue

@@ -655,9 +655,9 @@ export default {
         (this.column.componentType === 'multiselect' || this.column.componentType === 'select')
       ) {
         const isDynamic = isDynamicDataSourceSource(this.column)
+        let beforeColumnValue = param.row[this.column.prop]
         if (!isDynamic) {
           // 选项组保存时将数组处理为字符串
-          const beforeColumnValue = param.row[this.column.prop]
           if (beforeColumnValue && Object.prototype.toString.apply(beforeColumnValue) === '[object Array]') {
             // 如果是数组才需要转换
             param.row[this.column.prop] = beforeColumnValue.join(',')
@@ -678,54 +678,38 @@ export default {
             }
             if (selectDataKey) {
               // beforeColumnValue是数组值，如果是单选则是字符串
-              let beforeColumnValue = param.row[this.column.prop]
               if (this.column.componentType === 'select') {
                 if (selectDataKey !== temp.valueAttribute) {
                   // 解决当前字段不是动态数据源选项值所映射的字段的问题 例如当前字段是工厂名称， 动态数据源选项值是工厂编码
-                  beforeColumnValue = temp.optionItems.find(
-                    (item) =>
-                      // 当前字段映射的是工厂名称，
-                      // 筛选动态数据源选项值字段对应的当前字段所映射的字段， 例如 根据工厂编码找工厂编码对应的工厂名称
-                      // 找出名称后赋值给当前字段
-                      item[temp.valueAttribute] === beforeColumnValue
-                  )[selectDataKey]
+                  // 当前字段映射的是工厂名称，
+                  // 筛选动态数据源选项值字段对应的当前字段所映射的字段， 例如 根据工厂编码找工厂编码对应的工厂名称
+                  // 找出名称后赋值给当前字段
+                  const filterValue = temp.optionItems.find((item) => item[temp.valueAttribute] === beforeColumnValue)
+                  if (filterValue) {
+                    beforeColumnValue = filterValue[selectDataKey]
+                  }
                 }
-                // 如果是单选
-                // 现在选择时已经赋值，不再需要这里进行赋值
-                // temp.optionItems.forEach(optionItem => {
-                //   if (optionItem[temp.valueAttribute] === beforeColumnValue) {
-                //     this.$set(param.row, this.column.prop, optionItem[selectDataKey])
-                //   }
-                // })
                 param.row[this.column.prop] = beforeColumnValue
               } else {
-                // 如果是多选，join  “ ，” ， 并给row赋值
-                // 现在选择时已经赋值，不再需要这里进行赋值
-                // const afterColumnValue = []
-                // temp.optionItems.forEach(optionItem => {
-                //   beforeColumnValue.forEach(value => {
-                //     if (optionItem[temp.valueAttribute] === value) {
-                //       afterColumnValue.push(optionItem[selectDataKey])
-                //     }
-                //   })
-                // })
-                if (beforeColumnValue && selectDataKey !== temp.valueAttribute) {
+                if (beforeColumnValue && selectDataKey !== temp.valueAttribute && Array.isArray(beforeColumnValue)) {
                   // 解决当前字段不是动态数据源选项值所映射的字段的问题 例如当前字段是工厂名称， 动态数据源选项值是工厂编码
                   const t = []
                   beforeColumnValue.forEach((selectItem) => {
                     if (selectDataKey !== temp.valueAttribute) {
-                      t.push(
-                        temp.optionItems.find((option) => option[temp.valueAttribute] === selectItem)[selectDataKey]
-                      )
+                      const filterValue = temp.optionItems.find((option) => option[temp.valueAttribute] === selectItem)
+                      if (filterValue) {
+                        t.push(filterValue[selectDataKey])
+                      }
                     }
                   })
-                  beforeColumnValue = t
+                  if (t.length > 0) {
+                    beforeColumnValue = t
+                    param.row[this.column.prop] = beforeColumnValue.join(',')
+                  }
                 }
-                param.row[this.column.prop] = beforeColumnValue.join(',')
               }
             }
           } else {
-            const beforeColumnValue = param.row[this.column.prop]
             if (beforeColumnValue && Object.prototype.toString.apply(beforeColumnValue) === '[object Array]') {
               // 如果是数组才需要转换
               param.row[this.column.prop] = beforeColumnValue.join(',')

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

@@ -3071,6 +3071,7 @@ export default {
             listCode: popPageSetting._listCode,
             rowIndex: popPageSetting._rowIndex,
             row: popPageSetting.row,
+            columnProp: popPageSetting._columnProp,
             id: row?(row.ID?row.ID:row.id):null,
             isMobile,
             gridData: isSubTableShowPage

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

@@ -817,11 +817,16 @@ export function getHeaderAlign(column, gridParams){
 
 
 export function getHeaderLable(column) {
+  let label = column.label
   if (!column.titleValueSet) {
-    return column.label.replace(/\\n/g, '</br>')
+    label = label.replace(/\\n/g, '</br>')
   } else {
-    return formatHeader(column)
+    label = formatHeader(column)
   }
+  if (label === null || label === undefined || label === '') {
+    label = column.prop
+  }
+  return label
 }
 
 function formatHeader(column) {

package/src/permission.js

@@ -151,11 +151,17 @@ router.beforeEach((to, from, next) => {
                   if (!isDevp && devpRoleCodes) {
                     // 表示是开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码，对应运行平台的岗位编码
                     // console.log('开发环境设计时生成的运行平台的JWT，且缓存了项目权限编码时，!isDevp && devpRoleCodes')
+                    console.log('getDevPlatformPermissions---devpRoleCodes=', devpRoleCodes)
                     return store.dispatch('getDevPlatformPermissions', devpRoleCodes)
                   } else {
                     // 开发平台本身的功能或直接平台功能时
                     // console.log('开发平台本身的功能或直接平台功能时')
-                    return store.dispatch('getCurrentUserPermissions', user.loginName)
+                    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) => {

package/src/store/modules/user.js

@@ -231,9 +231,12 @@ const user = {
     },
 
     // 获得当前用户权限集合
-    getCurrentUserPermissions({ commit }, loginName, systemCode) {
+    getCurrentUserPermissions({ commit }, param) {
       return new Promise((resolve, reject) => {
+        const loginName = param.loginName
+        const systemCode = param.systemCode
         let storePermissions = getPermissions()
+        console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions=', storePermissions)
         // 这个判断会导致资源不会重新加载？？
         if (
           typeof storePermissions === 'undefined' ||

package/src/utils/permissionAuth.js

@@ -218,7 +218,7 @@ export function isDevpAccess() {
         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){
+                postManagementCodes.indexOf(DEV_ROLE_PROJECT_VIEWER_CODE) >= 0){
             // 表示是项目负责人岗位或观察者岗位或平台管理员，且当前登录用户是 devp的应用id
           return true
         }