AppFlowy-IO/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-09-19 23:19:13 +03:00
Code Issues Projects Releases Wiki Activity

feat: handling same as Notion when user fills in the mixing of number and text (#1650)

Browse Source 
* feat: handling same as Notion when user fills in the mixing of number and text

* feat: remove debug log

* feat: using lazy_static to initialized lazily the regex
This commit is contained in:
Kelvin 2023-01-05 20:59:12 +08:00 committed by GitHub
parent e9f8796809
commit 7949d3fe4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/rust-lib/flowy-grid/src/services/field/type_options/number_type_option/number_type_option.rs
View File

@ -7,9 +7,11 @@ use crate::services::field::{
TypeOptionCellDataCompare, TypeOptionCellDataFilter, TypeOptionTransform,
};
use bytes::Bytes;
use fancy_regex::Regex;
use flowy_derive::ProtoBuf;
use flowy_error::FlowyResult;
use grid_rev_model::{FieldRevision, TypeOptionDataDeserializer, TypeOptionDataSerializer};
use lazy_static::lazy_static;
use rust_decimal::Decimal;
use serde::{Deserialize, Serialize};
use std::cmp::Ordering;
@ -97,10 +99,13 @@ impl NumberTypeOptionPB {
pub(crate) fn format_cell_data(&self, s: &str) -> FlowyResult<NumberCellData> {
match self.format {
NumberFormat::Num => match Decimal::from_str(s) {
Ok(value, ..) => Ok(NumberCellData::from_decimal(value)),
Err(_) => Ok(NumberCellData::new()),
},
NumberFormat::Num => {
let strnum = NUM_REGEX.replace_all(s, "");
match Decimal::from_str(&strnum) {
Ok(value, ..) => Ok(NumberCellData::from_decimal(value)),
Err(_) => Ok(NumberCellData::new()),
}
}
_ => NumberCellData::from_format_str(s, self.sign_positive, &self.format),
}
}
@ -158,7 +163,11 @@ impl CellDataChangeset for NumberTypeOptionPB {
) -> FlowyResult<(String, <Self as TypeOption>::CellData)> {
let data = changeset.trim().to_string();
let number_cell_data = self.format_cell_data(&data)?;
Ok((data, number_cell_data.to_string().into()))
match self.format {
NumberFormat::Num => Ok((number_cell_data.to_string().into(), number_cell_data.to_string().into())),
_ => Ok((data, number_cell_data.to_string().into())),
}
}
}
@ -201,3 +210,7 @@ impl std::default::Default for NumberTypeOptionPB {
}
}
}
lazy_static! {
static ref NUM_REGEX: Regex = Regex::new(r"[^\d\.]").unwrap();
}