WIP Исправление всплывающего окна в процессе

This commit is contained in:
Daria Golova
2023-01-18 18:23:57 +03:00
parent 1283ea08f5
commit 9710ca9125
2 changed files with 15 additions and 19 deletions

View File

@@ -1,7 +1,6 @@
<template lang="pug"> <template lang="pug">
.flex.flex-col.absolute.left-2.top-6 q-menu(anchor="bottom middle")
.corner .popup-wrapper.flex.flex-col.gap-y-3.w-10.h-10.p-4.font-medium.text-sm.cursor-pointer
.popup-wrapper.flex.flex-col.gap-y-3.w-10.h-10.p-4
.button.keep-redaction.flex.gap-x-3(@click="openChangeData") .button.keep-redaction.flex.gap-x-3(@click="openChangeData")
.icon-edit.icon .icon-edit.icon
span Редактировать span Редактировать
@@ -51,10 +50,9 @@ export default {
<style lang="sass" scoped> <style lang="sass" scoped>
.popup-wrapper .popup-wrapper
width: 180px width: 180px
height: 164px height: auto
border-radius: 0 4px 4px 4px border-radius: 0 4px 4px 4px
background-color: var(--default-white) background-color: var(--default-white)
box-shadow: var(--default-shadow)
z-index: 11 z-index: 11
.keep-redaction .keep-redaction
color: var(--font-dark-blue-color) color: var(--font-dark-blue-color)
@@ -65,13 +63,6 @@ export default {
.button .button
&:hover &:hover
opacity: 0.7 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 .icon-delete
color: var(--btn-red-color) color: var(--btn-red-color)
</style> </style>

View File

@@ -12,14 +12,24 @@
:class="{'row-overlay-color': rowOverlay}" :class="{'row-overlay-color': rowOverlay}"
) )
.dots-wrapper.flex.items-center.px-2 .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", v-show="!isOpenChange && !rowOverlay",
:tabindex="1", :tabindex="1",
@click="(e) => openPopup(e)", @click="(e) => openPopup(e)",
@blur="handleUnFocusPopup" @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( clients-action-popup(
v-if="isOpenPopup",
:open-change-data="openChangeData", :open-change-data="openChangeData",
:disabled-delete="!!deletedClientId && !rowOverlay", :disabled-delete="!!deletedClientId && !rowOverlay",
@delete-client="transmitDeleteClient", @delete-client="transmitDeleteClient",
@@ -125,7 +135,6 @@ import ClientsActionPopup from "@/pages/clients/components/ClientsActionPopup";
import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox"; import ClientsTableCheckbox from "@/pages/clients/components/ClientsTableCheckbox";
import ClientDetailInfoWrapper from "@/pages/clients/components/ClientDetailInfoWrapper"; import ClientDetailInfoWrapper from "@/pages/clients/components/ClientDetailInfoWrapper";
import BaseButton from "@/components/base/BaseButton"; import BaseButton from "@/components/base/BaseButton";
import BaseModal from "@/components/base/BaseModal";
import { fetchWrapper } from "@/shared/fetchWrapper"; import { fetchWrapper } from "@/shared/fetchWrapper";
import { column } from "@/pages/clients/utils/tableConfig"; import { column } from "@/pages/clients/utils/tableConfig";
import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider"; import TheNotificationProvider from "@/components/Notifications/TheNotificationProvider";
@@ -136,7 +145,6 @@ export default {
name: "ClientsTableRow", name: "ClientsTableRow",
components: { components: {
BaseButton, BaseButton,
BaseModal,
ClientsTableCheckbox, ClientsTableCheckbox,
ClientsActionPopup, ClientsActionPopup,
TableCellBodyName, TableCellBodyName,
@@ -765,9 +773,6 @@ export default {
.dots .dots
min-width: 14px min-width: 14px
.dots-button .dots-button
width: 20px
height: 20px
border-radius: 50%
color: var(--font-grey-color) color: var(--font-grey-color)
&:hover &:hover
background-color: var(--btn-blue-color) background-color: var(--btn-blue-color)