Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FOUR-12891 / FOUR-12881 Fix Balloon position and improvement of Control Menu for Display Screen #1499

Merged
merged 16 commits into from
Jan 9, 2024
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/components/vue-form-builder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
group.key
]"
:key="elementIndex"
v-b-popover.hover.top="element.popoverContent"
v-b-popover.hover.right="{
content: $t(element.popoverContent),
customClass: 'custom-popover'
}"
:boundary="'viewport'"
:data-cy="`controls-${element.component}`"
:class="{
Expand Down Expand Up @@ -546,7 +549,8 @@ const controlGroups = {
"Nested Screen"
],
Navigation: ["Page Navigation"],
Files: ["File Upload", "File Download", "File Preview"],
Dashboards: ["Saved Search Chart", "Analytics Chart"],
Files: ["File Upload", "File Download", "File Preview", "List Table"],
Advanced: [
"Bootstrap Component",
"Bootstrap Wrapper",
Expand Down Expand Up @@ -580,10 +584,12 @@ const popoverContentMap = {
"Loop": "Format content in a table structure and allow for adding rows",
"Nested Screen": "Add a repeatable section of content",
"Page Navigation": "Add and reuse another Form within this Form",
"Analytics Chart": "Add a chart from the Analytics Reports",
"File Upload":
"Add special buttons that link between subpages within this Form",
"File Download": "Collect files uploaded into the Form",
"File Preview": "Offer a File download",
"List Table": "Create List Table",
"Bootstrap Component":
"Add a Preview section that displays the content of a File",
"Bootstrap Wrapper":
Expand Down Expand Up @@ -681,11 +687,12 @@ export default {
{ key: "InputFields", label: "Input Fields" },
{ key: "ContentFields", label: "Content Fields" },
{ key: "Navigation", label: "Navigation" },
{ key: "Dashboards", label: "Dashboards" },
{ key: "Files", label: "Files" },
{ key: "Advanced", label: "Advanced" }
],

isCollapsed: new Array(6).fill(true)
isCollapsed: new Array(7).fill(true)
};
},
computed: {
Expand Down Expand Up @@ -719,9 +726,12 @@ export default {
"Loop",
"Nested Screen",
"Page Navigation",
"Saved Search Chart",
"Analytics Chart",
"File Upload",
"File Download",
"File Preview",
"List Table",
"Bootstrap Component",
"Bootstrap Wrapper",
"Captcha",
Expand Down Expand Up @@ -889,7 +899,7 @@ export default {
},
checkForCaptcha(items, insideLoop = false, nestedScreen = null) {
items.forEach((item) => {
if (!item.items && item.component == "Captcha" && insideLoop) {
if (!item.items && item.component === "Captcha" && insideLoop) {
if (nestedScreen && nestedScreen.config.screen) {
this.$root.$emit("remove-nested", nestedScreen.config.screen);
nestedScreen.config.screen = null;
Expand Down Expand Up @@ -1375,6 +1385,9 @@ export default {
</script>

<style>
.custom-popover {
margin-right: -400px;
}
.gray-text {
color: gray;
}
Expand Down
Loading