aloha-vue 1.2.39 → 1.2.41

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.39",
+  "version": "1.2.41",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/ATable/ATable.js

@@ -332,6 +332,10 @@ export default {
       required: false,
       default: 0,
     },
+    useViewSlot: {
+      type: Boolean,
+      required: false,
+    },
     valuesForColumnDefault: {
       type: Array,
       required: false,
@@ -721,6 +725,7 @@ export default {
           modelView: this.modelView,
           tableActionsIndexFirstDropdownAction: this.tableActionsIndexFirstDropdownAction,
           tableActionsIndexFirstDropdownActionMobile: this.tableActionsIndexFirstDropdownActionMobile,
+          useViewSlot: this.useViewSlot,
           onUpdateViewCurrent: this.updateViewCurrent,
           onUpdateModelQuickSearch: this.updateModelQuickSearch,
           onToggleMultipleActionsActive: this.toggleMultipleActionsActive,

package/src/ATable/ATableTopPanel/ATableTopPanel.js

@@ -105,6 +105,10 @@ export default {
       required: false,
       default: 0,
     },
+    useViewSlot: {
+      type: Boolean,
+      required: false,
+    },
     viewCurrent: {
       type: Object,
       required: false,
@@ -150,6 +154,7 @@ export default {
 
     const {
       updateViewCurrentLocal,
+      viewSlotLocal,
     } = ViewsAPI(props, context);
 
     return {
@@ -166,6 +171,7 @@ export default {
       textMultipleSelectedTranslateExtra,
       toggleBtnAllRows,
       updateViewCurrentLocal,
+      viewSlotLocal,
     };
   },
   computed: {
@@ -251,7 +257,7 @@ export default {
             class: "a_d_inline_block",
             isButtonGroup: true,
             disabled: this.disabledViews,
-            slotName: undefined, // TODO: "buttonGroup" AIcon
+            slotName: this.viewSlotLocal,
             data: this.views,
             keyId: "id",
             keyLabel: "label",
@@ -259,9 +265,9 @@ export default {
             classFieldset: "a_p_0",
             "onUpdate:modelValue": this.updateViewCurrentLocal,
           }, {
-            buttonGroup: () => [ // TODO: AIcon
-              h("span", "aloha"),
-            ],
+            viewSlot: arg => this.$slots.viewSlot && this.$slots.viewSlot({
+              ...arg,
+            }),
           }),
           this.$slots.tableActionsAppend && this.$slots.tableActionsAppend({
             isMultipleActionsActive: this.isMultipleActionsActive,

package/src/ATable/ATableTopPanel/compositionAPI/ViewsAPI.js

@@ -1,9 +1,21 @@
+import {
+  computed,
+  toRef,
+} from "vue";
+
 export default function ViewsAPI(props, { emit }) {
+  const useViewSlot = toRef(props, "useViewSlot");
+
   const updateViewCurrentLocal = model => {
     emit("updateViewCurrent", model);
   };
 
+  const viewSlotLocal = computed(() => {
+    return useViewSlot.value ? "viewSlot" : undefined;
+  });
+
   return {
     updateViewCurrentLocal,
+    viewSlotLocal,
   };
 }

package/src/ATable/compositionAPI/ViewsAPI.js

@@ -4,6 +4,7 @@ import {
 } from "vue";
 
 import {
+  find,
   keyBy,
 } from "lodash-es";
 
@@ -26,10 +27,14 @@ export default function ViewsAPI(props, { emit }) {
 
   const initViewCurrent = () => {
     if (hasViews.value) {
-      const MODEL_VIEW = views.value[0].id;
+      const VIEW_ACTIVE = find(views.value, ["active", true]);
+      let modelViewLocal = views.value[0].id;
+      if (VIEW_ACTIVE) {
+        modelViewLocal = VIEW_ACTIVE.id;
+      }
       emit("updateView", {
-        _modelView: MODEL_VIEW,
-        view: viewKeyById.value[MODEL_VIEW],
+        _modelView: modelViewLocal,
+        view: viewKeyById.value[modelViewLocal],
         modelFilters: modelFilters.value,
         init: true,
       });