Merge branch 'v4.0'

# Conflicts:
#	.env.development
#	.env.production
#	.env.staging
#	build/index.js
#	jest.config.js
#	mock/index.js
#	mock/user.js
#	package.json
#	src/components/ErrorLog/index.vue
#	src/components/RightPanel/index.vue
#	src/components/ThemePicker/index.vue
#	src/components/Upload/singleImage.vue
#	src/layout/Layout.vue
#	src/layout/components/AppMain.vue
#	src/layout/components/Navbar.vue
#	src/layout/components/Settings/index.vue
#	src/layout/components/Sidebar/index.vue
#	src/router/index.js
#	src/router/modules/charts.js
#	src/router/modules/components.js
#	src/router/modules/nested.js
#	src/router/modules/table.js
#	src/router/modules/tree-table.js
#	src/settings.js
#	src/store/index.js
#	src/store/modules/app.js
#	src/store/modules/settings.js
#	src/styles/element-variables.scss
#	src/utils/request.js
#	src/views/components-demo/countTo.vue
#	src/views/components-demo/markdown.vue
#	src/views/dashboard/admin/index.vue
#	src/views/example/components/ArticleDetail.vue
#	src/views/example/list.vue
#	src/views/login/index.vue
#	src/views/table/complexTable.vue
#	src/views/table/dragTable.vue
#	src/views/table/inlineEditTable.vue
#	src/views/tree-table/custom/index.vue
#	src/views/tree-table/index.vue
#	vue.config.js

src/lang/index.js

@@ -24,11 +24,22 @@ const messages = {
     ...elementEsLocale
   }
 }
-
+export function getLanguage() {
+  const chooseLanguage = Cookies.get('language')
+  if (chooseLanguage) return chooseLanguage
+  const language = (navigator.language || navigator.browserLanguage).toLowerCase()
+  const locales = Object.keys(messages)
+  for (const locale of locales) {
+    if (language.indexOf(locale) > -1) {
+      return locale
+    }
+  }
+  return 'en'
+}
 const i18n = new VueI18n({
   // set locale
   // options: en | zh | es
-  locale: Cookies.get('language') || 'en',
+  locale: getLanguage(),
   // set locale messages
   messages
 })

src/layout/components/Sidebar/index.vue

@@ -1,3 +1,4 @@
+
 <template>
   <div :class="{'has-logo':showLogo}">
     <logo v-if="showLogo" :collapse="isCollapse" />
@@ -18,12 +19,11 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+  import { mapGetters } from 'vuex'
-import Logo from './Logo'
+  import Logo from './Logo'
-import SidebarItem from './SidebarItem'
+  import SidebarItem from './SidebarItem'
-import variables from '@/styles/variables.scss'
+  import variables from '@/styles/variables.scss'
-
+  export default {
-export default {
     components: { SidebarItem, Logo },
     computed: {
       ...mapGetters([
@@ -40,5 +40,5 @@ export default {
         return !this.sidebar.opened
       }
     }
-}
+  }
 </script>

src/store/index.js

@@ -1,24 +1,17 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import app from './modules/app'
-import errorLog from './modules/errorLog'
-import permission from './modules/permission'
-import tagsView from './modules/tagsView'
-import settings from './modules/settings'
-import user from './modules/user'
 import getters from './getters'
 
 Vue.use(Vuex)
-
+const modulesFiles = require.context('./modules', false, /\.js$/)
+const modules = {}
+modulesFiles.keys().forEach(item => {
+  const key = item.replace(/^\.\/(.*)\.\w+$/, '$1')
+  const value = modulesFiles(item)
+  modules[key] = value.default
+})
 const store = new Vuex.Store({
-  modules: {
+  modules,
-    app,
-    errorLog,
-    permission,
-    tagsView,
-    settings,
-    user
-  },
   getters
 })
 

src/store/modules/app.js

@@ -1,4 +1,5 @@
 import Cookies from 'js-cookie'
+import { getLanguage } from '@/lang/index'
 
 const state = {
   sidebar: {
@@ -6,7 +7,7 @@ const state = {
     withoutAnimation: false
   },
   device: 'desktop',
-  language: Cookies.get('language') || 'en',
+  language: getLanguage(),
   size: Cookies.get('size') || 'medium'
 }
 

webpack.config.js

@@ -0,0 +1,12 @@
+/**
+ * 不是真实的 webpack 配置，仅为兼容 webstorm 和 intellij idea 代码跳转
+ * ref: https://github.com/umijs/umi/issues/1109#issuecomment-423380125
+ */
+
+module.exports = {
+  resolve: {
+    alias: {
+      "@": require("path").resolve(__dirname, "src")
+    }
+  }
+};