From 9710ca9125d2e0a888c4e08477c9348bd476144c Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 18 Jan 2023 18:23:57 +0300
Subject: [PATCH] =?UTF-8?q?WIP=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=81=D0=BF=D0=BB=D1=8B?=
 =?UTF-8?q?=D0=B2=D0=B0=D1=8E=D1=89=D0=B5=D0=B3=D0=BE=20=D0=BE=D0=BA=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clients/components/ClientsActionPopup.vue | 15 +++------------
 .../clients/components/ClientsTableRow.vue    | 19 ++++++++++++-------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/pages/clients/components/ClientsActionPopup.vue b/src/pages/clients/components/ClientsActionPopup.vue
index 4c2b673..b88e784 100644
--- a/src/pages/clients/components/ClientsActionPopup.vue
+++ b/src/pages/clients/components/ClientsActionPopup.vue
@@ -1,7 +1,6 @@
 <template lang="pug">
-  .flex.flex-col.absolute.left-2.top-6
-    .corner
-    .popup-wrapper.flex.flex-col.gap-y-3.w-10.h-10.p-4
+  q-menu(anchor="bottom middle")
+    .popup-wrapper.flex.flex-col.gap-y-3.w-10.h-10.p-4.font-medium.text-sm.cursor-pointer
       .button.keep-redaction.flex.gap-x-3(@click="openChangeData")
         .icon-edit.icon
         span Редактировать
@@ -51,10 +50,9 @@ export default {
 <style lang="sass" scoped>
 .popup-wrapper
   width: 180px
-  height: 164px
+  height: auto
   border-radius: 0 4px 4px 4px
   background-color: var(--default-white)
-  box-shadow: var(--default-shadow)
   z-index: 11
 .keep-redaction
   color: var(--font-dark-blue-color)
@@ -65,13 +63,6 @@ export default {
 .button
   &:hover
     opacity: 0.7
-.corner
-  width: 8px
-  height: 8px
-  background: url("@/assets/icons/exclude.svg") right no-repeat
-  transform: scale(-1, 1)
-  z-index: 12
-  overflow: hidden
 .icon-delete
   color: var(--btn-red-color)
 </style>
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index 390623d..a50978d 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/src/pages/clients/components/ClientsTableRow.vue
@@ -12,14 +12,24 @@
         :class="{'row-overlay-color': rowOverlay}"
       )
         .dots-wrapper.flex.items-center.px-2
-          .relative.dots-button.icon-dots.cursor-pointer.leading-6.text-center(
+          //.relative.dots-button.icon-dots.cursor-pointer.leading-6.text-center(
             v-show="!isOpenChange && !rowOverlay",
             :tabindex="1",
             @click="(e) => openPopup(e)",
             @blur="handleUnFocusPopup"
+          //)
+          q-btn(
+            icon="app:icon-dots",
+            size="12px",
+            class="dots-button",
+            @click.stop,
+            v-show="!isOpenChange && !rowOverlay",
+            round,
+            dense,
+            no-caps,
+            padding="2px"
           )
             clients-action-popup(
-              v-if="isOpenPopup",
               :open-change-data="openChangeData",
               :disabled-delete="!!deletedClientId && !rowOverlay",
               @delete-client="transmitDeleteClient",
@@ -125,7 +135,6 @@ import ClientsActionPopup from "@/pages/clients/components/ClientsActionPopup";
 import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox";
 import ClientDetailInfoWrapper from "@/pages/clients/components/ClientDetailInfoWrapper";
 import BaseButton from "@/components/base/BaseButton";
-import BaseModal from "@/components/base/BaseModal";
 import { fetchWrapper } from "@/shared/fetchWrapper";
 import { column } from "@/pages/clients/utils/tableConfig";
 import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider";
@@ -136,7 +145,6 @@ export default {
   name: "ClientsTableRow",
   components: {
     BaseButton,
-    BaseModal,
     ClientsTableCheckbox,
     ClientsActionPopup,
     TableCellBodyName,
@@ -765,9 +773,6 @@ export default {
 .dots
   min-width: 14px
 .dots-button
-  width: 20px
-  height: 20px
-  border-radius: 50%
   color: var(--font-grey-color)
   &:hover
     background-color: var(--btn-blue-color)