Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

fix: euro currency number format (#3115)

Richard Shiuefbb175335055
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_tests.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_tests.rs
index b6ce2a11a4..3209c44ffe 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_tests.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_tests.rs
@@ -80,6 +80,18 @@ mod tests {
assert_number(&type_option, "0.2", "$0.2", &field_type, &field);
}
+ #[test]
+ fn euro_type_option_test() {
+ let field_type = FieldType::Number;
+ let mut type_option = NumberTypeOption::new();
+ type_option.format = NumberFormat::EUR;
+ let field = FieldBuilder::new(field_type.clone(), type_option.clone()).build();
+
+ assert_number(&type_option, "0.2", "€0,2", &field_type, &field);
+ assert_number(&type_option, "1000", "€1.000", &field_type, &field);
+ assert_number(&type_option, "1234.56", "€1.234,56", &field_type, &field);
+ }
+
fn assert_number(
type_option: &NumberTypeOption,
input_str: &str,
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
index 9407935487..76f7422700 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option.rs
@@ -219,7 +219,7 @@ impl CellDataChangeset for NumberTypeOption {
NumberCellData::from(formatter.to_string()),
)),
_ => Ok((
- NumberCellData::from(formatter.to_string()).into(),
+ NumberCellData::from(formatter.to_unformatted_string()).into(),
NumberCellData::from(formatter.to_string()),
)),
}
diff --git a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option_entities.rs b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option_entities.rs
index 9b8728ff97..59b069908f 100644
--- a/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option_entities.rs
+++ b/frontend/rust-lib/flowy-database2/src/services/field/type_options/number_type_option/number_type_option_entities.rs
@@ -7,7 +7,7 @@ use rust_decimal::Decimal;
use rusty_money::Money;
use std::str::FromStr;
-#[derive(Default)]
+#[derive(Debug, Default)]
pub struct NumberCellFormat {
decimal: Option<Decimal>,
money: Option<String>,
@@ -68,6 +68,13 @@ impl NumberCellFormat {
pub fn is_empty(&self) -> bool {
self.decimal.is_none()
}
+
+ pub fn to_unformatted_string(&self) -> String {
+ match self.decimal {
+ None => String::default(),
+ Some(decimal) => decimal.to_string(),
+ }
+ }
}
fn auto_fill_zero_at_start_if_need(num_str: &str) -> String {