@iankibetsh/shframework 3.0.8 → 4.0.1

package/dist/library.js

@@ -2094,18 +2094,20 @@ function filterData(e){
   }
   let filterValue = e.target.innerText;
   searchText.value = filterValue;
-  if(props.data) {
+  if (props.url) {
+    shApis.doGet(props.url, { all: 1,filter_value: filterValue }).then(res => {
+      suggestions.value = res.data.data ?? res.data;
+    }).catch(res => {
+      console.log(res);
+    });
+  } else if(props.data) {
     suggestions.value = props.data.filter(item=>{
       if(item.name.toLowerCase().includes(filterValue.toLowerCase())){
         return item
       }
     });
-  } else if (props.url) {
-      shApis.doGet(props.url, { all: 1,filter_value: filterValue }).then(res => {
-        suggestions.value = res.data.data ?? res.data;
-      }).catch(res => {
-        console.log(res);
-      });
+  } else {
+    console.log("Error: no data or url provided");
   }
 }
 
@@ -2136,6 +2138,7 @@ return (_ctx, _cache) => {
             contenteditable: "true",
             onClick: filterData,
             onInput: filterData,
+            onChange: filterData,
             class: "flex-fill h-100 sh-suggestion-input"
           }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_5$9)
         ], 8 /* PROPS */, _hoisted_2$d),
@@ -2243,7 +2246,8 @@ var script$s = {
       if(this.customComponent && this.customComponent[field]){
         return 'component'
       }
-      if(this.suggests && this.suggests.includes(field)){
+      if(this.suggests && this.suggests[field]){
+        // alert('found')
         return 'suggest'
       }
       if(this.editors && this.editors.includes(field)){
@@ -2471,7 +2475,7 @@ var script$s = {
           if (!this.suggests) {
             this.suggests = [];
           }
-          this.suggests.push(key);
+          this.suggests[key] = this.fillSelects[key];
         } else if (this.fillSelects[key].data) {
           this.selectData[key] = this.fillSelects[key].data;
         } else {
@@ -2692,8 +2696,10 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
                     "fill-selects": $props.fillSelects[field],
                     class: vue.normalizeClass(_ctx.form_errors[field] == null ? ' field_' + field:'is-invalid ' + field),
                     modelValue: _ctx.form_elements[field],
-                    "onUpdate:modelValue": $event => ((_ctx.form_elements[field]) = $event)
-                  }, null, 8 /* PROPS */, ["select-data", "fill-selects", "class", "modelValue", "onUpdate:modelValue"]))
+                    "onUpdate:modelValue": $event => ((_ctx.form_elements[field]) = $event),
+                    url: _ctx.suggests[field].url ?? false,
+                    data: _ctx.suggests[field].data ?? false
+                  }, null, 8 /* PROPS */, ["select-data", "fill-selects", "class", "modelValue", "onUpdate:modelValue", "url", "data"]))
                 : vue.createCommentVNode("v-if", true),
               ($options.getFieldType(field) === 'text')
                 ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("input", {
@@ -4305,7 +4311,7 @@ var script$b = {
         return {
             order_by: '',
             order_method: '',
-            per_page: shRepo.getShConfig('tablePerPage', 10),
+            per_page: this.pageCount ?? shRepo.getShConfig('tablePerPage', 10),
             page: 1,
           exactMatch: false,
             filter_value: '',

package/dist/library.mjs

@@ -2082,18 +2082,20 @@ function filterData(e){
   }
   let filterValue = e.target.innerText;
   searchText.value = filterValue;
-  if(props.data) {
+  if (props.url) {
+    shApis.doGet(props.url, { all: 1,filter_value: filterValue }).then(res => {
+      suggestions.value = res.data.data ?? res.data;
+    }).catch(res => {
+      console.log(res);
+    });
+  } else if(props.data) {
     suggestions.value = props.data.filter(item=>{
       if(item.name.toLowerCase().includes(filterValue.toLowerCase())){
         return item
       }
     });
-  } else if (props.url) {
-      shApis.doGet(props.url, { all: 1,filter_value: filterValue }).then(res => {
-        suggestions.value = res.data.data ?? res.data;
-      }).catch(res => {
-        console.log(res);
-      });
+  } else {
+    console.log("Error: no data or url provided");
   }
 }
 
@@ -2124,6 +2126,7 @@ return (_ctx, _cache) => {
             contenteditable: "true",
             onClick: filterData,
             onInput: filterData,
+            onChange: filterData,
             class: "flex-fill h-100 sh-suggestion-input"
           }, null, 40 /* PROPS, HYDRATE_EVENTS */, _hoisted_5$9)
         ], 8 /* PROPS */, _hoisted_2$d),
@@ -2231,7 +2234,8 @@ var script$s = {
       if(this.customComponent && this.customComponent[field]){
         return 'component'
       }
-      if(this.suggests && this.suggests.includes(field)){
+      if(this.suggests && this.suggests[field]){
+        // alert('found')
         return 'suggest'
       }
       if(this.editors && this.editors.includes(field)){
@@ -2459,7 +2463,7 @@ var script$s = {
           if (!this.suggests) {
             this.suggests = [];
           }
-          this.suggests.push(key);
+          this.suggests[key] = this.fillSelects[key];
         } else if (this.fillSelects[key].data) {
           this.selectData[key] = this.fillSelects[key].data;
         } else {
@@ -2680,8 +2684,10 @@ function render$2(_ctx, _cache, $props, $setup, $data, $options) {
                     "fill-selects": $props.fillSelects[field],
                     class: normalizeClass(_ctx.form_errors[field] == null ? ' field_' + field:'is-invalid ' + field),
                     modelValue: _ctx.form_elements[field],
-                    "onUpdate:modelValue": $event => ((_ctx.form_elements[field]) = $event)
-                  }, null, 8 /* PROPS */, ["select-data", "fill-selects", "class", "modelValue", "onUpdate:modelValue"]))
+                    "onUpdate:modelValue": $event => ((_ctx.form_elements[field]) = $event),
+                    url: _ctx.suggests[field].url ?? false,
+                    data: _ctx.suggests[field].data ?? false
+                  }, null, 8 /* PROPS */, ["select-data", "fill-selects", "class", "modelValue", "onUpdate:modelValue", "url", "data"]))
                 : createCommentVNode("v-if", true),
               ($options.getFieldType(field) === 'text')
                 ? withDirectives((openBlock(), createElementBlock("input", {
@@ -4293,7 +4299,7 @@ var script$b = {
         return {
             order_by: '',
             order_method: '',
-            per_page: shRepo.getShConfig('tablePerPage', 10),
+            per_page: this.pageCount ?? shRepo.getShConfig('tablePerPage', 10),
             page: 1,
           exactMatch: false,
             filter_value: '',

package/package.json

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