diff --git a/.eslintrc.js b/.eslintrc.js
index c9775054..506a0f0e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    parser: 'babel-eslint',
+    parser: '@babel/eslint-parser',
     sourceType: 'module'
   },
   env: {
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index d5408027..e3a992cb 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-patreon: panjiachen
-custom: https://panjiachen.github.io/vue-element-admin-site/donate
+github: [YamelSenih]
+custom: [paypal.me/YamelSenih, https://adempiere.github.io/adempiere-vue-site/donate/]
diff --git a/package.json b/package.json
index 470ee73b..1521d8a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adempiere-vue",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
   "contributors": [
@@ -30,17 +30,17 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@toast-ui/vue-editor": "^2.5.0",
-    "axios": "0.21.0",
+    "@toast-ui/vue-editor": "2.5.1",
+    "axios": "0.21.1",
     "clipboard": "2.0.6",
-    "codemirror": "5.58.2",
-    "core-js": "3.7.0",
+    "codemirror": "5.59.2",
+    "core-js": "3.8.3",
     "driver.js": "0.9.8",
-    "dropzone": "5.7.2",
-    "echarts": "4.9.0",
-    "element-ui": "2.14.1",
-    "file-saver": "2.0.2",
-    "fuse.js": "6.4.3",
+    "dropzone": "5.7.3",
+    "echarts": "5.0.2",
+    "element-ui": "2.15.0",
+    "file-saver": "2.0.5",
+    "fuse.js": "6.4.6",
     "js-cookie": "2.2.1",
     "jsonlint": "1.6.3",
     "jszip": "3.5.0",
@@ -49,52 +49,53 @@
     "nprogress": "0.2.0",
     "path-to-regexp": "6.2.0",
     "pinyin": "2.9.1",
-    "screenfull": "5.0.2",
+    "screenfull": "5.1.0",
     "script-loader": "0.7.2",
-    "sortablejs": "1.10.2",
+    "sortablejs": "1.13.0",
     "tui-editor": "1.4.10",
     "v-markdown": "^1.0.2",
     "vue": "2.6.12",
     "vue-content-loading": "^1.6.0",
     "vue-count-to": "1.0.13",
-    "vue-i18n": "8.22.1",
+    "vue-i18n": "8.22.4",
     "vue-multipane": "^0.9.5",
-    "vue-resize": "^0.5.0",
-    "vue-router": "3.4.9",
+    "vue-resize": "1.0.0",
+    "vue-router": "3.5.1",
     "vue-shortkey": "^3.1.7",
     "vue-split-panel": "^1.0.4",
     "vue-splitpane": "1.0.6",
-    "vuedraggable": "^2.24.3",
-    "vuex": "3.5.1",
-    "xlsx": "0.16.8"
+    "vuedraggable": "2.24.3",
+    "vuex": "3.6.2",
+    "xlsx": "0.16.9"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "4.5.8",
-    "@vue/cli-plugin-eslint": "4.5.8",
-    "@vue/cli-plugin-pwa": "4.5.8",
-    "@vue/cli-plugin-unit-jest": "4.5.8",
-    "@vue/cli-service": "4.5.8",
-    "@vue/test-utils": "1.1.1",
+    "@babel/core": "7.12.13",
+    "@babel/eslint-parser": "7.12.13",
+    "@vue/cli-plugin-babel": "4.5.11",
+    "@vue/cli-plugin-eslint": "4.5.11",
+    "@vue/cli-plugin-pwa": "4.5.11",
+    "@vue/cli-plugin-unit-jest": "4.5.11",
+    "@vue/cli-service": "4.5.11",
+    "@vue/test-utils": "1.1.3",
     "autoprefixer": "9.8.6",
-    "babel-eslint": "10.1.0",
     "babel-jest": "26.6.3",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "4.1.0",
-    "chokidar": "3.4.3",
+    "chokidar": "3.5.1",
     "connect": "3.7.0",
-    "eslint": "7.13.0",
+    "eslint": "7.19.0",
     "eslint-plugin-vue": "6.2.2",
     "fs": "0.0.1-security",
-    "html-webpack-plugin": "4.5.0",
-    "husky": "4.3.0",
-    "lint-staged": "10.5.1",
+    "html-webpack-plugin": "5.0.0",
+    "husky": "4.3.8",
+    "lint-staged": "10.5.4",
     "mockjs": "1.1.0",
     "plop": "2.7.4",
-    "sass": "1.29.0",
-    "sass-loader": "10.1.0",
+    "sass": "1.32.6",
+    "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "serve-static": "1.14.1",
-    "svg-sprite-loader": "5.0.0",
+    "svg-sprite-loader": "5.2.1",
     "svgo": "1.3.2",
     "tasksfile": "5.1.1",
     "vue-template-compiler": "2.6.12"
@@ -111,6 +112,7 @@
     "npm": ">= 3.0.0"
   },
   "keywords": [
+    "adempiere",
     "vue",
     "admin",
     "dashboard",
diff --git a/src/api/user.js b/src/api/user.js
index f16edf78..b14bdf3a 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -60,19 +60,6 @@ export function requestSessionInfo(token) {
     })
 }
 
-/**
- * Logout from server
- * @param {string} token or session UUID
- */
-export function logout(token) {
-  return requestRest({
-    url: '/user/logout',
-    data: {
-      token
-    }
-  })
-}
-
 /**
  * Get User menu from server
  * @param {string} sessionUuid
@@ -89,3 +76,16 @@ export function requestMenu({
   })
     .then(evaluateResponse)
 }
+
+/**
+ * Logout from server
+ * @param {string} token or session UUID
+ */
+export function logout(token) {
+  return requestRest({
+    url: '/user/logout',
+    data: {
+      token
+    }
+  })
+}
diff --git a/src/components/Charts/Keyboard.vue b/src/components/Charts/Keyboard.vue
index 0b258f36..2f6b84ca 100644
--- a/src/components/Charts/Keyboard.vue
+++ b/src/components/Charts/Keyboard.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import resize from './mixins/resize'
 
 export default {
diff --git a/src/components/Charts/LineMarker.vue b/src/components/Charts/LineMarker.vue
index 3dd74369..904ba425 100644
--- a/src/components/Charts/LineMarker.vue
+++ b/src/components/Charts/LineMarker.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import resize from './mixins/resize'
 
 export default {
diff --git a/src/components/Charts/MixChart.vue b/src/components/Charts/MixChart.vue
index c416542e..8474b85d 100644
--- a/src/components/Charts/MixChart.vue
+++ b/src/components/Charts/MixChart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 import resize from './mixins/resize'
 
 export default {
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
index bde7af50..8993d278 100644
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -211,10 +211,7 @@ export default {
       window.tinymce.get(this.tinymceId).getContent()
     },
     imageSuccessCBK(arr) {
-      const _this = this
-      arr.forEach(v => {
-        window.tinymce.get(_this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`)
-      })
+      arr.forEach(v => window.tinymce.get(this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`))
     }
   }
 }
diff --git a/src/lang/index.js b/src/lang/index.js
index dc50fb48..ed4d3f66 100644
--- a/src/lang/index.js
+++ b/src/lang/index.js
@@ -9,6 +9,7 @@ import enLocale from './en'
 import zhLocale from './zh'
 import esLocale from './es'
 import jaLocale from './ja'
+
 import esADempiere from './ADempiere/es'
 import enADempiere from './ADempiere/en'
 
@@ -44,8 +45,8 @@ const dateTimeFormats = {
 const messages = {
   en: {
     ...enLocale,
-    ...elementEnLocale,
-    ...enADempiere
+    ...enADempiere,
+    ...elementEnLocale
   },
   zh: {
     ...zhLocale,
@@ -53,8 +54,8 @@ const messages = {
   },
   es: {
     ...esLocale,
-    ...elementEsLocale,
-    ...esADempiere
+    ...esADempiere,
+    ...elementEsLocale
   },
   ja: {
     ...jaLocale,
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 1ffb6fb1..568085fc 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+
     <el-button
       v-if="isMenuMobile && isMobile"
       type="text"
@@ -12,7 +13,21 @@
     <div v-show="isMenuMobile && isMobile" style="display: inline-flex; float: right;">
       <search id="header-search" class="right-menu-item" style="padding-top: 10px;" />
       <badge style="padding-top: 6px;" />
-      <!-- <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
+    </div>
+    <!--
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
+
+        <error-log class="errLog-container right-menu-item hover-effect" />
+
+        <screenfull id="screenfull" class="right-menu-item hover-effect" />
+
+        <el-tooltip content="Global Size" effect="dark" placement="bottom">
+          <size-select id="size-select" class="right-menu-item hover-effect" />
+        </el-tooltip>
+
+      </template>
+
+      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
           <i class="el-icon-caret-bottom" />
@@ -40,8 +55,8 @@
             <span style="display:block;">{{ $t('navbar.logOut') }}</span>
           </el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown> -->
-    </div>
+      </el-dropdown>
+      -->
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
diff --git a/src/main.js b/src/main.js
index 633fd7c4..4dd1ac1f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,6 +6,8 @@ import 'normalize.css/normalize.css' // a modern alternative to CSS resets
 
 import Element from 'element-ui'
 import './styles/element-variables.scss'
+import enLang from 'element-ui/lib/locale/lang/en'// 如果使用中文语言包请默认支持，无需额外引入，请删除该依赖
+
 import VueSplit from 'vue-split-panel'
 import 'vue-resize/dist/vue-resize.css'
 import VueResize from 'vue-resize'
@@ -51,7 +53,8 @@ Vue.use(VueSplit)
 Vue.use(VueResize)
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium', // set element-ui default size
-  i18n: (key, value) => i18n.t(key, value)
+  i18n: (key, value) => i18n.t(key, value),
+  locale: enLang // 如果使用中文，无需设置，请删除
 })
 
 // register global utility filters
diff --git a/src/router/index.js b/src/router/index.js
index 8ac95d12..4a2539d9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,6 +12,8 @@ import chartsRouter from './modules/charts'
 import tableRouter from './modules/table'
 import nestedRouter from './modules/nested'
 
+import enrollmentRoute from './modules/ADempiere/enrollment.js'
+
 /**
  * Note: sub-menu only appear when route children.length >= 1
  * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html
@@ -39,6 +41,7 @@ import nestedRouter from './modules/nested'
  * all roles can be accessed
  */
 export const constantRoutes = [
+  ...enrollmentRoute,
   {
     path: '/redirect',
     component: Layout,
@@ -70,28 +73,6 @@ export const constantRoutes = [
     component: () => import('@/views/error-page/401'),
     hidden: true
   },
-  {
-    path: '/userEnrollment',
-    component: () => import('@/views/login/userEnrollment'),
-    hidden: true
-  },
-  {
-    path: '/forgotPassword',
-    component: () => import('@/views/login/forgotPassword'),
-    hidden: true
-  },
-  {
-    path: '/passwordReset',
-    name: 'passwordReset',
-    component: () => import('@/views/login/setPassword'),
-    hidden: true
-  },
-  {
-    path: '/createPassword',
-    name: 'createPassword',
-    component: () => import('@/views/login/setPassword'),
-    hidden: true
-  },
   {
     path: '/',
     component: Layout,
diff --git a/src/router/modules/ADempiere/enrollment.js b/src/router/modules/ADempiere/enrollment.js
new file mode 100644
index 00000000..59ad45bc
--- /dev/null
+++ b/src/router/modules/ADempiere/enrollment.js
@@ -0,0 +1,27 @@
+
+const enrollmentRoute = [
+  {
+    path: '/userEnrollment',
+    component: () => import('@/views/login/userEnrollment'),
+    hidden: true
+  },
+  {
+    path: '/forgotPassword',
+    component: () => import('@/views/login/forgotPassword'),
+    hidden: true
+  },
+  {
+    path: '/passwordReset',
+    name: 'passwordReset',
+    component: () => import('@/views/login/setPassword'),
+    hidden: true
+  },
+  {
+    path: '/createPassword',
+    name: 'createPassword',
+    component: () => import('@/views/login/setPassword'),
+    hidden: true
+  }
+]
+
+export default enrollmentRoute
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 221d3842..8e2bbada 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -13,11 +13,7 @@ export default function checkPermission(value) {
     const hasPermission = roles.some(role => {
       return permissionRoles.includes(role)
     })
-
-    if (!hasPermission) {
-      return false
-    }
-    return true
+    return hasPermission
   } else {
     console.error(`need roles! Like v-permission="['admin','editor']"`)
     return false
diff --git a/src/views/components-demo/avatar-upload.vue b/src/views/components-demo/avatar-upload.vue
index 5fb6471e..0dfe963b 100644
--- a/src/views/components-demo/avatar-upload.vue
+++ b/src/views/components-demo/avatar-upload.vue
@@ -58,4 +58,3 @@ export default {
     border-radius: 50%;
   }
 </style>
-
diff --git a/src/views/components-demo/back-to-top.vue b/src/views/components-demo/back-to-top.vue
index 58d9d75c..59be89a5 100644
--- a/src/views/components-demo/back-to-top.vue
+++ b/src/views/components-demo/back-to-top.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="components-container">
-    <aside>{{ $t('components.backToTopTips1') }}</aside>
-    <aside>{{ $t('components.backToTopTips2') }}</aside>
+    <aside>
+      {{ $t('components.backToTopTips1') }}
+    </aside>
+    <aside>
+      {{ $t('components.backToTopTips2') }}
+    </aside>
     <div class="placeholder-container">
       <div>placeholder</div>
       <div>placeholder</div>
diff --git a/src/views/components-demo/sticky.vue b/src/views/components-demo/sticky.vue
index de86e1a1..598ca09c 100644
--- a/src/views/components-demo/sticky.vue
+++ b/src/views/components-demo/sticky.vue
@@ -37,7 +37,9 @@
     </sticky>
 
     <div class="components-container">
-      <aside>Sticky header, {{ $t('components.stickyTips') }}</aside>
+      <aside>
+        Sticky header, {{ $t('components.stickyTips') }}
+      </aside>
       <div>placeholder</div>
       <div>placeholder</div>
       <div>placeholder</div>
diff --git a/src/views/components-demo/tinymce.vue b/src/views/components-demo/tinymce.vue
index 544219f5..20404d4c 100644
--- a/src/views/components-demo/tinymce.vue
+++ b/src/views/components-demo/tinymce.vue
@@ -33,4 +33,3 @@ export default {
   margin-top: 20px;
 }
 </style>
-
diff --git a/src/views/dashboard/admin/components/BarChart.vue b/src/views/dashboard/admin/components/BarChart.vue
index be0af34f..88e7ef64 100644
--- a/src/views/dashboard/admin/components/BarChart.vue
+++ b/src/views/dashboard/admin/components/BarChart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 
diff --git a/src/views/dashboard/admin/components/BoxCard.vue b/src/views/dashboard/admin/components/BoxCard.vue
index 4bd0532d..1ec1d378 100644
--- a/src/views/dashboard/admin/components/BoxCard.vue
+++ b/src/views/dashboard/admin/components/BoxCard.vue
@@ -15,7 +15,7 @@
         <el-progress :percentage="18" />
       </div>
       <div class="progress-item">
-        <span>Css</span>
+        <span>CSS</span>
         <el-progress :percentage="12" />
       </div>
       <div class="progress-item">
diff --git a/src/views/dashboard/admin/components/LineChart.vue b/src/views/dashboard/admin/components/LineChart.vue
index e654168d..702ff73f 100644
--- a/src/views/dashboard/admin/components/LineChart.vue
+++ b/src/views/dashboard/admin/components/LineChart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 
diff --git a/src/views/dashboard/admin/components/PieChart.vue b/src/views/dashboard/admin/components/PieChart.vue
index 4d2ef32a..63f0d849 100644
--- a/src/views/dashboard/admin/components/PieChart.vue
+++ b/src/views/dashboard/admin/components/PieChart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 
diff --git a/src/views/dashboard/admin/components/RaddarChart.vue b/src/views/dashboard/admin/components/RaddarChart.vue
index 52c8f9fb..70958903 100644
--- a/src/views/dashboard/admin/components/RaddarChart.vue
+++ b/src/views/dashboard/admin/components/RaddarChart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import echarts from 'echarts'
+import * as echarts from 'echarts'
 require('echarts/theme/macarons') // echarts theme
 import resize from './mixins/resize'
 
diff --git a/src/views/documentation/index.vue b/src/views/documentation/index.vue
index d3f77468..09f5951b 100644
--- a/src/views/documentation/index.vue
+++ b/src/views/documentation/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container documentation-container">
+    <a class="document-btn" target="_blank" href="https://store.akveo.com/products/vue-java-admin-dashboard-spring?utm_campaign=akveo_store-Vue-Vue_demo%2Fgithub&utm_source=vue_admin&utm_medium=referral&utm_content=demo_English_button">Java backend integration</a>
     <a class="document-btn" target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/">Documentation</a>
     <a class="document-btn" target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/">Github Repository</a>
     <a class="document-btn" target="_blank" href="https://panjiachen.gitee.io/vue-element-admin-site/zh/">国内文档</a>
@@ -37,7 +38,7 @@ export default {
   margin: 50px;
   display: flex;
   flex-wrap: wrap;
-  justify-content: space-evenly;
+  justify-content: flex-start;
 
   .document-btn {
     flex-shrink: 0;
@@ -46,8 +47,8 @@ export default {
     background: black;
     color: white;
     height: 60px;
-    width: 200px;
-    margin-bottom: 16px;
+    padding: 0 16px;
+    margin: 16px;
     line-height: 60px;
     font-size: 20px;
     text-align: center;
diff --git a/src/views/example/components/ArticleDetail.vue b/src/views/example/components/ArticleDetail.vue
index 5d74d1ce..607af91a 100644
--- a/src/views/example/components/ArticleDetail.vue
+++ b/src/views/example/components/ArticleDetail.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="createPost-container">
     <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+
       <sticky :z-index="10" :class-name="'sub-navbar '+postForm.status">
         <CommentDropdown v-model="postForm.comment_disabled" />
         <PlatformDropdown v-model="postForm.platforms" />
diff --git a/src/views/excel/export-excel.vue b/src/views/excel/export-excel.vue
index 92df140a..1ed55598 100644
--- a/src/views/excel/export-excel.vue
+++ b/src/views/excel/export-excel.vue
@@ -1,6 +1,7 @@
 <template>
   <!-- $t is vue-i18n global function to translate lang -->
   <div class="app-container">
+
     <div>
       <FilenameOption v-model="filename" />
       <AutoWidthOption v-model="autoWidth" />
@@ -51,6 +52,7 @@ import { parseTime } from '@/utils'
 import FilenameOption from './components/FilenameOption'
 import AutoWidthOption from './components/AutoWidthOption'
 import BookTypeOption from './components/BookTypeOption'
+
 export default {
   name: 'ExportExcel',
   components: { FilenameOption, AutoWidthOption, BookTypeOption },
diff --git a/src/views/pdf/index.vue b/src/views/pdf/index.vue
index b875295f..6225b2e0 100644
--- a/src/views/pdf/index.vue
+++ b/src/views/pdf/index.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="app-container">
-    <aside style="margin-top:15px;">{{ $t('pdf.tips') }}</aside>
+    <aside style="margin-top:15px;">
+      {{ $t('pdf.tips') }}
+    </aside>
     <router-link target="_blank" to="/pdf/download">
       <el-button type="primary">
         Click to download PDF
@@ -8,4 +10,3 @@
     </router-link>
   </div>
 </template>
-
diff --git a/src/views/permission/role.vue b/src/views/permission/role.vue
index 3e37a79b..d54d9cda 100644
--- a/src/views/permission/role.vue
+++ b/src/views/permission/role.vue
@@ -46,7 +46,15 @@
           />
         </el-form-item>
         <el-form-item label="Menus">
-          <el-tree ref="tree" :check-strictly="checkStrictly" :data="routesData" :props="defaultProps" show-checkbox node-key="path" class="permission-tree" />
+          <el-tree
+            ref="tree"
+            :check-strictly="checkStrictly"
+            :data="routesData"
+            :props="defaultProps"
+            show-checkbox
+            node-key="path"
+            class="permission-tree"
+          />
         </el-form-item>
       </el-form>
       <div style="text-align:right;">
diff --git a/src/views/theme/index.vue b/src/views/theme/index.vue
index bfa5953b..52abe3c7 100644
--- a/src/views/theme/index.vue
+++ b/src/views/theme/index.vue
@@ -9,7 +9,9 @@
       <div class="box-item">
         <span class="field-label">{{ $t('theme.change') }} : </span>
         <el-switch v-model="theme" />
-        <aside style="margin-top:15px;">{{ $t('theme.tips') }}</aside>
+        <aside style="margin-top:15px;">
+          {{ $t('theme.tips') }}
+        </aside>
       </div>
     </el-card>
 
diff --git a/vue.config.js b/vue.config.js
index 1e225950..a64e9ace 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -91,17 +91,6 @@ module.exports = {
       })
       .end()
 
-    // set preserveWhitespace
-    config.module
-      .rule('vue')
-      .use('vue-loader')
-      .loader('vue-loader')
-      .tap(options => {
-        options.compilerOptions.preserveWhitespace = true
-        return options
-      })
-      .end()
-
     config
       .when(process.env.NODE_ENV !== 'development',
         config => {