doway-coms 1.2.1 → 1.2.3

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -339,7 +339,7 @@
                   :style="{
                     display: 'flex',
                     flexWrap: 'wrap',
-                    justifyContent: 'center',
+                    justifyContent: 'left',
                     alignItems: 'center',
                     maxHeight: '150px',
                     overflow: 'auto',
@@ -351,10 +351,9 @@
                   v-for="loopSource in scope.column.params.dataSource"
                   :key="loopSource.value"
                   :value="loopSource.value"
-                  style="margin: 5px 0"
+                  style="margin: 5px 0;"
                 >{{ loopSource.caption }}
                 </a-checkbox>
-
               </a-checkbox-group>
 <!--          <a-select-->
 <!--              v-model="scope.column.filters[0].data.displayValues"-->
@@ -523,13 +522,6 @@ export default {
   data() {
     return {
       gridDefaultValueDisplay: gridDefaultValueDisplay,
-      //   gridOptions:{
-      //   border:true,
-      //     stripe:true,
-      //    columns:[
-      //
-      //    ]
-      // },
       showFooter: false,
       showGridColumnUserDefine: false,
       userDefineColumns: [],
@@ -597,13 +589,6 @@ export default {
             ],
           ],
         },
-        // body:{
-        //   options: [
-        //     [
-        //       { code: 'clearFilter', name: '清除所有筛选', visible: true, disabled: false }
-        //     ]
-        //   ]
-        // }
       },
       toolBarConfig: {
         custom: true,
@@ -877,8 +862,7 @@ export default {
         },
       });
     }
-
-    console.log(this.internalColumns)
+    // console.log(this.internalColumns)
     this.gridEdit = this.edit;
   },
 
@@ -1144,17 +1128,24 @@ export default {
               col.column.filters = [];
             }
           });
-          // vm.$refs.baseGrid.clearFilter()
           vm.$emit("filterChange");
           break;
         case "desc":
           if (this.sortRemote) {
-            this.$emit("sortChange", $table.getSortColumns());
+            let data = []
+            $table.getSortColumns().forEach(x=> {
+              data.push([x.field,x.order])
+            })
+            this.$emit("sortChange", data);
           }
           break;
         case "asc":
           if (this.sortRemote) {
-            this.$emit("sortChange", $table.getSortColumns());
+            let data = []
+            $table.getSortColumns().forEach(x=> {
+              data.push([x.field,x.order])
+            })
+            this.$emit("sortChange", data);
           }
           break;
         case "clearSort":
@@ -1167,7 +1158,11 @@ export default {
           }
           break;
         case "refresh":
-          this.$emit("sortChange", $table.getSortColumns());
+          let data = []
+          $table.getSortColumns().forEach(x=> {
+            data.push([x.field,x.order])
+          })
+          this.$emit("sortChange", data);
           break;
         default:
       }
@@ -1541,53 +1536,6 @@ export default {
         });
         this.$emit("sortChange", tempSortList);
       }
-
-      // let vm = this
-      // const $table = this.$refs.baseGrid
-      // //有children说明是 有筛选框
-      // if (column.children && column.children.length > 0) {
-      //   if (column.children[0].order == order) {
-      //     $table.clearSort(column.children[0].field)
-      //     column.children[0].order = null
-      //   } else if (order == 'asc') {
-      //     $table.sort(column.children[0].property, order)
-      //   } else if (order == 'desc') {
-      //     $table.sort(column.children[0].property, order)
-      //   }
-      // } else {
-      //   if (column.order == order) {
-      //     $table.clearSort(column.field)
-      //     column.order = null
-      //   } else if (order == 'asc') {
-      //     $table.sort(column.property, order)
-      //   } else if (order == 'desc') {
-      //     $table.sort(column.property, order)
-      //   }
-      // }
-      //远程emit 不是的话就调vxe的sort
-      // if (vm.sortRemote) {
-      // if (column.children && column.children.length > 0) {
-      //   if (column.children[0].order == order) {
-      //     column.children[0].order = null
-      //   } else
-      //     if (order == 'asc') {
-      //       column.children[0].order = order
-      //     } else if (order == 'desc') {
-      //       column.children[0].order = order
-      //     }
-      // } else {
-      //   if (column.order == order) {
-      //     column.order = null
-      //   } else
-      //     if (order == 'asc') {
-      //       column.order = 'asc'
-      //     } else if (order == 'desc') {
-      //       column.order = 'desc'
-      //     }
-      // }
-      //   let tmp = $table.getSortColumns()
-      //   vm.$emit('sortChange', tmp)
-      // }
     },
     currentChange(scope) {
       this.$emit("currentChange", scope.row);