fix: sort change ui

fast-crud · May 30, 2021 · cdd754e · cdd754e
1 parent 8915732
commit cdd754e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 19 deletions.
diff --git a/packages/fast-crud/src/ui/ui-interface.ts b/packages/fast-crud/src/ui/ui-interface.ts
@@ -53,6 +53,7 @@ export interface TableCI extends CI {
   data;
   fixedHeaderNeedComputeBodyHeight;
   vLoading;
+  onSortChange;
 }
 
 export interface CheckboxGroupCI extends CI {

diff --git a/packages/fast-crud/src/use/use-crud.ts b/packages/fast-crud/src/use/use-crud.ts
@@ -185,25 +185,15 @@ export function useCrud(ctx: UseCrudProps) {
   }
 
   function useTable() {
+    const events = ui.table.onSortChange({
+      emit({ isServerSort, prop, asc, order }) {
+        crudBinding.value.sort = isServerSort ? { prop, order, asc } : null;
+        expose.doRefresh();
+      }
+    });
     return {
       table: {
-        //监听el-table的服务端排序
-        onSortChange({ column, prop, order }) {
-          console.log("sort change", column, prop, order);
-          crudBinding.value.sort =
-            prop && column.sortable === "custom" ? { prop, order, asc: order === "ascending" } : null;
-          expose.doRefresh();
-        },
-        // 监听a-table的服务端排序
-        onChange(pagination, filters, sorter) {
-          console.log("table change", pagination, filters, sorter);
-          if (sorter) {
-            const { column, field, order } = sorter;
-            crudBinding.value.sort =
-              order && column.sorter === true ? { prop: field, order, asc: order === "ascend" } : null;
-            expose.doRefresh();
-          }
-        }
+        ...events
       }
     };
   }

diff --git a/packages/ui/ui-antdv/src/antdv.ts b/packages/ui/ui-antdv/src/antdv.ts
@@ -305,7 +305,24 @@ export class Antdv implements UiInterface {
     name: "a-table",
     data: "dataSource",
     fixedHeaderNeedComputeBodyHeight: true,
-    vLoading: false
+    vLoading: false,
+    onSortChange({ emit }) {
+      return {
+        // 监听a-table的服务端排序
+        onChange(pagination, filters, sorter) {
+          console.log("table change", pagination, filters, sorter);
+          if (sorter) {
+            const { column, field, order } = sorter;
+            emit({
+              isServerSort: order && column.sorter === true,
+              prop: field,
+              order,
+              asc: order === "ascend"
+            });
+          }
+        }
+      };
+    }
   };
 
   tableColumn: TableColumnCI = {

diff --git a/packages/ui/ui-element/src/element.ts b/packages/ui/ui-element/src/element.ts
@@ -295,7 +295,20 @@ export class Element implements UiInterface {
     name: "el-table",
     data: "data",
     fixedHeaderNeedComputeBodyHeight: false,
-    vLoading: "loading"
+    vLoading: "loading",
+    onSortChange({ emit }) {
+      return {
+        onSortChange({ column, prop, order }) {
+          console.log("sort change", column, prop, order);
+          emit({
+            isServerSort: prop && column.sortable === "custom",
+            prop,
+            order,
+            asc: order === "ascending"
+          });
+        }
+      };
+    }
   };
 
   textArea: TextAreaCI = {