doway-coms 2.10.48 → 2.10.50

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -322,7 +322,7 @@
             :popupAddPath="scope.column.params.popupAddPath"
             :allowAutoClear="scope.column.params.allowAutoClear"
             @preSearch="(searchInfo,repeatRowInfo,row,api) => preSearch(searchInfo, scope,null,api)"
-            @selectChanged="cellValueChange(scope)"
+            @selectChanged="(selectedRowInfo)=>pulldownSelectChanged(scope,selectedRowInfo)"
             @confirmMultiSelect="
               (pulldownView, selectRows) =>
                 pulldownMultiSelect(scope, pulldownView, selectRows)
@@ -1310,6 +1310,20 @@ export default {
     })
   },
   methods: {
+    getCellEditExp(scope){
+      //盘点是否存在条件
+      let editExpResult = true
+      if(scope.column.params.editExp){
+          for(let i=0;i<scope.column.params.editExp.length;i++){
+              let exp = scope.column.params.editExp[i]
+              if(scope.row[exp.field]!==exp.value){
+                editExpResult = false
+                  break
+              }
+          }
+      }
+      return scope.column.params.controlEdit === true && editExpResult
+    },
     keydownEvent({$event,$grid,$table}){
       if(this.keyBoardNavi){
         const key=$event.key
@@ -1886,6 +1900,9 @@ export default {
       if (originCol.params) {
         colParams = originCol.params
       }
+      if(originCol.editExp){
+        colParams['editExp'] = originCol.editExp
+      }
 
       if (originCol.footerSum === true) {
         this.showFooter = true
@@ -2701,6 +2718,10 @@ export default {
       }
       return { visible: fieldVisible, edit: originEdit }
     },
+    pulldownSelectChanged(scope,selectedRowInfo){
+        scope['pulldownSelectedRow'] = selectedRowInfo
+        this.cellValueChange(scope)
+    },
     cellValueChange(scope, e) {
       console.debug(scope.column.field + 'value change')
       if (