@iankibetsh/shframework 1.5.4 → 1.5.6

package/dist/library.js

@@ -3107,6 +3107,7 @@ var script$e = {
   'helperTexts','labels','data',
   'actionLabel',
     'textAreas',
+    'currentData',
     'emails',
     'phones','numbers','selects','dates'
 ],
@@ -3119,6 +3120,9 @@ const props = __props;
 
 const formFields = vue.ref([]);
 const getFieldComponent = (fieldObj)=>{
+  if(fieldObj.component){
+    return fieldObj.component
+  }
   const field = fieldObj.field;
   const defaultTextareas = ['message', 'meta_description', 'comment', 'call_response', 'comments', 'description'];
   const defaultNumbers = ['age'];
@@ -3226,14 +3230,28 @@ const submitForm = e => {
   return false
 };
 const submitBtnWidth = vue.ref(null);
+const setExistingData = ()=>{
+  console.log(props.currentData, formFields.value);
+  const existingData = props.currentData;
+  if (props.currentData) {
+    formFields.value.map(field=>{
+      existingData[field.field] && (field.value = existingData[field.field]);
+    });
+  }
+};
+vue.watch(()=>props.currentData,()=>{
+  setExistingData();
+});
 vue.onMounted((ev)=>{
   props.fields && props.fields.map(field=>{
     if(typeof field === 'object') {
       const fieldObj = {...field};
-      fieldObj.label && getLabel(fieldObj.field);
-      !fieldObj.helper && fieldObj.helperText ? fieldObj.helper = fieldObj.helperText : fieldObj.helper = getHelperText(fieldObj.field);
-      fieldObj.helperText === undefined && (fieldObj.label = getLabel(fieldObj.field));
-      fieldObj.placeholder && fieldObj.placeHolder && getPlaceholder(fieldObj.field);
+      // fieldObj.label && getLabel(fieldObj.field)
+      fieldObj.helper = fieldObj.helperText ?? fieldObj.helper;
+      // !fieldObj.helper && fieldObj.helperText ? fieldObj.helper = fieldObj.helperText : fieldObj.helper = getHelperText(fieldObj.field)
+      // fieldObj.helperText === undefined && ()
+      fieldObj.label = fieldObj.label ?? getLabel(fieldObj.field);
+      // fieldObj.placeholder && fieldObj.placeHolder && getPlaceholder(fieldObj.field)
       fieldObj.value = null;
       formFields.value.push(fieldObj);
     } else {
@@ -3245,6 +3263,7 @@ vue.onMounted((ev)=>{
       });
     }
   });
+  setExistingData();
 });
 
 
@@ -3274,9 +3293,8 @@ return (_ctx, _cache) => {
             onClick: $event => (removeValidationError(field.field)),
             "onUpdate:modelValue": [$event => (removeValidationError(field.field)), $event => ((formFields.value[index].value) = $event)],
             modelValue: formFields.value[index].value,
-            placeholder: vue.unref(isFloating) ? field.label:field.placeholder,
             class: getComponentClass(field.field)
-          }), null, 16 /* FULL_PROPS */, ["isInvalid", "onClick", "onUpdate:modelValue", "modelValue", "placeholder", "class"])),
+          }), null, 16 /* FULL_PROPS */, ["isInvalid", "onClick", "onUpdate:modelValue", "modelValue", "class"])),
           (vue.unref(isFloating) && field.label)
             ? (vue.openBlock(), vue.createElementBlock("label", {
                 key: 1,
@@ -3296,7 +3314,9 @@ return (_ctx, _cache) => {
                 key: 3,
                 class: vue.normalizeClass(getElementClass('invalidFeedback'))
               }, vue.toDisplayString(validationErrors.value[field.field]), 3 /* TEXT, CLASS */))
-            : vue.createCommentVNode("v-if", true)
+            : vue.createCommentVNode("v-if", true),
+          vue.createCommentVNode("      <h5>{{ getFieldComponent(field) }}</h5>"),
+          vue.createCommentVNode("      <h5>{{ getComponentProps(field) }}</h5>")
         ], 2 /* CLASS */))
       }), 128 /* KEYED_FRAGMENT */)),
       vue.createElementVNode("div", {

package/dist/library.mjs

@@ -2,7 +2,7 @@ import Axios from 'axios';
 import moment from 'moment';
 import Swal from 'sweetalert2';
 import NProgress from 'nprogress';
-import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, resolveComponent, withModifiers, createVNode, ref, onMounted, unref, normalizeClass, createBlock, resolveDynamicComponent, inject, mergeProps, normalizeStyle, renderSlot, normalizeProps, guardReactiveProps, withCtx, createStaticVNode, shallowRef, vModelCheckbox, pushScopeId, popScopeId, computed, isRef, watch } from 'vue';
+import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, resolveComponent, withModifiers, createVNode, ref, onMounted, unref, normalizeClass, createBlock, resolveDynamicComponent, inject, watch, mergeProps, normalizeStyle, renderSlot, normalizeProps, guardReactiveProps, withCtx, createStaticVNode, shallowRef, vModelCheckbox, pushScopeId, popScopeId, computed, isRef } from 'vue';
 import Editor from '@tinymce/tinymce-vue';
 import _ from 'lodash';
 import { useRoute, useRouter } from 'vue-router';
@@ -3094,6 +3094,7 @@ var script$e = {
   'helperTexts','labels','data',
   'actionLabel',
     'textAreas',
+    'currentData',
     'emails',
     'phones','numbers','selects','dates'
 ],
@@ -3106,6 +3107,9 @@ const props = __props;
 
 const formFields = ref([]);
 const getFieldComponent = (fieldObj)=>{
+  if(fieldObj.component){
+    return fieldObj.component
+  }
   const field = fieldObj.field;
   const defaultTextareas = ['message', 'meta_description', 'comment', 'call_response', 'comments', 'description'];
   const defaultNumbers = ['age'];
@@ -3213,14 +3217,28 @@ const submitForm = e => {
   return false
 };
 const submitBtnWidth = ref(null);
+const setExistingData = ()=>{
+  console.log(props.currentData, formFields.value);
+  const existingData = props.currentData;
+  if (props.currentData) {
+    formFields.value.map(field=>{
+      existingData[field.field] && (field.value = existingData[field.field]);
+    });
+  }
+};
+watch(()=>props.currentData,()=>{
+  setExistingData();
+});
 onMounted((ev)=>{
   props.fields && props.fields.map(field=>{
     if(typeof field === 'object') {
       const fieldObj = {...field};
-      fieldObj.label && getLabel(fieldObj.field);
-      !fieldObj.helper && fieldObj.helperText ? fieldObj.helper = fieldObj.helperText : fieldObj.helper = getHelperText(fieldObj.field);
-      fieldObj.helperText === undefined && (fieldObj.label = getLabel(fieldObj.field));
-      fieldObj.placeholder && fieldObj.placeHolder && getPlaceholder(fieldObj.field);
+      // fieldObj.label && getLabel(fieldObj.field)
+      fieldObj.helper = fieldObj.helperText ?? fieldObj.helper;
+      // !fieldObj.helper && fieldObj.helperText ? fieldObj.helper = fieldObj.helperText : fieldObj.helper = getHelperText(fieldObj.field)
+      // fieldObj.helperText === undefined && ()
+      fieldObj.label = fieldObj.label ?? getLabel(fieldObj.field);
+      // fieldObj.placeholder && fieldObj.placeHolder && getPlaceholder(fieldObj.field)
       fieldObj.value = null;
       formFields.value.push(fieldObj);
     } else {
@@ -3232,6 +3250,7 @@ onMounted((ev)=>{
       });
     }
   });
+  setExistingData();
 });
 
 
@@ -3261,9 +3280,8 @@ return (_ctx, _cache) => {
             onClick: $event => (removeValidationError(field.field)),
             "onUpdate:modelValue": [$event => (removeValidationError(field.field)), $event => ((formFields.value[index].value) = $event)],
             modelValue: formFields.value[index].value,
-            placeholder: unref(isFloating) ? field.label:field.placeholder,
             class: getComponentClass(field.field)
-          }), null, 16 /* FULL_PROPS */, ["isInvalid", "onClick", "onUpdate:modelValue", "modelValue", "placeholder", "class"])),
+          }), null, 16 /* FULL_PROPS */, ["isInvalid", "onClick", "onUpdate:modelValue", "modelValue", "class"])),
           (unref(isFloating) && field.label)
             ? (openBlock(), createElementBlock("label", {
                 key: 1,
@@ -3283,7 +3301,9 @@ return (_ctx, _cache) => {
                 key: 3,
                 class: normalizeClass(getElementClass('invalidFeedback'))
               }, toDisplayString(validationErrors.value[field.field]), 3 /* TEXT, CLASS */))
-            : createCommentVNode("v-if", true)
+            : createCommentVNode("v-if", true),
+          createCommentVNode("      <h5>{{ getFieldComponent(field) }}</h5>"),
+          createCommentVNode("      <h5>{{ getComponentProps(field) }}</h5>")
         ], 2 /* CLASS */))
       }), 128 /* KEYED_FRAGMENT */)),
       createElementVNode("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iankibetsh/shframework",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "Vue library for handling laravel backend",
   "main": "dist/library.js",
   "module": "dist/library.mjs",