doway-coms 1.4.10 → 1.4.12

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -1123,16 +1123,18 @@ export default {
           break;
         case "clearFilter":
           // 示例
-          const filterList = vm.$refs.baseGrid.getCheckedFilters();
+          const filterList = this.$refs.baseGrid.getCheckedFilters();
+          this.$refs.baseGrid.clearFilter();
           filterList.forEach((col) => {
-            if (
-              col.column.params.controlType === "select" ||
-              col.column.params.controlType === "checkbox"
-            ) {
+            // if (
+            //   col.column.params.controlType === "select" ||
+            //   col.column.params.controlType === "checkbox"
+            // ) {
+            //   col.column.filters = [{ data: [] }];
+            // } else {
+            //   col.column.filters = [{ data: [] }];
+            // }
               col.column.filters = [{ data: [] }];
-            } else {
-              col.column.filters = [];
-            }
           });
           vm.$emit("filterChange");
           break;

package/packages/utils/common.js

@@ -513,4 +513,31 @@ export function numberDigitsRound(rowInfo, colInfo) {
       rowInfo[colInfo.number] = rowInfo[colInfo.number].toFixed(rowInfo[colInfo.digits])
       break;
   }
+}
+// 导出用
+export function getExportParams(columns) {
+  let tempParams = {
+    fields: [],
+    dicts: {}
+  }
+  for (let i = 0; i < columns.length; i++) {
+    if (columns[i].visible === false) {
+      continue
+    }
+    let tempFieldInfo = {
+      field: columns[i].field,
+      title: columns[i].title
+    }
+    tempParams.fields.push(tempFieldInfo)
+    if (columns[i].dataSource && columns[i].dataSource.length > 0) {
+      if (!tempParams.dicts[columns[i].field]) {
+        tempParams.dicts[columns[i].field] = {}
+        for (let j = 0; j < columns[i].dataSource.length; j++) {
+          tempParams.dicts[columns[i].field][columns[i].dataSource[j].value] =
+            columns[i].dataSource[j].caption
+        }
+      }
+    }
+  }
+  return tempParams
 }