aloha-vue 1.0.16 → 1.0.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "author": "Ilia Brykin",
   "dependencies": {
     "@popperjs/core": "2.11.5",

package/src/AModal/AModal.js

@@ -26,6 +26,10 @@ export default {
       required: false,
       default: false,
     },
+    loading: {
+      type: Boolean,
+      required: false,
+    },
     selectorClose: {
       type: [String, Array],
       required: false,
@@ -210,6 +214,10 @@ export default {
       }
       return "";
     },
+
+    disabledLocal() {
+      return this.disabled || this.loading;
+    },
   },
   watch: {
     isModalHidden() {
@@ -412,7 +420,7 @@ export default {
                   type: "button",
                   class: "a_btn_close",
                   ariaLabel: "Close",
-                  disabled: this.disabled,
+                  disabled: this.disabledLocal,
                   onClick: this.close,
                 })
               ]),
@@ -442,7 +450,7 @@ export default {
                 this.save && h("button", {
                   type: "button",
                   class: this.saveButtonClass,
-                  disabled: this.disabled,
+                  disabled: this.disabledLocal,
                   onClick: this.save,
                 }, [
                   h("span", null, this.saveButtonText),
@@ -450,7 +458,7 @@ export default {
                 !this.isCloseButtonHidden && h("button", {
                   type: "button",
                   class: this.closeButtonClass,
-                  disabled: this.disabled,
+                  disabled: this.disabledLocal,
                   onClick: this.close,
                 }, [
                   h("span", null, this.closeButtonText),

package/src/ATable/ATableActionItem/ATableActionItem.js

@@ -28,6 +28,7 @@ export default {
   render() {
     if (this.type === "button") {
       return h("button", {
+        id: this.action.id,
         class: ["a_table__action", this.action.class],
         disabled: this.action.disabled,
       }, [
@@ -47,6 +48,7 @@ export default {
     }
     if (this.type === "link") {
       return h(resolveComponent("RouterLink"), {
+        id: this.action.id,
         class: ["a_table__action", this.action.class],
         to: this.action.to,
         disabled: this.action.disabled,

package/src/ATable/ATableTdActionItem/ATableTdActionItem.js

@@ -104,6 +104,13 @@ export default {
       }
       return undefined;
     },
+
+    idLocal() {
+      if (this.rowAction.id) {
+        return `${ this.rowAction.id }_${ this.rowIndex }`;
+      }
+      return undefined;
+    },
   },
   methods: {
     onClick() {
@@ -111,6 +118,7 @@ export default {
         row: this.row,
         rowIndex: this.rowIndex,
         rowAction: this.rowAction,
+        id: this.idLocal,
       });
     },
   },
@@ -126,11 +134,13 @@ export default {
         row: this.row,
         rowIndex: this.rowIndex,
         rowAction: this.rowAction,
+        id: this.idLocal,
       });
     }
     if (this.rowAction.type === "link") {
       return h("li", null, [
         h(resolveComponent("RouterLink"), {
+          id: this.idLocal,
           class: ["a_dropdown__item a_table__row_action", this.classLocal],
           disabled: this.disabledLocal,
           to: this.toLocal,
@@ -152,6 +162,7 @@ export default {
     }
     return h("li", null, [
       h("button", {
+        id: this.idLocal,
         type: "button",
         class: ["a_dropdown__item a_table__row_action", this.classLocal],
         disabled: this.disabledLocal,

package/src/styles/components/ui/ASelect.scss

@@ -43,7 +43,7 @@
   position: relative;
   min-width: 200px;
   max-width: 400px;
-  z-index: 999;
+  z-index: 1055;
   background-color: #fff;
   border: 1px solid grey;
   padding: 10px;

package/src/ui/ASelect/ASelect.js

@@ -157,6 +157,10 @@ export default {
       required: false,
       default: true,
     },
+    loading: {
+      type: Boolean,
+      required: false,
+    },
   },
   emits: [
     "onSearchOutside",