matt/opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish UX (#100)

Browse Source
This commit is contained in:
Chirag Chhatrala
2023-03-11 16:43:21 +05:30
committed by GitHub
parent 43020939ed
commit 5df4488c25
4 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/components/open/forms/components/form-components/FormInformation.vue
View File

@@ -45,7 +45,7 @@
<template #title>
Copy Settings from another form
</template>
<div class="p-4">
<div class="p-4 min-h-[450px]">
<p class="text-gray-600">
If you already have another form that you like to use as a base for this form, you can do that here.
Select another form, confirm, and we will copy all of the other form settings (except the form structure)

38
resources/js/components/open/forms/components/form-logic-components/FormBlockLogicEditor.vue
View File

@@ -43,23 +43,25 @@
/>
<modal :show="showCopyFormModal" @close="showCopyFormModal = false">
<h3 class="font-semibold block text-lg">
Copy logic from another field
</h3>
<p class="text-gray-400 mb-5">
Select another field/block to copy its logic and apply it to "{{ field.name }}".
</p>
<select-input v-model="copyFrom" name="copy_from" emit-key="value"
label="Copy logic from" placeholder="Choose a field/block..."
:options="copyFromOptions" :searchable="copyFromOptions && copyFromOptions.options > 5"
/>
<div class="flex justify-between mb-6">
<v-button color="blue" shade="light" @click="copyLogic">
Confirm & Copy
</v-button>
<v-button color="gray" shade="light" class="ml-1" @click="showCopyFormModal=false">
Close
</v-button>
<div class="min-h-[450px]">
<h3 class="font-semibold block text-lg">
Copy logic from another field
</h3>
<p class="text-gray-400 mb-5">
Select another field/block to copy its logic and apply it to "{{ field.name }}".
</p>
<select-input v-model="copyFrom" name="copy_from" emit-key="value"
label="Copy logic from" placeholder="Choose a field/block..."
:options="copyFromOptions" :searchable="copyFromOptions && copyFromOptions.options > 5"
/>
<div class="flex justify-between mb-6">
<v-button color="blue" shade="light" @click="copyLogic">
Confirm & Copy
</v-button>
<v-button color="gray" shade="light" class="ml-1" @click="showCopyFormModal=false">
Close
</v-button>
</div>
</div>
</modal>
</div>
@@ -101,7 +103,7 @@ export default {
computed: {
copyFromOptions() {
return this.form.properties.filter((field) => {
return field.id !== this.field.id
return field.id !== this.field.id && field.hasOwnProperty('logic') && field.logic !== null && field.logic !== {}
}).map((field) => {
return {name: field.name, value: field.id}
})

2
resources/js/components/open/forms/components/form-logic-components/GroupControlSlot.vue
View File

@@ -2,7 +2,7 @@
<div class="flex flex-wrap px-4 py-1 -ml-1 -mt-1">
<select-input ref="ruleSelect" v-model="selectedRule" class="flex-grow ml-1 mr-1 mt-1"
wrapper-class="relative" placeholder="Add condition on input field"
:options="groupCtrl.rules" margin-bottom=""
:options="groupCtrl.rules" margin-bottom="" :searchable="groupCtrl.rules.length > 5"
emit-key="identifier"
option-key="identifier"
name="group-control-slot-rule"