Fixes wrong positionint for metada compress button in tems page. Removes unecessary selected attribution on checkbox filter.
This commit is contained in:
parent
2938afc6c0
commit
fa18e6a270
|
@ -312,7 +312,7 @@
|
|||
v-html="formHooks['item']['end-left'].join('')"/>
|
||||
</template>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="column is-4-5"
|
||||
v-show="!isMetadataColumnCompressed">
|
||||
|
@ -933,9 +933,9 @@ export default {
|
|||
@import '../../scss/_variables.scss';
|
||||
|
||||
#metadata-column-compress-button {
|
||||
position: relative;
|
||||
position: absolute;
|
||||
z-index: 99;
|
||||
float: right;
|
||||
right: 0;
|
||||
top: 70px;
|
||||
max-width: 36px;
|
||||
height: 36px;
|
||||
|
|
|
@ -433,9 +433,9 @@
|
|||
@import '../../scss/_variables.scss';
|
||||
|
||||
#metadata-column-compress-button {
|
||||
position: relative;
|
||||
position: absolute;
|
||||
z-index: 99;
|
||||
float: right;
|
||||
right: 0;
|
||||
top: 70px;
|
||||
max-width: 36px;
|
||||
height: 36px;
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
margin-right: 0.375rem;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
animation-name: appear;
|
||||
animation-duration: 0.2s;
|
||||
|
||||
&:hover, &:hover .tag {
|
||||
background-color: $gray2;
|
||||
|
@ -21,14 +23,18 @@
|
|||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
||||
&.is-delete {
|
||||
&.is-delete,
|
||||
&.is-delete:hover,
|
||||
&.is-delete:focus,
|
||||
&.is-delete:active {
|
||||
border-radius: 50px !important;
|
||||
border-radius: 50px !important;
|
||||
color: $gray4;
|
||||
background-color: transparent;
|
||||
|
||||
&:hover {
|
||||
background-color: white !important;
|
||||
color: $gray5;
|
||||
background-color: transparent;
|
||||
color: $gray4;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -98,8 +98,8 @@
|
|||
},
|
||||
mixins: [filter_type_mixin],
|
||||
watch: {
|
||||
selected: function(val){
|
||||
this.selected = val;
|
||||
selected: function(){
|
||||
//this.selected = val;
|
||||
this.onSelect();
|
||||
}
|
||||
},
|
||||
|
@ -113,34 +113,35 @@
|
|||
this.metadatum_object.metadata_type_options.collection_id : this.collection_id;
|
||||
|
||||
promise = this.getValuesRelationship( collectionTarget, null, [], 0, this.filter.max_options);
|
||||
|
||||
promise.then(() => {
|
||||
if(this.options.length > this.filter.max_options){
|
||||
this.options.splice(this.filter.max_options);
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$console.error(error);
|
||||
promise
|
||||
.then(() => {
|
||||
if(this.options.length > this.filter.max_options){
|
||||
this.options.splice(this.filter.max_options);
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$console.error(error);
|
||||
})
|
||||
} else {
|
||||
promise = this.getValuesPlainText( this.metadatum, null, this.isRepositoryLevel, [], 0, this.filter.max_options );
|
||||
|
||||
promise.then(() => {
|
||||
if(this.options.length > this.filter.max_options){
|
||||
this.options.splice(this.filter.max_options);
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$console.error(error);
|
||||
})
|
||||
promise
|
||||
.then(() => {
|
||||
if(this.options.length > this.filter.max_options){
|
||||
this.options.splice(this.filter.max_options);
|
||||
}
|
||||
}).catch((error) => {
|
||||
this.$console.error(error);
|
||||
})
|
||||
}
|
||||
|
||||
promise.then(() => {
|
||||
this.isLoading = false;
|
||||
this.selectedValues()
|
||||
})
|
||||
.catch( error => {
|
||||
this.$console.log('error select', error );
|
||||
this.isLoading = false;
|
||||
});
|
||||
promise
|
||||
.then(() => {
|
||||
this.isLoading = false;
|
||||
this.selectedValues()
|
||||
})
|
||||
.catch( error => {
|
||||
this.$console.log('error select', error );
|
||||
this.isLoading = false;
|
||||
});
|
||||
},
|
||||
onSelect(){
|
||||
this.$emit('input', {
|
||||
|
|
|
@ -88,8 +88,8 @@
|
|||
}
|
||||
},
|
||||
watch: {
|
||||
selected: function(val){
|
||||
this.selected = val;
|
||||
selected: function(){
|
||||
//this.selected = val;
|
||||
this.onSelect();
|
||||
}
|
||||
},
|
||||
|
@ -146,7 +146,7 @@
|
|||
if ( !this.query || !this.query.taxquery || !Array.isArray( this.query.taxquery ) )
|
||||
return false;
|
||||
|
||||
let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy === this.taxonomy );
|
||||
let index = this.query.taxquery.findIndex(newMetadatum => newMetadatum.taxonomy == this.taxonomy );
|
||||
if ( index >= 0){
|
||||
let metadata = this.query.taxquery[ index ];
|
||||
this.selected = metadata.terms;
|
||||
|
|
Loading…
Reference in New Issue