diff --git a/Cargo.lock b/Cargo.lock index 0c13ea8484621a7530a8cd8645e6434124afa495..77c5a019263dbd2140c3eca1fa908cb9bff451fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3894,7 +3894,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "s2d" -version = "0.1.0" +version = "0.2.2" dependencies = [ "clap", "sql2doc_core", @@ -4324,11 +4324,11 @@ dependencies = [ [[package]] name = "sql2doc" -version = "0.1.0" +version = "0.2.2" [[package]] name = "sql2doc_core" -version = "0.1.0" +version = "0.2.2" dependencies = [ "docx-rs", "serde", @@ -4994,7 +4994,7 @@ dependencies = [ [[package]] name = "ui" -version = "0.1.0" +version = "0.2.2" dependencies = [ "slint", "slint-build", diff --git a/Cargo.toml b/Cargo.toml index 74504e0b2224e8c7ef994d2e3d91d47f6d772436..48f5c6849d069dc96fe9bcab001b45b5f26b5fef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sql2doc" -version = "0.2.0" +version = "0.2.2" edition = "2021" publish = ["crates-io"] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 002b134da39fe2af120906d7a9238998c210aa2d..8823a7b12ac9324c2c28721b80233bbee7d1ed62 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "s2d" -version = "0.2.0" +version = "0.2.2" edition = "2021" [dependencies] diff --git a/sql2doc_core/Cargo.toml b/sql2doc_core/Cargo.toml index c62a4a0380c2f9696e421b717d0b315efc22c7dc..f1e88fbeda12d206bed9bc563668a92203ffc257 100644 --- a/sql2doc_core/Cargo.toml +++ b/sql2doc_core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sql2doc_core" -version = "0.2.0" +version = "0.2.2" edition = "2021" [dependencies] diff --git a/sql2doc_core/src/to_word.rs b/sql2doc_core/src/to_word.rs index 05ccfe7e9549c1b95fd983cdaf5474a24d7d57c2..4f1851a591322e723373c19c8e1bad0b7fcef524 100644 --- a/sql2doc_core/src/to_word.rs +++ b/sql2doc_core/src/to_word.rs @@ -21,12 +21,17 @@ pub(crate) fn write(groups: &HashMap<&String, Vec<&Info>>, output: &str) -> Resu let path = Path::new(output); let file = File::create(path).unwrap(); let mut docx = Docx::new(); - groups - .iter() - .map(|(name, list)| { + let mut list = groups.iter().collect::>(); + list.sort_by(|a, b| a.0.cmp(b.0)); + list.iter() + .enumerate() + .map(|(index, (name, list))| { let name = format!("่กจ{}", name); let name = Paragraph::new() + .outline_lvl(0) + .add_bookmark_start(index, &name) .add_run(Run::new().add_text(name).size(36).bold()) + .add_bookmark_end(index) .indent(Some(100), None, None, None); let rows = table_rows(list); let table = Table::new(rows) diff --git a/ui/Cargo.toml b/ui/Cargo.toml index 5843f631c36328cc8bb4b975da3bbd5b660b9d9c..922782ceb7ef7216cc2a0e4da9ebd33ef71d9b79 100644 --- a/ui/Cargo.toml +++ b/ui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ui" -version = "0.2.0" +version = "0.2.2" edition = "2021" build = "build.rs"