Merge branch 'master' of github.com:jumpserver/lina

src/components/ListTable/formatters/index.js

@@ -11,7 +11,6 @@ import CustomActionsFormatter from './CustomActionsFormatter'
 import DeleteActionFormatter from './DeleteActionFormatter'
 import DateFormatter from './DateFormatter'
 
-
 export default {
   DetailFormatter,
   DisplayFormatter,

src/layout/components/NavHeader/index.vue

@@ -65,10 +65,12 @@ export default {
     },
     changeLangToZH() {
       this.$i18n.locale = 'cn'
+      localStorage.setItem('lang', 'cn')
       this.$cookie.set(this.LANG_COOKIE_NAME, 'zh-hans')
     },
     changeLangToEnglish() {
       this.$i18n.locale = 'en'
+      localStorage.setItem('lang', 'en')
       this.$cookie.set(this.LANG_COOKIE_NAME, 'en')
     }
   }