doway-coms 2.10.49 → 2.10.51

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -173,7 +173,7 @@
         <div class="interceptor-class">
           <a-input
             :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
-              v-if="scope.column.params.controlEdit === true"
+             v-if="getCellEditExp(scope)"
             class="inner-cell-control"
             size="small"
             v-model="scope.row[scope.column.property]"
@@ -200,7 +200,7 @@
       <template #number_edit="scope">
         <div class="interceptor-class">
           <a-input-number
-              v-if="scope.column.params.controlEdit === true"
+              v-if="getCellEditExp(scope)"
             class="inner-cell-control"
             :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             size="small"
@@ -305,7 +305,7 @@
             v-model="scope.row[scope.column.property]"
             :field="scope.column.property"
             :formRow="formRow"
-            :edit="scope.column.params.controlEdit === true"
+            :edit="getCellEditExp(scope)"
             :showLabel="false"
             :row="scope.row"
             :api="scope.column.params.api"
@@ -339,7 +339,7 @@
             v-model="scope.row[scope.column.property]"
             :field="scope.column.property"
             :formRow="formRow"
-            :edit="scope.column.params.controlEdit === true"
+            :edit="getCellEditExp(scope)"
             :showLabel="false"
             :row="scope.row"
             class="inner-cell-control"
@@ -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