adata-ui 0.1.67 → 0.1.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adata-ui",
-  "version": "0.1.67",
+  "version": "0.1.68",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/Button/AButton.vue

@@ -90,14 +90,17 @@ export default {
 
   &.size {
     &_extra_sm {
+      height: 24px;
       padding: 2px 16px;
       line-height: 20px;
     }
     &_sm {
+      height: 32px;
       padding: 6px 20px;
       line-height: 20px;
     }
     &_md {
+      height: 40px;
       padding: 8px 30px;
       line-height: 24px;
     }

package/src/components/Header/Header.vue

@@ -387,7 +387,6 @@ export default {
   },
   created() {
     this.fetchCurrencies();
-    this.fetchWeather()
   },
   mounted() {
     this.setBalance(this.balance);

package/src/components/Header/Profile.vue

@@ -17,7 +17,7 @@
                     fill="#2C3E50"></path>
             </svg>
           </div>
-          <a :href="loginUrl" class="sign" v-show="!isAuthenticated">
+          <a @click.prevent="goAuth" class="sign" v-show="!isAuthenticated">
             <svg width="18" height="18" fill="#25476AFF" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" class="desktop">
               <path fill="#fff" d="M0 0h16v16H0z" stroke="none"></path>
               <path d="M8 10l2-2.054L8.077 6" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"></path>
@@ -42,11 +42,12 @@
           <div class="profile-menu__inner">
             <div class="profile-menu__items" v-if="listDropDown.length">
               <div v-for="(elem, index) in listDropDown" :key="index">
-                <div :class="elem.link ? 'profile-menu__balance-link': 'profile-menu__links'"
-                     class="gray-text"
-                     v-if="elem[mode]"
-                     @click="handleClick(elem[mode], elem.name)"
-                     >
+                <a :href="elem[mode]" :class="elem.link ? 'profile-menu__balance-link': 'profile-menu__links'"
+                   class="gray-text"
+                   v-if="elem[mode]"
+                   @click="preventLink(elem.disabled, $event)"
+                   onclick="`return false`"
+                >
                   <div>
                     {{ elem.name }}
                   </div>
@@ -57,7 +58,7 @@
                   >
                       {{ elem.link }}
                     </span>
-                </div>
+                </a>
                 <div v-if="elem.children" @click="rotateItem(index)" class="gray-text profile-menu__item">
                   <div class="profile-menu__item__children">{{ elem.name }}
                     <span v-if="elem.children.length > 0">
@@ -303,6 +304,11 @@ export default {
     logout() {
       this.$emit("logout");
     },
+    preventLink(disabled, e) {
+      if (disabled) {
+        e.preventDefault()
+      }
+    },
     async showModal(url, name) {
       if (name.includes('Текущий')) {
         if(window.location.href.includes(url)) {
@@ -324,6 +330,12 @@ export default {
       this.chosenElem = this.listDropDown[index];
       this.$set(this.listDropDown[index], 'opened', !this.listDropDown[index].opened)
     },
+    goAuth() {
+      const fullPath = encodeURIComponent(window.location.toString())
+      if (window) {
+        window.location.href = `${this.loginUrl}?url=${fullPath}`
+      }
+    }
   }
 };
 </script>

package/src/components/Table/ATable.vue

@@ -5,8 +5,8 @@
         <th v-for="(col, i) in cols" :key="i">{{ col.name }}</th>
       </tr>
     </thead>
-    <tbody v-for="(row, i) in rows" :key="i">
-      <tr>
+    <tbody>
+      <tr v-for="(row, i) in rows" :key="i">
         <td v-for="col in cols" :key="col.key" :data-label="`${col.name}`">
           <slot :name="'key-' + col.key" :row="row">
             {{ row[col.key] || defaultEmpty }}