diff --git a/Cargo.lock b/Cargo.lock index 1ecdb0a5..3f204f46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1540,9 +1540,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", diff --git a/build.rs b/build.rs index 30690625..860bfe09 100644 --- a/build.rs +++ b/build.rs @@ -23,9 +23,8 @@ async fn main() { /// Creates a file with inlined remote files included async fn download_deps(filename: &str) { - println!("cargo:rerun-if-changed=build.rs"); - let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap()); let path_in = format!("sqlpage/{}", filename); + let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap()); let path_out: PathBuf = out_dir.join(filename); // Generate outfile by reading infile and interpreting all comments // like "/* !include https://... */" as a request to include the contents of diff --git a/examples/official-site/sqlpage/migrations/01_documentation.sql b/examples/official-site/sqlpage/migrations/01_documentation.sql index 53221d04..05d18346 100644 --- a/examples/official-site/sqlpage/migrations/01_documentation.sql +++ b/examples/official-site/sqlpage/migrations/01_documentation.sql @@ -377,8 +377,10 @@ INSERT INTO example(component, description, properties) VALUES 'table', 'A table with dashes', json( - '[{"component":"table", "search": true}, ' || - '{"id": 31456, "part_no": "MIC-ROCC-F-23-206-C"} + '[{"component":"table", "search": true, "sort": true}, ' || + '{"id": 31456, "part_no": "MIC-ROCC-F-23-206-C"}, + {"id": 996, "part_no": "MIC-ROCC-F-24-206-A"}, + {"id": 131456, "part_no": "KIB-ROCC-F-13-205-B"} ]' ) ); diff --git a/sqlpage/sqlpage.js b/sqlpage/sqlpage.js index 5546034b..eeede620 100644 --- a/sqlpage/sqlpage.js +++ b/sqlpage/sqlpage.js @@ -1,5 +1,5 @@ /* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js */ -/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js */ +/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */ function sqlpage_chart() { let first_chart = document.querySelector("[data-js]"); diff --git a/sqlpage/tabler-icons.svg b/sqlpage/tabler-icons.svg index 11756433..bcda9ced 100644 --- a/sqlpage/tabler-icons.svg +++ b/sqlpage/tabler-icons.svg @@ -1 +1 @@ -/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg */ \ No newline at end of file +/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.32.0/tabler-sprite.svg */ \ No newline at end of file diff --git a/sqlpage/templates/table.handlebars b/sqlpage/templates/table.handlebars index 99032cb5..30584984 100644 --- a/sqlpage/templates/table.handlebars +++ b/sqlpage/templates/table.handlebars @@ -7,20 +7,20 @@ {{/if}} - {{~#each_row~}} + {{#each_row}} {{#if (eq @row_index 0)}} {{#each this}} - {{~#if (not (starts_with @key '_sqlpage_'))~}} + {{#if (not (starts_with @key '_sqlpage_'))}} - {{~/if~}} + {{/if}} {{/each}} @@ -44,7 +44,7 @@ {{~/if~}} {{~/each~}} - {{~/each_row~}} + {{/each_row}} {{flush_delayed}}
- {{#if ../../sort}} + {{~#if ../../sort~}} - {{else}} - {{@key}} - {{/if}} + {{~else~}} + {{~@key~}} + {{~/if~}}