MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5068 from Budibase/fix/table-block-nested-setting 

Mark table block table column setting as nested to fix custom values
This commit is contained in:
Andrew Kingston 2022-03-24 16:15:27 +00:00 committed by GitHub
parent 4a115a722f 478433d05a
commit c858fc37cb
1 changed files with 219 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
packages/client/manifest.json
View File

@ -264,7 +264,8 @@
{ {
"label": "Primary", "label": "Primary",
"value": "primary" "value": "primary"
}, { },
{
"label": "Secondary", "label": "Secondary",
"value": "secondary" "value": "secondary"
}, },
@ -626,28 +627,36 @@
"defaultValue": "M", "defaultValue": "M",
"showInBar": true, "showInBar": true,
"barStyle": "picker", "barStyle": "picker",
"options": [{ "options": [
{
"label": "Extra Small", "label": "Extra Small",
"value": "XS" "value": "XS"
}, { },
{
"label": "Small", "label": "Small",
"value": "S" "value": "S"
}, { },
{
"label": "Medium", "label": "Medium",
"value": "M" "value": "M"
}, { },
{
"label": "Large", "label": "Large",
"value": "L" "value": "L"
}, { },
{
"label": "Extra Large", "label": "Extra Large",
"value": "XL" "value": "XL"
}, { },
{
"label": "2XL", "label": "2XL",
"value": "XXL" "value": "XXL"
}, { },
{
"label": "3XL", "label": "3XL",
"value": "XXXL" "value": "XXXL"
}] }
]
}, },
{ {
"type": "color", "type": "color",
@ -689,27 +698,32 @@
"defaultValue": "left", "defaultValue": "left",
"showInBar": true, "showInBar": true,
"barStyle": "buttons", "barStyle": "buttons",
"options": [{ "options": [
{
"label": "Left", "label": "Left",
"value": "left", "value": "left",
"barIcon": "TextAlignLeft", "barIcon": "TextAlignLeft",
"barTitle": "Align left" "barTitle": "Align left"
}, { },
{
"label": "Center", "label": "Center",
"value": "center", "value": "center",
"barIcon": "TextAlignCenter", "barIcon": "TextAlignCenter",
"barTitle": "Align center" "barTitle": "Align center"
}, { },
{
"label": "Right", "label": "Right",
"value": "right", "value": "right",
"barIcon": "TextAlignRight", "barIcon": "TextAlignRight",
"barTitle": "Align right" "barTitle": "Align right"
}, { },
{
"label": "Justify", "label": "Justify",
"value": "justify", "value": "justify",
"barIcon": "TextAlignJustify", "barIcon": "TextAlignJustify",
"barTitle": "Justify text" "barTitle": "Justify text"
}] }
]
} }
] ]
}, },
@ -733,28 +747,36 @@
"defaultValue": "M", "defaultValue": "M",
"showInBar": true, "showInBar": true,
"barStyle": "picker", "barStyle": "picker",
"options": [{ "options": [
{
"label": "Extra Small", "label": "Extra Small",
"value": "XS" "value": "XS"
}, { },
{
"label": "Small", "label": "Small",
"value": "S" "value": "S"
}, { },
{
"label": "Medium", "label": "Medium",
"value": "M" "value": "M"
}, { },
{
"label": "Large", "label": "Large",
"value": "L" "value": "L"
}, { },
{
"label": "Extra Large", "label": "Extra Large",
"value": "XL" "value": "XL"
}, { },
{
"label": "2XL", "label": "2XL",
"value": "XXL" "value": "XXL"
}, { },
{
"label": "3XL", "label": "3XL",
"value": "XXXL" "value": "XXXL"
}] }
]
}, },
{ {
"type": "color", "type": "color",
@ -796,27 +818,32 @@
"defaultValue": "left", "defaultValue": "left",
"showInBar": true, "showInBar": true,
"barStyle": "buttons", "barStyle": "buttons",
"options": [{ "options": [
{
"label": "Left", "label": "Left",
"value": "left", "value": "left",
"barIcon": "TextAlignLeft", "barIcon": "TextAlignLeft",
"barTitle": "Align left" "barTitle": "Align left"
}, { },
{
"label": "Center", "label": "Center",
"value": "center", "value": "center",
"barIcon": "TextAlignCenter", "barIcon": "TextAlignCenter",
"barTitle": "Align center" "barTitle": "Align center"
}, { },
{
"label": "Right", "label": "Right",
"value": "right", "value": "right",
"barIcon": "TextAlignRight", "barIcon": "TextAlignRight",
"barTitle": "Align right" "barTitle": "Align right"
}, { },
{
"label": "Justify", "label": "Justify",
"value": "justify", "value": "justify",
"barIcon": "TextAlignJustify", "barIcon": "TextAlignJustify",
"barTitle": "Justify text" "barTitle": "Justify text"
}] }
]
} }
] ]
}, },
@ -837,16 +864,20 @@
"defaultValue": "M", "defaultValue": "M",
"showInBar": true, "showInBar": true,
"barStyle": "picker", "barStyle": "picker",
"options": [{ "options": [
{
"label": "Small", "label": "Small",
"value": "S" "value": "S"
}, { },
{
"label": "Medium", "label": "Medium",
"value": "M" "value": "M"
}, { },
{
"label": "Large", "label": "Large",
"value": "L" "value": "L"
}] }
]
}, },
{ {
"type": "color", "type": "color",
@ -1037,16 +1068,20 @@
"defaultValue": "M", "defaultValue": "M",
"showInBar": true, "showInBar": true,
"barStyle": "picker", "barStyle": "picker",
"options": [{ "options": [
{
"label": "Small", "label": "Small",
"value": "S" "value": "S"
}, { },
{
"label": "Medium", "label": "Medium",
"value": "M" "value": "M"
}, { },
{
"label": "Large", "label": "Large",
"value": "L" "value": "L"
}] }
]
}, },
{ {
"type": "color", "type": "color",
@ -1088,27 +1123,32 @@
"defaultValue": "left", "defaultValue": "left",
"showInBar": true, "showInBar": true,
"barStyle": "buttons", "barStyle": "buttons",
"options": [{ "options": [
{
"label": "Left", "label": "Left",
"value": "left", "value": "left",
"barIcon": "TextAlignLeft", "barIcon": "TextAlignLeft",
"barTitle": "Align left" "barTitle": "Align left"
}, { },
{
"label": "Center", "label": "Center",
"value": "center", "value": "center",
"barIcon": "TextAlignCenter", "barIcon": "TextAlignCenter",
"barTitle": "Align center" "barTitle": "Align center"
}, { },
{
"label": "Right", "label": "Right",
"value": "right", "value": "right",
"barIcon": "TextAlignRight", "barIcon": "TextAlignRight",
"barTitle": "Align right" "barTitle": "Align right"
}, { },
{
"label": "Justify", "label": "Justify",
"value": "justify", "value": "justify",
"barIcon": "TextAlignJustify", "barIcon": "TextAlignJustify",
"barTitle": "Justify text" "barTitle": "Justify text"
}] }
]
} }
] ]
}, },
@ -1165,7 +1205,15 @@
"type": "select", "type": "select",
"label": "Card Width", "label": "Card Width",
"key": "cardWidth", "key": "cardWidth",
"options": ["24rem", "28rem", "32rem", "40rem", "48rem", "60rem", "100%"], "options": [
"24rem",
"28rem",
"32rem",
"40rem",
"48rem",
"60rem",
"100%"
],
"defaultValue": "32rem" "defaultValue": "32rem"
}, },
{ {
@ -1785,11 +1833,7 @@
"icon": "Form", "icon": "Form",
"hasChildren": true, "hasChildren": true,
"illegalChildren": ["section", "form"], "illegalChildren": ["section", "form"],
"actions": [ "actions": ["ValidateForm", "ClearForm", "ChangeFormStep"],
"ValidateForm",
"ClearForm",
"ChangeFormStep"
],
"styles": ["size"], "styles": ["size"],
"settings": [ "settings": [
{ {
@ -1816,7 +1860,8 @@
{ {
"label": "Medium", "label": "Medium",
"value": "spectrum--medium" "value": "spectrum--medium"
}, { },
{
"label": "Large", "label": "Large",
"value": "spectrum--large" "value": "spectrum--large"
} }
@ -1947,27 +1992,32 @@
"defaultValue": "left", "defaultValue": "left",
"showInBar": true, "showInBar": true,
"barStyle": "buttons", "barStyle": "buttons",
"options": [{ "options": [
{
"label": "Left", "label": "Left",
"value": "left", "value": "left",
"barIcon": "TextAlignLeft", "barIcon": "TextAlignLeft",
"barTitle": "Align left" "barTitle": "Align left"
}, { },
{
"label": "Center", "label": "Center",
"value": "center", "value": "center",
"barIcon": "TextAlignCenter", "barIcon": "TextAlignCenter",
"barTitle": "Align center" "barTitle": "Align center"
}, { },
{
"label": "Right", "label": "Right",
"value": "right", "value": "right",
"barIcon": "TextAlignRight", "barIcon": "TextAlignRight",
"barTitle": "Align right" "barTitle": "Align right"
}, { },
{
"label": "Justify", "label": "Justify",
"value": "justify", "value": "justify",
"barIcon": "TextAlignJustify", "barIcon": "TextAlignJustify",
"barTitle": "Justify text" "barTitle": "Justify text"
}] }
]
} }
] ]
}, },
@ -2964,7 +3014,8 @@
"label": "Table Columns", "label": "Table Columns",
"key": "tableColumns", "key": "tableColumns",
"dependsOn": "dataSource", "dependsOn": "dataSource",
"placeholder": "All columns" "placeholder": "All columns",
"nested": true
}, },
{ {
"type": "boolean", "type": "boolean",
@ -3116,7 +3167,6 @@
"key": "cardDescription", "key": "cardDescription",
"label": "Description", "label": "Description",
"nested": true "nested": true
}, },
{ {
"type": "text", "type": "text",