@iankibetsh/shframework 4.4.2 → 4.4.4

package/dist/dist/library.mjs.css

@@ -31,38 +31,6 @@
   opacity: 0.5;
 }
 
-.permissions-main {
-  background: #edeff2;
-}
-.permissions-main div#permissions-nav {
-  padding: 0;
-}
-.permissions-main div#permissions-nav ul {
-  padding-left: 0;
-  max-height: 400px;
-  overflow-y: auto;
-}
-.permissions-main div#permissions-nav ul li.active {
-  border-right: none !important;
-  position: relative;
-  top: 0;
-  left: 0;
-  background: #88b3b370;
-  border-radius: 10px;
-}
-.permissions-main div#permissions-nav ul li {
-  list-style: none;
-  padding-inline-start: 10px;
-  display: flex;
-  gap: 5px;
-}
-.permissions-main div#permissions-nav ul li label {
-  padding: 8px 0;
-  cursor: pointer;
-  height: 100%;
-  flex-grow: 1;
-}
-
 .colored-toast.swal2-icon-success {
   background-color: #a5dc86 !important;
 }
@@ -111,6 +79,38 @@
   margin-right: 0.255em;
 }
 
+.permissions-main {
+  background: #edeff2;
+}
+.permissions-main div#permissions-nav {
+  padding: 0;
+}
+.permissions-main div#permissions-nav ul {
+  padding-left: 0;
+  max-height: 400px;
+  overflow-y: auto;
+}
+.permissions-main div#permissions-nav ul li.active {
+  border-right: none !important;
+  position: relative;
+  top: 0;
+  left: 0;
+  background: #88b3b370;
+  border-radius: 10px;
+}
+.permissions-main div#permissions-nav ul li {
+  list-style: none;
+  padding-inline-start: 10px;
+  display: flex;
+  gap: 5px;
+}
+.permissions-main div#permissions-nav ul li label {
+  padding: 8px 0;
+  cursor: pointer;
+  height: 100%;
+  flex-grow: 1;
+}
+
 .callout{
   --bs-link-color-rgb: 110,168,254;
   --bs-code-color: #e685b5;

package/dist/library.js

@@ -2151,7 +2151,7 @@ const fetchRemoteData = ()=>{
   };
   shApis.doGet(props.url, data).then(res => {
     suggestions.value = res.data.data ?? res.data;
-    initializeExisting();
+    initializeExisting(props.modelValue);
   }).catch(res => {
     console.log(res);
   });
@@ -2170,12 +2170,11 @@ const hideDropDown = ()=>{
   }
 };
 
-const initializeExisting = ()=>{
-  console.log(props);
-  if(props.modelValue && suggestions.value){
+const initializeExisting = (currentValue)=>{
+  if(currentValue && suggestions.value){
     if(props.allowMultiple){
       let selected = [];
-      props.modelValue.forEach(id=>{
+      currentValue.forEach(id=>{
         let found = suggestions.value.find(sgt=>{
           return sgt.id === id
         });
@@ -2186,7 +2185,7 @@ const initializeExisting = ()=>{
       selectedSuggestions.value = selected;
     } else {
       let found = suggestions.value.find(sgt=>{
-        return sgt.id === props.modelValue
+        return sgt.id === currentValue
       });
       if(found){
         selectedSuggestions.value = [found];
@@ -2194,6 +2193,11 @@ const initializeExisting = ()=>{
     }
   }
 };
+vue.watch(()=>props.modelValue, (newValue)=>{
+  if(newValue) {
+    initializeExisting(newValue);
+  }
+});
 
 return (_ctx, _cache) => {
   return (vue.unref(id))
@@ -4896,7 +4900,16 @@ const __default__ = {
     },
     replaceLinkUrl: function (path, obj){
       if (typeof path === 'object') {
-        path = path.link ?? path.url;
+       // check path,link or url
+        if (path.link) {
+          path = path.link;
+        } else if (path.url) {
+          path = path.url;
+        } else if(path.path){
+          path = path.path;
+        } else {
+          path = '';
+        }
       }
       var matches = path.match(/\{(.*?)\}/g);
       matches && matches.forEach(key => {

package/dist/library.mjs

@@ -3,7 +3,7 @@ import moment from 'moment';
 import Swal from 'sweetalert2';
 import { Modal, Offcanvas } from 'bootstrap';
 import NProgress from 'nprogress';
-import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, ref, onMounted, unref, createBlock, resolveDynamicComponent, normalizeClass, resolveComponent, watch, inject, mergeProps, normalizeStyle, renderSlot, createVNode, normalizeProps, guardReactiveProps, withCtx, vModelCheckbox, shallowRef, pushScopeId, popScopeId, markRaw, computed, isRef } from 'vue';
+import { openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createCommentVNode, withDirectives, Fragment, renderList, vModelSelect, vModelText, ref, onMounted, watch, unref, createBlock, resolveDynamicComponent, normalizeClass, resolveComponent, inject, mergeProps, normalizeStyle, renderSlot, createVNode, normalizeProps, guardReactiveProps, withCtx, vModelCheckbox, shallowRef, pushScopeId, popScopeId, markRaw, computed, isRef } from 'vue';
 import _ from 'lodash';
 import { defineStore, storeToRefs } from 'pinia';
 import { useRoute, useRouter } from 'vue-router';
@@ -2139,7 +2139,7 @@ const fetchRemoteData = ()=>{
   };
   shApis.doGet(props.url, data).then(res => {
     suggestions.value = res.data.data ?? res.data;
-    initializeExisting();
+    initializeExisting(props.modelValue);
   }).catch(res => {
     console.log(res);
   });
@@ -2158,12 +2158,11 @@ const hideDropDown = ()=>{
   }
 };
 
-const initializeExisting = ()=>{
-  console.log(props);
-  if(props.modelValue && suggestions.value){
+const initializeExisting = (currentValue)=>{
+  if(currentValue && suggestions.value){
     if(props.allowMultiple){
       let selected = [];
-      props.modelValue.forEach(id=>{
+      currentValue.forEach(id=>{
         let found = suggestions.value.find(sgt=>{
           return sgt.id === id
         });
@@ -2174,7 +2173,7 @@ const initializeExisting = ()=>{
       selectedSuggestions.value = selected;
     } else {
       let found = suggestions.value.find(sgt=>{
-        return sgt.id === props.modelValue
+        return sgt.id === currentValue
       });
       if(found){
         selectedSuggestions.value = [found];
@@ -2182,6 +2181,11 @@ const initializeExisting = ()=>{
     }
   }
 };
+watch(()=>props.modelValue, (newValue)=>{
+  if(newValue) {
+    initializeExisting(newValue);
+  }
+});
 
 return (_ctx, _cache) => {
   return (unref(id))
@@ -4884,7 +4888,16 @@ const __default__ = {
     },
     replaceLinkUrl: function (path, obj){
       if (typeof path === 'object') {
-        path = path.link ?? path.url;
+       // check path,link or url
+        if (path.link) {
+          path = path.link;
+        } else if (path.url) {
+          path = path.url;
+        } else if(path.path){
+          path = path.path;
+        } else {
+          path = '';
+        }
       }
       var matches = path.match(/\{(.*?)\}/g);
       matches && matches.forEach(key => {

package/package.json

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