diff --git a/.eslintrc.js b/.eslintrc.js index f41b8b18e..4e574a888 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -5,7 +5,7 @@ module.exports = { 'plugin:vue/vue3-recommended' ], parserOptions: { - 'ecmaVersion': 2018 + 'ecmaVersion': 2020 }, rules: { /* Override/add rules settings here, such as: */ diff --git a/src/views/admin/components/edition/filter-edition-form.vue b/src/views/admin/components/edition/filter-edition-form.vue index bc907ecdd..050ddff7b 100644 --- a/src/views/admin/components/edition/filter-edition-form.vue +++ b/src/views/admin/components/edition/filter-edition-form.vue @@ -204,7 +204,7 @@
+ @update:model-value="onUpdateShowIntervalOnTag"> {{ $i18n.get('info_show_interval_on_tag') }} @@ -89,12 +89,12 @@ export default { props: { filter: Object, - value: [String, Number, Array], + modelValue: Object, id: '', disabled: false, }, emits: [ - 'input', + 'update:model-value', ], data() { return { @@ -105,14 +105,14 @@ }, created() { this.intervals = - this.value && this.value.intervals && this.value.intervals.length > 0 ? - this.value.intervals : + this.modelValue && this.modelValue.intervals && this.modelValue.intervals.length > 0 ? + this.modelValue.intervals : [{ label: '', to: null, from: null }]; - this.showIntervalOnTag = this.value && this.value.showIntervalOnTag != undefined ? this.value.showIntervalOnTag : true; + this.showIntervalOnTag = this.modelValue && this.modelValue.showIntervalOnTag != undefined ? this.modelValue.showIntervalOnTag : true; }, methods: { onUpdate: _.debounce( function(interval, validade) { @@ -127,7 +127,7 @@ this.showErrorMessage() } else { this.isValid = true; - this.$emit('input', { + this.$emit('update:model-value', { intervals: this.intervals, showIntervalOnTag: this.showIntervalOnTag }); @@ -135,7 +135,7 @@ }, 600), onUpdateShowIntervalOnTag() { if (this.isValid) { - this.$emit('input', { + this.$emit('update:model-value', { intervals: this.intervals, showIntervalOnTag: this.showIntervalOnTag }); diff --git a/src/views/admin/components/filter-types/numeric/FormNumeric.vue b/src/views/admin/components/filter-types/numeric/FormNumeric.vue index ae7446552..6a41fcb94 100644 --- a/src/views/admin/components/filter-types/numeric/FormNumeric.vue +++ b/src/views/admin/components/filter-types/numeric/FormNumeric.vue @@ -94,10 +94,10 @@ export default { props: { - value: [String, Number, Array] + modelValue: Object }, emits: [ - 'input', + 'update:model-value', ], data() { return { @@ -106,11 +106,11 @@ } }, created() { - this.step = this.value && this.value.step ? this.value.step : 1; + this.step = this.modelValue && this.modelValue.step ? this.modelValue.step : 1; }, methods: { - onUpdateStep(value) { - this.$emit('input', { step: value }); + onUpdateStep(modelValue) { + this.$emit('update:model-value', { step: modelValue }); } } } diff --git a/src/views/admin/components/modals/activity-details-modal.vue b/src/views/admin/components/modals/activity-details-modal.vue index 677fb7b8e..441b30ec9 100644 --- a/src/views/admin/components/modals/activity-details-modal.vue +++ b/src/views/admin/components/modals/activity-details-modal.vue @@ -618,7 +618,7 @@ FileItem }, props: { - activityId: String + activityId: Number }, emits: [ 'approveActivity', diff --git a/src/views/admin/components/modals/bulk-edition-modal.vue b/src/views/admin/components/modals/bulk-edition-modal.vue index 847823c77..a1825fc7e 100644 --- a/src/views/admin/components/modals/bulk-edition-modal.vue +++ b/src/views/admin/components/modals/bulk-edition-modal.vue @@ -319,7 +319,7 @@ name: "BulkEditionModal", props: { modalTitle: String, - totalItems: Array, + totalItems: Number, objectType: String, selectedForBulk: Object, collectionId: [String, Number] diff --git a/src/views/admin/components/modals/capability-edition-modal.vue b/src/views/admin/components/modals/capability-edition-modal.vue index e07fa60ce..4aae491ba 100644 --- a/src/views/admin/components/modals/capability-edition-modal.vue +++ b/src/views/admin/components/modals/capability-edition-modal.vue @@ -77,7 +77,7 @@
+ :is-full-page="false" />
diff --git a/src/views/admin/components/search/items-pagination.vue b/src/views/admin/components/search/items-pagination.vue index c58e9c1b6..5b26ec5aa 100644 --- a/src/views/admin/components/search/items-pagination.vue +++ b/src/views/admin/components/search/items-pagination.vue @@ -92,7 +92,7 @@