Merge pull request #37 from dderbentsov/UC-14
Исправлены ошибки отображения элементов заголовка таблицы
This commit is contained in:
@@ -17,6 +17,4 @@
|
|||||||
--bg-hover-row-table: rgba(215, 217, 255, 0.25)
|
--bg-hover-row-table: rgba(215, 217, 255, 0.25)
|
||||||
--default-white: #fff
|
--default-white: #fff
|
||||||
--btn-red-color: #ff6f6f
|
--btn-red-color: #ff6f6f
|
||||||
--time-indicator-color: #E93131
|
|
||||||
--br-grey-color: #D3D4DC
|
|
||||||
--time-indicator-color: #e93131
|
--time-indicator-color: #e93131
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ export default {
|
|||||||
.right
|
.right
|
||||||
order: 1
|
order: 1
|
||||||
.input-wrapper
|
.input-wrapper
|
||||||
border: 2px solid var(--br-grey-color)
|
border: 2px solid var(--border-light-grey-color)
|
||||||
border-radius: 4px
|
border-radius: 4px
|
||||||
.input-search
|
.input-search
|
||||||
min-width: 220px
|
min-width: 220px
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ export default {
|
|||||||
if (e.target.id === "all") {
|
if (e.target.id === "all") {
|
||||||
this.selectAll = !this.selectAll;
|
this.selectAll = !this.selectAll;
|
||||||
this.marked = this.dataClients.map((el) => el.id);
|
this.marked = this.dataClients.map((el) => el.id);
|
||||||
!this.selectAll ? (this.marked = []) : true;
|
!this.selectAll && (this.marked = []);
|
||||||
} else {
|
} else {
|
||||||
if (e.target.checked) {
|
if (e.target.checked) {
|
||||||
this.marked = [...this.marked, e.target.id];
|
this.marked = [...this.marked, e.target.id];
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
base-input(:with-icon="true")
|
base-input(:with-icon="true")
|
||||||
button.filter-button.flex.items-center.justify-center.box-border(class="px-2.5")
|
button.filter-button.flex.items-center.justify-center.box-border(class="px-2.5")
|
||||||
.icon-filter.text-xl.leading-4
|
.icon-filter.text-xl.leading-4
|
||||||
clients-table-header-actions(v-if="!!isOpenActions" :is-selected-one="isOpenActions")
|
clients-table-header-actions(v-if="!!isOpenActions" :is-selected-one="isOpenActions===1")
|
||||||
.flex.w-fit.h-fit.gap-x-2
|
.flex.w-fit.h-fit.gap-x-2
|
||||||
bass-export-button(:only-icon="true")
|
bass-export-button(:only-icon="true")
|
||||||
base-create-button(:with-icon="true")
|
base-create-button(:with-icon="true")
|
||||||
@@ -33,5 +33,5 @@ export default {
|
|||||||
<style lang="sass" scoped>
|
<style lang="sass" scoped>
|
||||||
.filter-button
|
.filter-button
|
||||||
border-radius: 4px
|
border-radius: 4px
|
||||||
border: 2px solid var(--br-grey-color)
|
border: 2px solid var(--border-light-grey-color)
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template lang="pug">
|
<template lang="pug">
|
||||||
.wrapper.flex.px-5.items-center.gap-x-2
|
.wrapper.flex.px-5.items-center.gap-x-2
|
||||||
clients-action-button(v-for="data in dataBtn" :key="data.prompt" :img="data.img" :prompt="data.prompt")
|
clients-action-button(v-for="data in (isSelectedOne?dataBtn:dataBtn.filter((el) => el.prompt !== 'ведение'))" :key="data.prompt" :img="data.img" :prompt="data.prompt")
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -13,7 +13,7 @@ export default {
|
|||||||
name: "ClientsTableHeaderActions",
|
name: "ClientsTableHeaderActions",
|
||||||
components: { ClientsActionButton },
|
components: { ClientsActionButton },
|
||||||
props: {
|
props: {
|
||||||
isSelectedOne: Number,
|
isSelectedOne: Boolean,
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -37,11 +37,6 @@ export default {
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
|
||||||
if (this.isSelectedOne > 1) {
|
|
||||||
this.dataBtn = this.dataBtn.filter((el) => el.prompt !== "ведение");
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user