doway-coms 1.4.88 → 1.4.90

package/package.json

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

package/packages/BaseGridAdjust/src/index.vue

@@ -14,6 +14,8 @@
         chronological: true,
       }"
       column-key
+      :menu-config="menuConfig"
+      @menu-click="contextMenuClickEvent"
     >
       <template #empty>
         <div>拖拽调整字段位置或者宽度</div>
@@ -216,7 +218,6 @@ export default {
   },
   created() {
     this.adjustUserDefineColumns = this.userDefineColumns
-
     this.adjustUserDefineColumns.forEach(item => {
         if (item.visible) {
             this.$set(item, 'show', true)
@@ -226,24 +227,34 @@ export default {
     })
     this.adjustGridOptions.columns = []
     this.adjustUserDefineColumns.forEach(item => {
-        if (item.field === 'operation') {
-            return
-        }
+      if (item.field === 'operation') {
+          return
+      }
 
-        const column = {
-            field: item.field,
-            title: item.title,
-            slots: {
-                header: 'checkbox',
-                filter: item.slots.filter
-            },
-            params: item.params,
-            width: item.width,
-            filters: item.filters,
-            sortable: true,
-        }
-        this.$set(column.params,'show',item.show)
-        this.adjustGridOptions.columns.push(column)
+      const column = {
+          field: item.field,
+          title: item.title,
+          slots: {
+              header: 'checkbox',
+              filter: item.slots.filter
+          },
+          params: item.params,
+          width: item.width,
+          filters: item.filters,
+          sortable: true,
+          filterResetMethod:({ options, column })=>{
+            column.filters = [
+                {
+                    data: {
+                        bindingValues: [],
+                        displayValues: []
+                    }
+                }
+            ]
+          }
+      }
+      this.$set(column.params,'show',item.show)
+      this.adjustGridOptions.columns.push(column)
     })
   },
   mounted() {
@@ -260,6 +271,21 @@ export default {
   },
   data() {
     return {
+      menuConfig: {
+        header: {
+          options: [
+            [
+              {
+                code: "clearFilter",
+                name: "清空筛选",
+                visible: true,
+                disabled: false,
+              },
+            ],
+          ],
+        },
+        enabled:true
+      },
       adjustGridLoading: false,
       adjustUserDefineColumns: null,
       adjustGridOptions: {
@@ -283,8 +309,42 @@ export default {
       const find = XEUtils.find(this.$refs.adjustGrid.getTableColumn().collectColumn,item=>item.field ===val.field)
       find.visible = val.params.show
     },
+    //右键菜单事件
+    contextMenuClickEvent({ menu, row, column }) {
+      const $table = this.$refs.adjustGrid;
+      switch (menu.code) {
+        case 'clearFilter':
+          const filterList = this.$refs.adjustGrid.getCheckedFilters();
+          filterList.forEach((col) => {
+              this.getTableColumn().forEach(column => {
+                if(column.field==col.property){
+                  this.$set(column.filters[0].data,'displayValues',[])
+                  this.$set(column.filters[0].data,'bindingValues',[])
+                  this.$refs.adjustGrid.clearFilter(column)
+                }
+              });
+              //这个col和 internalColumn之间没有绑定上
+              col.column.filters = [
+                  {
+                      data: {
+                          bindingValues: [],
+                          displayValues: []
+                      }
+                  }
+              ]
+          });
+          // this.$refs.adjustGrid.clearFilter()
+          // .then(res=>{
+          //   console.log('a',this.$refs.adjustGrid.getCheckedFilters())
+          //   console.log('b',this.getTableColumn())
+          // })
+      //     XEUtils.clear(this.filterExpression)
+      //     vm.$emit("filterChange");
+          break
+      }
+    },
     resizableChange($rowIndex) {
-      this.adjustUserDefineColumns.forEach(item => {
+        this.$refs.adjustGrid.getTableColumn().collectColumn.forEach(item => {
         if (item.field === $rowIndex.column.field) {
           item.width = $rowIndex.column.resizeWidth
         }
@@ -367,6 +427,7 @@ export default {
     getTableColumn() {
         return this.$refs.adjustGrid.getTableColumn().collectColumn
     },
+
   }
 }
 </script>