mooho-base-admin-plus 0.4.52 → 0.4.54

package/dist/mooho-base-admin-plus.min.esm.js

@@ -30376,6 +30376,12 @@ const _sfc_main$J = {
     static: {
       type: Boolean,
       default: false
+    },
+    filter: {
+      type: Object,
+      default() {
+        return {};
+      }
     }
   },
   computed: {},
@@ -30428,24 +30434,39 @@ const _sfc_main$J = {
         if (this.tableView.filtering) {
           filter2 = JSON.parse(this.tableView.filtering);
         }
-        let data2 = {
-          ...filter2
-        };
+        for (let key in this.filter) {
+          filter2[key] = this.filter[key];
+        }
+        for (let key in staticData) {
+          filter2[key] = staticData[key];
+        }
+        if (this.tableView.sorting) {
+          let obj = JSON.parse(this.tableView.sorting);
+          let arr = [];
+          for (let key in obj) {
+            if (obj[key] === "desc") {
+              arr.push("-" + key);
+            } else {
+              arr.push("+" + key);
+            }
+          }
+          filter2.orderBy = arr.join(",");
+        }
         if (this.tableView.isGroupBy) {
-          data2.isGroupBy = true;
-          data2.groupColumn = JSON.parse(this.tableView.groupColumn);
-          data2.groupMethod = JSON.parse(this.tableView.groupMethod);
+          filter2.isGroupBy = true;
+          filter2.groupColumn = JSON.parse(this.tableView.groupColumn);
+          filter2.groupMethod = JSON.parse(this.tableView.groupMethod);
         }
         if (this.tableView.isCustom) {
-          let res2 = await customModelApi.query(this.tableView.model, data2);
+          let res2 = await customModelApi.query(this.tableView.model, filter2);
           this.total = res2.totalCount;
           this.data = res2.data;
         } else if (this.tableView.isDataSource) {
-          let res2 = await dataSourceApi.query(this.tableView.dataSource, data2);
+          let res2 = await dataSourceApi.query(this.tableView.dataSource, filter2);
           this.total = res2.totalCount;
           this.data = res2.table;
         } else {
-          let res2 = await modelApi.query(this.tableView.model, data2, this.tableView.functionName, this.tableView.functionType);
+          let res2 = await modelApi.query(this.tableView.model, filter2, this.tableView.functionName, this.tableView.functionType);
           this.total = res2.totalCount;
           this.data = res2.data;
         }