adminforth 1.5.11-next.2 → 1.5.11

package/dist/spa/src/afcl/AreaChart.vue

@@ -116,8 +116,12 @@ const options = computed(() => {
 
   // for each of  ...props.options  merge on lowest level. so if { chart: {height : 2} }, it should not replace chart level, only height level
   function mergeOptions(options: any, newOptions: any) {
+    if (!newOptions) {
+      return;
+    }
     for (const key in newOptions) {
-      if (typeof newOptions[key] === 'object') {
+      // and is not array
+      if (typeof newOptions[key] === 'object' && !Array.isArray(newOptions[key])) {
         if (!options[key]) {
           options[key] = {};
         }

package/dist/spa/src/afcl/BarChart.vue

@@ -128,8 +128,12 @@ const options = computed(() => {
 
   // for each of  ...props.options  merge on lowest level. so if { chart: {height : 2} }, it should not replace chart level, only height level
   function mergeOptions(options: any, newOptions: any) {
+    if (!newOptions) {
+      return;
+    }
     for (const key in newOptions) {
-      if (typeof newOptions[key] === 'object') {
+      // and is not array
+      if (typeof newOptions[key] === 'object' && !Array.isArray(newOptions[key])) {
         if (!options[key]) {
           options[key] = {};
         }

package/dist/spa/src/afcl/PieChart.vue

@@ -42,7 +42,7 @@ const optionsBase = {
     chart: {
       height: 400,
       width: "100%",
-      type: "donut",
+      type: "pie",
     },
     stroke: {
       colors: ["transparent"],
@@ -137,7 +137,8 @@ const options = computed(() => {
       return;
     }
     for (const key in newOptions) {
-      if (typeof newOptions[key] === 'object') {
+      // and is not array
+      if (typeof newOptions[key] === 'object' && !Array.isArray(newOptions[key])) {
         if (!options[key]) {
           options[key] = {};
         }

package/dist/spa/src/afcl/Select.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="relative inline-block afcl-select">
+  <div class="relative inline-block afcl-select" ref="internalSelect">
     <div class="relative">
       <input
         ref="inputEl"
@@ -89,7 +89,6 @@ import { ref, computed, onMounted, onUnmounted, watch, type Ref } from 'vue';
 import { IconCaretDownSolid } from '@iconify-prerendered/vue-flowbite';
 import { useElementSize } from '@vueuse/core'
 
-
 const props = defineProps({
   options: Array,
   modelValue: {
@@ -123,6 +122,7 @@ const dropdownStyle = ref<{ top?: string; }>({
 });
 
 const selectedItems: Ref<any[]> = ref([]);
+const internalSelect = ref<HTMLElement | null>(null);
 
 function inputInput() {
   if (!props.multiple && selectedItems.value.length) {
@@ -147,15 +147,12 @@ function updateFromProps() {
 }
 
 function inputClick() {
-  if (props.isReadonly) {
-    return;
-  }
-  if (!showDropdown.value) {
-    showDropdown.value = true;
-  } else {
-    if (!search.value) {
-      showDropdown.value = false;
-    }
+  if (props.isReadonly) return;
+  // Toggle local dropdown
+  showDropdown.value = !showDropdown.value;
+  // If the dropdown is about to close, reset the search
+  if (!showDropdown.value && !search.value) {
+    search.value = '';
   }
 }
 
@@ -198,10 +195,12 @@ const filteredItems = computed(() => {
   );
 });
 
-const handleClickOutside = (event) => {
-  if (!event.target.closest('.afcl-select')) {
+
+const handleClickOutside = (event: MouseEvent) => {
+  const targetEl = event.target as HTMLElement | null;
+  const closestSelect = targetEl?.closest('.afcl-select');
+  if (closestSelect !== internalSelect.value)
     showDropdown.value = false;
-  }
 };
 
 const addClickListener = () => {
@@ -228,7 +227,7 @@ const toogleItem = (item) => {
   if (!props.multiple && search.value) {
     search.value = '';
   }
-  
+
   const list = selectedItems.value.map(item => item.value);
   const updValue = list.length ? list : null;
   let emitValue;
@@ -238,13 +237,10 @@ const toogleItem = (item) => {
     emitValue = updValue;
   }
   emit('update:modelValue', emitValue);
-
 };
 
-
 onUnmounted(() => {
   removeClickListener();
 });
 
-
 </script>

package/dist/spa/src/afcl/Table.vue

@@ -7,7 +7,7 @@
           <th scope="col" class="px-6 py-3"
             v-for="column in columns"
           >
-            <slot v-if="$slots[`header:${column.fieldName}`]" :name="$slots[`header:${column.fieldName}`]" :column="column" />
+            <slot v-if="$slots[`header:${column.fieldName}`]" :name="`header:${column.fieldName}`" :column="column" />
             
             <span v-else>
               {{ column.label }}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.5.11-next.2",
+  "version": "1.5.11",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "module": "dist/index.js",