aloha-vue 1.0.232 → 1.0.233

package/docs/src/views/PageTable/PageTable.js

@@ -129,6 +129,12 @@ export default {
       data: [],
       isLoadingOptions: false,
       rowActions: [
+        {
+          isDivider: true,
+        },
+        {
+          isDivider: true,
+        },
         {
           label: "Click me",
           title: "Click me title",
@@ -140,6 +146,15 @@ export default {
         {
           isDivider: true,
         },
+        {
+          isDivider: true,
+        },
+        {
+          isDivider: true,
+        },
+        {
+          isDivider: true,
+        },
         {
           labelCallback: ({ row, rowIndex }) => `${ rowIndex } Click ${ row.aloha }`,
           titleCallback: ({ row, rowIndex }) => `${ rowIndex } Click ${ row.aloha } title`,
@@ -154,8 +169,20 @@ export default {
           label: "Dokument herunterladen",
           target: "_blank",
         },
+        {
+          isDivider: true,
+        },
+        {
+          isDivider: true,
+        },
       ],
       multipleActions: [
+        {
+          isDivider: true,
+        },
+        {
+          isDivider: true,
+        },
         {
           label: "Aloha1",
           title: "Aloha1 Title",
@@ -171,7 +198,12 @@ export default {
         },
         {
           isDivider: true,
-          isHidden: true,
+        },
+        {
+          isDivider: true,
+        },
+        {
+          isDivider: true,
         },
         {
           label: "Aloha1 modal",
@@ -182,6 +214,12 @@ export default {
           isHidden: false,
           isHiddenCallback: this.isHiddenMultiple,
         },
+        {
+          isDivider: true,
+        },
+        {
+          isDivider: true,
+        },
       ],
       tableActions: [
         {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.232",
+  "version": "1.0.233",
   "author": "Ilia Brykin",
   "scripts": {
     "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"

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

@@ -10,6 +10,7 @@ import {
   cloneDeep,
   filter,
   forEach,
+  last,
 } from "lodash-es";
 
 export default function ActionsAPI(props, { emit }) {
@@ -52,9 +53,24 @@ export default function ActionsAPI(props, { emit }) {
 
   const multipleActions = toRef(props, "multipleActions");
   const multipleActionsFiltered = computed(() => {
-    return filter(multipleActions.value, action => {
+    const ACTIONS_FILTERED = filter(multipleActions.value, action => {
       return !action.isHidden;
     });
+
+    const ACTIONS_DIVIDER_FILTERED = [];
+    forEach(ACTIONS_FILTERED, action => {
+      if (!action.isDivider ||
+            (ACTIONS_DIVIDER_FILTERED.length > 0 &&
+              !last(ACTIONS_DIVIDER_FILTERED).isDivider)) {
+        ACTIONS_DIVIDER_FILTERED.push(action);
+      }
+    });
+
+    if (last(ACTIONS_DIVIDER_FILTERED).isDivider) {
+      ACTIONS_DIVIDER_FILTERED.pop();
+    }
+
+    return ACTIONS_DIVIDER_FILTERED;
   });
 
   const isMultipleActionsFiltered = computed(() => {

package/src/ATable/compositionAPI/RowActionsAPI.js

@@ -6,7 +6,9 @@ import {
 
 import {
   filter,
+  forEach,
   isFunction,
+  last,
 } from "lodash-es";
 
 export default function RowActionsAPI(props) {
@@ -30,7 +32,22 @@ export default function RowActionsAPI(props) {
   };
 
   const rowActionsFiltered = computed(() => {
-    return filter(rowActions.value, rowAction => isRowActionVisible({ rowAction }));
+    const ROW_ACTIONS_FILTERED = filter(rowActions.value, rowAction => isRowActionVisible({ rowAction }));
+
+    const ROW_ACTIONS_DIVIDER_FILTERED = [];
+    forEach(ROW_ACTIONS_FILTERED, action => {
+      if (!action.isDivider ||
+        (ROW_ACTIONS_DIVIDER_FILTERED.length > 0 &&
+          !last(ROW_ACTIONS_DIVIDER_FILTERED).isDivider)) {
+        ROW_ACTIONS_DIVIDER_FILTERED.push(action);
+      }
+    });
+
+    if (last(ROW_ACTIONS_DIVIDER_FILTERED).isDivider) {
+      ROW_ACTIONS_DIVIDER_FILTERED.pop();
+    }
+
+    return ROW_ACTIONS_DIVIDER_FILTERED;
   });
 
   const isRowActionsDropdownVisible = computed(() => {