doway-coms 1.4.31 → 1.4.33

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -2263,20 +2263,22 @@ export default {
       });
     },
     filterConfirm(colInfo) {
-      console.log(colInfo);
+      let col= this.internalColumns.find(x=>x.field==colInfo.property)
+      this.$set(col.filters[0].data,'bindingValues',[])
       colInfo.filters[0].data.bindingValues = [];
       XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
         if (colInfo.params.controlType === controlType.select) {
           colInfo.filters[0].data.bindingValues.push(item);
+          this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
         } else {
           if (item.value[0] || item.value[1]) {
             colInfo.filters[0].data.bindingValues.push(item);
+            this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
           }
         }
       });
       colInfo.filters[0].checked =
         colInfo.filters[0].data.bindingValues.length > 0;
-
       if (this.filterRemote) {
         //设置筛选过滤条件
         this.setFilterExpression();
@@ -2348,7 +2350,7 @@ export default {
         };
         let expStr = "";
         let filterBindingValues = loopColInfo.filters[0].data.bindingValues;
-
+        debugger
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };
 

package/packages/utils/common.js

@@ -563,4 +563,19 @@ export function setFormButtons(toolBtns,statusBtns,permissionBtns){
             break
       }
   })
+}
+export function setGridPagerButton(dataCode,datas,pagerButtons){
+   let tempData =  XEUtils.find(datas,p=>p.code===dataCode)
+   if(!tempData){
+      return
+   }
+   XEUtils.arrayEach(tempData.fields,loopField=>{
+      if(loopField.controlType==='pager_button'){
+        pagerButtons.push({
+          field:loopField.boundField,
+          title:loopField.name,
+          visible:true
+        })
+      }
+   })
 }