diff --git a/src/components/Form/DataForm/index.vue b/src/components/Form/DataForm/index.vue index 0bd81d2c2..ab27417b7 100644 --- a/src/components/Form/DataForm/index.vue +++ b/src/components/Form/DataForm/index.vue @@ -14,26 +14,6 @@ - - {{ button.title }} - - - {{ $t('Reset') }} - - - {{ $t('SaveAndAddAnother') }} - {{ submitBtnText }} + + {{ $t('SaveAndAddAnother') }} + + + {{ $t('Reset') }} + + + {{ button.title }} + diff --git a/src/guards.js b/src/guards.js index 73e1b0a9a..ce83c6528 100644 --- a/src/guards.js +++ b/src/guards.js @@ -1,19 +1,18 @@ /* eslint-disable no-unused-vars */ import router from './router' -import NProgress from 'nprogress' // progress bar import 'nprogress/nprogress.css' // progress bar style import { startup } from '@/utils/startup' import store from '@/store' import { isSameView } from '@/utils/jms' import { toSentenceCase } from '@/utils/common' -NProgress.configure({ - showSpinner: false -}) // NProgress Configuration - +// NProgress.configure({ +// showSpinner: false +// }) // NProgress Configuration +// router.beforeEach(async(to, from, next) => { // start progress bar - NProgress.start() + // NProgress.start() try { await startup({ to, from, next }) next() @@ -43,6 +42,6 @@ router.afterEach(async(to, from) => { // finish progress bar await setPageTitle() await generateViewRoutesIfChange({ to, from }) - NProgress.done() + // NProgress.done() }) diff --git a/src/layout/components/NavLeft/index.vue b/src/layout/components/NavLeft/index.vue index 633df402e..6646a0adc 100644 --- a/src/layout/components/NavLeft/index.vue +++ b/src/layout/components/NavLeft/index.vue @@ -33,7 +33,7 @@ :default-openeds="defaultOpensMenu" :text-color="variables['menuText']" :text-weigth="variables['menuTextWeight']" - :unique-opened="true" + :unique-opened="false" class="left-menu" mode="vertical" > @@ -74,13 +74,13 @@ export default { data() { return { viewShown: false, - switchViewOtherClasses: '' + switchViewOtherClasses: '', + defaultOpensMenu: [] } }, computed: { ...mapGetters([ 'currentViewRoute', - 'defaultOpensMenu', 'sidebar' ]), activeMenu() { @@ -163,6 +163,10 @@ export default {