Merge branch 'master' of github.com:d2-projects/d2-admin into feature/crud

Former-commit-id: 4333f18cd4accc207948ed7db8d1bae5bd35b91c [formerly 4333f18cd4accc207948ed7db8d1bae5bd35b91c [formerly 4333f18cd4accc207948ed7db8d1bae5bd35b91c [formerly 4333f18cd4accc207948ed7db8d1bae5bd35b91c [formerly bb4b79be576ee5160d735dcf56c146d496149e53 [formerly ada5fc1677ef91fe5fd4d21d31336b45fc50ddd1]]]]]
Former-commit-id: d9aecd89928f7f9d9839577b5e0b25321574bbf0
Former-commit-id: de1611ab5f977f2bee9dc8a198aff9132062317c
Former-commit-id: fc1cfccaf39869393008c829c7d7a0d0fa4f90db [formerly da42dbc190814356a632069f0f4075b487c6b4a5]
Former-commit-id: cc3cf7369050009889a55ac118b0848b32f2b58a
Former-commit-id: c6be98cc475fa30477b38a5d0595acbeb57f662f
Former-commit-id: ca41fcae2f69e240778c0759b4006f4aca81292b
Former-commit-id: 93a813f36b9d008624323ad5d14a90b052f898c0
Former-commit-id: c45ac65f8b8c18dd8f47aa3576b9fe63a22e6db2

src/api/components/markdown/index.js

@@ -0,0 +1,9 @@
+import request from '@/plugin/axios'
+
+export function ComponentsMarkdownBase (url) {
+  return request({
+    baseURL: process.env.BASE_URL,
+    url,
+    method: 'get'
+  })
+}

src/api/demo/business/table/1/index.js

@@ -0,0 +1,9 @@
+import request from '@/plugin/axios'
+
+export function BusinessTable1List (data) {
+  return request({
+    url: '/demo/business/table/1',
+    method: 'post',
+    data
+  })
+}

src/api/demo/plugins/mocks/ajax/index.js

@@ -0,0 +1,8 @@
+import request from '@/plugin/axios'
+
+export function PluginMocksAjax () {
+  return request({
+    url: '/demo/plugins/mock/ajax',
+    method: 'get'
+  })
+}

src/api/sys/http/index.js

@@ -0,0 +1,17 @@
+import request from '@/plugin/axios'
+
+export function httpGet (url, params = {}) {
+  return request({
+    url,
+    method: 'get',
+    params
+  })
+}
+
+export function httpPost (url, data = {}) {
+  return request({
+    url,
+    method: 'post',
+    data
+  })
+}

src/api/sys/login/index.js

@@ -0,0 +1,9 @@
+import request from '@/plugin/axios'
+
+export function AccountLogin (data) {
+  return request({
+    url: '/login',
+    method: 'post',
+    data
+  })
+}

src/assets/style/theme/theme.scss.REMOVED.git-id

@@ -1 +1 @@
-87fff7214e7b64123842f1f52b649a8af614eb46
+bfee5e91a3b150e04d9f24695061f6f3e7c59342

src/components/d2-markdown/index.vue

@@ -12,6 +12,7 @@ import marked from 'marked'
 import highlight from 'highlight.js'
 import bandupan from './plugin/baidupan'
 import 'github-markdown-css'
+import { ComponentsMarkdownBase } from '@/api/components/markdown'
 export default {
   name: 'd2-markdown',
   props: {
@@ -63,7 +64,7 @@ export default {
     },
     // 从 url 加载原始数据
     async getReadme (url) {
-      const data = await this.$axios.get(url)
+      const data = await ComponentsMarkdownBase(url)
       return this.marked(data)
     },
     marked (data) {

src/layout/header-aside/components/menu-header/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-menu mode="horizontal" @select="handleMenuSelect">
+  <el-menu mode="horizontal" :default-active="active" @select="handleMenuSelect">
     <template v-for="(menu, menuIndex) in header">
       <d2-layout-header-aside-menu-item v-if="menu.children === undefined" :menu="menu" :key="menuIndex"/>
       <d2-layout-header-aside-menu-sub v-else :menu="menu" :key="menuIndex"/>
@@ -25,6 +25,19 @@ export default {
     ...mapState('d2admin/menu', [
       'header'
     ])
+  },
+  data () {
+    return {
+      active: ''
+    }
+  },
+  watch: {
+    '$route.matched': {
+      handler (val) {
+        this.active = val[val.length - 1].path
+      },
+      immediate: true
+    }
   }
 }
 </script>

src/mock/api/demo/business/table/1/index.js

@@ -7,17 +7,23 @@ Mock.mock('/api/demo/business/table/1', ({ body }) => {
   page.total = 1000
   return Mock.mock(
     {
-      page,
-      'list|20': [{
-        'key': '@guid',
-        'value|1': [10, 100, 200, 500],
-        'type': '@boolean',
-        'admin': '@cname',
-        'adminNote': '@cparagraph(0.5)',
-        'dateTimeCreat': '@datetime',
-        'used': '@boolean',
-        'dateTimeUse': '@datetime'
-      }]
+      code: 0,
+      msg: '获取数据成功',
+      data: {
+        page,
+        'list|20': [
+          {
+            'key': '@guid',
+            'value|1': [10, 100, 200, 500],
+            'type': '@boolean',
+            'admin': '@cname',
+            'adminNote': '@cparagraph(0.5)',
+            'dateTimeCreat': '@datetime',
+            'used': '@boolean',
+            'dateTimeUse': '@datetime'
+          }
+        ]
+      }
     }
   )
 })

src/mock/api/demo/plugins/mock/ajax/index.js

@@ -1,13 +1,19 @@
 import Mock from 'mockjs'
 
 Mock.mock('/api/demo/plugins/mock/ajax', {
-  'list|4-10': [{
-    'id|+1': 1,
-    'name': '@CNAME',
-    'star|1-5': '★',
-    'delFlag|1': [0, 1],
-    'creatDate': '@DATE',
-    'address': '@CITY',
-    'zip': '@ZIP'
-  }]
+  code: 0,
+  msg: '获取数据成功',
+  data: {
+    'list|4-10': [
+      {
+        'id|+1': 1,
+        'name': '@CNAME',
+        'star|1-5': '★',
+        'delFlag|1': [0, 1],
+        'creatDate': '@DATE',
+        'address': '@CITY',
+        'zip': '@ZIP'
+      }
+    ]
+  }
 })

src/mock/api/sys/login/index.js

@@ -21,7 +21,7 @@ const userDB = [
   }
 ]
 
-Mock.mock('/login', 'post', ({url, type, body}) => {
+Mock.mock('/api/login', 'post', ({url, type, body}) => {
   const bodyObj = JSON.parse(body)
   const user = userDB.find(e => e.username === bodyObj.username && e.password === bodyObj.password)
   if (user) {
@@ -36,7 +36,8 @@ Mock.mock('/login', 'post', ({url, type, body}) => {
   } else {
     return {
       code: 401,
-      msg: '用户名或密码错误'
+      msg: '用户名或密码错误',
+      data: {}
     }
   }
 })

src/pages/demo/business/table/1/index.vue

@@ -17,6 +17,7 @@
 </template>
 
 <script>
+import { BusinessTable1List } from '@/api/demo/business/table/1'
 export default {
   // name 值和本页的 $route.name 一致才可以缓存页面
   name: 'demo-business-table-1',
@@ -53,7 +54,7 @@ export default {
       this.$notify({
         title: '开始请求模拟表格数据'
       })
-      this.$axios.post('/api/demo/business/table/1', {
+      BusinessTable1List({
         ...form,
         page: this.page
       })

src/pages/demo/components/markdown/url.vue

@@ -1,6 +1,6 @@
 <template>
   <d2-container>
     <template slot="header">异步加载文件</template>
-    <d2-markdown :url="`${$baseUrl}markdown/demo.md`"/>
+    <d2-markdown url="markdown/demo.md"/>
   </d2-container>
 </template>

src/pages/demo/plugins/mock/ajax.vue

@@ -23,7 +23,9 @@
 </template>
 
 <script>
+import { PluginMocksAjax } from '@/api/demo/plugins/mocks/ajax'
 export default {
+  name: 'demo-plugins-mock-ajax',
   data () {
     return {
       table: {
@@ -37,7 +39,7 @@ export default {
   },
   methods: {
     ajax () {
-      this.$axios.get('/api/demo/plugins/mock/ajax')
+      PluginMocksAjax()
         .then(res => {
           this.table.columns = Object.keys(res.list[0]).map(e => ({
             label: e,
@@ -45,6 +47,9 @@ export default {
           }))
           this.table.data = res.list
         })
+        .catch(() => {
+          // 错误情况
+        })
     }
   }
 }

src/plugin/axios/index.js

@@ -1,13 +1,110 @@
+import store from '@/store'
 import axios from 'axios'
+import { Message } from 'element-ui'
+import util from '@/libs/util'
 
-axios.interceptors.response.use(res => {
-  return res.data
-}, err => {
-  return Promise.reject(err)
+// 创建一个错误
+function errorCreat (msg) {
+  const err = new Error(msg)
+  errorLog(err)
+  throw err
+}
+
+// 记录和显示错误
+function errorLog (err) {
+  // 添加到日志
+  store.dispatch('d2admin/log/add', {
+    type: 'error',
+    err,
+    info: '数据请求异常'
+  })
+  // 打印到控制台
+  if (process.env.NODE_ENV === 'development') {
+    util.log.danger('>>>>>> Error >>>>>>')
+    console.log(err)
+  }
+  // 显示提示
+  Message({
+    message: err.message,
+    type: 'error',
+    duration: 5 * 1000
+  })
+}
+
+// 创建一个 axios 实例
+const service = axios.create({
+  baseURL: process.env.VUE_APP_API,
+  timeout: 5000 // 请求超时时间
 })
 
-export default {
-  install (Vue, options) {
-    Vue.prototype.$axios = axios
+// 请求拦截器
+service.interceptors.request.use(
+  config => {
+    // 在请求发送之前做一些处理
+    if (!(/^https:\/\/|http:\/\//.test(config.url))) {
+      const token = util.cookies.get('token')
+      if (token && token !== 'undefined') {
+        // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
+        config.headers['X-Token'] = token
+      }
+    }
+    return config
+  },
+  error => {
+    // 发送失败
+    console.log(error)
+    Promise.reject(error)
   }
-}
+)
+
+// 响应拦截器
+service.interceptors.response.use(
+  response => {
+    // dataAxios 是 axios 返回数据中的 data
+    const dataAxios = response.data
+    // 这个状态码是和后端约定的
+    const { code } = dataAxios
+    // 根据 code 进行判断
+    if (code === undefined) {
+      // 如果没有 code 代表这不是项目后端开发的接口 比如可能是 D2Admin 请求最新版本
+      return dataAxios
+    } else {
+      // 有 code 代表这是一个后端接口 可以进行进一步的判断
+      switch (code) {
+        case 0:
+          // [ 示例 ] code === 0 代表没有错误
+          return dataAxios.data
+        case 'xxx':
+          // [ 示例 ] 其它和后台约定的 code
+          errorCreat(`[ code: xxx ] ${dataAxios.msg}: ${response.config.url}`)
+          break
+        default:
+          // 不是正确的 code
+          errorCreat(`${dataAxios.msg}: ${response.config.url}`)
+          break
+      }
+    }
+  },
+  error => {
+    if (error && error.response) {
+      switch (error.response.status) {
+        case 400: error.message = '请求错误'; break
+        case 401: error.message = '未授权，请登录'; break
+        case 403: error.message = '拒绝访问'; break
+        case 404: error.message = `请求地址出错: ${error.response.config.url}`; break
+        case 408: error.message = '请求超时'; break
+        case 500: error.message = '服务器内部错误'; break
+        case 501: error.message = '服务未实现'; break
+        case 502: error.message = '网关错误'; break
+        case 503: error.message = '服务不可用'; break
+        case 504: error.message = '网关超时'; break
+        case 505: error.message = 'HTTP版本不受支持'; break
+        default: break
+      }
+    }
+    errorLog(error)
+    return Promise.reject(error)
+  }
+)
+
+export default service

src/plugin/d2admin/index.js

@@ -8,7 +8,6 @@ import '@/components'
 // svg 图标
 import '@/assets/svg-icons'
 // 功能插件
-import pluginAxios from '@/plugin/axios'
 import pluginError from '@/plugin/error'
 import pluginExport from '@/plugin/export'
 import pluginImport from '@/plugin/import'
@@ -20,7 +19,6 @@ export default {
     // Element
     Vue.use(ElementUI)
     // 插件
-    Vue.use(pluginAxios)
     Vue.use(pluginError)
     Vue.use(pluginExport)
     Vue.use(pluginImport)

src/store/modules/d2admin/modules/account.js

@@ -1,4 +1,5 @@
 import util from '@/libs/util.js'
+import { AccountLogin } from '@/api/sys/login'
 
 export default {
   namespaced: true,
@@ -12,13 +13,9 @@ export default {
      */
     login ({ commit }, { vm, username, password }) {
       // 开始请求登录接口
-      vm.$axios({
-        method: 'post',
-        url: '/login',
-        data: {
-          username,
-          password
-        }
+      AccountLogin({
+        username,
+        password
       })
         .then(res => {
           // 设置 cookie 一定要存 uuid 和 token 两个 cookie
@@ -26,11 +23,11 @@ export default {
           // uuid 是用户身份唯一标识 用户注册的时候确定 并且不可改变 不可重复
           // token 代表用户当前登录状态 建议在网络请求中携带 token
           // 如有必要 token 需要定时更新，默认保存一天
-          util.cookies.set('uuid', res.data.uuid)
-          util.cookies.set('token', res.data.token)
+          util.cookies.set('uuid', res.uuid)
+          util.cookies.set('token', res.token)
           // 设置 vuex 用户信息
           commit('d2admin/user/set', {
-            name: res.data.name
+            name: res.name
           }, { root: true })
           // 用户登陆后从持久化数据加载一系列的设置
           commit('load')

src/store/modules/d2admin/modules/releases.js

@@ -1,4 +1,4 @@
-import axios from 'axios'
+import { httpGet } from '@/api/sys/http'
 import semver from 'semver'
 import util from '@/libs/util.js'
 import setting from '@/setting.js'
@@ -19,7 +19,7 @@ export default {
      * @param {Object} param context
      */
     checkUpdate ({ state, commit }) {
-      axios.get(setting.releases.api)
+      httpGet(setting.releases.api)
         .then(res => {
           let versionGet = res.tag_name
           const update = semver.lt(state.version, versionGet)