Skip to content

Commit

Permalink
Merge pull request #139 from IDEMSInternational/content/1.4.3
Browse files Browse the repository at this point in the history 
content: 1.4.3
  • Loading branch information
@esmeetewinkel
esmeetewinkel authored Jan 17, 2025
2 parents 703fd3a + 71171ac commit 1bd76a5
Show file tree
Hide file tree
Showing 8 changed files with 336 additions and 84 deletions.
4 changes: 1 addition & 3 deletions app_data/sheets/contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3572,9 +3572,7 @@
"parameter_list": {
"app_config": {
"LAYOUT": {
"page_padding": {
"horizontal": 0
}
"page_padding": "32px 0"
}
}
},
Expand Down
85 changes: 55 additions & 30 deletions app_data/sheets/template/component_demo/comp_button.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
},
{
"type": "button",
"value": "With icon",
"value": "With aligned icon",
"_translations": {
"value": {}
},
Expand All @@ -59,6 +59,31 @@
"name": "button_5",
"_nested_name": "button_5"
},
{
"type": "button",
"value": "Button with icon",
"_translations": {
"value": {}
},
"parameter_list": {
"icon": "images/icons/leaf_blue.svg"
},
"name": "button_6",
"_nested_name": "button_6"
},
{
"type": "button",
"value": "Button with right icon",
"_translations": {
"value": {}
},
"parameter_list": {
"icon": "images/icons/globe_blue.svg",
"button_align": "right"
},
"name": "button_7",
"_nested_name": "button_7"
},
{
"type": "button",
"value": "Icon and toggle",
Expand All @@ -74,20 +99,20 @@
"position": "right",
"style": "in_button"
},
"_nested_name": "button_6.toggle_bar_1"
"_nested_name": "button_8.toggle_bar_1"
}
],
"name": "button_6",
"_nested_name": "button_6"
"name": "button_8",
"_nested_name": "button_8"
},
{
"type": "title",
"value": "Transparent Button Card",
"_translations": {
"value": {}
},
"name": "title_8",
"_nested_name": "title_8"
"name": "title_10",
"_nested_name": "title_10"
},
{
"type": "button",
Expand All @@ -102,8 +127,8 @@
"style": "no-background",
"text_align": "left"
},
"name": "button_9",
"_nested_name": "button_9"
"name": "button_11",
"_nested_name": "button_11"
},
{
"type": "button",
Expand All @@ -118,17 +143,17 @@
"style": "no-background",
"text_align": "left"
},
"name": "button_10",
"_nested_name": "button_10"
"name": "button_12",
"_nested_name": "button_12"
},
{
"type": "title",
"value": "Button card-portrait",
"_translations": {
"value": {}
},
"name": "title_11",
"_nested_name": "title_11"
"name": "title_13",
"_nested_name": "title_13"
},
{
"type": "button",
Expand All @@ -141,11 +166,11 @@
{
"type": "toggle_bar",
"name": "toggle_bar_2",
"_nested_name": "button_12.toggle_bar_2"
"_nested_name": "button_14.toggle_bar_2"
}
],
"name": "button_12",
"_nested_name": "button_12"
"name": "button_14",
"_nested_name": "button_14"
},
{
"type": "button",
Expand Down Expand Up @@ -190,7 +215,7 @@
"icon_true_asset": "images/icons/heart_blue.svg",
"icon_false_asset": "images/icons/heart_outline.svg"
},
"_nested_name": "button_14.toggle_bar_3",
"_nested_name": "button_16.toggle_bar_3",
"_dynamicFields": {
"value": [
{
Expand Down Expand Up @@ -232,17 +257,17 @@
}
}
],
"name": "button_14",
"_nested_name": "button_14"
"name": "button_16",
"_nested_name": "button_16"
},
{
"type": "text",
"value": "Unlocked:",
"_translations": {
"value": {}
},
"name": "text_16",
"_nested_name": "text_16"
"name": "text_18",
"_nested_name": "text_18"
},
{
"name": "is_locked",
Expand Down Expand Up @@ -295,7 +320,7 @@
"icon_false_asset": "images/icons/heart_outline.svg"
},
"condition": "[email protected]_locked",
"_nested_name": "button_18.toggle_bar_3",
"_nested_name": "button_20.toggle_bar_3",
"_dynamicFields": {
"value": [
{
Expand Down Expand Up @@ -355,7 +380,7 @@
},
"condition": "@local.is_locked",
"name": "image_2",
"_nested_name": "button_18.image_2",
"_nested_name": "button_20.image_2",
"_dynamicFields": {
"condition": [
{
Expand All @@ -373,8 +398,8 @@
}
}
],
"name": "button_18",
"_nested_name": "button_18",
"name": "button_20",
"_nested_name": "button_20",
"_dynamicFields": {
"parameter_list": {
"disabled": [
Expand All @@ -399,8 +424,8 @@
"_translations": {
"value": {}
},
"name": "text_20",
"_nested_name": "text_20"
"name": "text_22",
"_nested_name": "text_22"
},
{
"name": "is_locked_2",
Expand Down Expand Up @@ -453,7 +478,7 @@
"icon_false_asset": "images/icons/heart_outline.svg"
},
"condition": "[email protected]_locked_2",
"_nested_name": "button_22.toggle_bar_3",
"_nested_name": "button_24.toggle_bar_3",
"_dynamicFields": {
"value": [
{
Expand Down Expand Up @@ -513,7 +538,7 @@
},
"condition": "@local.is_locked_2",
"name": "image_2",
"_nested_name": "button_22.image_2",
"_nested_name": "button_24.image_2",
"_dynamicFields": {
"condition": [
{
Expand All @@ -531,8 +556,8 @@
}
}
],
"name": "button_22",
"_nested_name": "button_22",
"name": "button_24",
"_nested_name": "button_24",
"_dynamicFields": {
"parameter_list": {
"disabled": [
Expand Down
140 changes: 118 additions & 22 deletions app_data/sheets/template/component_demo/comp_combo_box.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,6 @@
"status": "released",
"flow_subtype": "component_demo",
"rows": [
{
"type": "title",
"name": "title_1",
"value": "Answer list",
"_translations": {
"value": {}
},
"_nested_name": "title_1"
},
{
"type": "combo_box",
"name": "combo_box_par_1_1",
"parameter_list": {
"answer_list": ""
},
"_nested_name": "combo_box_par_1_1"
},
{
"name": "answer_list_1",
"value": [
Expand All @@ -40,6 +23,119 @@
"type": "set_variable",
"_nested_name": "answer_list_1"
},
{
"type": "title",
"value": "Dropdown variant",
"_translations": {
"value": {}
},
"name": "title_3",
"_nested_name": "title_3"
},
{
"type": "combo_box",
"name": "combo_box_dropdown_1",
"action_list": [
{
"trigger": "changed",
"action_id": "set_local",
"args": [
"var_1",
"this.value"
],
"_raw": "changed | set_local: var_1: @local.combo_box_dropdown_1",
"_cleaned": "changed | set_local: var_1: @local.combo_box_dropdown_1"
}
],
"parameter_list": {
"variant": "dropdown",
"answer_list": "@local.answer_list_1",
"placeholder": "Select from dropdown"
},
"_nested_name": "combo_box_dropdown_1",
"_dynamicFields": {
"action_list": {
"0": {
"_raw": [
{
"fullExpression": "changed | set_local: var_1: @local.combo_box_dropdown_1",
"matchedExpression": "@local.combo_box_dropdown_1",
"type": "local",
"fieldName": "combo_box_dropdown_1"
}
],
"_cleaned": [
{
"fullExpression": "changed | set_local: var_1: @local.combo_box_dropdown_1",
"matchedExpression": "@local.combo_box_dropdown_1",
"type": "local",
"fieldName": "combo_box_dropdown_1"
}
]
}
},
"parameter_list": {
"answer_list": [
{
"fullExpression": "@local.answer_list_1",
"matchedExpression": "@local.answer_list_1",
"type": "local",
"fieldName": "answer_list_1"
}
]
}
},
"_dynamicDependencies": {
"@local.combo_box_dropdown_1": [
"action_list.0._raw",
"action_list.0._cleaned"
],
"@local.answer_list_1": [
"parameter_list.answer_list"
]
}
},
{
"type": "text",
"value": "Dropdown value: @local.combo_box_dropdown_1",
"_translations": {
"value": {}
},
"name": "text_5",
"_nested_name": "text_5",
"_dynamicFields": {
"value": [
{
"fullExpression": "Dropdown value: @local.combo_box_dropdown_1",
"matchedExpression": "@local.combo_box_dropdown_1",
"type": "local",
"fieldName": "combo_box_dropdown_1"
}
]
},
"_dynamicDependencies": {
"@local.combo_box_dropdown_1": [
"value"
]
}
},
{
"type": "title",
"name": "title_1",
"value": "Answer list",
"_translations": {
"value": {}
},
"_nested_name": "title_1"
},
{
"type": "combo_box",
"name": "combo_box_par_1_1",
"parameter_list": {
"answer_list": ""
},
"_nested_name": "combo_box_par_1_1"
},
{
"type": "combo_box",
"name": "combo_box_par_1_2",
Expand Down Expand Up @@ -404,8 +500,8 @@
"_translations": {
"value": {}
},
"name": "title_22",
"_nested_name": "title_22"
"name": "title_25",
"_nested_name": "title_25"
},
{
"type": "combo_box",
Expand All @@ -418,11 +514,11 @@
"value": "comp_combo_box_items",
"rows": [],
"name": "data_items_1",
"_nested_name": "combo_box_23.data_items_1"
"_nested_name": "combo_box_26.data_items_1"
}
],
"name": "combo_box_23",
"_nested_name": "combo_box_23"
"name": "combo_box_26",
"_nested_name": "combo_box_26"
},
{
"type": "button",
Expand Down
Loading

0 comments on commit 1bd76a5

Please sign in to comment.