doway-coms 2.10.81 → 2.10.83

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -250,6 +250,7 @@
           <a-select
            :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             :allowClear="scope.column.params.allowClear"
+             v-if="getCellEditExp(scope)"
             show-search
              option-filter-prop="children"
             v-model="scope.row[scope.column.property]"
@@ -264,6 +265,9 @@
               >{{ loopSource.caption }}</a-select-option
             >
           </a-select>
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
       <template #multiSelect_edit="scope">
@@ -271,6 +275,7 @@
           <a-select
            :style="{color:scope.column.params.fontColor?scope.column.params.fontColor:null}"
             v-model="scope.row[scope.column.property]"
+             v-if="getCellEditExp(scope)"
             @change="cellValueChange(scope)"
             mode="multiple"
             size="small"
@@ -284,6 +289,9 @@
               >{{ loopSource.caption }}</a-select-option
             >
           </a-select>
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
       <template #time_edit="scope" class="interceptor-class">
@@ -1346,10 +1354,19 @@ export default {
       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
+              if(exp.operator==='NE'){
+                  //不等于
+                if(scope.row[exp.field]===exp.value){
+                    editExpResult = false
+                    break
+                }
+              }else{
+                if(scope.row[exp.field]!==exp.value){
+                  editExpResult = false
+                    break
+                }
               }
+              
           }
       }
       return scope.column.params.controlEdit === true && editExpResult
@@ -2892,6 +2909,9 @@ export default {
     getVisibleData() {
       return this.$refs.baseGrid.getTableData().visibleData
     },
+    getVisibleDataLength(){
+      return this.$refs.baseGrid.getTableData().visibleData.length
+    },
     /**
      * 获取更新的行
      */

package/packages/BasePulldown/src/index.vue

@@ -478,6 +478,9 @@ export default {
       }
       if (this.columns[i].dataSource) {
         this.columns[i]['params'].dataSource = this.columns[i].dataSource
+        if(this.columns[i].controlType===controlType.select){
+          this.columns[i]['formatter'] = 'formatSelect'
+        }
       }
       if (!this.columns[i].width) {
         this.columns[i]['width'] = 100