doway-coms 2.6.4 → 2.6.6

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -2006,7 +2006,7 @@ export default {
 
       //是否系统显示还是系统隐藏
       colParams['sysVisible'] = true
-      if (!originCol.sysVisible) {
+      if (originCol.sysVisible===false) {
         colParams['sysVisible'] = false
       }
       if (originCol.children) {

package/packages/BasePulldown/src/index.vue

@@ -895,8 +895,23 @@ export default {
           dataSource: [],
         }
         this.$emit('preSearch', tempSearch)
-        this.searchRows = tempSearch.dataSource
-        this.gridPagerConfig.total = tempSearch.dataSource.length
+        this.searchRows = []
+        //判断删选条件过滤
+        XEUtils.arrayEach(tempSearch.dataSource,loopItem=>{
+           let tempFlag = this.filterCols.length===0
+            for(let i=0;i< this.filterCols.length;i++){
+               let tempValue = loopItem[this.filterCols[i].field]
+                if(XEUtils.isString(tempValue) && tempValue.includes(this.currentValue)===true){
+                    tempFlag = true
+                    break
+                }
+            }
+            if(tempFlag===true || !this.currentValue){
+              this.searchRows.push(loopItem)
+            }
+           
+        })
+        this.gridPagerConfig.total = this.searchRows.length
         return
       }