agilebuilder-ui 1.1.41 → 1.1.42-sit1

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

@@ -3,6 +3,7 @@ import { $emit } from '../../utils/gogocodeTransfer'
 import Sortable from 'sortablejs'
 import { packageEnumAndBeanColumnValueSets } from '../../utils/value-set'
 import store from './store'
+import { checkPermission, isFieldHasBranchAuth } from '../../../src/utils/permission'
 import { isHasOptionFunction } from './utils'
 
 const superGridService = {
@@ -25,8 +26,7 @@ const superGridService = {
         resolve()
       } else {
         let additionalParams
-        const additionalParamMap =
-          window.sessionStorage.getItem('additionalParamMap')
+        const additionalParamMap = window.sessionStorage.getItem('additionalParamMap')
         if (additionalParamMap) {
           console.log('进入判断', additionalParamMap)
           if (additionalParamMap && typeof additionalParamMap === 'object') {
@@ -35,20 +35,14 @@ const superGridService = {
             additionalParams = additionalParamMap
           }
         }
-        if (
-          this.options.additionalParamMap &&
-          typeof this.options.additionalParamMap === 'object'
-        ) {
+        if (this.options.additionalParamMap && typeof this.options.additionalParamMap === 'object') {
           const optionParam = JSON.stringify(this.options.additionalParamMap)
           if (additionalParams) {
             Object.assign(additionalParams, optionParam)
           } else {
             additionalParams = optionParam
           }
-        } else if (
-          this.options.additionalParamMap &&
-          this.options.additionalParamMap !== ''
-        ) {
+        } else if (this.options.additionalParamMap && this.options.additionalParamMap !== '') {
           const optionParam = this.options.additionalParamMap
           if (additionalParams) {
             Object.assign(additionalParams, optionParam)
@@ -67,9 +61,18 @@ const superGridService = {
             this.isLoadCompleteQuery(data.columns)
             // 行编辑设置所有字段的默认值null时使用，优化行编辑性能
             let allColumns = []
-            allColumns = allColumns.concat(
-              JSON.parse(JSON.stringify(data.columns))
-            )
+            // if (structuredClone) {
+            // structuredClone
+            //   allColumns = structuredClone(data.columns)
+            // } else {
+            allColumns.concat(JSON.parse(JSON.stringify(data.columns)))
+            // }
+            if (data.branchFieldsMap && Object.keys(data.branchFieldsMap).length > 0) {
+              if (data.branchFieldsMap.allAuthFields && data.branchFieldsMap.allAuthFields.length > 0) {
+                gridParams.branchFieldsMap = data.branchFieldsMap
+              }
+            }
+            data.columns = this.filterHasAuthColumns(data.columns, gridParams, data.basicInfo?.systemCode)
             // 根据this.options.showColumns设置显示的字段
             this.getShowColumns(data)
             // 将列表信息存入store缓存中，用来导出时获取国际化名
@@ -101,14 +104,14 @@ const superGridService = {
             }
 
             // 需要多个组件共享的数据放到store中，避免组件定义一堆props来接收这些共享数据
-            packageEnumAndBeanColumnValueSets(data.columns, this.code, gridParams.additionalParamMap, this.parentFormData)
+            packageEnumAndBeanColumnValueSets(
+              data.columns,
+              this.code,
+              gridParams.additionalParamMap,
+              this.parentFormData
+            )
               .then(() => {
-                return this.getDynamicColumnByBean(
-                  additionalParams,
-                  data.dynamicColumnInfo,
-                  data.columns,
-                  gridParams
-                )
+                return this.getDynamicColumnByBean(additionalParams, data.dynamicColumnInfo, data.columns, gridParams)
               })
               .then((dynamicColumns) => {
                 const b = new Date().getTime()
@@ -117,21 +120,13 @@ const superGridService = {
                   showColumns = this.options.showColumns.split(',')
                 }
                 let customDynamicColumns = dynamicColumns
-                if (
-                  !customDynamicColumns ||
-                  customDynamicColumns.length === 0
-                ) {
-                  if (
-                    this.options.dynamicColumns &&
-                    this.options.dynamicColumns.length > 0
-                  ) {
+                if (!customDynamicColumns || customDynamicColumns.length === 0) {
+                  if (this.options.dynamicColumns && this.options.dynamicColumns.length > 0) {
                     customDynamicColumns = this.options.dynamicColumns
                   }
                 }
                 if (customDynamicColumns && customDynamicColumns.length > 0) {
-                  allColumns = allColumns.concat(
-                    JSON.parse(JSON.stringify(customDynamicColumns))
-                  )
+                  allColumns = allColumns.concat(JSON.parse(JSON.stringify(customDynamicColumns)))
                   if (showColumns && showColumns.length > 0) {
                     for (let i = 0; i < customDynamicColumns.length; i++) {
                       const prop = customDynamicColumns[i].prop
@@ -145,9 +140,7 @@ const superGridService = {
                   }
                   data.columns = data.columns.concat(customDynamicColumns)
                   // 按照排序字段的值升序排列字段
-                  data.columns = data.columns.sort(
-                    (col1, col2) => col1.displayOrder - col2.displayOrder
-                  )
+                  data.columns = data.columns.sort((col1, col2) => col1.displayOrder - col2.displayOrder)
                 }
                 Object.assign(this, data)
                 if (this.options && typeof isSqlSetting === 'undefined') {
@@ -177,22 +170,21 @@ const superGridService = {
                 gridParams.pageContext = this.pageContext
                 gridParams.configureObj = this.configureObj
                 this.tableName = this.basicInfo.tableName
-                gridParams.hiddenColumns = this.options.hiddenColumns?JSON.parse(JSON.stringify(this.options.hiddenColumns)):[]
+                gridParams.hiddenColumns = this.options.hiddenColumns
+                  ? JSON.parse(JSON.stringify(this.options.hiddenColumns))
+                  : []
                 if (this.pagination) {
                   // 监控每行显示多少条变量使用
                   this.pageSize = this.pagination.pageSize
                 }
                 gridParams.query = this.query
                 gridParams.dynamicColumnInfo = this.dynamicColumnInfo
-                gridParams.mainDefaultValueColumns =
-                  this.mainDefaultValueColumns
+                gridParams.mainDefaultValueColumns = this.mainDefaultValueColumns
                 gridParams.contextParameter = this.contextParameter
                 // 是否显示分页区域
                 this.isShowPage = this.isShowPageArea()
                 // 子表是否分页
-                this.isSubTableShowPage = this.isFormSubTable
-                  ? this.isShowPage
-                  : false
+                this.isSubTableShowPage = this.isFormSubTable ? this.isShowPage : false
                 gridParams.isSubTableShowPage = this.isSubTableShowPage
                 this.getDetailColumn()
                 this.hasLoadedColumns = true
@@ -213,8 +205,7 @@ const superGridService = {
                     // 表示是页面展示模式
                   } else if (typeof this.options.initSearch === 'undefined') {
                     if (
-                      typeof gridParams.basicInfo.initializationQuery ===
-                      'undefined' ||
+                      typeof gridParams.basicInfo.initializationQuery === 'undefined' ||
                       gridParams.basicInfo.initializationQuery
                     ) {
                       // console.log('fetchData-----this.loadCompleteQuery=', this.loadCompleteQuery, '1111111')
@@ -256,35 +247,35 @@ const superGridService = {
     if (this.isFormSubTable && this.options.showRowForm) {
       // 显示详情列
       const detailColumn = {
-        "prop": "$detail",
-        "orgProp": "$detail",
-        "label": "详情",
-        "dataType": "TEXT",
-        "width": 80,
-        "show": true,
-        "exportable": false,
-        "sortable": "false",
-        "filterable": false,
-        "fixed": "left",
-        "span": false,
-        "queryType": "no",
-        "querySetting": "{}",
-        "editable": false,
-        "componentType": "input",
-        "titleAlign": "center",
-        "contAlign": "center",
-        "showType": "default",
-        "exportType": "default",
-        "displayOrderType": "default",
-        "displayOrder": 5,
-        "widthType": "default",
-        "ifMultiData": true,
-        "dynamic": false,
-        "total": false,
-        "custom": true,
-        "remoteEnum": false,
-        "fuzzy": true,
-        "groupHeader": false
+        prop: '$detail',
+        orgProp: '$detail',
+        label: '详情',
+        dataType: 'TEXT',
+        width: 80,
+        show: true,
+        exportable: false,
+        sortable: 'false',
+        filterable: false,
+        fixed: 'left',
+        span: false,
+        queryType: 'no',
+        querySetting: '{}',
+        editable: false,
+        componentType: 'input',
+        titleAlign: 'center',
+        contAlign: 'center',
+        showType: 'default',
+        exportType: 'default',
+        displayOrderType: 'default',
+        displayOrder: 5,
+        widthType: 'default',
+        ifMultiData: true,
+        dynamic: false,
+        total: false,
+        custom: true,
+        remoteEnum: false,
+        fuzzy: true,
+        groupHeader: false
       }
       detailColumn.label = this.$t('superGrid.detail')
       this.detailColumn = detailColumn
@@ -297,10 +288,7 @@ const superGridService = {
       if (this.settings) {
         resolve(this.settings)
       } else {
-        const url =
-          window.$vueApp.config.globalProperties.baseAPI +
-          '/component/super-grids/' +
-          this.code
+        const url = window.$vueApp.config.globalProperties.baseAPI + '/component/super-grids/' + this.code
         const param = {}
         const isSqlSetting = this.options.isSql
         if (this.options && typeof isSqlSetting !== 'undefined') {
@@ -324,7 +312,8 @@ const superGridService = {
           .post(url, param)
           .then((data) => {
             resolve(data)
-          }).catch(error => {
+          })
+          .catch((error) => {
             reject(error)
           })
       }
@@ -334,13 +323,17 @@ const superGridService = {
     if (columns !== null) {
       let queryParameterSize = 0
       columns.forEach((column) => {
-        if (
-          column.hasOwnProperty('queryType') &&
-          column.hasOwnProperty('prop')
-        ) {
+        if (column.hasOwnProperty('queryType') && column.hasOwnProperty('prop')) {
           if (column.prop !== '$index' && column.prop !== '$selection') {
-            if (column.queryType && column.queryType !== 'no' && column.componentType && (column.componentType === 'date' || column.componentType === 'dateSection' ||
-              column.componentType === 'timePicker' || column.componentType === 'dateTimePicker')) {
+            if (
+              column.queryType &&
+              column.queryType !== 'no' &&
+              column.componentType &&
+              (column.componentType === 'date' ||
+                column.componentType === 'dateSection' ||
+                column.componentType === 'timePicker' ||
+                column.componentType === 'dateTimePicker')
+            ) {
               // 配置了默认值
               if (column.controlConfig && column.controlConfig.timeDefaultQueryRange) {
                 queryParameterSize++
@@ -372,24 +365,12 @@ const superGridService = {
       }
     })
   },
-  getDynamicColumnByBean(
-    additionalParams,
-    dynamicColumnInfos,
-    columns,
-    gridParams
-  ) {
+  getDynamicColumnByBean(additionalParams, dynamicColumnInfos, columns, gridParams) {
     return new Promise((resolve, reject) => {
-      if (
-        gridParams.options.extraParam &&
-        gridParams.options.extraParam.entityMap
-      ) {
+      if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
         this.parentFormData = gridParams.options.extraParam.entityMap
       }
-      if (
-        !this.options.isPageInfo &&
-        dynamicColumnInfos &&
-        dynamicColumnInfos.length > 0
-      ) {
+      if (!this.options.isPageInfo && dynamicColumnInfos && dynamicColumnInfos.length > 0) {
         const totalDynamicColumns = []
         this.getDynamicColumnByBeanWithOneSet(
           additionalParams,
@@ -422,58 +403,48 @@ const superGridService = {
   ) {
     return new Promise((resolve, reject) => {
       if (dynamicColumnInfo && dynamicColumnInfo.beanName) {
-        const url =
-          window.$vueApp.config.globalProperties.baseURL +
-          '/common/dynamic-columns'
+        const url = window.$vueApp.config.globalProperties.baseURL + '/common/dynamic-columns'
         const param = {
           additionalParams, // 附加参数对象
           listCode: this.code,
           columns,
-          beanName: dynamicColumnInfo.beanName,
+          beanName: dynamicColumnInfo.beanName
         }
         if (this.parentFormData) {
           // 初始化表单时，加载动态列需要
           if (gridParams.dynamicTemp) {
             param.parent = gridParams.dynamicTemp.parent
-            param.watchParentAttrValues =
-              gridParams.dynamicTemp.watchParentAttrValues
+            param.watchParentAttrValues = gridParams.dynamicTemp.watchParentAttrValues
           } else {
             param.parent = this.parentFormData
           }
           // 监听主表字段的值
           if (dynamicColumnInfo.watchParentAttr) {
-            const watchParentAttrs =
-              dynamicColumnInfo.watchParentAttr.split(',')
+            const watchParentAttrs = dynamicColumnInfo.watchParentAttr.split(',')
             watchParentAttrs.forEach((watchParentAttr) => {
               if (watchParentAttr) {
                 // 存储属性对应的值
                 if (!param.watchParentAttrValues) {
                   param.watchParentAttrValues = {}
                 }
-                param.watchParentAttrValues[watchParentAttr] =
-                  this.parentFormData[watchParentAttr]
-                const unWatch = this.$watch(
-                  'parentFormData.' + watchParentAttr,
-                  function (newValue, oldValue) {
+                param.watchParentAttrValues[watchParentAttr] = this.parentFormData[watchParentAttr]
+                const unWatch = this.$watch('parentFormData.' + watchParentAttr, function (newValue, oldValue) {
+                  // 重新加载表格及表格数据
+                  if (!gridParams.dynamicTemp) {
+                    gridParams.dynamicTemp = {}
+                  }
+                  gridParams.dynamicTemp.parent = this.parentFormData
+                  if (!gridParams.dynamicTemp.watchParentAttrValues) {
+                    gridParams.dynamicTemp.watchParentAttrValues = {}
+                  }
+                  gridParams.dynamicTemp.watchParentAttrValues[watchParentAttr] = newValue
+                  if (this.$refs && this.$refs.superGrid) {
+                    // 手动注销watch，否则会调用多次watch
+                    unWatch()
                     // 重新加载表格及表格数据
-                    if (!gridParams.dynamicTemp) {
-                      gridParams.dynamicTemp = {}
-                    }
-                    gridParams.dynamicTemp.parent = this.parentFormData
-                    if (!gridParams.dynamicTemp.watchParentAttrValues) {
-                      gridParams.dynamicTemp.watchParentAttrValues = {}
-                    }
-                    gridParams.dynamicTemp.watchParentAttrValues[
-                      watchParentAttr
-                    ] = newValue
-                    if (this.$refs && this.$refs.superGrid) {
-                      // 手动注销watch，否则会调用多次watch
-                      unWatch()
-                      // 重新加载表格及表格数据
-                      $emit(this, 'reload-grid')
-                    }
+                    $emit(this, 'reload-grid')
                   }
-                )
+                })
               }
             })
           }
@@ -530,10 +501,7 @@ const superGridService = {
             //   return listColumn.listColumnFixed === 'left' || listColumn.listColumnFixed === 'right'
             // })
             for (var r = 0; r < vm.columns.length; r++) {
-              if (
-                vm.columns[r].fixed === 'left' ||
-                vm.columns[r].fixed === 'right'
-              ) {
+              if (vm.columns[r].fixed === 'left' || vm.columns[r].fixed === 'right') {
                 frozenArr.push(r)
               }
             }
@@ -579,12 +547,7 @@ const superGridService = {
                 }
               }
             }
-            vm.indexAfterTheChangeUpdateDisplayOrder(
-              vm.columns,
-              oldIndex,
-              newIndex,
-              'displayOrder'
-            )
+            vm.indexAfterTheChangeUpdateDisplayOrder(vm.columns, oldIndex, newIndex, 'displayOrder')
             let splitArr = []
             if (oldIndex > newIndex) {
               // 从后往前
@@ -595,14 +558,10 @@ const superGridService = {
             }
             const params = {
               listCode: vm.code,
-              columns: splitArr,
+              columns: splitArr
             }
             vm.$http
-              .post(
-                window.$vueApp.config.globalProperties.baseAPI +
-                '/component/super-grids/drag-columns',
-                params
-              )
+              .post(window.$vueApp.config.globalProperties.baseAPI + '/component/super-grids/drag-columns', params)
               .then((data) => {
                 console.log('移动成功')
               })
@@ -627,7 +586,7 @@ const superGridService = {
             //   vm.$set(targetItem, 'displayOrder', currentDisplayOrder)
             //   vm.$set(targetItem, 'displayOrderType', 'custom')
             // })
-          },
+          }
         })
       }
     }
@@ -652,7 +611,7 @@ const superGridService = {
             that.columns.splice(oldIndex, 1)
             that.columns.splice(newIndex, 0, oldItem)
             $emit(this, 'columnDrop', oldIndex, newIndex)
-          },
+          }
         })
       }
     }
@@ -705,11 +664,7 @@ const superGridService = {
     }
   },
   getDisplayOrder(column, dragIndex) {
-    if (
-      column &&
-      column.displayOrder !== undefined &&
-      column.displayOrder !== null
-    ) {
+    if (column && column.displayOrder !== undefined && column.displayOrder !== null) {
       return column.displayOrder
     } else {
       return dragIndex + 1
@@ -771,13 +726,13 @@ const superGridService = {
       if (width !== undefined) {
         const params = {
           prop: prop,
-          width: width + '',
+          width: width + ''
         }
         this.$http
           .post(
             window.$vueApp.config.globalProperties.baseAPI +
-            '/component/super-grids/setting-column-widths/' +
-            this.code,
+              '/component/super-grids/setting-column-widths/' +
+              this.code,
             params
           )
           .then((data) => {
@@ -791,5 +746,38 @@ const superGridService = {
       }
     })
   },
+  filterHasAuthColumns(columns, gridParams, systemCode) {
+    if(!this.pageContext || !this.configureObj) {
+      return columns
+    }
+    const prop = this.configureObj.code ? this.configureObj.code : this.code
+    if (!this.pageContext.subTablePageInfo) {
+      this.pageContext.subTablePageInfo = {}
+    }
+    if (!this.pageContext.subTablePageInfo[prop]) {
+      this.pageContext.subTablePageInfo[prop] = {}
+    }
+    this.pageContext.subTablePageInfo[prop].fields = []
+    return columns.filter((column) => {
+      // 如果有 functionCode，则检查权限
+      let hasAuth = true
+      if (gridParams.branchFieldsMap) {
+        // 检查分支权限
+        hasAuth = isFieldHasBranchAuth(gridParams.branchFieldsMap, column.prop)
+      }
+      if (column.functionCode) {
+        hasAuth = checkPermission(column.functionCode, systemCode)
+      }
+      if (hasAuth) {
+        if (column.prop !== '$index' && column.prop !== '$selection') {
+          this.pageContext.subTablePageInfo[prop].fields.push(column.prop)
+        }
+        return true
+      } else {
+        // 如果没有权限，则不显示该列
+        return false
+      }
+    })
+  }
 }
 export default superGridService

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

@@ -92,7 +92,6 @@
         @cell-dblclick="cellDblClick"
       >
         <row-detail v-if="detailColumn" :column="detailColumn" :list-code="code" @show-detail="openRowForm" />
-
         <component
           :is="getComponentType(column)"
           v-for="({ column, ...item }, index) in visibleColumnsComponentData"
@@ -139,7 +138,7 @@
 
     <columns-config
       v-if="showColumnConfig"
-      :columns="columns"
+      :columns="visibleColumns"
       :list-code="code"
       :is-sql="isSql"
       @close="closeCustomConfig($event)"
@@ -220,7 +219,6 @@ import events from './events'
 import publicMethods from './public-methods'
 import superGridService from './super-grid-service'
 import formValidatorService from './formValidatorUtil'
-import { getSystemCode } from '../../../src/utils/permissionAuth'
 import apis from './apis'
 import headerContextMenu from './header-context-menu.vue'
 import { isMobileBrowser, isPromise } from '../../../src/utils/common-util'
@@ -455,7 +453,9 @@ export default {
   computed: {
     // 高度偏移
     heightOffset() {
-      return Number(this.manualHeightOffset ?? this.options?.configureObj?.props?.size?.pc?.heightOffset ?? 33)
+      //去掉之前的偏移量33，解决偏移导致横向滚动条被遮住无法显示问题
+      return Number(this.manualHeightOffset ?? this.options?.configureObj?.props?.size?.pc?.heightOffset ?? 0)
+      // return Number(this.manualHeightOffset ?? this.options?.configureObj?.props?.size?.pc?.heightOffset ?? 33)
     },
     // 限制高度最低值
     hasMaxHeight() {
@@ -488,13 +488,11 @@ export default {
       const gridParams = store.get(this.code)
       const operations = this.getOptionOperations()
       gridParams.canntEdit = false
-
       const setAttrs = (data) => data.map((item) => ({ property: item.prop, ...item }))
-
       if (operations && operations.operation && operations.operation.length > 0) {
         operations.operation.forEach((buttonInfo) => {
           if (buttonInfo.props.code === 'lineEditUpdate') {
-            if (checkPermission(buttonInfo.props.functionCode)) {
+            if (checkPermission(buttonInfo.props.functionCode, this.basicInfo.systemCode)) {
               gridParams.canntEdit = true
             }
           }
@@ -603,15 +601,17 @@ export default {
     },
     scrollbarAlwaysOn() {
       // 检查全局 Vue 应用配置中是否有 scrollbarAlwaysOn 属性
-      if (window.$vueApp && 
-          window.$vueApp.config && 
-          window.$vueApp.config.globalProperties && 
-          window.$vueApp.config.globalProperties.scrollbarAlwaysOn !== undefined) {
+      if (
+        window.$vueApp &&
+        window.$vueApp.config &&
+        window.$vueApp.config.globalProperties &&
+        window.$vueApp.config.globalProperties.scrollbarAlwaysOn !== undefined
+      ) {
         // 返回全局配置的值
-        return window.$vueApp.config.globalProperties.scrollbarAlwaysOn;
+        return window.$vueApp.config.globalProperties.scrollbarAlwaysOn
       }
       // 默认返回 false
-      return false;
+      return false
     }
     // ,
     // hasLoadMainTable() {
@@ -1383,6 +1383,9 @@ export default {
         param.additionalParamMap = gridParams.additionalParamMap
         param.pageContext = this.pageContext
         param.configureOb = this.configureObj
+        if (param.row) {
+          param.row = this.handRowKeyToUpperCase(param.row)
+        }
         return gridParams.options.rowStyleRender.call(this, param)
       }
       if (this.options && this.options.renderRow && this.options.renderRow.hasOwnProperty(param.rowIndex)) {
@@ -1415,6 +1418,9 @@ export default {
         param.pageContext = this.pageContext
         param.configureObj = this.configureObj
         param.cellStyle = columnStyleSetting
+        if (param.row) {
+          param.row = this.handRowKeyToUpperCase(param.row)
+        }
         return gridParams.options.cellStyleRender.call(this, param)
       } else if (
         funName !== null &&
@@ -1433,6 +1439,9 @@ export default {
           rowIndex: param.rowIndex,
           cellStyle: columnStyleSetting
         }
+        if (params.row) {
+          params.row = this.handRowKeyToUpperCase(params.row)
+        }
         return gridParams.options['eventCallBack'][funName].call(this, params)
       }
     },
@@ -1726,7 +1735,7 @@ export default {
         // 父级字段名，例如：parentId 或 fk_parent_id
         param['parentProp'] = this.parentProp
         // 传入系统code
-        param.systemCode = getSystemCode()
+        param.systemCode = this.basicInfo.systemCode
 
         requestUrl = this.options.subRowUrl
       }
@@ -3394,6 +3403,26 @@ export default {
     },
     getSuperGridRef() {
       return this.$refs.superGrid
+    },
+    getColumns() {
+      return this.columns
+    },
+    handRowKeyToUpperCase(row) {
+      // 把row对象的所有key都转成大写
+      if (row) {
+        const newRow = {}
+        try {
+          for (const key in row) {
+            if (Object.prototype.hasOwnProperty.call(row, key)) {
+              newRow[key.toUpperCase()] = row[key]
+            }
+          }
+        } catch (error) {
+          console.error('handRowKeyToUpperCase error:', error)
+          return row
+        }
+        return newRow
+      }
     }
   },
   emits: [