From 2bb54abc1a1db5433004ad7b6f5582a9b7c47e81 Mon Sep 17 00:00:00 2001
From: shuhaib s <95394061+shuhaib-aot@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:33:28 +0530
Subject: [PATCH] Formio url issue fixed on form object  (#296)

* fixed form related issue

* Update package.json
---
 camunda-formio-tasklist-vue/package.json              |  2 +-
 .../src/components/form/FormListModal.vue             | 11 ++++++-----
 .../src/styles/camundaFormIOTasklist.scss             |  8 ++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/camunda-formio-tasklist-vue/package.json b/camunda-formio-tasklist-vue/package.json
index 94480aba..6bc5ab08 100644
--- a/camunda-formio-tasklist-vue/package.json
+++ b/camunda-formio-tasklist-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "camunda-formio-tasklist-vue",
-  "version": "1.1.6-rc",
+  "version": "1.1.7-rc",
   "description": "Vue components to integrate formsflow.ai",
   "private": false,
   "main": "./dist/camunda-formio-tasklist-vue.common.js",
diff --git a/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue b/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue
index 9c07cba1..73741f56 100644
--- a/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue
+++ b/camunda-formio-tasklist-vue/src/components/form/FormListModal.vue
@@ -75,7 +75,7 @@
                       </div>
                      <div class="d-flex align-items-center">
                       <input 
-                        class=" form-control"  
+                        class="me-2 form-control"  
                         v-model="searchValue" 
                         type="text" 
                         @keypress.enter="handleSearch"
@@ -182,6 +182,7 @@
             <Form
               v-if="Object.keys(formData).length > 0"
               ref="formio-form"
+              :src="currentFormUrl"
               :form="formData"
               submission=""
               options=""
@@ -249,6 +250,7 @@ export default class FormListModal extends Mixins(BaseMixin) {
   private sortBy: string="formName" ;
   private formError: string="";
   public submissionError: string= "";
+  public currentFormUrl: string= "";
   public isSearch: boolean= false;
   private isFormloading: boolean=true;
   public formData = {
@@ -328,6 +330,7 @@ export default class FormListModal extends Mixins(BaseMixin) {
     };
     this.formId = val;
     const url = this.formioUrl.concat(val);
+   
     axios.get(url, {
       headers:{
         "x-jwt-token": localStorage.getItem("formioToken")
@@ -335,6 +338,7 @@ export default class FormListModal extends Mixins(BaseMixin) {
     }).then((res)=>{
       if(res.data){
         this.formData = res.data;
+        this.currentFormUrl = url;
       }else{
         this.formData = {
         };
@@ -426,10 +430,7 @@ export default class FormListModal extends Mixins(BaseMixin) {
 }
 </script>
 <style>
- input{
-  margin-right: 10px;
-  float: right;
-}
+ 
 .formspinner{
   width: 3rem; 
   height: 3rem
diff --git a/camunda-formio-tasklist-vue/src/styles/camundaFormIOTasklist.scss b/camunda-formio-tasklist-vue/src/styles/camundaFormIOTasklist.scss
index dcc82a89..473e1e7c 100644
--- a/camunda-formio-tasklist-vue/src/styles/camundaFormIOTasklist.scss
+++ b/camunda-formio-tasklist-vue/src/styles/camundaFormIOTasklist.scss
@@ -698,3 +698,11 @@
     fill: rgb(56,89,138) !important;
   }
 }
+
+
+.formio-form, 
+.formio-builder-form {
+    .form-group {
+      margin-bottom: 1rem;
+    }
+  }
\ No newline at end of file