Fixes build-watch on Linux. Disables dragging when editing a filter or field.
This commit is contained in:
parent
73319097f6
commit
fc10a7db54
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/sh
|
#!/bin/bash
|
||||||
## Run the build script whenever there is a change in src folder
|
## Run the build script whenever there is a change in src folder
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
:list="activeFieldList"
|
:list="activeFieldList"
|
||||||
:options="{
|
:options="{
|
||||||
group: { name:'fields', pull: false, put: true },
|
group: { name:'fields', pull: false, put: true },
|
||||||
|
sort: openedFieldId == '' || openedFieldId == undefined,
|
||||||
|
disabled: openedFieldId != '' && openedFieldId != undefined,
|
||||||
handle: '.handle',
|
handle: '.handle',
|
||||||
ghostClass: 'sortable-ghost',
|
ghostClass: 'sortable-ghost',
|
||||||
filter: 'not-sortable-item',
|
filter: 'not-sortable-item',
|
||||||
|
@ -20,7 +22,7 @@
|
||||||
<div
|
<div
|
||||||
class="active-field-item"
|
class="active-field-item"
|
||||||
:class="{
|
:class="{
|
||||||
'not-sortable-item': field.id == undefined || openedFieldId == field.id,
|
'not-sortable-item': field.id == undefined || openedFieldId != '' ,
|
||||||
'not-focusable-item': openedFieldId == field.id,
|
'not-focusable-item': openedFieldId == field.id,
|
||||||
'disabled-field': field.enabled == false}"
|
'disabled-field': field.enabled == false}"
|
||||||
v-for="(field, index) in activeFieldList" :key="index">
|
v-for="(field, index) in activeFieldList" :key="index">
|
||||||
|
@ -368,11 +370,17 @@ export default {
|
||||||
i, i:before { font-size: 20px; }
|
i, i:before { font-size: 20px; }
|
||||||
}
|
}
|
||||||
|
|
||||||
&.not-sortable-item, &.not-sortable-item:hover, &.not-focusable-item, &.not-focusable-item:hover {
|
&.not-sortable-item, &.not-sortable-item:hover {
|
||||||
box-shadow: none !important;
|
|
||||||
cursor: default;
|
cursor: default;
|
||||||
background-color: white !important;
|
background-color: white !important;
|
||||||
|
|
||||||
|
.label-details, .icon {
|
||||||
|
color: $gray !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.not-focusable-item, &.not-focusable-item:hover {
|
||||||
|
cursor: default;
|
||||||
|
|
||||||
.field-name {
|
.field-name {
|
||||||
color: $primary;
|
color: $primary;
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
:list="activeFilterList"
|
:list="activeFilterList"
|
||||||
:options="{
|
:options="{
|
||||||
group: { name:'filters', pull: false, put: true },
|
group: { name:'filters', pull: false, put: true },
|
||||||
|
sort: openedFilterId == '' || openedFilterId == undefined,
|
||||||
|
disabled: openedFilterId != '' && openedFilterId != undefined,
|
||||||
handle: '.handle',
|
handle: '.handle',
|
||||||
ghostClass: 'sortable-ghost',
|
ghostClass: 'sortable-ghost',
|
||||||
filter: 'not-sortable-item',
|
filter: 'not-sortable-item',
|
||||||
|
@ -20,7 +22,7 @@
|
||||||
<div
|
<div
|
||||||
class="active-filter-item"
|
class="active-filter-item"
|
||||||
:class="{
|
:class="{
|
||||||
'not-sortable-item': filter.id == undefined || openedFilterId == filter.id || choosenField.name == filter.name,
|
'not-sortable-item': filter.id == undefined || openedFilterId != '' || choosenField.name == filter.name,
|
||||||
'not-focusable-item': openedFilterId == filter.id,
|
'not-focusable-item': openedFilterId == filter.id,
|
||||||
'disabled-filter': filter.enabled == false
|
'disabled-filter': filter.enabled == false
|
||||||
}"
|
}"
|
||||||
|
@ -485,9 +487,15 @@ export default {
|
||||||
border-bottom: 1px solid $draggable-border-color;
|
border-bottom: 1px solid $draggable-border-color;
|
||||||
margin-top: 1.0em;
|
margin-top: 1.0em;
|
||||||
}
|
}
|
||||||
&.not-sortable-item, &.not-sortable-item:hover, &.not-focusable-item, &.not-focusable-item:hover {
|
&.not-sortable-item, &.not-sortable-item:hover {
|
||||||
box-shadow: none !important;
|
cursor: default;
|
||||||
background-color: white !important;
|
background-color: white !important;
|
||||||
|
|
||||||
|
.label-details, .icon {
|
||||||
|
color: $gray !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
&.not-focusable-item, &.not-focusable-item:hover {
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
|
||||||
.field-name {
|
.field-name {
|
||||||
|
|
Loading…
Reference in New Issue