Commit 902ded878d2e9cb921754047e257386c47a2fdbf
1 parent
6edb52dd
add support of the cell in table description. This allow to merge together many …
…cells into one. The result will be colspan of the number of inside cells
Showing
2 changed files
with
10 additions
and
3 deletions
Show diff stats
hayamiki_lib @ 7a53f1c1257
src/generation/edit_view_table_form.anubis
| @@ -19,7 +19,7 @@ public define String | @@ -19,7 +19,7 @@ public define String | ||
| 19 | )= | 19 | )= |
| 20 | if cell_description is | 20 | if cell_description is |
| 21 | { | 21 | { |
| 22 | - empty then "" | 22 | + empty then "empty" |
| 23 | column(col_name) then | 23 | column(col_name) then |
| 24 | if get_column_type_from_name(columns, col_name) is | 24 | if get_column_type_from_name(columns, col_name) is |
| 25 | { | 25 | { |
| @@ -32,7 +32,14 @@ public define String | @@ -32,7 +32,14 @@ public define String | ||
| 32 | } | 32 | } |
| 33 | } | 33 | } |
| 34 | label(label_str) then "label(\""+label_str+"\")" | 34 | label(label_str) then "label(\""+label_str+"\")" |
| 35 | - | 35 | + cell(cells) then |
| 36 | + "cell(\""+ | ||
| 37 | + join(", ", | ||
| 38 | + map((HK_Edit_View_Table_Cell _cell) | ||
| 39 | + |-> | ||
| 40 | + make_cell(_cell, columns, type_name), | ||
| 41 | + cells))+ | ||
| 42 | + ")" | ||
| 36 | } | 43 | } |
| 37 | . | 44 | . |
| 38 | 45 |