Fix CButtonSubmit conflict resolve issues
This commit is contained in:
@@ -109,6 +109,7 @@
|
||||
|
||||
<template #footer>
|
||||
<c-button-submit
|
||||
:disabled="saveDisabled"
|
||||
:processing="processing"
|
||||
:success="success"
|
||||
:text="$t('admin:general.label.submit')"
|
||||
|
||||
@@ -24,7 +24,7 @@ import {
|
||||
TooltipComponent,
|
||||
} from 'echarts/components'
|
||||
|
||||
const { CCorredorManualButtons, CPermissionsButton, CInputConfirm } = components
|
||||
const { CCorredorManualButtons, CPermissionsButton, CInputConfirm, CButtonSubmit } = components
|
||||
|
||||
Vue.use(PortalVue)
|
||||
Vue.component('c-corredor-manual-buttons', CCorredorManualButtons)
|
||||
@@ -33,7 +33,7 @@ Vue.component('font-awesome-icon', FontAwesomeIcon)
|
||||
Vue.component('c-content-header', CContentHeader)
|
||||
Vue.component('c-resource-list-status-filter', CResourceListStatusFilter)
|
||||
Vue.component('c-input-confirm', CInputConfirm)
|
||||
Vue.component('c-button-submit', components.CButtonSubmit)
|
||||
Vue.component('c-button-submit', CButtonSubmit)
|
||||
|
||||
// Map things
|
||||
Vue.component('l-map', LMap)
|
||||
|
||||
@@ -47,10 +47,6 @@
|
||||
export default {
|
||||
name: 'CButtonSubmit',
|
||||
|
||||
i18nOptions: {
|
||||
namespaces: 'admin',
|
||||
},
|
||||
|
||||
props: {
|
||||
processing: {
|
||||
type: Boolean,
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
data-test-id="button-save"
|
||||
:disabled="submitDisabled"
|
||||
:processing="processing"
|
||||
:button-text="labels.save"
|
||||
:text="labels.save"
|
||||
@submit="onSubmit"
|
||||
/>
|
||||
</template>
|
||||
@@ -246,7 +246,7 @@
|
||||
data-test-id="button-save"
|
||||
:disabled="submitDisabled"
|
||||
:processing="processing"
|
||||
:button-text="labels.save"
|
||||
:text="labels.save"
|
||||
@submit="onSubmit"
|
||||
/>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user