Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update collab libs rev (#3342)

Browse Source
This commit is contained in:
Nathan.fooo
2023-09-06 16:00:23 +08:00
committed by GitHub
parent 790580eea4
commit a0fc4b86b0
9 changed files with 99 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/rust-lib/flowy-database2/src/manager.rs
View File

@ -255,10 +255,7 @@ impl DatabaseManager {
let (field, layout_setting) = DatabaseLayoutDepsResolver::new(database, layout)
.resolve_deps_when_create_database_linked_view();
if let Some(field) = field {
params = params.with_deps_fields(
vec![field.clone()],
vec![default_field_settings_by_layout_map()],
);
params = params.with_deps_fields(vec![field], vec![default_field_settings_by_layout_map()]);
}
if let Some(layout_setting) = layout_setting {
params = params.with_layout_setting(layout_setting);

4
frontend/rust-lib/flowy-database2/src/services/database/database_editor.rs
View File

@ -1422,12 +1422,12 @@ impl DatabaseViewData for DatabaseViewDataImpl {
fn get_field_settings(
&self,
view_id: &str,
field_ids: &Vec<String>,
field_ids: &[String],
) -> HashMap<String, FieldSettings> {
let field_settings_map = self
.database
.lock()
.get_field_settings(view_id, Some(&field_ids));
.get_field_settings(view_id, Some(field_ids));
field_settings_map
.into_iter()

2
frontend/rust-lib/flowy-database2/src/services/database_view/view_editor.rs
View File

@ -126,7 +126,7 @@ pub trait DatabaseViewData: Send + Sync + 'static {
fn get_field_settings(
&self,
view_id: &str,
field_ids: &Vec<String>,
field_ids: &[String],
) -> HashMap<String, FieldSettings>;
fn get_all_field_settings(&self, view_id: &str) -> HashMap<String, FieldSettings>;