doway-coms 1.4.24 → 1.4.26

package/dist/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "doway-coms",
+  "version": "1.0.0",
+  "description": "",
+  "main": "doway-coms.common.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1135,22 +1135,20 @@ export default {
         case "clearFilter":
           // 示例
           const filterList = this.$refs.baseGrid.getCheckedFilters();
-
           filterList.forEach((col) => {
-            // if (
-            //   col.column.params.controlType === "select" ||
-            //   col.column.params.controlType === "checkbox"
-            // ) {
-            //   col.column.filters = [{ data: [] }];
-            // } else {
-            //   col.column.filters = [{ data: [] }];
-            // }
               this.$refs.baseGrid.clearFilter(col.column);
+              this.internalColumns.forEach(column => {
+                if(column.field==col.property){
+                  this.$set(column.filters[0].data,'displayValues',[])
+                  this.$set(column.filters[0].data,'bindingValues',[])
+                }
+              });
+              //这个col和 internalColumn之间没有绑定上
               col.column.filters = [
                   {
                       data: {
-                          bindingValues: '',
-                          displayValues: ''
+                          bindingValues: [],
+                          displayValues: []
                       }
                   }
               ]
@@ -2249,24 +2247,37 @@ export default {
       });
     },
     filterConfirm(colInfo) {
-      console.log(colInfo);
-      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);
-        } else {
-          if (item.value[0] || item.value[1]) {
+      if (this.filterRemote) {
+        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) {
+            col.filters[0].data.bindingValues.push(item)
             colInfo.filters[0].data.bindingValues.push(item);
+          } else {
+            if (item.value[0] || item.value[1]) {
+              col.filters[0].data.bindingValues.push(item)
+              colInfo.filters[0].data.bindingValues.push(item);
+            }
+          }
+        });
+        colInfo.filters[0].checked =
+          colInfo.filters[0].data.bindingValues.length > 0;
+        //设置筛选过滤条件
+        this.setFilterExpression();
+        //通知外部筛选改变事件
+        this.$emit("filterChange", { filterCol: colInfo });
+      } else {
+        for (let i = 0; i < colInfo.filters.length; i++) {
+          if (!colInfo.filters[i].value) {
+            colInfo.filters[i].checked = true;
+          } else {
+            colInfo.filters[i].checked = false;
           }
         }
-      });
-      colInfo.filters[0].checked =
-        colInfo.filters[0].data.bindingValues.length > 0;
-
-      //设置筛选过滤条件
-      this.setFilterExpression();
-      //通知外部筛选改变事件
-      this.$emit("filterChange", { filterCol: colInfo });
+        this.$refs.baseGrid.updateData();
+      }
       this.$refs.baseGrid.closeFilter()
     },
     setFilterExpression() {
@@ -2287,7 +2298,6 @@ export default {
         };
         let expStr = "";
         let filterBindingValues = loopColInfo.filters[0].data.bindingValues;
-
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };