@iankibetsh/shframework 1.5.3 → 1.5.5

package/dist/library.js

@@ -3107,6 +3107,7 @@ var script$e = {
   'helperTexts','labels','data',
   'actionLabel',
     'textAreas',
+    'currentData',
     'emails',
     'phones','numbers','selects','dates'
 ],
@@ -3226,14 +3227,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 +3260,7 @@ vue.onMounted((ev)=>{
       });
     }
   });
+  setExistingData();
 });
 
 
@@ -3274,9 +3290,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 +3311,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", {
@@ -3949,7 +3966,8 @@ var script$6 = {
       downloading: false,
       appUrl: window.VITE_APP_API_URL,
       hasCanvas: 0,
-      selectedRecord: null
+      selectedRecord: null,
+      timeOut: null
     }
   },
   mounted () {
@@ -3963,6 +3981,17 @@ var script$6 = {
     }
   },
   methods: {
+    userTyping: function(){
+      if (this.timeOut){
+        console.log('timer cleared');
+        clearTimeout(this.timeOut);
+      }
+      const self = this;
+      this.timeOut = setTimeout(()=>{
+        console.log('Searching');
+        self.reloadData(1);
+      },1000);
+    },
     cleanCanvasProps: function (actions) {
       let replaced = actions;
       replaced.class = null;
@@ -4369,9 +4398,11 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
           vue.createElementVNode("div", _hoisted_8$2, [
             vue.createElementVNode("div", _hoisted_9$2, [
               vue.withDirectives(vue.createElementVNode("input", {
+                onKeydown: _cache[1] || (_cache[1] = (...args) => ($options.userTyping && $options.userTyping(...args))),
+                onKeyup: _cache[2] || (_cache[2] = (...args) => ($options.userTyping && $options.userTyping(...args))),
                 type: "search",
-                onChange: _cache[1] || (_cache[1] = $event => ($options.reloadData(1))),
-                "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => (($data.filter_value) = $event)),
+                onChange: _cache[3] || (_cache[3] = $event => ($options.reloadData(1))),
+                "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => (($data.filter_value) = $event)),
                 placeholder: $props.searchPlaceholder ? $props.searchPlaceholder : 'Search',
                 class: "form-control sh-search-input"
               }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_10$1), [

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'
 ],
@@ -3213,14 +3214,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 +3247,7 @@ onMounted((ev)=>{
       });
     }
   });
+  setExistingData();
 });
 
 
@@ -3261,9 +3277,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 +3298,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", {
@@ -3936,7 +3953,8 @@ var script$6 = {
       downloading: false,
       appUrl: window.VITE_APP_API_URL,
       hasCanvas: 0,
-      selectedRecord: null
+      selectedRecord: null,
+      timeOut: null
     }
   },
   mounted () {
@@ -3950,6 +3968,17 @@ var script$6 = {
     }
   },
   methods: {
+    userTyping: function(){
+      if (this.timeOut){
+        console.log('timer cleared');
+        clearTimeout(this.timeOut);
+      }
+      const self = this;
+      this.timeOut = setTimeout(()=>{
+        console.log('Searching');
+        self.reloadData(1);
+      },1000);
+    },
     cleanCanvasProps: function (actions) {
       let replaced = actions;
       replaced.class = null;
@@ -4356,9 +4385,11 @@ function render$1(_ctx, _cache, $props, $setup, $data, $options) {
           createElementVNode("div", _hoisted_8$2, [
             createElementVNode("div", _hoisted_9$2, [
               withDirectives(createElementVNode("input", {
+                onKeydown: _cache[1] || (_cache[1] = (...args) => ($options.userTyping && $options.userTyping(...args))),
+                onKeyup: _cache[2] || (_cache[2] = (...args) => ($options.userTyping && $options.userTyping(...args))),
                 type: "search",
-                onChange: _cache[1] || (_cache[1] = $event => ($options.reloadData(1))),
-                "onUpdate:modelValue": _cache[2] || (_cache[2] = $event => (($data.filter_value) = $event)),
+                onChange: _cache[3] || (_cache[3] = $event => ($options.reloadData(1))),
+                "onUpdate:modelValue": _cache[4] || (_cache[4] = $event => (($data.filter_value) = $event)),
                 placeholder: $props.searchPlaceholder ? $props.searchPlaceholder : 'Search',
                 class: "form-control sh-search-input"
               }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_10$1), [

package/package.json

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