@eturnity/eturnity_reusable_components 7.4.4-EPDM-7260.13 → 7.4.4-EPDM-7260.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.4.4-EPDM-7260.13",
+  "version": "7.4.4-EPDM-7260.15",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/components/inputs/select/index.vue

@@ -178,7 +178,10 @@ const selectorProps = {
   showBorder: Boolean
 }
 const Selector = styled('div', selectorProps)`
-  ${(props) => props.selectWidth === '100%' ? 'width: 100%;' : `width: calc(${props.selectWidth} -
+  ${(props) =>
+    props.selectWidth === '100%'
+      ? 'width: 100%;'
+      : `width: calc(${props.selectWidth} -
       (
         ${CARET_WIDTH} +
         ${props.paddingLeft}
@@ -187,8 +190,7 @@ const Selector = styled('div', selectorProps)`
     );
     white-space: nowrap;
     text-overflow: ellipsis;
-    overflow: hidden;`
-  }
+    overflow: hidden;`}
 `
 
 const labelAttrs = { fontSize: String, fontColor: String }

package/src/components/rangeSlider/Slider.vue

@@ -1,5 +1,6 @@
 <template>
   <div
+    :data-id="dataId"
     :style="style"
     :class="className"
     @mousedown="elementMouseDown"
@@ -59,6 +60,10 @@ export default {
   replace: true,
   name: 'slider',
   props: {
+    dataId: {
+      type: String,
+      default: ''
+    },
     className: {
       type: String,
       default: 'vdr'

package/src/components/rangeSlider/index.vue

@@ -14,10 +14,12 @@
             @click.native.stop="
               onBarRightClick({ event: $event, label, type: 'add' })
             "
+            :data-id="`slider_bar_${dataLocation}_${label.id}`"
           >
             <SliderWrapper>
               <Slider
                 v-for="(bar, index) in label.selectedTariffs"
+                :dataId="`slider_bar_item_${dataLocation}_${label.id}_${bar.name}`"
                 :key="bar.id"
                 :draggable="!disabled"
                 :resizable="!disabled"
@@ -279,6 +281,7 @@ const BarItemText = styled.div`
 export default {
   name: 'RangeSlider',
   props: {
+    dataLocation: { type: String, default: '' },
     tariffItems: { type: Array, default: () => [] },
     labels: { type: Array, default: () => [] },
     rangeMargin: { type: Number, default: 1 },
@@ -403,6 +406,7 @@ export default {
       return `${this.$gettext('Remove')} ${value}`
     },
     onActivateBar({ item }) {
+      this.$emit('activate')
       this.activeItem = item
       document.addEventListener('keydown', this.onKeyDownDelete)
     },
@@ -504,6 +508,8 @@ export default {
 
         if (labels) {
           labels.value.forEach((label) => {
+            if (this.hasOverlap) return
+
             label.selectedTariffs.forEach((tariff) => {
               this.hasOverlap = this.checkOverlap(tariff, label.selectedTariffs)
 
@@ -511,6 +517,7 @@ export default {
                 const existing = this.OverlapId.find((id) => id === label.id)
 
                 if (!existing) this.OverlapId.push(label.id)
+                return
               } else
                 this.OverlapId = this.OverlapId
                   ? this.OverlapId.filter((id) => id !== label.id)