doway-coms 2.11.80 → 2.11.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.11.80",
+  "version": "2.11.85",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseForm/src/index.vue

@@ -274,6 +274,7 @@
           col.controlType === 'pulldown' &&
           (col.isButtonShow == false || col.isButtonShow == undefined)
         "
+        :ref="'pulldown_' + col.field"
         :formRow="formRow"
         :isOld="isOld"
         :edit="col.edit"
@@ -798,6 +799,16 @@ export default {
       //   })
       // }
       this.$emit('selectRows', selectRows)
+    },
+    reloadPulldownColumn(field) {
+      const pulldownRef = this.$refs['pulldown_' + field]
+      if (pulldownRef) {
+        // 处理 ref 可能是数组的情况（v-for 中的 ref）
+        const component = Array.isArray(pulldownRef) ? pulldownRef[0] : pulldownRef
+        if (component && component.reloadColumn) {
+          component.reloadColumn()
+        }
+      }
     }
   },
 }

package/packages/BaseGrid/src/index.vue

@@ -1333,7 +1333,11 @@ export default {
     //拖动后输入框有错位问题，暂时不启用
     // this.initColumnDrop()
     for (let i = 0; i < this.columns.length; i++) {
-      this.internalColumns.push(this.initColumns(this.columns[i]))
+      let tempCol = this.initColumns(this.columns[i])
+      if(tempCol===null){
+          continue
+      }
+      this.internalColumns.push(tempCol)
       if (
         this.columns[i].visible !== false &&
         this.columns[i].controlType !== 'operation'
@@ -1539,7 +1543,11 @@ export default {
         })
       }
       for (let i = 0; i < this.columns.length; i++) {
-        this.internalColumns.push(this.initColumns(this.columns[i]))
+        let tempCol = this.initColumns(this.columns[i])
+        if(tempCol===null){
+          continue
+        }
+        this.internalColumns.push(tempCol)
         if (
           this.columns[i].visible !== false &&
           this.columns[i].controlType !== 'operation'
@@ -2051,7 +2059,6 @@ export default {
     initColumns(originCol) {
       let vm = this
       let colParams = {}
-
       let colInfo = {
         field: originCol.field,
         title: originCol.title,
@@ -2139,6 +2146,9 @@ export default {
       if(originCol.headerCellStyle){
         colParams['headerCellStyle'] =originCol.headerCellStyle
       }
+      if(originCol.permissionField){
+        colParams['permissionField'] = originCol.permissionField
+      }
 
       if (originCol.footerSum === true) {
         this.showFooter = true
@@ -2191,8 +2201,8 @@ export default {
       // if (XEUtils.isNumber(originCol.max)) {
       //   colParams['max'] = originCol.max
       // }
-      colParams['max'] =XEUtils.isNumber(originCol.max)?originCol.max:'Infinity'
-      colParams['min'] =XEUtils.isNumber(originCol.min)?originCol.min:'-Infinity'
+      colParams['max'] =XEUtils.isNumber(originCol.max)?originCol.max:Infinity
+      colParams['min'] =XEUtils.isNumber(originCol.min)?originCol.min:-Infinity
       if (originCol.precision) {
         colParams['precision'] = originCol.precision
         //加入验证逻辑
@@ -2401,7 +2411,11 @@ export default {
       if (originCol.children) {
         colInfo['children'] = []
         for (let x = 0; x < originCol.children.length; x++) {
-          colInfo['children'].push(this.initColumns(originCol.children[x]))
+          let tempCol = this.initColumns(originCol.children[x])
+          if(tempCol===null){
+            continue
+          }
+          colInfo['children'].push(tempCol)
         }
       }
       //防止报错 有slots值就走前面 没有slots这个键key就走后面
@@ -2896,6 +2910,7 @@ export default {
       if (this.pager.buttons) {
         for (let i = 0; i < this.pager.buttons.length; i++) {
           let editVisible = this.getColumnEdit(
+            null,
             this.pager.buttons[i].edit,
             currentState,
             currentStatus,
@@ -2949,6 +2964,7 @@ export default {
             this.internalColumns[i].params.columns[j].edit = false
             //设置工具栏可编辑状态
             let editVisible = this.getColumnEdit(
+              this.internalColumns[i].params.columns[j].permissionField,
               this.internalColumns[i].params.columns[j].edit,
               currentState,
               currentStatus,
@@ -2973,6 +2989,7 @@ export default {
         //设置网格列编辑状态
         if (this.gridEdit === true) {
           let editVisible = this.getColumnEdit(
+            this.internalColumns[i].params.permissionField,
             this.internalColumns[i].params.edit,
             currentState,
             currentStatus,
@@ -2989,6 +3006,7 @@ export default {
       }
     },
     getColumnEdit(
+      permissionField,
       originEdit,
       currentState,
       currentStatus,
@@ -3018,6 +3036,23 @@ export default {
       if (currentStatus && editStatuss) {
         originEdit = editStatuss.indexOf(currentStatus) > -1
       }
+      //是否存在字段编辑权限控制
+      //首先判断是否满足触发权限字段逻辑,包括单据状态是否满足,编辑状态是否满足
+      if(permissionField && originEdit===true){
+         let usePermissionEdit = false
+          if(currentState && permissionField.editStates){
+              usePermissionEdit = permissionField.editStates.indexOf(currentState) > -1
+          }
+          if(currentStatus && permissionField.editStatuss){
+              usePermissionEdit = permissionField.editStatuss.indexOf(currentStatus) > -1
+          }
+          if(usePermissionEdit===true){
+              //满足条件触发权限字段控制
+              originEdit = permissionField.edit===true
+          }
+      }
+      //---------------------------------------------------------------------
+
       return { visible: fieldVisible, edit: originEdit }
     },
     pulldownSelectChanged(scope,selectedRowInfo){
@@ -3281,7 +3316,11 @@ export default {
       this.internalColumns = []
 
       columns.forEach((column) => {
-        this.internalColumns.push(this.initColumns(column))
+        let tempCol = this.initColumns(column)
+        if(tempCol===null){
+           return
+        }
+        this.internalColumns.push(tempCol)
       })
       //注意，不能移到上面添加，会出现布局问题，暂时不知道什么原因????
       if (this.showCheckBox) {

package/packages/BasePulldown/src/index.vue

@@ -617,7 +617,11 @@ export default {
           this.filterCols.push(this.columns[i])
         }
       }
-      this.$refs.pupupGridView.refreshColumn()
+      this.$nextTick(() => {
+        if (this.$refs.pupupGridView) {
+          this.$refs.pupupGridView.refreshColumn()
+        }
+      })
     },
     gridRowStyle(scope) {
       if (scope.row.sysRepeat === true) {

package/packages/utils/enum.js

@@ -61,7 +61,8 @@ export const sysRowState = {
     y_axis: 'y_axis',
     series: 'series',
     treeSelect: 'treeSelect',
-    multiSelect: 'multiSelect'
+    multiSelect: 'multiSelect',
+    permission:'permission'//权限控制字段
   }
   export const dataType = {
     frame: 'frame',

package/packages/utils/store.js

@@ -83,6 +83,30 @@ export default new Vuex.Store({
                   }
                 let operationFields = []
                 XEUtils.arrayEach(loopData.fields, loopField => {
+
+                    if(loopField.controlType===controlType.permission){
+                        //权限字段,无需处理
+                        return
+                    }
+
+                    let extraInfo = loopField.extraInfo
+                        ? JSON.parse(loopField.extraInfo)
+                        : {}
+                    let userExtraInfo = loopField.userExtraInfo
+                        ? JSON.parse(loopField.userExtraInfo)
+                        : {}
+                    extraInfo = {...extraInfo, ...userExtraInfo}
+
+                    if(extraInfo.permissionField){
+                        //存在权限控制字段
+                        let tempPermissionFieldInfo =  XEUtils.find(loopData.fields,p=>p.code===extraInfo.permissionField)
+                        if(tempPermissionFieldInfo){
+                            //存在权限控制字段
+                            extraInfo.permissionField = tempPermissionFieldInfo
+                        }
+                    }
+
+
                     let tempField = {
                         field:loopField.code, // loopField.boundField,
                         title: loopField.name,
@@ -108,13 +132,7 @@ export default new Vuex.Store({
                         tempField['editStatuss'] = loopField.editStatuss.split(',')
                         tempField['visibleStatuss'] = loopField.editStatuss.split(',')
                     }
-                    let extraInfo = loopField.extraInfo
-                        ? JSON.parse(loopField.extraInfo)
-                        : {}
-                    let userExtraInfo = loopField.userExtraInfo
-                        ? JSON.parse(loopField.userExtraInfo)
-                        : {}
-                    extraInfo = {...extraInfo, ...userExtraInfo}
+                    
                     //存在额外参数，就赋值
                     if (Object.keys(extraInfo).length) {
                         if (Object.hasOwn(extraInfo, 'api')) {