ソースを参照

fix: filter orders (#1535)

Co-authored-by: nathan <[email protected]>
Nathan.fooo 2 年 前
コミット
72dc0b8f67

+ 9 - 0
frontend/app_flowy/lib/plugins/grid/presentation/widgets/filter/choicechip/select_option/select_option.dart

@@ -167,3 +167,12 @@ class _SelectOptionFilterEditorState extends State<SelectOptionFilterEditor> {
     );
     );
   }
   }
 }
 }
+
+class _FilterPannel extends StatelessWidget {
+  const _FilterPannel({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container();
+  }
+}

+ 2 - 10
shared-lib/flowy-sync/src/client_grid/view_revision_pad.rs

@@ -61,11 +61,7 @@ impl GridViewRevisionPad {
     }
     }
 
 
     pub fn get_groups_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<GroupConfigurationRevision>> {
     pub fn get_groups_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<GroupConfigurationRevision>> {
-        self.groups
-            .get_objects_by_field_revs(field_revs)
-            .into_values()
-            .flatten()
-            .collect()
+        self.groups.get_objects_by_field_revs(field_revs)
     }
     }
 
 
     pub fn get_all_groups(&self) -> Vec<Arc<GroupConfigurationRevision>> {
     pub fn get_all_groups(&self) -> Vec<Arc<GroupConfigurationRevision>> {
@@ -131,11 +127,7 @@ impl GridViewRevisionPad {
     }
     }
 
 
     pub fn get_all_filters(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<FilterRevision>> {
     pub fn get_all_filters(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<FilterRevision>> {
-        self.filters
-            .get_objects_by_field_revs(field_revs)
-            .into_values()
-            .flatten()
-            .collect()
+        self.filters.get_objects_by_field_revs(field_revs)
     }
     }
 
 
     pub fn get_filters(&self, field_id: &str, field_type_rev: &FieldTypeRevision) -> Vec<Arc<FilterRevision>> {
     pub fn get_filters(&self, field_id: &str, field_type_rev: &FieldTypeRevision) -> Vec<Arc<FilterRevision>> {

+ 6 - 5
shared-lib/grid-rev-model/src/grid_setting_rev.rs

@@ -83,9 +83,9 @@ where
             .cloned()
             .cloned()
     }
     }
 
 
-    pub fn get_objects_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> HashMap<String, Vec<Arc<T>>> {
+    pub fn get_objects_by_field_revs(&self, field_revs: &[Arc<FieldRevision>]) -> Vec<Arc<T>> {
         // Get the objects according to the FieldType, so we need iterate the field_revs.
         // Get the objects according to the FieldType, so we need iterate the field_revs.
-        let objects_by_field_id = field_revs
+        let objects = field_revs
             .iter()
             .iter()
             .flat_map(|field_rev| {
             .flat_map(|field_rev| {
                 let field_type = &field_rev.ty;
                 let field_type = &field_rev.ty;
@@ -93,10 +93,11 @@ where
 
 
                 let object_rev_map = self.inner.get(field_id)?;
                 let object_rev_map = self.inner.get(field_id)?;
                 let objects: Vec<Arc<T>> = object_rev_map.get(field_type)?.clone();
                 let objects: Vec<Arc<T>> = object_rev_map.get(field_type)?.clone();
-                Some((field_rev.id.clone(), objects))
+                Some(objects)
             })
             })
-            .collect::<HashMap<String, Vec<Arc<T>>>>();
-        objects_by_field_id
+            .flatten()
+            .collect::<Vec<Arc<T>>>();
+        objects
     }
     }
 
 
     pub fn get_all_objects(&self) -> Vec<Arc<T>> {
     pub fn get_all_objects(&self) -> Vec<Arc<T>> {