tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:tainacan/tainacan into develop

This commit is contained in:
vnmedeiros 2021-09-14 13:49:09 -03:00
parent 880bcfe7b7 1a6fe0135b
commit 2dadffbbd3
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/views/admin/components/other/checkbox-radio-metadata-input.vue
View File

@ -63,7 +63,7 @@
v-if="isCheckbox"
class="b-checkbox checkbox">
<input
:disabled="(selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length"
:disabled="(Array.isArray(selected) && selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length"
v-model="selected"
:value="option.id ? (isNaN(Number(option.id)) ? option.id : Number(option.id)) : (isNaN(Number(option.value)) ? option.value : Number(option.value))"
type="checkbox">
@ -75,10 +75,6 @@
</span>
</label>
<b-radio
v-tooltip="{
content: option.name ? option.name : option.label,
autoHide: false,
}"
v-else
v-model="selected"
:native-value="option.id ? (isNaN(Number(option.id)) ? option.id : Number(option.value)) : (isNaN(Number(option.value)) ? option.value : Number(option.value))">
@ -136,18 +132,13 @@
:key="key">
<label class="b-checkbox checkbox">
<input
:disabled="(selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length"
:disabled="(Array.isArray(selected) && selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length"
v-model="selected"
:value="option.value"
type="checkbox">
<span class="check" />
<span class="control-label">
<span
v-tooltip="{
content: option.label,
autoHide: false,
}"
class="checkbox-label-text">{{ `${ (option.label ? option.label : '') }` }}</span>
<span class="checkbox-label-text">{{ `${ (option.label ? option.label : '') }` }}</span>
</span>
</label>
</li>
@ -193,27 +184,18 @@
<label
v-if="isCheckbox"
class="b-checkbox checkbox"
:class="{ 'is-disabled': (selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length }">
:class="{ 'is-disabled': (Array.isArray(selected) && selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length }">
<input
:disabled="(selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length"
:disabled="(Array.isArray(selected) && selected.indexOf((isNaN(Number(option.value)) ? option.value : Number(option.value))) < 0) && maxMultipleValues !== undefined && maxMultipleValues - 1 < selected.length"
v-model="selected"
:value="(isNaN(Number(option.value)) ? option.value : Number(option.value))"
type="checkbox">
<span class="check" />
<span class="control-label">
<span
v-tooltip="{
content: option.label,
autoHide: false,
}"
class="checkbox-label-text">{{ `${option.label}` }}</span>
<span class="checkbox-label-text">{{ `${option.label}` }}</span>
</span>
</label>
<b-radio
v-tooltip="{
content: option.label,
autoHide: false,
}"
v-else
v-model="selected"
:native-value="(isNaN(Number(option.value)) ? option.value : Number(option.value))">
@ -854,13 +836,21 @@
align-items: center;
padding: 0;
.b-checkbox, .b-radio {
/deep/ .b-checkbox, /deep/ .b-radio {
max-width: 100%;
min-height: 1.5em;
margin-left: 0.7em;
margin-bottom: 0px !important;
height: 24px;
overflow: hidden;
height: auto;
padding-top: 2px;
padding-bottom: 2px;
-webkit-break-inside: avoid;
break-inside: avoid;
.control-label {
white-space: normal;
overflow: visible;
}
&.is-disabled {
cursor: not-allowed;
@ -884,6 +874,11 @@
.b-checkbox, .b-radio {
margin-right: 0px;
margin-bottom: 0;
.control-label {
white-space: normal;
overflow: visible;
}
&.is-disabled {
cursor: not-allowed;
opacity: 0.5;