aloha-vue 1.0.207 → 1.0.209

package/docs/src/views/PageAccordion/PageAccordion.js

@@ -30,6 +30,8 @@ export default {
                 {
                   label: "label 1.1.3",
                   content: "content 1.1.3",
+                  readonly: true,
+                  isCaret: false,
                 },
               ],
             },

package/package.json

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

package/src/AAccordion/AAccordionItem.js

@@ -13,7 +13,7 @@ import ASafeHtml from "../directives/ASafeHtml";
 
 import {
   cloneDeep,
-  get,
+  get, isUndefined,
 } from "lodash-es";
 
 export default {
@@ -167,19 +167,30 @@ export default {
       }
     },
 
+    readonlyLocal() {
+      return this.readonly || this.item.readonly;
+    },
+
+    isCaretLocal() {
+      if (!isUndefined(this.item.isCaret)) {
+        return this.item.isCaret;
+      }
+      return this.isCaret;
+    },
+
     buttonTag() {
-      return this.readonly ? "div" : "button";
+      return this.readonlyLocal ? "div" : "button";
     },
 
     buttonAttributes() {
       const ATTRIBUTES = {
         class: ["a_accordion__button", this.classButton, {
           a_accordion__button_collapsed: !this.isOpen,
-          a_accordion__button_has_not_caret: !this.isCaret,
+          a_accordion__button_has_not_caret: !this.isCaretLocal,
         }],
       };
 
-      if (!this.readonly) {
+      if (!this.readonlyLocal) {
         ATTRIBUTES.ariaExpanded = this.isOpen;
         ATTRIBUTES["aria-controls"] = this.idForCollapse;
         ATTRIBUTES.type = "button";

package/src/ATable/ATableActionItem/ATableActionItem.js

@@ -64,10 +64,15 @@ export default {
       ]);
     }
     if (this.type === "link") {
-      return h(resolveComponent("RouterLink"), {
+      const LINK_TAG = this.action.to ?
+        resolveComponent("RouterLink") :
+        "a";
+
+      return h(LINK_TAG, {
         id: this.action.id,
         class: ["a_table__action", this.action.class],
         to: this.action.to,
+        href: this.action.href,
         disabled: this.action.disabled,
       }, () => [
         this.action.title && h("span", {

package/src/ATable/ATableTopPanel/ATableTopPanel.js

@@ -182,7 +182,10 @@ export default {
         h("div", {
           class: "a_table__top_panel__actions",
         }, [
-          this.$slots.tableActions && this.$slots.tableActions(),
+          this.$slots.tableActionsStart && this.$slots.tableActionsStart({
+            isMultipleActionsActive: this.isMultipleActionsActive,
+            modelView: this.modelView,
+          }),
           this.tableActionFiltered.map(action => {
             return h(ATableActionItem, {
               action,
@@ -279,6 +282,10 @@ export default {
             }),
           ]),
         ]),
+        this.$slots.tableActionsEnd && this.$slots.tableActionsEnd({
+          isMultipleActionsActive: this.isMultipleActionsActive,
+          modelView: this.modelView,
+        }),
         h("div", {
           class: "a_table__multiple_panel__actions",
         }, [