Modify: Update the README preview address and document address;

修改：更新 README 预览地址及文档地址；

.env

@@ -0,0 +1,10 @@
+VUE_APP_PUBLIC_PATH=/
+VUE_APP_NAME=Admin
+VUE_APP_ROUTES_KEY=admin.routes
+VUE_APP_PERMISSIONS_KEY=admin.permissions
+VUE_APP_ROLES_KEY=admin.roles
+VUE_APP_USER_KEY=admin.user
+VUE_APP_SETTING_KEY=admin.setting
+VUE_APP_TBAS_KEY=admin.tabs
+VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
+VUE_APP_API_BASE_URL=http://api.iczer.com

.env.development

@@ -0,0 +1 @@
+VUE_APP_API_BASE_URL=http://dev.iczer.com

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -17,3 +17,4 @@ selenium-debug.log
 *.njsproj
 *.sln
 package-lock.json
+.env.production.local

README.en-US.md

@@ -16,9 +16,9 @@ Multiple theme modes available：
 ![image](./src/assets/img/preview-nine.png)
 </div>
 
-- Preview：https://iczer.gitee.io/vue-antd-admin
-- Documentation：https://iczer.github.io/vue-antd-admin
-- FAQ：https://iczer.github.io/vue-antd-admin/start/faq.html
+- Preview：https://vue-antd-admin.pages.dev
+- Documentation：https://doc.vue-antd-admin.pages.dev
+- FAQ：https://doc.vue-antd-admin.pages.dev/start/faq.html
 - Mirror Repo in China：https://gitee.com/iczer/vue-antd-admin
 
 ## Browsers support
@@ -43,11 +43,11 @@ $ yarn serve
 $ npm install
 $ npm run serve
 ```
-More instructions at [documentation](https://iczer.github.io/vue-antd-admin).
+More instructions at [documentation](https://iczer.gitee.io/vue-antd-admin-docs).
 
 ## Contributing
 Any type of contribution is welcome, here are some examples of how you may contribute to this project: :star2:：
 - Use Vue Antd Admin in your daily work.
 - Submit [Issue](https://github.com/iczer/vue-antd-admin/issues) to report :bug: or ask questions.
 - Propose [Pull Request](https://github.com/iczer/vue-antd-admin/pulls) to improve our code.
-- Join the community and share your experiences with us. QQ Group: 610090280
+- Join the community and share your experiences with us. QQ Group:942083829、812277510(full)、610090280(full)

README.md

@@ -1,3 +1,5 @@
+
+
 简体中文 | [English](./README.en-US.md)
 <h1 align="center">Vue Antd Admin</h1>
 
@@ -6,6 +8,12 @@
 [Ant Design Pro](https://github.com/ant-design/ant-design-pro) 的 Vue 实现版本  
 开箱即用的中后台前端/设计解决方案
 
+:star::star::star:
+vue3 版本现已推出，更名为
+[stepin-template](https://github.com/stepui/stepin-template)，欢迎体验，
+[立即前往](https://github.com/stepui/stepin-template)
+--
+
 [![MIT](https://img.shields.io/github/license/iczer/vue-antd-admin)](https://github.com/iczer/vue-antd-admin/blob/master/LICENSE)
 [![Dependence](https://img.shields.io/david/iczer/vue-antd-admin)](https://david-dm.org/iczer/vue-antd-admin)
 [![DevDependencies](https://img.shields.io/david/dev/iczer/vue-antd-admin)](https://david-dm.org/iczer/vue-antd-admin?type=dev)
@@ -16,9 +24,9 @@
 ![image](./src/assets/img/preview-nine.png)
 </div>
 
-- 预览地址：https://iczer.gitee.io/vue-antd-admin
-- 使用文档：https://iczer.github.io/vue-antd-admin
-- 常见问题：https://iczer.github.io/vue-antd-admin/start/faq.html
+- 预览地址：https://vue-antd-admin.pages.dev
+- 使用文档：https://doc.vue-antd-admin.pages.dev
+- 常见问题：https://doc.vue-antd-admin.pages.dev/start/faq.html
 - 国内镜像：https://gitee.com/iczer/vue-antd-admin
 
 ## 浏览器支持
@@ -43,11 +51,18 @@ $ yarn serve
 $ npm install
 $ npm run serve
 ```
-更多信息参考 [使用文档](https://iczer.github.io/vue-antd-admin)
+更多信息参考 [使用文档](https://iczer.gitee.io/vue-antd-admin-docs)
 
 ## 参与贡献
 我们非常欢迎你的贡献，你可以通过以下方式和我们一起共建 :star2:：
 - 在你的公司或个人项目中使用 Vue Antd Admin。
 - 通过 [Issue](https://github.com/iczer/vue-antd-admin/issues) 报告:bug:或进行咨询。
 - 提交 [Pull Request](https://github.com/iczer/vue-antd-admin/pulls) 改进 Admin 的代码。
-- 加入社群，与小伙伴们一同交流心得。QQ群：610090280
+- 加入社群，与小伙伴们一同交流心得。QQ群：942083829、 812277510（已满）、610090280（已满）
+
+## 打赏
+如果该项目对您有所帮助，可以请作者喝一杯咖啡。
+<p>
+  <img src="./src/assets/img/alipay.png" width="320px" style="display: inline-block;" />
+  <img src="./src/assets/img/wechatpay.png" width="320px" style="display: inline-block; margin-left: 24px;" />
+</p>

babel.config.js

@@ -1,5 +1,13 @@
+const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV)
+
+const plugins = []
+if (IS_PROD) {
+  plugins.push('transform-remove-console')
+}
+
 module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset'
-  ]
+  ],
+  plugins
 }

docs/.vuepress/components/Alert.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="alert" :style="`top: ${top}px`">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'Alert',
+    props: ['show'],
+    data() {
+      return {
+        top: 100
+      }
+    },
+    mounted() {
+      console.log(this)
+      // this.$page.alert = this.$page.alert ? this.$page.alert : {top: 100}
+      // this.$page.alert.top += 20
+      // this.top = this.$page.alert.top
+      setTimeout(() => {
+        this.$el.remove()
+      }, 1000)
+    }
+  }
+</script>
+
+<style scoped>
+  .alert{
+    position: absolute;
+    padding: 6px 8px;
+    background-color: #f0f2f5;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+    border-radius: 4px;
+    margin: 0 auto;
+    z-index: 999;
+    top: 100px;
+    width: fit-content;
+    left: 0;
+    right: 0;
+  }
+</style>

docs/.vuepress/components/Color.vue

@@ -0,0 +1,35 @@
+<template>
+  <div :data-clipboard-text="color" class="color" @click="onClick" :style="`background-color:${color}`" />
+</template>
+
+<script>
+  import Clipboard from 'clipboard'
+  export default {
+    name: 'Color',
+    props: ['color'],
+    data() {
+      return {
+        alert: false
+      }
+    },
+    methods: {
+      onClick() {
+        let clipboard = new Clipboard('.color')
+        clipboard.on('success', () => {
+          this.$alert(`颜色代码已复制：${this.color}`)
+          clipboard.destroy()
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .color{
+    border: 1px dashed #a0d911;
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    cursor: pointer;
+  }
+</style>

docs/.vuepress/components/ColorList.vue

@@ -0,0 +1,18 @@
+<template>
+  <div>
+    <color class="color" :key="index" v-for="(color, index) in colors" :color="color" ></color>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'ColorList',
+    props: ['colors']
+  }
+</script>
+
+<style scoped>
+  .color{
+    margin: 0 2px;
+  }
+</style>

docs/.vuepress/config.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: 'Vue Antd Admin',
   description: 'Vue Antd Admin',
-  base: '/vue-antd-admin/',
+  base: '/',
   head: [
     ['link', { rel: 'icon', href: '/favicon.ico' }]
   ],
@@ -36,7 +36,8 @@ module.exports = {
         title: '进阶',
         collapsable: false,
         children: [
-          '/advance/i18n', '/advance/chart', '/advance/theme', '/advance/error', '/advance/authority'
+          '/advance/i18n', '/advance/async', '/advance/authority', '/advance/login', '/advance/guard', '/advance/interceptors',
+          '/advance/api'
         ]
       },
       {
@@ -50,7 +51,7 @@ module.exports = {
     nextLinks: true,
     prevLinks: true,
   },
-  plugins: ['@vuepress/back-to-top'],
+  plugins: ['@vuepress/back-to-top', require('./plugins/alert')],
   markdown: {
     lineNumbers: true
   }

docs/.vuepress/plugins/alert/Alert.vue

@@ -0,0 +1,46 @@
+<template>
+  <div class="alert" :style="`top: ${top}px`">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'Alert',
+    props: ['alert'],
+    data() {
+      return {
+        top: 0
+      }
+    },
+    beforeMount() {
+      this.top = this.alert.top
+    },
+    mounted() {
+     window.addEventListener('alert_remove', (e) => {
+       this.top -= e.detail.height
+     })
+    },
+    watch: {
+      'page.alert.top': function (value) {
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .alert{
+    position: fixed;
+    padding: 6px 8px;
+    background-color: #fff;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.25);
+    border-radius: 4px;
+    margin: 0 auto;
+    z-index: 999;
+    top: 100px;
+    width: fit-content;
+    left: 0;
+    right: 0;
+    transition: top 0.3s;
+  }
+</style>

docs/.vuepress/plugins/alert/alertMixin.js

@@ -0,0 +1,38 @@
+import Alert from './Alert'
+
+const AlertMixin = {
+  install(Vue) {
+    Vue.mixin({
+      methods: {
+        $alert(message, duration = 2000) {
+          let Constructor= Vue.extend(Alert)
+          let alert = new Constructor()
+          alert.$slots.default = message
+          alert.$props.alert = this.$page.alert
+          alert.$mount()
+          document.body.appendChild(alert.$el)
+
+          const appendHeight = alert.$el.offsetHeight + 16
+          this.$page.alert.top += appendHeight
+
+          setTimeout(() => {
+            this.$page.alert.top -= appendHeight
+            this.triggerRemoveAlert(appendHeight)
+            setTimeout(() => {
+              alert.$destroy()
+              alert.$el.remove()
+            }, 100)
+          }, duration)
+        },
+        triggerRemoveAlert(height) {
+          const event = new CustomEvent('alert_remove', {
+            detail: {height}
+          })
+          window.dispatchEvent(event)
+        }
+      }
+    })
+  }
+}
+
+export default AlertMixin

docs/.vuepress/plugins/alert/clientRootMixin.js

@@ -0,0 +1,5 @@
+export default {
+  updated() {
+    this.$page.alert.top = 100
+  }
+}

docs/.vuepress/plugins/alert/enhanceApp.js

@@ -0,0 +1,5 @@
+import AlertMixin from './alertMixin'
+
+export default ({Vue}) => {
+  Vue.use(AlertMixin)
+}

docs/.vuepress/plugins/alert/index.js

@@ -0,0 +1,13 @@
+const path = require('path')
+
+module.exports = (options, ctx) => {
+  return {
+    clientRootMixin: path.resolve(__dirname, 'clientRootMixin.js'),
+    extendPageData($page) {
+      $page.alert = {
+        top: 100
+      }
+    },
+    enhanceAppFiles: path.resolve(__dirname, 'enhanceApp.js')
+  }
+}

docs/.vuepress/styles/index.styl

@@ -1,9 +1,12 @@
 .custom-block.tip{
-  border-color: #52c41a
+  border-color: #1890ff
 }
-.custom-block.warning{
-  border-color: #fa8c16
-}
-.custom-block.error{
-  border-color: #f5222d
+.theme-default-content code .token.inserted{
+  color: #60bd90;
 }
+//.custom-block.warning{
+//  border-color: #fa8c16
+//}
+//.custom-block.error{
+//  border-color: #f5222d
+//}

docs/advance/api.md

@@ -0,0 +1,42 @@
+---
+title: 全局API
+lang: zn-CN
+---
+# 全局API
+我们提供了一些全局Api，在日常功能开发中或许会有帮助，它们均被绑定到了页面组件或子组件实例上。  
+在组件内可以直接通过`this.$[apiName]`的方式调用。如下：
+
+## 多页签
+### $closePage(closeRoute, nextRoute)
+该api用于关闭当前已打开的页签，接收两个参数：
+* **closeRoute**  
+要关闭的页签对应的 route 对象，可简写为路由的 fullPath 字符串值。
+* **nextRoute**  
+关闭页签要后跳转的 route 对象，可不传，不传则会自动选择打开页签（临近原则）。
+
+### $refreshPage(route)
+该api用于刷新路由对应的页签，接收一个参数：
+* **route**  
+要刷新的页签对应的 route 对象，可简写为路由的 fullPath 字符串值。
+
+### $openPage(route, title)
+该api用于打开一个新页签，接收两个参数：
+* **route**  
+要打开的页签对应的 route 对象，可简写为路由的 fullPath 字符串值。
+* **title**  
+设置打开页签的标题，可不传。
+
+### $setPageTitle(route, title)
+该api用于设置页签的标题，接收两个参数：
+* **route**  
+要设置的页签对应的 route 对象，可简写为路由的 fullPath 字符串值。
+* **title**  
+页签的标题。
+
+## 权限
+### $auth(check, type)
+该api可以用于操作权限校验，接收两个参数：
+* **check**  
+需要要校验的操作权限
+* **type**  
+操作权限校验类别，可选 `permission` 和 `role`，即通过权限校验还是角色进行校验，可不传（不传的话，会对两种类型都进行匹配，任意一种匹配成功即校验通过）。

docs/advance/async.md

@@ -0,0 +1,258 @@
+---
+title: 异步路由和菜单
+lang: zn-CN
+---
+# 异步路由和菜单
+在现实业务中，存在这样的场景，系统的路由和菜单会根据用户的角色变化而变化，或者路由菜单根据用户的权限动态生成。我们为此准备了一套完整的异步加载方案，
+可以让你很方便的从服务端加载路由和菜单配置，并应用到系统中。
+## 异步加载路由
+动态路由的实现主要有以下四个步骤：
+### 开启异步路由设置
+在 `/config/config.js` 文件中设置 `asyncRoutes` 的值为 true:
+```js {7}
+module.exports = {
+  theme: {
+    color: '#13c2c2',
+    mode: 'night'
+  },
+  multiPage: true,
+  asyncRoutes: true,       //异步加载路由，true:开启，false:不开启
+  animate: {
+    name: 'roll',
+    direction: 'default'
+  }
+}
+```
+### 注册路由组件
+基础路由组件包含路由基本配置和对应的视图组件，我们统一在 `/router/async/router.map.js` 文件中注册它们。它和正常的路由配置基本无异，相当于把完整的路由拆分成单个的路由配置进行注册，为后面的路由动态配置打好基础。  
+一个单独的路由组件注册示例如下：
+```jsx
+registerName: {                               //路由组件注册名称，唯一标识
+  path: 'path',                               //路由path，可缺省，默认取路由注册名称 registerName 的值
+  name: '演示页',                             //路由名称
+  redirect: '/login',                         //路由重定向
+  component: () => import('@/pages/demo'),    //路由视图
+  icon: 'permission',                         //路由的菜单icon，会注入到路由元数据meta中
+  invisible: false,                           //是否隐藏菜单项，true 隐藏，false 不隐藏，会注入到路由元数据meta中。
+  authority: {                                //路由权限配置，会注入到路由元数据meta中。可缺省，默认为 ‘*’, 即无权限限制
+    permission: 'form',                       //路由需要的权限  
+    role: 'admin'                             //路由需要的角色。当permission未设置，通过 role 检查权限
+  },                     
+  page: {                                     //路由的页面数据，会注入到路由元数据meta中
+    title: '演示页',                          //页面标题
+    breadcrumb: ['首页', '演示页']            //页面面包屑
+  }             
+}
+```
+
+:::details 点击查看完整的路由注册示例：
+```js
+// 视图组件
+const view = {
+  tabs: () => import('@/layouts/tabs'),
+  blank: () => import('@/layouts/BlankView'),
+  page: () => import('@/layouts/PageView')
+}
+
+// 路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@/pages/login')
+  },
+  demo: {
+    name: '演示页',
+    renderMenu: false,
+    component: () => import('@/pages/demo')
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@/pages/exception/500')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: '/login',
+    component: view.tabs
+  },
+  parent1: {
+    name: '父级路由1',
+    icon: 'dashboard',
+    component: view.blank
+  },
+  parent2: {
+    name: '父级路由2',
+    icon: 'form',
+    component: view.page
+  },
+  exception: {
+    name: '异常页',
+    icon: 'warning',
+    component: view.blank
+  }
+}
+export default routerMap
+```
+:::
+### 配置基本路由
+如果没有任何路由，你的应用是无法访问的，所以我们需要在本地配置一些基本的路由，比如登录页、404、403 等。你可以在 `/router/async/config.async.js` 文件中配置一些本地必要的路由。如下：
+```js
+const routesConfig = [
+  'login',                      //匹配 router.map.js 中注册的 registerName = login 的路由
+  'root',                       //匹配 router.map.js 中注册的 registerName = root 的路由
+  {
+    router: 'exp404',           //匹配 router.map.js 中注册的 registerName = exp404 的路由
+    path: '*',                  //重写 exp404 路由的 path 属性
+    name: '404'                 //重写 exp404 路由的 name 属性
+  },
+  {
+    router: 'exp403',           //匹配 router.map.js 中注册的 registerName = exp403 的路由
+    path: '/403',               //重写 exp403 路由的 path 属性
+    name: '403'                 //重写 exp403 路由的 name 属性
+  }
+]
+```
+完成配置后，即可通过 `routesConfig` 和已注册的 `routerMap` 生成 [router.options.routes](https://router.vuejs.org/zh/api/#router-%E6%9E%84%E5%BB%BA%E9%80%89%E9%A1%B9) 配置，如下：
+```js
+const options = {
+  routes: parseRoutes(routesConfig, routerMap)
+}
+```
+:::details 点击查看完整的 config.async.js 代码
+```js
+import routerMap from './router.map'
+import {parseRoutes} from '@/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+const options = {
+  routes: parseRoutes(routesConfig, routerMap)
+}
+export default options
+```
+:::
+完成以上设置后，本地就已经有了包含 login、404、403 页面的路由，并且这些路由是可以直接访问的。
+### 异步获取路由配置
+当用户登录后（或者其它的前提条件），你可能想根据不同用户加载不同的路由和菜单。
+那么我们就需要先从后端服务获取异步路由配置，后端返回的异步路由配置 `routesConfig` 是一个异步路由配置数组， 应当如下格式：
+```jsx
+[{
+  router: 'root',                           //匹配 router.map.js 中注册名 registerName = root 的路由
+  children: [                               //root 路由的子路由配置
+    {
+      router: 'dashboard',                  //匹配 router.map.js 中注册名 registerName = dashboard 的路由
+      children: ['workplace', 'analysis'],  //dashboard 路由的子路由配置，依次匹配 registerName 为 workplace 和 analysis 的路由
+    },
+    {
+      router: 'form',                       //匹配 router.map.js 中注册名 registerName = form 的路由
+      children: [                           //form 路由的子路由配置
+        'basicForm',                        //匹配 router.map.js 中注册名 registerName = basicForm 的路由
+        'stepForm',                         //匹配 router.map.js 中注册名 registerName = stepForm 的路由
+        {
+          router: 'advanceForm',            //匹配 router.map.js 中注册名 registerName = advanceForm 的路由
+          path: 'advance'                   //重写 advanceForm 路由的 path 属性
+        }
+      ]   
+    },
+    {
+      router: 'basicForm',                  //匹配 router.map.js 中注册名 registerName = basicForm 的路由
+      name: '验权表单',                     //重写 basicForm 路由的 name 属性
+      icon: 'file-excel',                   //重写 basicForm 路由的 icon 属性
+      authority: 'form'                     //重写 basicForm 路由的 authority 属性
+    }
+  ]
+}]
+```
+其中 `router` 属性 对应 `router.map.js` 中已注册的`基础路由`的注册名称 `registerName`，`children` 属性为路由的嵌套子路由配置。  
+有些情况下你可能想重写已注册路由的属性，你可以为 `routesConfig` 配置同名属性去覆盖它。如上面的`验权表单`路由覆盖了注册路由的 `name`、`icon`、`authority` 属性。
+
+### 加载路由并应用
+我们提供了一个路由加载工具，你只需调用 `/utils/routerUtil.js` 中的 `loadRoutes` 方法加载上一步获取到的 `routesConfig` 即可，如下：
+```js {3}
+getRoutesConfig().then(result => {
+  const routesConfig = result.data.data
+  loadRoutes(routesConfig)
+})
+```
+至此，异步路由的加载就完成了，你可以访问异步加载的路由了。
+:::tip
+上面获取异步路由的代码，在 /pages/login/Login.vue 文件中可以找到。   
+loadRoutes 方法会合并 /router/async/config.async.js 文件中配置的基本路由。
+:::
+:::details 点击查看 loadRoutes 的详细代码
+```js
+/**
+ * 加载路由
+ * @param routesConfig 路由配置
+ */
+function loadRoutes(routesConfig) {
+  // 如果 routesConfig 有值，则更新到本地，否则从本地获取
+  if (routesConfig) {
+    store.commit('account/setRoutesConfig', routesConfig)
+  } else {
+    routesConfig = store.getters['account/routesConfig']
+  }
+  // 如果开启了异步路由，则加载异步路由配置
+  const asyncRoutes = store.state.setting.asyncRoutes
+  if (asyncRoutes) {
+    if (routesConfig && routesConfig.length > 0) {
+      const routes = parseRoutes(routesConfig, routerMap)
+      formatAuthority(routes)
+      const finalRoutes = mergeRoutes(router.options.routes, routes)
+      router.options = {...router.options, routes: finalRoutes}
+      router.matcher = new Router({...router.options, routes:[]}).matcher
+      router.addRoutes(finalRoutes)
+    }
+  }
+  // 初始化Admin后台菜单数据
+  const rootRoute = router.options.routes.find(item => item.path === '/')
+  const menuRoutes = rootRoute && rootRoute.children
+  if (menuRoutes) {
+    mergeI18nFromRoutes(i18n, menuRoutes)
+    store.commit('setting/setMenuData', menuRoutes)
+  }
+}
+```
+:::
+
+## 异步加载菜单
+Vue Antd Admin 的菜单，是根据路由配置自动生成的，默认获取根路由 `‘/’` 下所有子路由作为菜单配置。  
+当你完成了异步路由的加载，菜单也会随之改变，无需你做其它额外的操作。主要代码如下：
+```js
+// 初始化Admin后台菜单数据
+  const rootRoute = router.options.routes.find(item => item.path === '/')
+  const menuRoutes = rootRoute && rootRoute.children
+  if (menuRoutes) {
+    mergeI18nFromRoutes(i18n, menuRoutes)
+    store.commit('setting/setMenuData', menuRoutes)
+  }
+```
+:::tip
+如果你不想从根路由 `‘/’` 下获取菜单数据，可以根据自己的需求更改。
+:::

docs/advance/authority.md

@@ -3,5 +3,228 @@ title: 权限管理
 lang: zn-CN
 ---
 # 权限管理
+权限控制是中后台系统中常见的需求之一，你可以利用 Vue Antd Admin 提供的权限控制脚手架，实现一些基本的权限控制功能。
+## 角色和权限
+通常情况下有两种方式可以控制用户权限，一种是通过用户角色 role 来控制权限，另一种是通过更细致的权限 permission 来控制。
+这两种方式 Vue Antd Admin 都支持。  
+我们定义了 role 和 permission 的基本格式，如果你获取的 role 和 permission 数据格式与 Vue Antd Admin 不一致，
+你需要在获取到 role 和 permission 后将其转换为 Vue Antd Admin 的格式。
+### 角色
+Vue Antd Admin 的 `角色/role` 包含 `id` 和 `operation` 两个属性。其中 `id` 为 `角色/role` 的 id，`operation` 为 `角色/role` 具有的操作权限，是一个字符串数组。
+```js
+role = {
+  id: 'admin',                                   //角色ID
+  operation: ['add', 'delete', 'edit', 'close']  //角色的操作权限
+}
+```
+你也可以设置 role 的值为字符串，比如 role = 'admin', 它等同于：
+```js
+role = {
+  id: 'admin'
+}
+```
+### 权限
+Vue Antd Admin 的 `权限/permission` 也包含 `id` 和 `operation` 两个属性。其中 `id` 为 `权限/permission` 的 id，`operation` 为 `权限/permission` 下的操作权限，是一个字符串数组。
+```js
+permission = {
+  id: 'form',                                    //权限ID
+  operation: ['add', 'delete', 'edit', 'close']  //权限下的操作权限
+}
+```
+你也可以设置 permission 的值为字符串，比如 permission = 'form', 它等同于：
+```js
+permission = {
+  id: 'form'
+}
+```
+### 设置用户的角色和权限
+你只需为用户配置 roles 和 permissions 两者中的其中一种，即可完成权限管理功能。当然你也可以两者都配置。 
+ 
+获取到用户权限或角色后，将其格式化转为 Vue Antd Admin 可用的格式，然后使用 `store.commit('account/setPermissions', permissions)` 或 `store.commit('account/setRoles', roles)`
+将其存在本地即可。如下：
+```js
+getPermissions().then(res => {
+  const permissions = res.data
+  this.$store.commit('account/setPermissions', permissions)
+})
+getRoles().then(res => {
+  const roles = res.data
+  this.$store.commit('account/setRoles', roles)
+})
+```
+:::tip
+注意，存在本地的 permissions 和 roles 都应该是数组。  
+你可以在 /pages/login/Login.vue 查看完整的用户角色和权限设置代码。
+:::
+## 页面权限
+如果你想给一些页面设置准入权限，只需要给该页面对应的路由设置元数据 authority 即可。 authority 的值可以是一个字符串，也可以是对象。  
 
-### 作者还没来得及编辑该页面，如果你感兴趣，可以点击下方链接，帮助作者完善此页
+如下路由配置，则表明 `验权页面` 需要准入权限(permission): `form`
+```js {5}
+const route = {
+  name: '验权页面',
+  path: 'auth/demo',
+  meta: {
+    authority: 'form',
+  },
+  component: () => import('@/pages/demo')
+}
+```
+下面是 authority 的值为对象的写法，这种写法和上面字符串的写法具有相同的效果：
+```js {5-7}
+const route = {
+  name: '验权页面',
+  path: 'auth/demo',
+  meta: {
+    authority: {
+      permission: 'form'
+    }
+  },
+  component: () => import('@/pages/demo')
+}
+```
+有时你可能需要通过用户角色来配置页面权限，我们同样支持，用法和上面类似。  
+
+如下配置，表明 `验权页面` 需要准入角色(role) `admin`：
+```js {5-7}
+const route = {
+  name: '验权页面',
+  path: 'auth/demo',
+  meta: {
+    authority: {
+      role: 'admin'
+    }
+  },
+  component: () => import('@/pages/demo')
+}
+```
+:::tip
+当你未设置 authority 或 设置 authority 的值 为 `*` 时，等同于该页面无需权限限制，我们会忽略此页面的权限检查。
+:::
+:::tip
+当 authority 的值为字符串时，会以 [权限/permission](#权限) 验证权限。如果你需要以 [角色/role](#角色) 验证权限，请以对象形式设置 authority 的值。
+:::
+## 操作权限
+在一些复杂的些场景下，权限可能不仅仅是页面层级这么简单。在一些页面你可能需要校验用户是否具有某些操作的权限，比如 增、删、改、查等。  
+为此，我们提供了 `权限校验注入` 和 `权限校验指令` 两个实用的功能。
+### 权限校验注入
+通过对Vue组件的实例方法进行 `权限校验注入`，我们可以控制该实例方法的执行权限，从而精准且安全的验证用户操作。  
+
+比如，QueryList 页面的 deleteRecord 方法，我们希望具有操作权限 `delete` 的用户才能调用此方法。
+只需为 `deleteRecord` 方法注入权限校验，按如下方式配置 `authorize` 即可：
+```vue {9-11,13}
+<template>
+  ...
+</template>
+<script>
+...
+export default {
+  name: 'QueryList',
+  data () {...},
+  authorize: {              //权限校验注入设置
+    deleteRecord: 'delete'  //key为需要注入权限校验的方法名，这里为 deleteRecord 方法；值为需要校验的操作权限，这里为 delete 操作权限
+  },
+  methods: {
+    deleteRecord(key) {
+      this.dataSource = this.dataSource.filter(item => item.key !== key)
+      this.selectedRows = this.selectedRows.filter(item => item.key !== key)
+    },
+    ...
+  }
+}
+</script>
+```
+如果用户没有 `delete` 权限，调用 deleteRecord 方法，会看到如下提示：  
+
+![无此权限](../assets/permission.png)
+### 操作权限校验的类型
+`authorize` 会根据当前页面匹配到的权限类型([permission](#权限) / [role](#角色))，来判断是使用 `permission.operation` 还是 `role.operation` 来进行权限校验。
+如果当前页面同时匹配到了 permission 和 role 权限，则默认通过 permission.operation 来进行操作权限校验。  
+
+当然你也可以指定操作权限校验的类型，如下设置即可：
+```js {2-5}
+authorize: {             
+  deleteRecord: {        //需要 注入权限校验 的方法名：deleteRecord
+    check: 'delete',     //需要校验的操作权限：check
+    type: 'role'         //指定操作权限校验的类型，可选 permission 和 role。这里指定以 role.operation 校验操作权限
+  }
+}
+```
+### 权限校验指令
+有时我们可能希望用户能够更直观的了解自己的操作权限。比如给没有操作权限的控件应用 disable 样式，禁用 click 事件等。
+我们提供了权限校验指令 `v-auth` 来实现这个功能。  
+
+比如，我们想为 QueryList 页面的删除控件进行 `delete` 操作权限校验，只需为删除控件设置 v-auth="\`delete\`" 指令即可，如下：
+```vue {6}
+<template>
+  <a-card>...
+    <standard-table ...>
+      ...
+      <div slot="action" slot-scope="{text, record}">
+        <a @click="deleteRecord(record.key)" v-auth="`delete`">
+          <a-icon type="delete" />删除
+        </a>
+      </div>
+      ...
+    </standard-table>
+  </a-card>
+</template>
+```
+假如用户没有 `delete` 操作权限，则控件会被应用 disable 样式，且 click 事件无效，如下图：  
+
+![权限校验指令](../assets/auth.png)
+:::warning 重要！！！
+v-auth 是我们自定义的一个 [Vue指令](https://cn.vuejs.org/v2/guide/custom-directive.html#ad)。因为 `Vue指令` 的值需要是一个 javascript 表达式，因此你不能直接给 v-auth 赋值为字符串，
+需要把 v-auth 的字符串值用 ` `` ` 包裹起来，否则可能会报 undefined 错误。
+:::
+### 权限校验指令的类型
+你同样也可以指定 v-auth 的权限校验类型，可选 [permission](#权限) 和 [role](#角色)。它的校验方式和 [authorize](#权限校验注入) 类似，如未指定则会自动识别。
+`v-auth:role` 表示通过 `role.operation` 进行校验，`v-auth:permission` 表示通过 `permission.operation` 进行校验。 
+ 
+如下，指定通过 `role.operation` 校验删除控件的操作权限：
+```vue {3}
+<div slot="action" slot-scope="{text, record}">
+  ...
+  <a v-auth:role="`delete`">
+    <a-icon type="delete" />删除
+  </a>
+  ...
+</div>
+```
+## 异步路由权限
+异步路由同样可以进行权限校验配置，它和正常的路由权限配置基本无异，只是无需把 [authority](#页面权限) 配置在元数据属性 meta 里。
+你可以在路由组件注册时设置 authority，也可以在异步路由配置里设置 authority。  
+
+路由组件注册时设置 [authority](#页面权限)：
+```js {6}
+// 路由组件注册
+const routerMap = {
+  ...
+  demo: {
+    name: '演示页',
+    authority: 'form',
+    component: () => import('@/pages/demo')
+  }
+  ...
+}
+```
+
+异步路由配置里设置 [authority](#页面权限)：
+```js {11-13}
+const routesConfig = [{
+    router: 'root',
+    children: ['demo',
+      {router: 'parent1'...},
+      ...
+      {
+        router: 'demo',
+        icon: 'file-ppt',
+        path: 'auth/demo',
+        name: '验权页面',
+        authority: {
+          permission: 'form',
+        }
+      }
+    ]
+  }]
+```

docs/advance/guard.md

@@ -0,0 +1,109 @@
+---
+title: 路由守卫
+lang: zn-CN
+---
+# 路由守卫
+Vue Antd Admin 使用 vue-router 实现路由导航功能，因此可以为路由配置一些守卫。  
+我们统一把导航守卫配置在 router/guards.js 文件中。
+
+## 前置守卫
+Vue Antd Admin 为每个前置导航守卫函数注入 to,from,next,options 四个参数：
+* `to: Route`: 即将要进入的目标[路由对象](https://router.vuejs.org/zh/api/#%E8%B7%AF%E7%94%B1%E5%AF%B9%E8%B1%A1)
+* `from: Route`: 当前导航正要离开的路由对象
+* `next: Function`: 一定要调用该方法来 resolve 这个钩子。执行效果依赖 next 方法的调用参数。详情查看 [Vue Router #导航守卫](https://router.vuejs.org/zh/guide/advanced/navigation-guards.html)
+* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。  
+如下，是登录拦截导航守卫的定义
+```js
+const loginGuard = (to, from, next, options) => {
+  const {message} = options
+  if (!loginIgnore.includes(to) && !checkAuthorization()) {
+    message.warning('登录已失效，请重新登录')
+    next({path: '/login'})
+  } else {
+    next()
+  }
+}
+```
+
+## 后置守卫
+你也可以定义后置导航守卫，Vue Antd Admin 为每个后置导航函数注入 to,from,options 三个参数：
+* `to: Route`: 即将要进入的目标[路由对象](https://router.vuejs.org/zh/api/#%E8%B7%AF%E7%94%B1%E5%AF%B9%E8%B1%A1)
+* `from: Route`: 当前导航正要离开的路由对象
+* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。  
+如下，是一个后置导航守卫的定义
+```js
+const afterGuard = (to, from, options) => {
+  const {store, message} = options
+  // 做些什么
+  message.info('do something')
+}
+```
+
+## 导出守卫配置
+定义好导航守卫后，只需按照类别在 guard.js 中导出即可。分为两类，`前置守卫`和`后置守卫`。如下：
+```js
+export default {
+  beforeEach: [loginGuard, authorityGuard],
+  afterEach: [afterGuard]
+}
+```
+
+:::details 点击查看完整的导航守卫配置
+```js
+import {loginIgnore} from '@/router/index'
+import {checkAuthorization} from '@/utils/request'
+
+/**
+ * 登录守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const loginGuard = (to, from, next, options) => {
+  const {message} = options
+  if (!loginIgnore.includes(to) && !checkAuthorization()) {
+    message.warning('登录已失效，请重新登录')
+    next({path: '/login'})
+  } else {
+    next()
+  }
+}
+
+/**
+ * 权限守卫
+ * @param to
+ * @param form
+ * @param next
+ * @param options
+ */
+const authorityGuard = (to, from, next, options) => {
+  const {store, message} = options
+  const permissions = store.getters['account/permissions']
+  const roles = store.getters['account/roles']
+  if (!hasAuthority(to, permissions, roles)) {
+    message.warning(`对不起，您无权访问页面: ${to.fullPath}，请联系管理员`)
+    next({path: '/403'})
+  } else {
+    next()
+  }
+}
+
+/**
+ * 后置守卫
+ * @param to
+ * @param form
+ * @param options
+ */
+const afterGuard = (to, from, options) => {
+  const {store, message} = options
+  // 做些什么
+  message.info('do something')
+}
+
+export default {
+  beforeEach: [loginGuard, authorityGuard],
+  afterEach: [afterGuard]
+}
+```
+:::

docs/advance/i18n.md

@@ -3,5 +3,127 @@ title: 国际化
 lang: zn-CN
 ---
 # 国际化
+vue-antd-admin 采用 [vue-i18n](https://kazupon.github.io/vue-i18n/) 插件来实现国际化，该项目已经内置并且加载好了基础配置。可以直接上手使用。
 
-### 作者还没来得及编辑该页面，如果你感兴趣，可以点击下方链接，帮助作者完善此页
+> 如果你还没有看快速入门，请先移步查看: [页面 -> i18n国际化配置](../develop/page.html#i18n国际化配置)
+
+
+## 菜单和路由
+
+### 默认情况
+如果你没有对菜单进行国际化配置，admin 默认会从路由数据中提取数据作为国际化配置。route.name 作为中文语言，route.path 作为英文语言。  
+国际化提取函数定义在 `@/utils/i18n.js` 文件中，会在路由加载时调用，如下：
+```js
+/**
+ * 从路由提取国际化数据
+ * @param i18n
+ * @param routes
+ */
+function mergeI18nFromRoutes(i18n, routes) {
+  formatFullPath(routes)
+  const CN = generateI18n(new Object(), routes, 'name')
+  const US = generateI18n(new Object(), routes, 'path')
+  i18n.mergeLocaleMessage('CN', CN)
+  i18n.mergeLocaleMessage('US', US)
+  const messages = routesI18n.messages
+  Object.keys(messages).forEach(lang => {
+    i18n.mergeLocaleMessage(lang, messages[lang])
+  })
+}
+```
+### 自定义
+如果你想自定义菜单国际化数据，可在 `@/router/i18n.js` 文件中配置。我们以路由的 path 作为 key（嵌套path 的写法也会被解析），name 作为 国际化语言的值。    
+假设你有一个路由的配置如下：
+```js
+[{
+  path: 'parent',
+  ...
+  children: [{
+    path: 'self',
+    ...
+  }]
+}]
+
+or 
+
+[{
+  path: 'other',
+  ...
+  children: [{
+    path: '/parent/self',   // 在国际化配置中 key 会解析为 parent.self
+    ...
+  }]
+}]
+```
+那么你需要在 `@/router/i18n.js` 中这样配置：
+```jsx
+ messages: {
+    CN: {
+      parent: {
+        name: '父級菜單',
+        self: {name: '菜單名'},
+    },
+    US: {
+      parent: {
+        name: 'parent menu',
+        self: {name: 'menu name'},
+    },
+    HK: {
+      parent: {
+        name: '父級菜單',
+        self: {name: '菜單名'},
+    },
+```
+
+## 添加语言
+
+首先在 `@/layouts/header/AdminHeader.vue` ，新增一门语言 (多个同理)。
+
+```vue {15}
+<template>
+  ...
+</template>
+<script>
+...
+export default {
+  ...
+  data() {
+    return {
+      langList: [
+        {key: 'CN', name: '简体中文', alias: '简体'},
+        {key: 'HK', name: '繁體中文', alias: '繁體'},
+        {key: 'US', name: 'English', alias: 'English'},
+        // 新增一个语言选项, key是i18n的索引，name是菜单显示名称
+        {key: 'JP', name: 'Japanese', alias: 'Japanese'}
+      ],
+      searchActive: false
+    }
+  },
+}
+</script>
+```
+
+> TIP: 后续开发建议把这里改成动态配置的方式！
+
+然后开始往 `@/router/i18n.js` 和 `@/pages/你的页面/i18n.js` 里面分别添加上语言的翻译。
+
+```vue {12,13,14}
+module.exports = {
+    messages: {
+        CN: {
+            home: {name: '首页'},
+        },
+        US: {
+            home: {name: 'home'},
+        },
+        HK: {
+            home: {name: '首頁'},
+        },
+        JP: {
+            home: {name: '最初のページ'},
+        },
+    }
+}
+```
+
+> Notice: 更多用法请移步到 [vue-i18n](https://kazupon.github.io/vue-i18n/) 。

docs/advance/interceptors.md

@@ -0,0 +1,131 @@
+---
+title: 拦截器配置
+lang: zn-CN
+---
+# 拦截器配置
+Vue Antd Admin 基于 aixos 封装了 http 通信功能，我们可以为 http 请求响应配置一些拦截器。拦截器统一配置在 /utils/axios-interceptors.js 文件中。
+## 请求拦截器
+你可以为每个请求拦截器配置 `onFulfilled` 或 `onRejected` 两个钩子函数。
+### onFulfilled
+我们会为 onFulfilled 钩子函数注入 config 和 options 两个参数：
+* `config: AxiosRequestConfig`: axios 请求配置，详情参考 [axios 请求配置](http://www.axios-js.com/zh-cn/docs/#%E8%AF%B7%E6%B1%82%E9%85%8D%E7%BD%AE)
+* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。
+
+### onRejected
+我们会为 onFulfilled 钩子函数注入 error 和 options 两个参数：
+* `error: Error`: axios 请求错误对象
+* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。  
+  
+如下，为一个完整的请求拦截器配置：
+```js
+const tokenCheck = {
+  // 发送请求之前做些什么
+  onFulfilled(config, options) {
+    const {message} = options
+    const {url, xsrfCookieName} = config
+    if (url.indexOf('login') === -1 && xsrfCookieName && !Cookie.get(xsrfCookieName)) {
+      message.warning('认证 token 已过期，请重新登录')
+    }
+    return config
+  },
+  // 请求出错时做点什么
+  onRejected(error, options) {
+    const {message} = options
+    message.error(error.message)
+    return Promise.reject(error)
+  }
+}
+```
+## 响应拦截器
+响应拦截器也同样可以配置 `onFulfilled` 或 `onRejected` 两个钩子函数。
+### onFulfilled
+我们会为 onFulfilled 钩子函数注入 response 和 options 两个参数：
+* `response: AxiosResponse`: axios 响应对象，详情参考 [axios 响应对象](http://www.axios-js.com/zh-cn/docs/#%E5%93%8D%E5%BA%94%E7%BB%93%E6%9E%84)
+* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。
+
+### onRejected
+我们会为 onRejected 钩子函数注入 error 和 options 两个参数：
+* `error: Error`: axios 请求错误对象
+* `options: Object`: 应用配置，包含: {router, i18n, store, message}，可根据需要扩展。 
+
+如下，为一个完整的响应拦截器配置：
+```js
+const resp401 = {
+  // 响应数据之前做点什么
+  onFulfilled(response, options) {
+    const {message} = options
+    if (response.status === 401) {
+      message.error('无此接口权限')
+    }
+    return response
+  },
+  // 响应出错时做点什么
+  onRejected(error, options) {
+    const {message} = options
+    if (response.status === 401) {
+      message.error('无此接口权限')
+    }
+    return Promise.reject(error)
+  }
+}
+```
+## 导出拦截器
+定义好拦截器后，只需在 axios-interceptors.js 文件中导出即可。分为两类，`请求拦截器`和`响应拦截器`。如下：
+```js
+export default {
+  request: [tokenCheck], // 请求拦截
+  response: [resp401] // 响应拦截
+}
+```
+
+:::details 点击查看完整的拦截器配置示例
+```js
+import Cookie from 'js-cookie'
+// 401拦截
+const resp401 = {
+  onFulfilled(response, options) {
+    const {message} = options
+    if (response.status === 401) {
+      message.error('无此接口权限')
+    }
+    return response
+  },
+  onRejected(error, options) {
+    const {message} = options
+    message.error(error.message)
+    return Promise.reject(error)
+  }
+}
+
+const resp403 = {
+  onFulfilled(response, options) {
+    const {message} = options
+    if (response.status === 403) {
+      message.error(`请求被拒绝`)
+    }
+    return response
+  }
+}
+
+const reqCommon = {
+  onFulfilled(config, options) {
+    const {message} = options
+    const {url, xsrfCookieName} = config
+    if (url.indexOf('login') === -1 && xsrfCookieName && !Cookie.get(xsrfCookieName)) {
+      message.warning('认证 token 已过期，请重新登录')
+    }
+    return config
+  },
+  onRejected(error, options) {
+    const {message} = options
+    message.error(error.message)
+    return Promise.reject(error)
+  }
+}
+
+export default {
+  request: [reqCommon], // 请求拦截
+  response: [resp401, resp403] // 响应拦截
+}
+```
+:::

docs/advance/login.md

@@ -0,0 +1,76 @@
+---
+title: 登录认证
+lang: zn-CN
+---
+# 登录认证
+Vue Antd Admin 使用 js-cookie.js 管理用户的 token，结合 axios 配置，可以为每个请求头加上 token 信息。
+
+## token名称
+后端系统通常会从请求 header 中获取用户的 token，因此我们需要配置好 token 名称，好让后端能正确的识别到用户 token。
+Vue Antd Admin 默认token 名称为 `Authorization`，你可以在 /utils/request.js 中修改它。
+```js{5}
+import axios from 'axios'
+import Cookie from 'js-cookie'
+
+// 跨域认证信息 header 名
+const xsrfHeaderName = 'Authorization'
+...
+```
+## token 设置
+调用登录接口后拿到用户的 token 和 token 过期时间（如无过期时间，可忽略），并使用 /utils/request.js #setAuthorization 方法保存token。
+```js{5}
+import {setAuthorization} from '@/utils/request'
+
+login(name, password).then(res => {
+  const {token, expireAt} = res.data
+  setAuthorization({token, expireAt: new Date(expireAt)})
+})
+```
+## token 校验
+Vue Antd Admin 默认添加了登录导航守卫，如检查到本地cookie 中不包含 token 信息，则会拦截跳转至登录页。你可以在 /router/index.js 中配置
+不需要登录拦截的路由
+```js
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'],      //根据路由名称匹配
+  paths: ['/login'],   //根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes(route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+```
+或者在 /router/guards.js 中移出登录守卫
+```diff
+...
+export default {
+-  beforeEach: [loginGuard, authorityGuard, redirectGuard],
++  beforeEach: [authorityGuard, redirectGuard],
+  afterEach: []
+}
+```
+## Api
+### setAuthorization(auth, authType)
+来源：/utils/request.js  
+该方法用于保存用户 token，接收两个参数:  
+* **auth**   
+认证信息，包含 token、expireAt 等认证数据。  
+* **authType**  
+认证类型，默认为 `AUTH_TYPE.BEARER`（AUTH_TYPE.BEARER 默认会给token 加上 Bearer 识别前缀），可根据自己的认证类型自行扩展。  
+
+### checkAuthorization(authType)
+该方法用于校验用户 token 是否过期，接收一个参数:  
+* **authType**  
+认证类型，默认为 `AUTH_TYPE.BEARER`。 
+
+### removeAuthorization(authType)
+该方法用于移出用户本地存储的 token，接收一个参数:  
+* **authType**  
+认证类型，默认为 `AUTH_TYPE.BEARER`。
+:::tip
+以上 Api 均可在 /utils/request.js 文件中找到。
+:::

docs/advance/skill.md

@@ -0,0 +1,10 @@
+---
+title: 108个小技巧
+lang: zn-CN
+---
+# 108个小技巧
+
+## 自定义菜单icon
+## 隐藏页面标题
+## 关闭页签API
+## 权限校验PI

docs/develop/layout.md

@@ -29,7 +29,7 @@ lang: zh-CN
 
 ![blank-view](../assets/blank-view.png)
 ## 如何使用
-通常我们会把视图组件和路由配置结合一起使用，我们把配置信息抽离在路由配置文件中 [router/index.js](https://github.com/iczer/vue-antd-admin/blob/master/src/router/index.js) 。如下：
+通常我们会把视图组件和路由配置结合一起使用，我们把配置信息抽离在路由配置文件中 [src/router/config.js](https://github.com/iczer/vue-antd-admin/blob/master/src/router/config.js) 。如下：
 ```jsx {7,12}
 {
   path: 'form',

docs/develop/page.md

@@ -3,5 +3,216 @@ title: 页面
 lang: zh-CN
 ---
 # 页面
-
-### 作者还没来得及编辑该页面，如果你感兴趣，可以点击下方链接，帮助作者完善此页
+这里的『页面』包含新建页面文件，配置路由、样式文件及i18n国际化等。通常情况下，你仅需简单的配置就可以添加一个新的页面。
+## 新建页面文件
+在 src/pages 下创建新的 .vue 文件。如果页面相关文件过多，您可以创建一个文件夹来放置这些文件。
+```diff                    
+  ├── public
+  ├── src
+  │   ├── assets               # 本地静态资源
+  :   :
+  │   ├── pages                # 页面组件和通用模板
++ │   │   └── NewPage.vue      # 新页面文件
+or
++ │   │   └── newPage          # 为新页面创建一个文件夹
++ │   │       ├── NewPage.vue  # 新页面文件
++ │   │       ├── index.less   # 页面样式文件
++ │   │       └── index.js     # import 引导文件
+  :   :
+  │   └── main.js              # 应用入口js
+  ├── package.json             # package.json
+  ├── README.md                # README.md
+  └── vue.config.js            # vue 配置文件
+```
+为了更好地演示，我们初始化 NewPage.vue 文件如下：
+```vue
+<template>
+  <div class="new-page" :style="`min-height: ${pageMinHeight}px`">
+    <h1>演示页面</h1>
+  </div>
+</template>
+<script>
+  import {mapState} from 'vuex'
+  export default {
+    name: 'NewPage',
+    data() {
+      return {
+        desc: '这是一个演示页面'
+      }
+    },
+    computed: {
+      ...mapState('setting', ['pageMinHeight']),
+    }
+  }
+</script>
+<style scoped lang="less">
+@import "index.less";
+</style>
+```
+index.less 文件：
+```less
+.new-page{
+  height: 100%;
+  background-color: @base-bg-color;
+  text-align: center;
+  padding: 200px 0 0 0;
+  margin-top: -24px;
+  h1{
+    font-size: 48px;
+  }
+}
+```
+index.js 文件：
+```js
+import NewPage from './NewPage'
+export default NewPage
+```
+## 配置路由
+路由配置在 src/router/config.js 文件中，我们把上面创建的页面文件加入路由配置中
+```js {10-14}
+const options = {
+  routes: [
+    {name: '登录页'...},
+    {
+      path: '/',
+      name: '首页',
+      component: TabsView,
+      redirect: '/login',
+      children: [
+        {
+          path: 'newPage',
+          name: '新页面',
+          component: () => import('@/pages/newPage'),
+        },
+        {
+          path: 'dashboard',
+          name: 'Dashboard',
+          meta: {
+            icon: 'dashboard'
+          },
+          component: BlankView,
+          children: [...]
+        }
+      ]
+      ...
+    }
+  ]
+}
+```
+:::tip
+我们建议使用英文设置路由的 path 属性，用中文设置路由的 name 属性。因为系统将自动提取路由的 path 和 name 属性作为国际化配置。这在后面的章节
+ [进阶>国际化](../advance/i18n.md)中将会讲到。
+ 当然，如果你的项目不需要国际化，可以忽略。
+:::
+启动服务，你将看到新增页面如下：
+![newPage](../assets/new-page.png)
+如果你想把它配置为二级页面或更深层级的页面，只需为它配置一个父级路由，并为父级路由配置一个[视图组件](./layout.md#admin-的视图)，
+这里我们选择 [PageView](https://github.com/iczer/vue-antd-admin/blob/master/src/layouts/PageView.vue)，如下：
+```js {10-21}
+const options = {
+  routes: [
+    {name: '登录页'...},
+    {
+      path: '/',
+      name: '首页',
+      component: TabsView,
+      redirect: '/login',
+      children: [
+        {
+          path: 'parent',
+          name: '父级路由',
+          component: PageView,
+          children: [
+            {
+              path: 'newPage',
+              name: '新页面',
+              component: () => import('@/pages/newPage'),
+            }
+          ]
+        },
+        {name: 'dashboard'...}
+      ]
+      ...
+    }
+  ]
+}
+```
+:::warning
+页面所有父级路由的组件必须配置为[视图组件](../develop/layout.md#admin-的视图)，否则页面的内容可能不会显示。  
+目前有 [PageView](https://github.com/iczer/vue-antd-admin/blob/master/src/layouts/PageView.vue)、
+[TabsView](https://github.com/iczer/vue-antd-admin/blob/master/src/layouts/tabs/TabsView.vue) 和
+[BlankView](https://github.com/iczer/vue-antd-admin/blob/master/src/layouts/BlankView.vue) 可选，
+你也可以自己创建视图组件。（[什么是视图组件？](../develop/layout.md#admin-的视图)）
+:::
+页面如下：
+![newPage2](../assets/new-page-2.png)
+## i18n国际化配置
+如果你想为页面增加i18n国际化配置，只需在页面同级文件夹下创建 i18n.js 文件，然后在页面文件中引入并使用即可。  
+创建 i18n.js 文件：
+```diff {9}                    
+  ├── public
+  ├── src
+  │   ├── assets               # 本地静态资源
+  :   :
+  │   ├── pages                # 页面组件和通用模板
+  │   │   └── newPage        # 为新页面创建一个文件夹
+  │   │       ├── NewPage.vue  # 新页面文件
+  │   │       ├── index.less   # 页面样式文件
++ │   │       ├── i18n.js      # i18n 国际化配置文件
+  │   │       └── index.js     # import 引导文件
+  :   :
+  │   └── main.js              # 应用入口js
+  ├── package.json             # package.json
+  ├── README.md                # README.md
+  └── vue.config.js            # vue 配置文件
+```
+i18n.js 文件内容：
+```js
+module.exports = {
+  messages: {
+    CN: {
+      content: '演示页面',
+      description: '这是一个演示页面'
+    },
+    HK: {
+      content: '演示頁面',
+      description: '這是一個演示頁面'
+    },
+    US: {
+      content: 'Demo Page',
+      description: 'This is a demo page'
+    }
+  }
+}
+```
+在 NewPage.vue 文件中引入 i18n.js，并添加需要国际化的内容。如下修改：
+```vue {3,10,13-15}
+<template>
+  <div class="new-page" :style="`min-height: ${pageMinHeight}px`">
+    <h1>{{$t('content')}}</h1>
+  </div>
+</template>
+<script>
+  import {mapState} from 'vuex'
+  export default {
+    name: 'NewPage',
+    i18n: require('./i18n'),
+    computed: {
+      ...mapState('setting', ['pageMinHeight']),
+      desc() {
+        return this.$t('description')
+      }
+    }
+  }
+</script>
+<style scoped lang="less">
+@import "index";
+</style>
+```
+然后页面右上角语言项选择 ``English``，你会发现，页面语言切换为英文了。如下：
+![newPageUs](../assets/new-page-us.png)
+一切就是这么的简单！
+:::tip
+如果你尝试切换为繁体语言，可能会发现``页面标题``和``面包屑``显示为英文。  
+这涉及到路由的国际化配置，在章节 [进阶 > 国际化](../advance/i18n.md) 中，我们会对此作详细讲解。
+:::

docs/develop/router.md

@@ -17,9 +17,8 @@ lang: zh-CN
 ## 路由
 Vue Antd Admin 的路由配置完全遵循 vue-router 的 [routes 配置规则](https://router.vuejs.org/zh/api/#routes)。
 另外我们还在 routes 的元数据属性 [meta](https://router.vuejs.org/zh/guide/advanced/meta.html#%E8%B7%AF%E7%94%B1%E5%85%83%E4%BF%A1%E6%81%AF) 中注入了三个属性 icon、invisible 和 page，它们将在生成菜单和页头时发挥作用。配置示例如下：
-```js {8,14}
-import Router from 'vue-router'
-export default new Router({
+```js {7,13}
+const options = {
   routes: [{
     path: '/',
     name: '首页',
@@ -45,9 +44,9 @@ export default new Router({
       }]
     }]
   }]
-})
+}
 ```
-完整配置示例，请查看 [router/index.js](https://github.com/iczer/vue-antd-admin/blob/master/src/router/index.js)
+完整配置示例，请查看 [src/router/config.js](https://github.com/iczer/vue-antd-admin/blob/master/src/router/config.js)
 
 ## 菜单
 Admin 系统的菜单直接通过路由配置生成，路由属性和菜单功能对应关系如下

docs/develop/service.md

@@ -3,5 +3,159 @@ title: 服务端交互
 lang: zh-CN
 ---
 # 服务端交互
+数据服务是一个应用的灵魂，它驱动着应用的各个功能模块的正常运转。Vue Antd Admin 在 service 模块封装了服务端交互，通过 API 的形式可以和任何技术栈的服务端应用一起工作。
+## 服务交互流程
+在 Vue Antd Admin 中，服务端交互流程如下：
+* 组件内调用 service 服务 API
+* service 服务 API 封装请求数据，通过 request.js 发送请求
+* 组件获取 service 返回的数据，更新视图数据或触发其它行为  
 
-### 作者还没来得及编辑该页面，如果你感兴趣，可以点击下方链接，帮助作者完善此页
+我们以登录为例，Login.vue 组件内，用户输入账号密码，点击登录，调用 services/user/login api
+```vue {5,17}
+<template>
+  ...
+</template>
+<script>
+import {login} from '@/services/user'
+...
+export default {
+  name: 'Login',
+  methods: {
+    onSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err) => {
+        if (!err) {
+          this.logging = true
+          const name = this.form.getFieldValue('name')
+          const password = this.form.getFieldValue('password')
+          login(name, password).then(res => this.afterLogin(res))
+        }
+      })
+    }
+  }
+}
+</script>
+```
+`services/user/login` 封装账户密码数据，通过 `request.js` 发送登录服务请求
+```js
+import {request, METHOD} from '@/utils/request'
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+async function login(name, password) {
+  return request(LOGIN, METHOD.POST, {
+    name: name,
+    password: password
+  })
+}
+```
+Login.vue 获取登录服务返回的数据，进行后续操作
+```vue {14,18-23}
+<template>
+  ...
+</template>
+<script>
+import {login} from '@/services/user'
+...
+export default {
+  name: 'Login',
+  methods: {
+    onSubmit (e) {
+      this.form.validateFields((err) => {
+        if (!err) {
+          ...
+          login(name, password).then(res => this.afterLogin(res))
+        }
+      })
+    },
+    afterLogin(res) {
+      if (res.data.code >= 0) {                 //登录成功
+        ...
+      } else {                                  //登录失败
+        this.error = loginRes.message
+      }
+    }
+  }
+}
+</script>
+```
+## 服务模块结构
+服务模块结构如下：
+```bash
+...
+├── src
+│   └── services                # 数据服务模块
+│       ├── user.js             # 用户数据服务
+│       ├── product.js          # 产品服务
+│       ...           
+│       ├── api.js              # api 地址管理
+│       └── index.js            # 服务模块导出
+...
+│   └── utils                   # 数据服务模块
+│       ├── request.js          # 基于 axios 的 http 请求工具
+...
+```
+services 文件夹下， api.js 用于服务请求地址的统一管理，index.js 用于模块化导出服务，其它 *.js 文件对应各个服务模块。
+## request.js
+request.js 基于 axios 封装了一些常用的函数，如下：  
+```js
+export {
+  METHOD,                 //http method 常量
+  AUTH_TYPE,              //凭证认证类型 常量
+  request,                //http请求函数
+  setAuthorization,       //设置身份凭证函数
+  removeAuthorization,    //移除身份凭证函数
+  checkAuthorization      //检查身份凭证是否过期函数
+}
+```
+:::tip
+凭证认证类型默认为 [Bearer](https://www.jianshu.com/p/8f7009456abc)，你可以根据自己的需要实现其它类型的认证
+:::
+## Base url 配置
+你可以在项目根目录下的环境变量文件(.env 和 .env.development)中配置你的 API 服务 base url 地址。
+
+生产环境，.env 文件
+```properties
+VUE_APP_API_BASE_URL=https://www.server.com
+```
+开发环境，.env.development 文件：
+```properties
+VUE_APP_API_BASE_URL=https://localhost:8000
+```
+## 跨域设置
+在开发环境中，通常我们的Vue应用和服务应用运行在不同的地址或端口上。我们可以通过简单的设置，代理前端请求，来避免跨域问题。如下：  
+
+首先，在 services/api.js 文件中设置 API_PROXY_PREFIX 常量，BASE_URL 像下面这样设置：
+```js {2,4}
+//跨域代理前缀
+const API_PROXY_PREFIX='/api'
+//base url
+const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
+//导出api服务地址
+module.exports = {
+  LOGIN: `${BASE_URL}/login`,
+  ROUTES: `${BASE_URL}/routes`
+}
+```
+然后，在 vue.config.js 文件中配置代理：
+```js
+model.exports = {
+  devServer: {
+    proxy: {
+      '/api': {               //此处要与 /services/api.js 中的 API_PROXY_PREFIX 值保持一致
+        target: process.env.VUE_APP_API_BASE_URL,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/api': ''
+        }
+      }
+    }
+  }
+}
+```
+:::tip
+此代理配置仅适用于开发环境，生产环境的跨域代理请在自己的web服务器配置。
+:::

docs/develop/theme.md

@@ -4,4 +4,499 @@ lang: zh-CN
 ---
 # 主题定制
 
-### 作者还没来得及编辑该页面，如果你感兴趣，可以点击下方链接，帮助作者完善此页
+## 主题颜色
+### 主题色
+我们内置了一个色盘供您选择 
+
+<color color="#fa541c"/>
+<color color="#fadb14"/>
+<color color="#3eaf7c"/>
+<color color="#13c2c2"/>
+<color color="#1890ff"/>
+<color color="#722ed1"/>
+<color color="#eb2f96"/>
+
+如果这不能满足你的需求，你也可以使用任何你喜欢的颜色，只需要在 src/config/config.js 文件中配置你的主题色即可。如：
+```js {3}
+module.exports = {
+  theme: {
+    color: '#13c2c2', //换成任何你喜欢的颜色，支持 hex 色值
+    mode: 'night'
+  },
+  multiPage: true,
+  animate: {
+    name: 'roll',
+    direction: 'default'
+  }
+}
+```
+当你设置好主题色后，系统会根据这个主题色为你生成一系列配套的颜色，并应用到vue组件中。
+:::tip 
+你可以在你的样式文件中直接使用 less 变量 ``@theme-color``。
+::: 
+:::warning
+主题色目前只支持 ``hex`` 模式的色值。如果设置为 ``rgb`` 或其它模式的色值，可能会导致配套颜色无法生成。
+:::
+### 功能色
+除了主题色，系统还有一些功能性颜色，分别为：成功色、警告色和错误色。默认色值分别为：
+|名称|success   |warning  |error  |
+|:-:|:--------:|:-------:|:-----:|
+|色值|``#52c41a``|``#faad14``|``#f5222d``|
+|颜色|<color color="#52c41a"/>|<color color="#faad14"/>|<color color="#f5222d" />|
+|less变量|@success-color|@warning-color|@error-color|
+
+你也可以在 src/config/config.js 重新定义这些功能色
+```js {5-7}
+module.exports = {
+  theme: {
+    color: '#13c2c2', 
+    mode: 'night',
+    success: '#52c41a', //定义成功色，支持 hex 色值
+    warning: '#faad14', //定义警告色，支持 hex 色值
+    error: '#f5222d'    //定义错误色，支持 hex 色值
+  },
+  multiPage: true,
+  animate: {
+    name: 'roll',
+    direction: 'default'
+  }
+}
+```
+:::tip
+想在在你的样式文件中使用以上各功能色，引用各功能色对应的 less 变量即可。
+:::
+:::warning
+功能色目前也只支持 ``hex`` 模式的色值。如果设置为 ``rgb`` 或其它模式的色值，可能会导致配套颜色无法生成。
+:::
+### 文本色
+<table style="text-align: center" >
+  <tr>
+    <th>主题模式</th>
+    <th>标题色</th>
+    <th>文本色</th>
+    <th>次级文本色</th>
+  </tr>
+  <tr>
+    <td rowspan="2">light/dark</td>
+    <td><color color="rgba(0,0,0,0.85)"/></td>
+    <td><color color="rgba(0,0,0,0.65)"/></td>
+    <td><color color="rgba(0,0,0,0.45)"/></td>
+  </tr>
+  <tr>
+    <td><code>rgba(0,0,0,0.85)</code></td>
+    <td><code>rgba(0,0,0,0.65)</code></td>
+    <td><code>rgba(0,0,0,0.45)</code></td>
+  </tr>
+  <tr>
+    <td rowspan="2">night</td>
+    <td><color color="rgba(255,255,255,0.85)"/></td>
+    <td><color color="rgba(255,255,255,0.65)"/></td>
+    <td><color color="rgba(255,255,255,0.45)"/></td>
+  </tr>
+  <tr>
+    <td><code>rgba(255,255,255,0.85)</code></td>
+    <td><code>rgba(255,255,255,0.65)</code></td>
+    <td><code>rgba(255,255,255,0.45)</code></td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>@title-color</td>
+    <td>@text-color</td>
+    <td>@text-color-second</td>
+  </tr>
+</table>
+
+:::tip
+想在在你的样式文件中使用以上文本色，引用各文本色对应的 less 变量即可。
+:::
+:::warning
+目前不支持自定义文本色，因为涉及到主题模式切换时文本色的置换问题。如强行修改，可能会导致主题模式切换时出现样式异常。
+如果你的项目不需要主题模式切换，可自行替换以上文本色。
+:::
+
+### 背景色
+
+<table style="text-align: center">
+  <tr>
+    <th>主题模式</th>
+    <th>布局背景色</th>
+    <th>基础背景色</th>
+    <th>hover背景色</th>
+    <th>边框颜色</th>
+    <th>阴影颜色</th>
+  </tr>
+  <tr>
+    <td rowspan="2">light/dark</td>
+    <td><color color="#f0f2f5"/></td>
+    <td><color color="#fff"/></td>
+    <td><color color="rgba(0,0,0,0.025)"/></td>
+    <td><color color="#f0f0f0"/></td>
+    <td><color color="rgba(0,0,0,0.15)"/></td>
+  </tr>
+  <tr>
+    <td><code>#f0f2f5</code></td>
+    <td><code>#fff</code></td>
+    <td><code>rgba(0,0,0,0.025)</code></td>
+    <td><code>#f0f0f0</code></td>
+    <td><code>rgba(0,0,0,0.15)</code></td>
+  </tr>
+  <tr>
+    <td rowspan="2">night</td>
+    <td><color color="#000"/></td>
+    <td><color color="#141414"/></td>
+    <td><color color="rgba(255,255,255,0.025)"/></td>
+    <td><color color="#303030"/></td>
+    <td><color color="rgba(255,255,255,0.15)"/></td>
+  </tr>
+  <tr>
+    <td><code>#000</code></td>
+    <td><code>#141414</code></td>
+    <td><code>rgba(255,255,255,0.025)</code></td>
+    <td><code>#303030</code></td>
+    <td><code>rgba(255,255,255,0.15)</code></td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>@layout-bg-color</td>
+    <td>@base-bg-color</td>
+    <td>@hover-bg-color</td>
+    <td>@border-color</td>
+    <td>@shadow-color</td>
+  </tr>
+</table>
+
+:::tip
+想在在你的样式文件中使用以上背景色，引用各背景色对应的 less 变量即可。
+:::
+:::warning
+目前也不支持自定义背景色，因为涉及到主题模式切换时背景色的置换问题。如强行修改，可能会导致主题模式切换时出现样式异常。
+如果你的项目不需要主题模式切换，可自行替换以上背景色。
+:::
+
+### antd 的色系
+除了以上颜色，我们还引入了 ant-design 内置的色系。如下：
+
+<table style="text-align: center">
+  <tr>
+    <th>色系</th>
+    <th>类型</th>
+    <th>颜色</th>
+  </tr>
+  <tr>
+    <td rowspan="2">blue/拂晓蓝</td>
+    <td>色盘</td>
+    <td >
+      <color-list
+       :colors="['#e6f7ff', '#bae7ff', '#91d5ff', '#69c0ff', '#40a9ff', '#1890ff', '#096dd9', '#0050b3', '#003a8c', '#002766']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@blue-1</code>、
+      <code>@blue-2</code>
+      <code>...</code>
+      <code>@blue-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">purple/酱紫</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#f9f0ff', '#efdbff', '#d3adf7', '#b37feb', '#9254de', '#722ed1', '#531dab', '#391085', '#22075e', '#120338']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@purple-1</code>、
+      <code>@purple-2</code>
+      <code>...</code>
+      <code>@purple-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">cyan/明青</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#e6fffb', '#b5f5ec', '#87e8de', '#5cdbd3', '#36cfc9', '#13c2c2', '#08979c', '#006d75', '#00474f', '#002329']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@cyan-1</code>、
+      <code>@cyan-2</code>
+      <code>...</code>
+      <code>@cyan-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">green/极光绿</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#f6ffed', '#d9f7be', '#b7eb8f', '#95de64', '#73d13d', '#52c41a', '#389e0d', '#237804', '#135200', '#092b00']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@green-1</code>、
+      <code>@green-2</code>
+      <code>...</code>
+      <code>@green-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">magenta/法式洋红</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#fff0f6', '#ffd6e7', '#ffadd2', '#ff85c0', '#f759ab', '#eb2f96', '#c41d7f', '#9e1068', '#780650', '#520339']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@magenta-1</code>、
+      <code>@magenta-2</code>
+      <code>...</code>
+      <code>@magenta-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">red/薄暮</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#fff1f0', '#ffccc7', '#ffa39e', '#ff7875', '#ff4d4f', '#f5222d', '#cf1322', '#a8071a', '#820014', '#5c0011']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@red-1</code>、
+      <code>@red-2</code>
+      <code>...</code>
+      <code>@red-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">orange/日暮</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#fff7e6', '#ffe7ba', '#ffd591', '#ffc069', '#ffa940', '#fa8c16', '#d46b08', '#ad4e00', '#873800', '#612500']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@orange-1</code>、
+      <code>@orange-2</code>
+      <code>...</code>
+      <code>@orange-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">yellow/日出</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#feffe6', '#ffffb8', '#fffb8f', '#fff566', '#ffec3d', '#fadb14', '#d4b106', '#ad8b00', '#876800', '#614700']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@yellow-1</code>、
+      <code>@yellow-2</code>
+      <code>...</code>
+      <code>@yellow-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">volcano/火山</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#fff2e8', '#ffd8bf', '#ffbb96', '#ff9c6e', '#ff7a45', '#fa541c', '#d4380d', '#ad2102', '#871400', '#610b00']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@volcano-1</code>、
+      <code>@volcano-2</code>
+      <code>...</code>
+      <code>@volcano-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">geekblue/极客蓝</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#f0f5ff', '#d6e4ff', '#adc6ff', '#85a5ff', '#597ef7', '#2f54eb', '#1d39c4', '#10239e', '#061178', '#030852']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@geekblue-1</code>、
+      <code>@geekblue-2</code>
+      <code>...</code>
+      <code>@geekblue-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">lime/青柠</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#fcffe6', '#f4ffb8', '#eaff8f', '#d3f261', '#bae637', '#a0d911', '#7cb305', '#5b8c00', '#3f6600', '#254000']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@lime-1</code>、
+      <code>@lime-2</code>
+      <code>...</code>
+      <code>@lime-10</code>
+    </td>
+  </tr>
+  <tr>
+    <td rowspan="2">gold/金盏花</td>
+    <td>色盘</td>
+    <td>
+      <color-list
+       :colors="['#fffbe6', '#fff1b8', '#ffe58f', '#ffd666', '#ffc53d', '#faad14', '#d48806', '#ad6800', '#874d00', '#613400']" 
+      />
+    </td>
+  </tr>
+  <tr>
+    <td>less变量</td>
+    <td>
+      <code>@gold-1</code>、
+      <code>@gold-2</code>
+      <code>...</code>
+      <code>@gold-10</code>
+    </td>
+  </tr>
+</table>
+以上色系对应的less变量均可以在你的样式代码中直接使用。
+
+:::tip
+我们建议在开发中使用 `less变量` 而不是直接使用 `颜色值` 来设置颜色。这样做对主题色和主题模式切换很有帮助。
+:::
+## 主题模式
+Vue Antd Admin 有三种主题模式，分别为：`light/亮色菜单模式`、`dark/暗色菜单模式` 和 `night/黑夜模式`。
+
+light / 亮色菜单模式:
+![light](../assets/mode-light.png)
+dark / 暗色菜单模式:
+![dark](../assets/mode-dark.png)
+night / 黑夜模式:
+![night](../assets/mode-night.png)
+
+你可以在这三种模式之间随意切换，也可以在 src/config/config.js 中设置默认的主题模式。
+```js {4}
+module.exports = {
+  theme: {
+    color: '#13c2c2',
+    mode: 'night'       //设置你的默认主题模式，可选 light、dark 和 night
+  },
+  multiPage: true,
+  animate: {
+    name: 'roll',
+    direction: 'default'
+  }
+}
+```
+
+## 导航布局
+Vue Antd Admin 有两种导航布局，`side/侧边导航` 和 `head/顶部导航`。  
+默认为侧边导航，你可以在 src/config/config.js 中修改导航布局
+```js {6}
+module.exports = {
+  theme: {
+    color: '#13c2c2',
+    mode: 'night'       
+  },
+  layout: 'side',     //设置你的默认导航布局，有 side 和 head 可选
+  multiPage: true,
+  animate: {
+    name: 'roll',
+    direction: 'default'
+  }
+}
+```
+## 动画
+Vue Antd Admin 内置了 [animate.css](https://animate.style) 动画库，在页面切换时会应用动画效果。你可以在 src/config/config.js 中配置动画效果或者禁用动画。
+```js {7-11}
+module.exports = {
+  theme: {
+    color: '#13c2c2',
+    mode: 'night'       
+  },
+  multiPage: true,
+  animate: {
+    disabled: false,      //禁用动画，true:禁用，false:启用
+    name: 'roll',         //动画效果，支持的动画效果可参考 src/config/default/animate.config.js
+    direction: 'default'  //动画方向，切换页面时动画的方向，参考 src/config/default/animate.config.js
+  }
+}
+```
+支持的动画特效种类，可以参考 src/config/default/animate.config.js 文件。
+## 其它
+### 色弱模式
+对于有视觉障碍的群体，我们提供了色弱模式，你可以通过配置 src/config/config.js 启用色弱模式
+```js {7}
+module.exports = {
+  theme: {
+    color: '#13c2c2',
+    mode: 'night'       
+  },
+  multiPage: true,
+  weekMode: false,   //色弱模式，true:开启，false:不开启
+  animate: {
+    name: 'roll',         
+    direction: 'default'
+  }
+}
+```
+### 多页签
+在 src/config/config.js 设置 multiPage 来启用或关闭多页签模式
+```js {6}
+module.exports = {
+  theme: {
+    color: '#13c2c2',
+    mode: 'night'       
+  },
+  multiPage: true,          //多页签模式，true:开启，false:不开启
+  animate: {
+    name: 'roll',         
+    direction: 'default'
+  }
+}
+```
+完整的系统设置参考 src/config/default/setting.config.js
+:::tip
+以上所有主题设置项，均已映射到 vuex/setting 模块的 state 中，你可以通过提交 setting/mutations 实时修改设置项。  
+如何使用 [mutations](https://vuex.vuejs.org/zh/guide/mutations.html) ？
+:::

docs/other/community.md

@@ -5,4 +5,4 @@ lang: zh-CN
 # 社区
 
 ## 交流学习
-### QQ群：610090280
+### QQ群：812277510、610090280（已满）

docs/start/use.md

@@ -13,7 +13,17 @@ $ git clone https://github.com/iczer/vue-antd-admin.git
 安装依赖
 ```bash
 $ yarn install
+or
+$ npm install
 ```
+:::tip
+master 分支是 Vue Antd Admin 的标准版代码，此分支代码适合用于用于学习研究，不推荐在此分支做正式开发。
+我们在 basic 分支提供了 Vue Antd Admin 的基础版代码，正式开发请切换至此分支，以便于后续的版本更新。
+:::
+:::warning
+如果基于 `master分支` 进行开发，在版本更新时遇到的代码冲突问题请自行解决，我们不对基于 `master分支` 开发时遇到的问题提供技术支持。  
+再次强调，`master分支` 仅推荐用于学习参考，正式开发请切换至 `basic` 分支！！！
+:::
 ## 目录结构
 我们已经为你生成了一个完整的开发框架，提供了涵盖中后台开发的各类功能和坑位，下面是整个项目的目录结构。
 
@@ -24,17 +34,19 @@ $ yarn install
 │   └── index.html           # 入口 HTML
 ├── src
 │   ├── assets               # 本地静态资源
-│   ├── components           # 业务通用组件
+│   ├── components           # 内置通用组件
 │   ├── config               # 系统配置
 │   ├── layouts              # 通用布局
 │   ├── mock                 # 本地 mock 数据
 │   ├── pages                # 页面组件和通用模板
 │   ├── plugins              # vue 插件
 │   ├── router               # 路由配置
+│   ├── services             # 数据服务模块
 │   ├── store                # vuex 状态管理配置
 │   ├── theme                # 主题相关
 │   ├── utils                # js 工具
-│   └── App.vue              # 应用入口组件
+│   ├── App.vue              # 应用入口组件
+│   ├── bootstrap.js         # 应用启动引导js
 │   └── main.js              # 应用入口js
 ├── package.json             # package.json
 ├── README.md                # README.md
@@ -44,5 +56,7 @@ $ yarn install
 启动服务
 ```bash
 $ yarn serve
+or
+$ npm run serve
 ```
 启动成功后，会看到一个本地预览地址，通常是 http://localhost:8080 。接下来就可以修改代码，并实时预览修改结果啦！

package.json

@@ -1,30 +1,32 @@
 {
   "name": "vue-antd-admin",
-  "version": "0.2.1",
+  "version": "0.7.4",
   "homepage": "https://iczer.github.io/vue-antd-admin",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "serve": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build": "export NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "lint": "vue-cli-service lint",
     "predeploy": "yarn build",
-    "deploy": "gh-pages -d dist -b pages -r https://gitee.com/iczer/vue-antd-admin.git",
-    "docs:dev": "vuepress dev docs",
-    "docs:build": "vuepress build docs",
-    "docs:deploy": "vuepress build docs && gh-pages -d docs/.vuepress/dist"
+    "deploy": "gh-pages -d dist -b pages -r https://github.com/iczer/vue-antd-admin.git",
+    "docs:dev": "export NODE_OPTIONS=--openssl-legacy-provider && vuepress dev docs",
+    "docs:build": "export NODE_OPTIONS=--openssl-legacy-provider && vuepress build docs",
+    "predocs:deploy": "yarn docs:build",
+    "docs:deploy": "gh-pages -d docs/.vuepress/dist -b doc -r https://github.com/iczer/vue-antd-admin.git"
   },
   "dependencies": {
     "@antv/data-set": "^0.11.4",
     "animate.css": "^4.1.0",
-    "ant-design-vue": "^1.6.2",
+    "ant-design-vue": "1.7.2",
     "axios": "^0.19.2",
     "clipboard": "^2.0.6",
     "core-js": "^3.6.5",
     "date-fns": "^2.14.0",
     "enquire.js": "^2.1.6",
+    "highlight.js": "^10.2.1",
     "js-cookie": "^2.2.1",
     "mockjs": "^1.1.0",
-    "pouchdb": "^7.2.1",
+    "nprogress": "^0.2.0",
     "viser-vue": "^2.4.8",
     "vue": "^2.6.11",
     "vue-i18n": "^8.18.2",
@@ -39,7 +41,9 @@
     "@vue/cli-service": "^4.4.0",
     "@vuepress/plugin-back-to-top": "^1.5.2",
     "babel-eslint": "^10.1.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "babel-polyfill": "^6.26.0",
+    "compression-webpack-plugin": "^2.0.0",
     "deepmerge": "^4.2.2",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
@@ -50,7 +54,7 @@
     "vue-cli-plugin-style-resources-loader": "^0.1.4",
     "vue-template-compiler": "^2.6.11",
     "vuepress": "^1.5.2",
-    "webpack-theme-color-replacer": "^1.3.12",
+    "webpack-theme-color-replacer": "1.3.18",
     "whatwg-fetch": "^3.0.0"
   },
   "eslintConfig": {

public/index.html

@@ -1,17 +1,27 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" class="beauty-scroll">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title><%= process.env.VUE_APP_NAME %></title>
+    <!-- require cdn assets css -->
+    <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
+      <link rel="stylesheet" href="<%= htmlWebpackPlugin.options.cdn.css[i] %>" />
+    <% } %>
   </head>
-  <body class="beauty-scroll">
+  <body>
     <noscript>
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
-    <div id="app"></div>
+    <div id="popContainer" class="beauty-scroll" style="height: 100vh; overflow-y: scroll">
+      <div id="app"></div>
+    </div>
+    <!-- require cdn assets js -->
+    <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.js) { %>
+      <script type="text/javascript" src="<%= htmlWebpackPlugin.options.cdn.js[i] %>"></script>
+    <% } %>
     <!-- built files will be auto injected -->
   </body>
 </html>

src/App.vue

@@ -1,13 +1,14 @@
 <template>
-  <a-config-provider :locale="locale">
+  <a-config-provider :locale="locale" :get-popup-container="popContainer">
     <router-view/>
   </a-config-provider>
 </template>
 
 <script>
-import enquireScreen from './utils/device'
-import {mapState} from 'vuex'
+import {enquireScreen} from './utils/util'
+import {mapState, mapMutations} from 'vuex'
 import themeUtil from '@/utils/themeUtil';
+import {getI18nKey} from '@/utils/routerUtil'
 
 export default {
   name: 'App',
@@ -17,11 +18,9 @@ export default {
     }
   },
   created () {
-    let _this = this
+    this.setHtmlTitle()
     this.setLanguage(this.lang)
-    enquireScreen(isMobile => {
-      _this.$store.commit('setting/setDevice', isMobile)
-    })
+    enquireScreen(isMobile => this.setDevice(isMobile))
   },
   mounted() {
    this.setWeekModeTheme(this.weekMode)
@@ -32,24 +31,28 @@ export default {
     },
     lang(val) {
       this.setLanguage(val)
+      this.setHtmlTitle()
+    },
+    $route() {
+      this.setHtmlTitle()
     },
     'theme.mode': function(val) {
       let closeMessage = this.$message.loading(`您选择了主题模式 ${val}, 正在切换...`)
-      themeUtil.changeThemeColor(this.theme.color, val).then(() => {
-        setTimeout(closeMessage, 1000)
-      })
+      themeUtil.changeThemeColor(this.theme.color, val).then(closeMessage)
     },
     'theme.color': function(val) {
       let closeMessage = this.$message.loading(`您选择了主题色 ${val}, 正在切换...`)
-      themeUtil.changeThemeColor(val, this.theme.mode).then(() => {
-        setTimeout(closeMessage, 1000)
-      })
+      themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
+    },
+    'layout': function() {
+      window.dispatchEvent(new Event('resize'))
     }
   },
   computed: {
-    ...mapState('setting', ['theme', 'weekMode', 'lang'])
+    ...mapState('setting', ['layout', 'theme', 'weekMode', 'lang'])
   },
   methods: {
+    ...mapMutations('setting', ['setDevice']),
     setWeekModeTheme(weekMode) {
       if (weekMode) {
         document.body.classList.add('week-mode')
@@ -71,6 +74,14 @@ export default {
           this.locale = require('ant-design-vue/es/locale-provider/en_US').default
           break
       }
+    },
+    setHtmlTitle() {
+      const route = this.$route
+      const key = route.path === '/' ? 'home.name' : getI18nKey(route.matched[route.matched.length - 1].path)
+      document.title = process.env.VUE_APP_NAME + ' | ' + this.$t(key)
+    },
+    popContainer() {
+      return document.getElementById("popContainer")
     }
   }
 }

src/bootstrap.js

@@ -0,0 +1,25 @@
+import {loadRoutes, loadGuards, setAppOptions} from '@/utils/routerUtil'
+import {loadInterceptors} from '@/utils/request'
+import guards from '@/router/guards'
+import interceptors from '@/utils/axios-interceptors'
+
+/**
+ * 启动引导方法
+ * 应用启动时需要执行的操作放在这里
+ * @param router 应用的路由实例
+ * @param store 应用的 vuex.store 实例
+ * @param i18n 应用的 vue-i18n 实例
+ * @param i18n 应用的 message 实例
+ */
+function bootstrap({router, store, i18n, message}) {
+  // 设置应用配置
+  setAppOptions({router, store, i18n})
+  // 加载 axios 拦截器
+  loadInterceptors(interceptors, {router, store, i18n, message})
+  // 加载路由
+  loadRoutes()
+  // 加载路由守卫
+  loadGuards(guards, {router, store, i18n, message})
+}
+
+export default bootstrap

src/components/cache/AKeepAlive.js

@@ -0,0 +1,172 @@
+import {isDef, isRegExp, remove} from '@/utils/util'
+
+const patternTypes = [String, RegExp, Array]
+
+function matches (pattern, name) {
+  if (Array.isArray(pattern)) {
+    if (pattern.indexOf(name) > -1) {
+      return true
+    } else {
+      for (let item of pattern) {
+        if (isRegExp(item) && item.test(name)) {
+          return true
+        }
+      }
+      return false
+    }
+  } else if (typeof pattern === 'string') {
+    return pattern.split(',').indexOf(name) > -1
+  } else if (isRegExp(pattern)) {
+    return pattern.test(name)
+  }
+  /* istanbul ignore next */
+  return false
+}
+
+function getComponentName (opts) {
+  return opts && (opts.Ctor.options.name || opts.tag)
+}
+
+function getComponentKey (vnode) {
+  const {componentOptions, key} = vnode
+  return key == null
+    ? componentOptions.Ctor.cid + (componentOptions.tag ? `::${componentOptions.tag}` : '')
+    : key + componentOptions.Ctor.cid
+}
+
+function getFirstComponentChild (children) {
+  if (Array.isArray(children)) {
+    for (let i = 0; i < children.length; i++) {
+      const c = children[i]
+      if (isDef(c) && (isDef(c.componentOptions) || c.isAsyncPlaceholder)) {
+        return c
+      }
+    }
+  }
+}
+
+function pruneCache (keepAliveInstance, filter) {
+  const { cache, keys, _vnode } = keepAliveInstance
+  for (const key in cache) {
+    const cachedNode = cache[key]
+    if (cachedNode) {
+      const name = getComponentName(cachedNode.componentOptions)
+      const componentKey = getComponentKey(cachedNode)
+      if (name && !filter(name, componentKey)) {
+        pruneCacheEntry(cache, key, keys, _vnode)
+      }
+    }
+  }
+}
+
+function pruneCacheEntry2(cache, key, keys) {
+  const cached = cache[key]
+  if (cached) {
+    cached.componentInstance.$destroy()
+  }
+  cache[key] = null
+  remove(keys, key)
+}
+
+function pruneCacheEntry (cache, key, keys, current) {
+  const cached = cache[key]
+  if (cached && (!current || cached.tag !== current.tag)) {
+    cached.componentInstance.$destroy()
+  }
+  cache[key] = null
+  remove(keys, key)
+}
+
+export default {
+  name: 'AKeepAlive',
+  abstract: true,
+  model: {
+    prop: 'clearCaches',
+    event: 'clear',
+  },
+  props: {
+    include: patternTypes,
+    exclude: patternTypes,
+    excludeKeys: patternTypes,
+    max: [String, Number],
+    clearCaches: Array
+  },
+  watch: {
+    clearCaches: function(val) {
+      if (val && val.length > 0) {
+        const {cache, keys} = this
+        val.forEach(key => {
+          pruneCacheEntry2(cache, key, keys)
+        })
+        this.$emit('clear', [])
+      }
+    }
+  },
+
+  created() {
+    this.cache = Object.create(null)
+    this.keys = []
+  },
+
+  destroyed () {
+    for (const key in this.cache) {
+      pruneCacheEntry(this.cache, key, this.keys)
+    }
+  },
+
+  mounted () {
+    this.$watch('include', val => {
+      pruneCache(this, (name) => matches(val, name))
+    })
+    this.$watch('exclude', val => {
+      pruneCache(this, (name) => !matches(val, name))
+    })
+    this.$watch('excludeKeys', val => {
+      pruneCache(this, (name, key) => !matches(val, key))
+    })
+  },
+
+  render () {
+    const slot = this.$slots.default
+    const vnode = getFirstComponentChild(slot)
+    const componentOptions = vnode && vnode.componentOptions
+    if (componentOptions) {
+      // check pattern
+      const name = getComponentName(componentOptions)
+      const componentKey = getComponentKey(vnode)
+      const { include, exclude, excludeKeys } = this
+      if (
+        // not included
+        (include && (!name || !matches(include, name))) ||
+        // excluded
+        (exclude && name && matches(exclude, name)) ||
+        (excludeKeys && componentKey && matches(excludeKeys, componentKey))
+      ) {
+        return vnode
+      }
+
+      const { cache, keys } = this
+      const key = vnode.key == null
+        // same constructor may get registered as different local components
+        // so cid alone is not enough (#3269)
+        ? componentOptions.Ctor.cid + (componentOptions.tag ? `::${componentOptions.tag}` : '')
+        : vnode.key + componentOptions.Ctor.cid
+      if (cache[key]) {
+        vnode.componentInstance = cache[key].componentInstance
+        // make current key freshest
+        remove(keys, key)
+        keys.push(key)
+      } else {
+        cache[key] = vnode
+        keys.push(key)
+        // prune oldest entry
+        if (this.max && keys.length > parseInt(this.max)) {
+          pruneCacheEntry(cache, keys[0], keys, this._vnode)
+        }
+      }
+
+      vnode.data.keepAlive = true
+    }
+    return vnode || (slot && slot[0])
+  }
+}

src/components/chart/MiniProgress.vue

@@ -25,7 +25,7 @@ export default {
     position: relative;
     width: 100%;
     .wrap {
-      background-color: @bg-color;
+      background-color: @layout-bg-color;
       position: relative;
     }
     .progress {

src/components/chart/RankingList.vue

@@ -35,7 +35,7 @@ export default {
           line-height: 22px;
         }
         span:first-child {
-          background-color: @bg-color;
+          background-color: @layout-bg-color;
           border-radius: 20px;
           display: inline-block;
           font-size: 12px;

src/components/checkbox/ImgCheckbox.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-tooltip :title="title">
+  <a-tooltip :title="title" :overlayStyle="{zIndex: 2001}">
     <div class="img-check-box" @click="toggle">
       <img :src="img" />
       <div v-if="sChecked" class="check-item">

src/components/exception/ExceptionPage.vue

@@ -7,7 +7,7 @@
       <h1>{{config[type].title}}</h1>
       <div class="desc">{{config[type].desc}}</div>
       <div class="action">
-        <a-button type="primary" >返回首页</a-button>
+        <a-button type="primary" @click="backHome">返回首页</a-button>
       </div>
     </div>
   </div>
@@ -18,11 +18,19 @@ import Config from './typeConfig'
 
 export default {
   name: 'ExceptionPage',
-  props: ['type'],
+  props: ['type', 'homeRoute'],
   data () {
     return {
       config: Config
     }
+  },
+  methods: {
+    backHome() {
+      if (this.homeRoute) {
+        this.$router.push(this.homeRoute)
+      }
+      this.$emit('backHome', this.type)
+    }
   }
 }
 </script>

src/components/input/IInput.vue

@@ -0,0 +1,66 @@
+<template>
+  <a-input
+    :addon-after="addonAfter"
+    :addon-before="addonBefore"
+    :default-value="defaultValue"
+    :disabled="disabled"
+    :id="id"
+    :max-length="maxLength"
+    :prefix="prefix"
+    :size="size"
+    :suffix="suffix || lenSuffix"
+    :type="type"
+    :allow-clear="allowClear"
+    v-model="sValue"
+    :value="value"
+    @change="onChange"
+    @input="onInput"
+    @pressEnter="onPressEnter"
+    @keydown="onKeydown"
+  >
+    <template :slot="slot" v-for="slot in Object.keys($slots)">
+      <slot :name="slot"></slot>
+    </template>
+  </a-input>
+</template>
+
+<script>
+  export default {
+    name: 'IInput',
+    model: {
+      prop: 'value',
+      event: 'change.value'
+    },
+    props: ['addonAfter', 'addonBefore', 'defaultValue', 'disabled', 'id', 'maxLength', 'prefix', 'size', 'suffix', 'type', 'value', 'allowClear'],
+    data() {
+      return {
+        sValue: this.value || this.defaultValue || ''
+      }
+    },
+    watch: {
+      value(val) {
+        this.sValue = val
+      }
+    },
+    computed: {
+      lenSuffix() {
+        return this.maxLength && `${(this.sValue + '').length}/${this.maxLength}`
+      }
+    },
+    methods: {
+      onChange(e) {
+        this.$emit('change', e)
+        this.$emit('change.value', e.target.value)
+      },
+      onInput(e) {
+        this.$emit('input', e)
+      },
+      onPressEnter(e) {
+        this.$emit('pressEnter', e)
+      },
+      onKeydown(e) {
+        this.$emit('keydown', e)
+      }
+    }
+  }
+</script>

src/components/menu/Contextmenu.vue

@@ -33,6 +33,7 @@ export default {
       left: 0,
       top: 0,
       target: null,
+      meta: null,
       selectedKeys: []
     }
   },
@@ -45,14 +46,12 @@ export default {
     }
   },
   created () {
-    const clickHandler = () => this.closeMenu()
-    const contextMenuHandler = e => this.setPosition(e)
-    window.addEventListener('click', clickHandler)
-    window.addEventListener('contextmenu', contextMenuHandler)
-    this.$emit('hook:beforeDestroy', () => {
-      window.removeEventListener('click', clickHandler)
-      window.removeEventListener('contextmenu', contextMenuHandler)
-    })
+    window.addEventListener('click', this.closeMenu)
+    window.addEventListener('contextmenu', this.setPosition)
+  },
+  beforeDestroy() {
+    window.removeEventListener('click', this.closeMenu)
+    window.removeEventListener('contextmenu', this.setPosition)
   },
   methods: {
     closeMenu () {
@@ -62,9 +61,10 @@ export default {
       this.left = e.clientX
       this.top = e.clientY
       this.target = e.target
+      this.meta = e.meta
     },
     handleClick ({ key }) {
-      this.$emit('select', key, this.target)
+      this.$emit('select', key, this.target, this.meta)
       this.closeMenu()
     }
   }

src/components/menu/SideMenu.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-layout-sider :theme="sideTheme" :class="['side-menu', isMobile ? null : 'shadow']" width="256px" :collapsible="collapsible" v-model="collapsed" :trigger="null">
+  <a-layout-sider :theme="sideTheme" :class="['side-menu', 'beauty-scroll', isMobile ? null : 'shadow']" width="256px" :collapsible="collapsible" v-model="collapsed" :trigger="null">
     <div :class="['logo', theme]">
       <router-link to="/dashboard/workplace">
         <img src="@/assets/img/logo.png">

src/components/menu/index.less

@@ -2,7 +2,8 @@
   box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
 }
 .side-menu{
-  min-height: 100%;
+  min-height: 100vh;
+  overflow-y: auto;
   z-index: 10;
   .logo{
     height: 64px;

src/components/menu/menu.js

@@ -22,18 +22,42 @@
  *  }
  * ]
  *
- * i18n: 国际化配置。组件默认会根据 options route配置的 path 和 name 生成英文以及中文的国际化配置，如需自定义或增加其他语言，配置
+ * i18n: 国际化配置。系统默认会根据 options route配置的 path 和 name 生成英文以及中文的国际化配置，如需自定义或增加其他语言，配置
  * 此项即可。如：
  * i18n: {
- *   CN: {dashboard: {name: '监控中心'}}
- *   HK: {dashboard: {name: '監控中心'}}
+ *   messages: {
+ *     CN: {dashboard: {name: '监控中心'}}
+ *     HK: {dashboard: {name: '監控中心'}}
+ *   }
  * }
  **/
 import Menu from 'ant-design-vue/es/menu'
 import Icon from 'ant-design-vue/es/icon'
+import fastEqual from 'fast-deep-equal'
+import {getI18nKey} from '@/utils/routerUtil'
 
 const {Item, SubMenu} = Menu
 
+const resolvePath = (path, params = {}) => {
+  let _path = path
+  Object.entries(params).forEach(([key, value]) => {
+    _path = _path.replace(new RegExp(`:${key}`, 'g'), value)
+  })
+  return _path
+}
+
+const toRoutesMap = (routes) => {
+  const map = {}
+  routes.forEach(route => {
+    map[route.fullPath] = route
+    if (route.children && route.children.length > 0) {
+      const childrenMap = toRoutesMap(route.children)
+      Object.assign(map, childrenMap)
+    }
+  })
+  return map
+}
+
 export default {
   name: 'IMenu',
   props: {
@@ -56,29 +80,29 @@ export default {
       required: false,
       default: false
     },
-    i18n: Object
+    i18n: Object,
+    openKeys: Array
   },
   data () {
     return {
-      openKeys: [],
       selectedKeys: [],
+      sOpenKeys: [],
       cachedOpenKeys: []
     }
   },
   computed: {
-    rootSubmenuKeys: (vm) => {
-      let keys = []
-      vm.options.forEach(item => {
-        keys.push(item.path)
-      })
-      return keys
-    },
     menuTheme() {
       return this.theme == 'light' ? this.theme : 'dark'
+    },
+    routesMap() {
+      return toRoutesMap(this.options)
     }
   },
   created () {
     this.updateMenu()
+    if (this.options.length > 0 && !this.options[0].fullPath) {
+      this.formatOptions(this.options, '')
+    }
     // 自定义国际化配置
     if(this.i18n && this.i18n.messages) {
       const messages = this.i18n.messages
@@ -88,30 +112,62 @@ export default {
     }
   },
   watch: {
+    options(val) {
+      if (val.length > 0 && !val[0].fullPath) {
+        this.formatOptions(this.options, '')
+      }
+    },
+    i18n(val) {
+      if(val && val.messages) {
+        const messages = this.i18n.messages
+        Object.keys(messages).forEach(key => {
+          this.$i18n.mergeLocaleMessage(key, messages[key])
+        })
+      }
+    },
     collapsed (val) {
       if (val) {
-        this.cachedOpenKeys = this.openKeys
-        this.openKeys = []
+        this.cachedOpenKeys = this.sOpenKeys
+        this.sOpenKeys = []
       } else {
-        this.openKeys = this.cachedOpenKeys
+        this.sOpenKeys = this.cachedOpenKeys
       }
     },
     '$route': function () {
       this.updateMenu()
+    },
+    sOpenKeys(val) {
+      this.$emit('openChange', val)
+      this.$emit('update:openKeys', val)
     }
   },
   methods: {
-    renderIcon: function (h, icon) {
+    renderIcon: function (h, icon, key) {
+      if (this.$scopedSlots.icon && icon && icon !== 'none') {
+        const vnodes = this.$scopedSlots.icon({icon, key})
+        vnodes.forEach(vnode => {
+          vnode.data.class = vnode.data.class ? vnode.data.class : []
+          vnode.data.class.push('anticon')
+        })
+        return vnodes
+      }
       return !icon || icon == 'none' ? null : h(Icon, {props: {type:  icon}})
     },
     renderMenuItem: function (h, menu) {
+      let tag = 'router-link'
+      const path = resolvePath(menu.fullPath, menu.meta.params)
+      let config = {props: {to: {path, query: menu.meta.query}, }, attrs: {style: 'overflow:hidden;white-space:normal;text-overflow:clip;'}}
+      if (menu.meta && menu.meta.link) {
+        tag = 'a'
+        config = {attrs: {style: 'overflow:hidden;white-space:normal;text-overflow:clip;', href: menu.meta.link, target: '_blank'}}
+      }
       return h(
         Item, {key: menu.fullPath},
         [
-          h('router-link', {props: {to: menu.fullPath}},
+          h(tag, config,
             [
-              this.renderIcon(h, menu.meta ? menu.meta.icon : 'none'),
-              h('span', [this.$t(menu.fullPath.substring(1).replace(new RegExp('/', 'g'), '.') + '.name')])
+              this.renderIcon(h, menu.meta ? menu.meta.icon : 'none', menu.fullPath),
+              this.$t(getI18nKey(menu.fullPath))
             ]
           )
         ]
@@ -119,10 +175,10 @@ export default {
     },
     renderSubMenu: function (h, menu) {
       let this_ = this
-      let subItem = [h('span', {slot: 'title'},
+      let subItem = [h('span', {slot: 'title', attrs: {style: 'overflow:hidden;white-space:normal;text-overflow:clip;'}},
         [
-          this.renderIcon(h, menu.meta ? menu.meta.icon : 'none'),
-          h('span', [this.$t(menu.fullPath.substring(1).replace(new RegExp('/', 'g'), '.') + '.name')])
+          this.renderIcon(h, menu.meta ? menu.meta.icon : 'none', menu.fullPath),
+          this.$t(getI18nKey(menu.fullPath))
         ]
       )]
       let itemArr = []
@@ -159,38 +215,32 @@ export default {
       return menuArr
     },
     formatOptions(options, parentPath) {
-      let this_ = this
       options.forEach(route => {
         let isFullPath = route.path.substring(0, 1) == '/'
         route.fullPath = isFullPath ? route.path : parentPath + '/' + route.path
         if (route.children) {
-          this_.formatOptions(route.children, route.fullPath)
+          this.formatOptions(route.children, route.fullPath)
         }
       })
     },
-    onOpenChange (openKeys) {
-      const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1)
-      if (this.rootSubmenuKeys.indexOf(latestOpenKey) === -1) {
-        this.openKeys = openKeys
-      } else {
-        this.openKeys = latestOpenKey ? [latestOpenKey] : []
-      }
-    },
     updateMenu () {
-      let routes = this.$route.matched.concat()
-      const route = routes.pop()
-      this.selectedKeys = [this.getSelectedKey(route)]
-      let openKeys = []
-      routes.forEach((item) => {
-        openKeys.push(item.path)
-      })
-      this.collapsed || this.mode === 'horizontal' ? this.cachedOpenKeys = openKeys : this.openKeys = openKeys
-    },
-    getSelectedKey (route) {
-      if (route.meta.invisible && route.parent) {
-        return this.getSelectedKey(route.parent)
+      this.selectedKeys = this.getSelectedKeys()
+      let openKeys = this.selectedKeys.filter(item => item !== '')
+      openKeys = openKeys.slice(0, openKeys.length -1)
+      if (!fastEqual(openKeys, this.sOpenKeys)) {
+        this.collapsed || this.mode === 'horizontal' ? this.cachedOpenKeys = openKeys : this.sOpenKeys = openKeys
       }
-      return route.path
+    },
+    getSelectedKeys() {
+      let matches = this.$route.matched
+      const route = matches[matches.length - 1]
+      let chose = this.routesMap[route.path]
+      if (chose && chose.meta && chose.meta.highlight) {
+        chose = this.routesMap[chose.meta.highlight]
+        const resolve = this.$router.resolve({path: chose.fullPath})
+        matches = (resolve.resolved && resolve.resolved.matched) || matches
+      }
+      return matches.map(item => item.path)
     }
   },
   render (h) {
@@ -200,13 +250,15 @@ export default {
         props: {
           theme: this.menuTheme,
           mode: this.$props.mode,
-          openKeys: this.openKeys,
-          selectedKeys: this.selectedKeys
+          selectedKeys: this.selectedKeys,
+          openKeys: this.openKeys ? this.openKeys : this.sOpenKeys
         },
         on: {
-          openChange: this.onOpenChange,
-          select: (obj) => {
-            this.selectedKeys = obj.selectedKeys
+          'update:openKeys': (val) => {
+            this.sOpenKeys = val
+          },
+          click: (obj) => {
+            obj.selectedKeys = [obj.key]
             this.$emit('select', obj)
           }
         }

src/components/page/header/PageHeader.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="page-header">
-    <div :class="['page-header-wide', layout]">
+  <div :class="['page-header', layout, pageWidth]">
+    <div class="page-header-wide">
       <div class="breadcrumb">
         <a-breadcrumb>
           <a-breadcrumb-item :key="index" v-for="(item, index) in breadcrumb">
@@ -11,7 +11,7 @@
       <div class="detail">
         <div class="main">
           <div class="row">
-            <h1 v-if="title" class="title">{{title}}</h1>
+            <h1 v-if="showPageTitle && title" class="title">{{title}}</h1>
             <div class="action"><slot name="action"></slot></div>
           </div>
           <div class="row">
@@ -28,11 +28,12 @@
 </template>
 
 <script>
+import {mapState} from 'vuex'
 export default {
   name: 'PageHeader',
   props: {
     title: {
-      type: String,
+      type: [String, Boolean],
       required: false
     },
     breadcrumb: {
@@ -49,9 +50,7 @@ export default {
     },
   },
   computed: {
-    layout () {
-      return this.$store.state.setting.layout
-    }
+    ...mapState('setting', ['layout', 'showPageTitle', 'pageWidth'])
   }
 }
 </script>

src/components/page/header/index.less

@@ -1,13 +1,11 @@
 .page-header{
   background: @base-bg-color;
   padding: 16px 24px;
+  &.head.fixed{
+    margin: auto;
+    max-width: 1400px;
+  }
   .page-header-wide{
-    &.head{
-      margin: auto;
-      max-width: 1400px;
-    }
-    &.side{
-    }
     .breadcrumb{
       margin-bottom: 20px;
     }

src/components/setting/Setting.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="side-setting">
+    <setting-item>
+      <a-button @click="saveSetting" type="primary" icon="save">{{$t('save')}}</a-button>
+      <a-button @click="resetSetting" type="dashed" icon="redo" style="float: right">{{$t('reset')}}</a-button>
+    </setting-item>
     <setting-item :title="$t('theme.title')">
       <img-checkbox-group
         @change="values => setTheme({...theme, mode: values[0]})"
@@ -26,15 +30,21 @@
       >
         <img-checkbox :title="$t('navigate.side')" img="https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg" value="side"/>
         <img-checkbox :title="$t('navigate.head')" img="https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg" value="head"/>
+        <img-checkbox :title="$t('navigate.mix')" img="https://gw.alipayobjects.com/zos/antfincdn/x8Ob%26B8cy8/LCkqqYNmvBEbokSDscrm.svg" value="mix"/>
       </img-checkbox-group>
     </setting-item>
     <setting-item>
       <a-list :split="false">
         <a-list-item>
           {{$t('navigate.content.title')}}
-          <a-select size="small" defaultValue="1" slot="actions" style="width: 80px">
-            <a-select-option value="1">{{$t('navigate.content.fluid')}}</a-select-option>
-            <a-select-option value="2">{{$t('navigate.content.fixed')}}</a-select-option>
+          <a-select
+            :getPopupContainer="getPopupContainer"
+            :value="pageWidth"
+            @change="setPageWidth"
+            class="select-item" size="small" slot="actions"
+          >
+            <a-select-option value="fluid">{{$t('navigate.content.fluid')}}</a-select-option>
+            <a-select-option value="fixed">{{$t('navigate.content.fixed')}}</a-select-option>
           </a-select>
         </a-list-item>
         <a-list-item>
@@ -75,6 +85,7 @@
           {{$t('animate.effect')}}
           <a-select
             :value="animate.name"
+            :getPopupContainer="getPopupContainer"
             @change="val => setAnimate({...animate, name: val})"
             class="select-item" size="small" slot="actions"
           >
@@ -85,6 +96,7 @@
           {{$t('animate.direction')}}
           <a-select
             :value="animate.direction"
+            :getPopupContainer="getPopupContainer"
             @change="val => setAnimate({...animate, direction: val})"
             class="select-item" size="small" slot="actions"
           >
@@ -94,12 +106,13 @@
       </a-list>
     </setting-item>
     <a-alert
+      v-if="isDev"
       style="max-width: 240px; margin: -16px 0 8px; word-break: break-all"
       type="warning"
       :message="$t('alert')"
     >
     </a-alert>
-    <a-button id="copyBtn" :data-clipboard-text="copyConfig" @click="copyCode" style="width: 100%" icon="copy" >{{$t('copy')}}</a-button>
+    <a-button v-if="isDev" id="copyBtn" :data-clipboard-text="copyConfig" @click="copyCode" style="width: 100%" icon="copy" >{{$t('copy')}}</a-button>
   </div>
 </template>
 
@@ -110,7 +123,9 @@ import Clipboard from 'clipboard'
 import { mapState, mapMutations } from 'vuex'
 import {formatConfig} from '@/utils/formatter'
 import {setting} from '@/config/default'
+import sysConfig from '@/config/config'
 import fastEqual from 'fast-deep-equal'
+import deepMerge from 'deepmerge'
 
 const ColorCheckboxGroup = ColorCheckbox.Group
 const ImgCheckboxGroup = ImgCheckbox.Group
@@ -120,14 +135,15 @@ export default {
   components: {ImgCheckboxGroup, ImgCheckbox, ColorCheckboxGroup, ColorCheckbox, SettingItem},
   data() {
     return {
-      copyConfig: 'Sorry, you have copied nothing O(∩_∩)O~'
+      copyConfig: 'Sorry, you have copied nothing O(∩_∩)O~',
+      isDev: process.env.NODE_ENV === 'development'
     }
   },
   computed: {
     directions() {
       return this.animates.find(item => item.name == this.animate.name).directions
     },
-    ...mapState('setting', ['theme', 'layout', 'animate', 'animates', 'palettes', 'multiPage', 'weekMode', 'fixedHeader', 'fixedSideBar', 'hideSetting'])
+    ...mapState('setting', ['theme', 'layout', 'animate', 'animates', 'palettes', 'multiPage', 'weekMode', 'fixedHeader', 'fixedSideBar', 'hideSetting', 'pageWidth'])
   },
   watch: {
     'animate.name': function(val) {
@@ -135,30 +151,56 @@ export default {
     }
   },
   methods: {
+    getPopupContainer() {
+      return this.$el.parentNode
+    },
     copyCode () {
+      let config = this.extractConfig(false)
+      this.copyConfig = `// 自定义配置，参考 ./default/setting.config.js，需要自定义的属性在这里配置即可
+      module.exports = ${formatConfig(config)}
+      `
+      let clipboard = new Clipboard('#copyBtn')
+      clipboard.on('success', () => {
+        this.$message.success(`复制成功，覆盖文件 src/config/config.js 然后重启项目即可生效`).then(() => {
+          const localConfig = localStorage.getItem(process.env.VUE_APP_SETTING_KEY)
+          if (localConfig) {
+            console.warn('检测到本地有历史保存的主题配置，想要要拷贝的配置代码生效，您可能需要先重置配置')
+            this.$message.warn('检测到本地有历史保存的主题配置，想要要拷贝的配置代码生效，您可能需要先重置配置', 5)
+          }
+        })
+        clipboard.destroy()
+      })
+    },
+    saveSetting() {
+      const closeMessage = this.$message.loading('正在保存到本地，请稍后...', 0)
+      const config = this.extractConfig(true)
+      localStorage.setItem(process.env.VUE_APP_SETTING_KEY, JSON.stringify(config))
+      setTimeout(closeMessage, 800)
+    },
+    resetSetting() {
+      this.$confirm({
+        title: '重置主题会刷新页面，当前页面内容不会保留，确认重置？',
+        onOk() {
+          localStorage.removeItem(process.env.VUE_APP_SETTING_KEY)
+          window.location.reload()
+        }
+      })
+    },
+    //提取配置
+    extractConfig(local = false) {
       let config = {}
-      // 提取配置
       let mySetting = this.$store.state.setting
+      let dftSetting = local ? deepMerge(setting, sysConfig) : setting
       Object.keys(mySetting).forEach(key => {
-        const dftValue = setting[key], myValue = mySetting[key]
-        // 只提取与默认配置不同的配置项
+        const dftValue = dftSetting[key], myValue = mySetting[key]
         if (dftValue != undefined && !fastEqual(dftValue, myValue)) {
           config[key] = myValue
         }
       })
-      this.copyConfig = '// 自定义配置，参考 ./default/setting.config.js，需要自定义的属性在这里配置即可\n'
-      this.copyConfig += 'module.exports = '
-      this.copyConfig += formatConfig(config)
-
-      let clipboard = new Clipboard('#copyBtn')
-      const _this = this
-      clipboard.on('success', function () {
-        _this.$message.success(`复制成功，覆盖文件 src/config/config.js 然后重启项目即可生效`)
-        clipboard.destroy()
-      })
+      return config
     },
     ...mapMutations('setting', ['setTheme', 'setLayout', 'setMultiPage', 'setWeekMode',
-      'setFixedSideBar', 'setFixedHeader', 'setAnimate', 'setHideSetting'])
+      'setFixedSideBar', 'setFixedHeader', 'setAnimate', 'setHideSetting', 'setPageWidth'])
   }
 }
 </script>

src/components/setting/SettingItem.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="setting-item">
-    <h3 class="title">{{title}}</h3>
+    <h3 v-if="title" class="title">{{title}}</h3>
     <slot></slot>
   </div>
 </template>

src/components/setting/i18n.js

@@ -12,6 +12,7 @@ module.exports = {
         title: '导航设置',
         side: '侧边导航',
         head: '顶部导航',
+        mix: '混合导航',
         content: {
           title: '内容区域宽度',
           fluid: '流式',
@@ -33,7 +34,9 @@ module.exports = {
         direction: '动画方向'
       },
       alert: '拷贝配置后，直接覆盖文件 src/config/config.js 中的全部内容，然后重启即可。（注意：仅会拷贝与默认配置不同的项）',
-      copy: '拷贝配置'
+      copy: '拷贝配置',
+      save: '保存配置',
+      reset: '重置配置',
     },
     HK: {
       theme: {
@@ -68,7 +71,9 @@ module.exports = {
         direction: '動畫方向'
       },
       alert: '拷貝配置后，直接覆蓋文件 src/config/config.js 中的全部內容，然後重啟即可。（注意：僅會拷貝與默認配置不同的項）',
-      copy: '拷貝配置'
+      copy: '拷貝配置',
+      save: '保存配置',
+      reset: '重置配置',
     },
     US: {
       theme: {
@@ -82,6 +87,7 @@ module.exports = {
         title: 'Navigation Mode',
         side: 'Side Menu Layout',
         head: 'Top Menu Layout',
+        mix: 'Mix Menu Layout',
         content: {
           title: 'Content Width',
           fluid: 'Fluid',
@@ -103,7 +109,9 @@ module.exports = {
         direction: 'Direction'
       },
       alert: 'After copying the configuration code, directly cover all contents in the file src/config/config.js, then restart the server. (Note: only items that are different from the default configuration will be copied)',
-      copy: 'Copy Setting'
+      copy: 'Copy Setting',
+      save: 'Save',
+      reset: 'Reset',
     }
   }
 }

src/components/table/StandardTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="standard-table">
     <div class="alert">
-      <a-alert type="info" :show-icon="true">
+      <a-alert type="info" :show-icon="true" v-if="selectedRows">
         <div class="message" slot="message">
           已选择&nbsp;<a>{{selectedRows.length}}</a>&nbsp;项 <a class="clear" @click="onClear">清空</a>
           <template  v-for="(item, index) in needTotalList" >
@@ -20,11 +20,20 @@
       :dataSource="dataSource"
       :rowKey="rowKey"
       :pagination="pagination"
-      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: updateSelect}"
+      :expandedRowKeys="expandedRowKeys"
+      :expandedRowRender="expandedRowRender"
+      @change="onChange"
+      :rowSelection="selectedRows ? {selectedRowKeys, onSelect, onSelectAll} : undefined"
     >
-      <template slot-scope="text, record, index" :slot="slot" v-for="slot in scopedSlots">
+      <template slot-scope="text, record, index" :slot="slot" v-for="slot in Object.keys($scopedSlots).filter(key => key !== 'expandedRowRender') ">
         <slot :name="slot" v-bind="{text, record, index}"></slot>
       </template>
+      <template :slot="slot" v-for="slot in Object.keys($slots)">
+        <slot :name="slot"></slot>
+      </template>
+      <template slot-scope="record, index, indent, expanded" :slot="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''">
+        <slot v-bind="{record, index, indent, expanded}" :name="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''"></slot>
+      </template>
     </a-table>
   </div>
 </template>
@@ -32,38 +41,100 @@
 <script>
 export default {
   name: 'StandardTable',
-  props: ['bordered', 'loading', 'columns', 'dataSource', 'rowKey', 'pagination', 'selectedRows'],
+  props: {
+    bordered: Boolean,
+    loading: [Boolean, Object],
+    columns: Array,
+    dataSource: Array,
+    rowKey: {
+      type: [String, Function],
+      default: 'key'
+    },
+    pagination: {
+      type: [Object, Boolean],
+      default: true
+    },
+    selectedRows: Array,
+    expandedRowKeys: Array,
+    expandedRowRender: Function
+  },
   data () {
     return {
-      needTotalList: [],
-      scopedSlots: []
+      needTotalList: []
     }
   },
   methods: {
-    updateSelect (selectedRowKeys, selectedRows) {
-      this.$emit('update:selectedRows', selectedRows)
-      this.$emit('change', selectedRowKeys, selectedRows)
+    equals(record1, record2) {
+      if (record1 === record2) {
+        return true
+      }
+      const {rowKey} = this
+      if (rowKey && typeof rowKey === 'string') {
+        return record1[rowKey] === record2[rowKey]
+      } else if (rowKey && typeof rowKey === 'function') {
+        return rowKey(record1) === rowKey(record2)
+      }
+      return false
+    },
+    contains(arr, item) {
+      if (!arr || arr.length === 0) {
+        return false
+      }
+      const {equals} = this
+      for (let i = 0; i < arr.length; i++) {
+        if (equals(arr[i], item)) {
+          return true
+        }
+      }
+      return false
+    },
+    onSelectAll(selected, rows) {
+      const {getKey, contains} = this
+      const unselected = this.dataSource.filter(item => !contains(rows, item, this.rowKey))
+      const _selectedRows = this.selectedRows.filter(item => !contains(unselected, item, this.rowKey))
+      const set = {}
+      _selectedRows.forEach(item => set[getKey(item)] = item)
+      rows.forEach(item => set[getKey(item)] = item)
+      const _rows = Object.values(set)
+      this.$emit('update:selectedRows', _rows)
+      this.$emit('selectedRowChange', _rows.map(item => getKey(item)), _rows)
+    },
+    getKey(record) {
+      const {rowKey} = this
+      if (!rowKey || !record) {
+        return undefined
+      }
+      if (typeof rowKey === 'string') {
+        return record[rowKey]
+      } else {
+        return rowKey(record)
+      }
+    },
+    onSelect(record, selected) {
+      const {equals, selectedRows, getKey} = this
+      const _selectedRows = selected ? [...selectedRows, record] : selectedRows.filter(row => !equals(row, record))
+      this.$emit('update:selectedRows', _selectedRows)
+      this.$emit('selectedRowChange', _selectedRows.map(item => getKey(item)), _selectedRows)
     },
     initTotalList (columns) {
-      const totalList = []
-      columns.forEach(column => {
-        if (column.needTotal) {
-          totalList.push({...column, total: 0})
-        }
-      })
-      return totalList
-    },
-    getScopedSlots(columns) {
-      return columns.filter(item => item.scopedSlots && item.scopedSlots.customRender)
-        .map(item => item.scopedSlots.customRender)
+      return columns.filter(item => item.needTotal)
+        .map(item => {
+          return {
+            ...item,
+            total: 0
+          }
+        })
     },
     onClear() {
-      this.updateSelect([], [])
+      this.$emit('update:selectedRows', [])
+      this.$emit('selectedRowChange', [], [])
       this.$emit('clear')
+    },
+    onChange(pagination, filters, sorter, {currentDataSource}) {
+      this.$emit('change', pagination, filters, sorter, {currentDataSource})
     }
   },
   created () {
-    this.scopedSlots = this.getScopedSlots(this.columns)
     this.needTotalList = this.initTotalList(this.columns)
   },
   watch: {
@@ -72,7 +143,14 @@ export default {
         return {
           ...item,
           total: selectedRows.reduce((sum, val) => {
-            return sum + val[item.dataIndex]
+            let v
+            try{
+              v = val[item.dataIndex] ? val[item.dataIndex] : eval(`val.${item.dataIndex}`);
+            }catch(_){
+              v = val[item.dataIndex];
+            }
+            v = !isNaN(parseFloat(v)) ? parseFloat(v) : 0;
+            return sum + v
           }, 0)
         }
       })
@@ -80,8 +158,8 @@ export default {
   },
   computed: {
     selectedRowKeys() {
-      return this.selectedRows.map(row => row.key)
-    }
+      return this.selectedRows.map(record => this.getKey(record))
+    },
   }
 }
 </script>

src/components/table/advance/ActionColumns.vue

@@ -0,0 +1,155 @@
+<template>
+  <div class="action-columns" ref="root">
+      <a-popover v-model="visible" placement="bottomRight" trigger="click" :get-popup-container="() => $refs.root">
+        <div slot="title">
+          <a-checkbox :indeterminate="indeterminate" :checked="checkAll" @change="onCheckAllChange" class="check-all" />列展示
+          <a-button @click="resetColumns" style="float: right" type="link" size="small">重置</a-button>
+        </div>
+        <a-list style="width: 100%" size="small" :key="i" v-for="(col, i) in columns" slot="content">
+          <a-list-item>
+            <a-checkbox v-model="col.visible" @change="e => onCheckChange(e, col)"/>
+            <template v-if="col.title">
+              {{col.title}}:
+            </template>
+            <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+            <template slot="actions">
+              <a-tooltip title="固定在列头" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
+                <a-icon :class="['left', {active: col.fixed === 'left'}]" @click="fixColumn('left', col)" type="vertical-align-top" />
+              </a-tooltip>
+              <a-tooltip title="固定在列尾" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
+                <a-icon :class="['right', {active: col.fixed === 'right'}]" @click="fixColumn('right', col)" type="vertical-align-bottom" />
+              </a-tooltip>
+              <a-tooltip title="添加搜索" :mouseEnterDelay="0.5" :get-popup-container="() => $refs.root">
+                <a-icon :class="{active: col.searchAble}" @click="setSearch(col)" type="search" />
+              </a-tooltip>
+            </template>
+          </a-list-item>
+        </a-list>
+        <a-icon class="action" type="setting" />
+      </a-popover>
+  </div>
+</template>
+
+<script>
+  import cloneDeep from 'lodash.clonedeep'
+
+  export default {
+    name: 'ActionColumns',
+    props: ['columns', 'visibleColumns'],
+    data() {
+      return {
+        visible: false,
+        indeterminate: false,
+        checkAll: true,
+        checkedCounts: this.columns.length,
+        backColumns: cloneDeep(this.columns)
+      }
+    },
+    watch: {
+      checkedCounts(val) {
+        this.checkAll = val === this.columns.length
+        this.indeterminate = val > 0 && val < this.columns.length
+      },
+      columns(newVal, oldVal) {
+        if (newVal != oldVal) {
+          this.checkedCounts = newVal.length
+          this.formatColumns(newVal)
+        }
+      }
+    },
+    created() {
+      this.formatColumns(this.columns)
+    },
+    methods: {
+      onCheckChange(e, col) {
+        if (!col.visible) {
+          this.checkedCounts -= 1
+        } else {
+          this.checkedCounts += 1
+        }
+      },
+      fixColumn(fixed, col) {
+        if (fixed !== col.fixed) {
+          this.$set(col, 'fixed', fixed)
+        } else {
+          this.$set(col, 'fixed', undefined)
+        }
+      },
+      setSearch(col) {
+        this.$set(col, 'searchAble', !col.searchAble)
+        if (!col.searchAble && col.search) {
+          this.resetSearch(col)
+        }
+      },
+      resetSearch(col) {
+        // col.search.value = col.dataType === 'boolean' ? false : undefined
+        col.search.value = undefined
+        col.search.backup = undefined
+      },
+      resetColumns() {
+        const {columns, backColumns} = this
+        let counts = columns.length
+        backColumns.forEach((back, index) => {
+          const column = columns[index]
+          column.visible = back.visible === undefined || back.visible
+          if (!column.visible) {
+            counts -= 1
+          }
+          if (back.fixed !== undefined) {
+            column.fixed = back.fixed
+          } else {
+            this.$set(column, 'fixed', undefined)
+          }
+          this.$set(column, 'searchAble', back.searchAble)
+          // column.searchAble = back.searchAble
+          this.resetSearch(column)
+        })
+        this.checkedCounts = counts
+        this.visible = false
+        this.$emit('reset', this.getConditions(columns))
+      },
+      onCheckAllChange(e) {
+        if (e.target.checked) {
+          this.checkedCounts = this.columns.length
+          this.columns.forEach(col => col.visible = true)
+        } else {
+          this.checkedCounts = 0
+          this.columns.forEach(col => col.visible = false)
+        }
+      },
+      getConditions(columns) {
+        const conditions = {}
+        columns.filter(item => item.search.value !== undefined && item.search.value !== '' && item.search.value !== null)
+          .forEach(col => {
+            conditions[col.dataIndex] = col.search.value
+          })
+        return conditions
+      },
+      formatColumns(columns) {
+        for (let col of columns) {
+          if (col.visible === undefined) {
+            this.$set(col, 'visible', true)
+          }
+          if (!col.visible) {
+            this.checkedCounts -= 1
+          }
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.action-columns{
+  display: inline-block;
+  .check-all{
+    margin-right: 8px;
+  }
+  .left,.right{
+    transform: rotate(-90deg);
+  }
+  .active{
+    color: @primary-color;
+  }
+}
+</style>

src/components/table/advance/ActionSize.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="action-size" ref="root">
+    <a-tooltip title="密度">
+      <a-dropdown placement="bottomCenter" :trigger="['click']" :get-popup-container="() => $refs.root">
+        <a-icon class="action" type="column-height" />
+        <a-menu :selected-keys="[value]" slot="overlay" @click="onClick">
+          <a-menu-item key="default">
+            默认
+          </a-menu-item>
+          <a-menu-item key="middle">
+            中等
+          </a-menu-item>
+          <a-menu-item key="small">
+            紧密
+          </a-menu-item>
+        </a-menu>
+      </a-dropdown>
+    </a-tooltip>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'ActionSize',
+    props: ['value'],
+    inject: ['table'],
+    data() {
+      return {
+        selectedKeys: ['middle']
+      }
+    },
+    methods: {
+      onClick({key}) {
+        this.$emit('input', key)
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.action-size{
+  display: inline-block;
+}
+</style>

src/components/table/advance/AdvanceTable.vue

@@ -0,0 +1,249 @@
+<template>
+  <div ref="table" :id="id" class="advanced-table">
+    <a-spin :spinning="loading">
+    <div :class="['header-bar', size]">
+      <div class="title">
+        <template v-if="title">{{title}}</template>
+        <slot v-else-if="$slots.title" name="title"></slot>
+        <template v-else>高级表格</template>
+      </div>
+      <div class="search">
+        <search-area :format-conditions="formatConditions" @change="onSearchChange" :columns="columns" >
+          <template :slot="slot" v-for="slot in slots">
+            <slot :name="slot"></slot>
+          </template>
+        </search-area>
+      </div>
+      <div class="actions">
+        <a-tooltip title="刷新">
+          <a-icon @click="refresh" class="action" :type="loading ? 'loading' : 'reload'" />
+        </a-tooltip>
+        <action-size v-model="sSize" class="action" />
+        <a-tooltip title="列配置">
+          <action-columns :columns="columns" @reset="onColumnsReset" class="action">
+            <template :slot="slot" v-for="slot in slots">
+              <slot :name="slot"></slot>
+            </template>
+          </action-columns>
+        </a-tooltip>
+        <a-tooltip title="全屏">
+          <a-icon @click="toggleScreen" class="action" :type="fullScreen ? 'fullscreen-exit' : 'fullscreen'" />
+        </a-tooltip>
+      </div>
+    </div>
+    <a-table
+      v-bind="{...$props, columns: visibleColumns, title: undefined, loading: false}"
+      :size="sSize"
+      @expandedRowsChange="onExpandedRowsChange"
+      @change="onChange"
+      @expand="onExpand"
+    >
+      <template slot-scope="text, record, index" :slot="slot" v-for="slot in scopedSlots ">
+        <slot :name="slot" v-bind="{text, record, index}"></slot>
+      </template>
+      <template :slot="slot" v-for="slot in slots">
+        <slot :name="slot"></slot>
+      </template>
+      <template slot-scope="record, index, indent, expanded" :slot="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''">
+        <slot v-bind="{record, index, indent, expanded}" :name="$scopedSlots.expandedRowRender ? 'expandedRowRender' : ''"></slot>
+      </template>
+    </a-table>
+    </a-spin>
+  </div>
+</template>
+
+<script>
+  import ActionSize from '@/components/table/advance/ActionSize'
+  import ActionColumns from '@/components/table/advance/ActionColumns'
+  import SearchArea from '@/components/table/advance/SearchArea'
+  export default {
+    name: 'AdvanceTable',
+    components: {SearchArea, ActionColumns, ActionSize},
+    props: {
+      tableLayout: String,
+      bordered: Boolean,
+      childrenColumnName: {type: String, default: 'children'},
+      columns: Array,
+      components: Object,
+      dataSource: Array,
+      defaultExpandAllRows: Array[String],
+      expandedRowKeys: Array[String],
+      expandedRowRender: Function,
+      expandIcon: Function,
+      expandRowByClick: Boolean,
+      expandIconColumnIndex: Number,
+      footer: Function,
+      indentSize: Number,
+      loading: Boolean,
+      locale: Object,
+      pagination: [Object, Boolean],
+      rowClassName: Function,
+      rowKey: [String, Function],
+      rowSelection: Object,
+      scroll: Object,
+      showHeader: {type: Boolean, default: true},
+      size: String,
+      title: String,
+      customHeaderRow: Function,
+      customRow: Function,
+      getPopupContainer: Function,
+      transformCellText: Function,
+      formatConditions: Boolean
+    },
+    provide() {
+      return {
+        table: this
+      }
+    },
+    data() {
+      return {
+        id: `${new Date().getTime()}-${Math.floor(Math.random() * 10)}`,
+        sSize: this.size || 'default',
+        fullScreen: false,
+        conditions: {}
+      }
+    },
+    computed: {
+      slots() {
+        return Object.keys(this.$slots).filter(slot => slot !== 'title')
+      },
+      scopedSlots() {
+        return Object.keys(this.$scopedSlots).filter(slot => slot !== 'expandedRowRender' && slot !== 'title')
+      },
+      visibleColumns(){
+        return this.columns.filter(col => col.visible)
+      }
+    },
+    created() {
+      this.addListener()
+    },
+    beforeDestroy() {
+      this.removeListener()
+    },
+    methods: {
+      refresh() {
+        this.$emit('refresh', this.conditions)
+      },
+      onSearchChange(conditions, searchOptions) {
+        this.conditions = conditions
+        this.$emit('search', conditions, searchOptions)
+      },
+      toggleScreen() {
+        if (this.fullScreen) {
+          this.outFullScreen()
+        } else {
+          this.inFullScreen()
+        }
+      },
+      inFullScreen() {
+        const el = this.$refs.table
+        el.classList.add('beauty-scroll')
+        if (el.requestFullscreen) {
+          el.requestFullscreen()
+          return true
+        } else if (el.webkitRequestFullScreen) {
+          el.webkitRequestFullScreen()
+          return true
+        } else if (el.mozRequestFullScreen) {
+          el.mozRequestFullScreen()
+          return true
+        } else if (el.msRequestFullscreen) {
+          el.msRequestFullscreen()
+          return true
+        }
+        this.$message.warn('对不起，您的浏览器不支持全屏模式')
+        el.classList.remove('beauty-scroll')
+        return false
+      },
+      outFullScreen() {
+        if (document.exitFullscreen) {
+          document.exitFullscreen()
+        } else if (document.webkitCancelFullScreen) {
+          document.webkitCancelFullScreen();
+        } else if (document.mozCancelFullScreen) {
+          document.mozCancelFullScreen()
+        } else if (document.msExitFullscreen) {
+          document.msExitFullscreen()
+        }
+        this.$refs.table.classList.remove('beauty-scroll')
+      },
+      onColumnsReset(conditions) {
+        this.$emit('reset', conditions)
+      },
+      onExpandedRowsChange(expandedRows) {
+        this.$emit('expandedRowsChange', expandedRows)
+      },
+      onChange(pagination, filters, sorter, options) {
+        this.$emit('change', pagination, filters, sorter, options)
+      },
+      onExpand(expanded, record) {
+        this.$emit('expand', expanded, record)
+      },
+      addListener() {
+        document.addEventListener('fullscreenchange', this.fullScreenListener)
+        document.addEventListener('webkitfullscreenchange', this.fullScreenListener)
+        document.addEventListener('mozfullscreenchange', this.fullScreenListener)
+        document.addEventListener('msfullscreenchange', this.fullScreenListener)
+      },
+      removeListener() {
+        document.removeEventListener('fullscreenchange', this.fullScreenListener)
+        document.removeEventListener('webkitfullscreenchange', this.fullScreenListener)
+        document.removeEventListener('mozfullscreenchange', this.fullScreenListener)
+        document.removeEventListener('msfullscreenchange', this.fullScreenListener)
+      },
+      fullScreenListener(e) {
+        if (e.target.id === this.id) {
+          this.fullScreen = !this.fullScreen
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.advanced-table{
+  overflow-y: auto;
+  background-color: @component-background;
+  .header-bar{
+    padding: 16px 24px;
+    display: flex;
+    align-items: center;
+    border-radius: 4px;
+    transition: all 0.3s;
+    &.middle{
+      padding: 12px 16px;
+    }
+    &.small{
+      padding: 8px 12px;
+      border: 1px solid @border-color;
+      border-bottom: 0;
+      .title{
+        font-size: 16px;
+      }
+    }
+    .title{
+      transition: all 0.3s;
+      font-size: 18px;
+      color: @title-color;
+      font-weight: 700;
+    }
+    .search{
+      flex: 1;
+      text-align: right;
+      margin: 0 24px;
+    }
+    .actions{
+      text-align: right;
+      font-size: 17px;
+      color: @text-color;
+      .action{
+        margin: 0 8px;
+        cursor: pointer;
+        &:hover{
+          color: @primary-color;
+        }
+      }
+    }
+  }
+}
+</style>

src/components/table/advance/SearchArea.vue

@@ -0,0 +1,313 @@
+<template>
+  <div class="search-area" ref="root">
+    <div class="select-root" ref="selectRoot"></div>
+    <div class="search-item" :key="index" v-for="(col, index) in searchCols">
+      <div v-if="col.dataType === 'boolean'" :class="['title', {active: col.search.value !== undefined}]">
+        <template v-if="col.title">
+          {{col.title}}:
+        </template>
+        <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+        <a-switch @change="onSwitchChange(col)" class="switch" v-model="col.search.value" size="small"
+                  :checked-children="(col.search.switchOptions && col.search.switchOptions.checkedText) || '是'"
+                  :un-checked-children="(col.search.switchOptions && col.search.switchOptions.uncheckedText) || '否'"
+        />
+        <a-icon v-if="col.search.value !== undefined" class="close" @click="e => onCloseClick(e, col)" type="close-circle" theme="filled" />
+      </div>
+      <div v-else-if="col.dataType === 'time'" :class="['title', {active: col.search.value}]">
+        <template v-if="col.title">
+          {{col.title}}:
+        </template>
+        <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+        <a-time-picker :format="col.search.format" v-model="col.search.value" placeholder="选择时间" @change="(time, timeStr) => onCalendarChange(time, timeStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="time-picker" size="small" :get-popup-container="() => $refs.root"/>
+      </div>
+      <div v-else-if="col.dataType === 'date'" :class="['title', {active: col.search.value}]">
+        <template v-if="col.title">
+          {{col.title}}:
+        </template>
+        <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+        <a-date-picker :format="col.search.format" v-model="col.search.value" @change="onDateChange(col)" class="date-picker" size="small" :getCalendarContainer="() => $refs.root"/>
+      </div>
+      <div v-else-if="col.dataType === 'datetime'" class="title datetime active">
+        <template v-if="col.title">
+          {{col.title}}:
+        </template>
+        <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+        <a-date-picker :format="col.search.format" v-model="col.search.value" @change="(date, dateStr) => onCalendarChange(date, dateStr, col)" @openChange="open => onCalendarOpenChange(open, col)" class="datetime-picker" size="small" show-time :getCalendarContainer="() => $refs.root"/>
+      </div>
+      <div v-else-if="col.dataType === 'select'" :class="['title', {active: col.search.value !== undefined}]">
+        <template v-if="col.title">
+          {{col.title}}:
+        </template>
+        <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+        <a-select :allowClear="true" :options="col.search.selectOptions" v-model="col.search.value" placeholder="请选择..." @change="onSelectChange(col)" class="select" slot="content" size="small" :get-popup-container="() => $refs.selectRoot">
+        </a-select>
+      </div>
+      <div v-else :class="['title', {active: col.search.value}]">
+        <a-popover @visibleChange="onVisibleChange(col, index)" v-model="col.search.visible" placement="bottom" :trigger="['click']" :get-popup-container="() => $refs.root">
+          <template v-if="col.title">
+            {{col.title}}
+          </template>
+          <slot v-else-if="col.slots && col.slots.title" :name="col.slots.title"></slot>
+          <div class="value " v-if="col.search.value">:&nbsp;&nbsp;{{col.search.format && typeof col.search.format === 'function' ? col.search.format(col.search.value) : col.search.value}}</div>
+          <a-icon v-if="!col.search.value" class="icon-down" type="down"/>
+          <div class="operations" slot="content">
+            <a-button @click="onCancel(col)" class="btn" size="small" type="link">取消</a-button>
+            <a-button @click="onConfirm(col)" class="btn" size="small" type="primary">确认</a-button>
+          </div>
+          <div class="search-overlay" slot="title">
+            <a-input :id="`${searchIdPrefix}${index}`" :allow-clear="true" @keyup.esc="onCancel(col)" @keyup.enter="onConfirm(col)" v-model="col.search.value" size="small" />
+          </div>
+        </a-popover>
+        <a-icon v-if="col.search.value" @click="e => onCloseClick(e, col)" class="close" type="close-circle" theme="filled"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import fastEqual from 'fast-deep-equal'
+  import moment from 'moment'
+
+  export default {
+    name: 'SearchArea',
+    props: ['columns', 'formatConditions'],
+    inject: ['table'],
+    created() {
+      this.formatColumns(this.columns)
+    },
+    watch: {
+      columns(newVal, oldVal) {
+        if (newVal != oldVal) {
+          this.formatColumns(newVal)
+        }
+      },
+      searchCols(newVal, oldVal) {
+        if (newVal.length != oldVal.length) {
+          const newConditions = this.getConditions(newVal)
+          const newSearchOptions = this.getSearchOptions(newVal)
+          if (!fastEqual(newConditions, this.conditions)) {
+            this.conditions = newConditions
+            this.searchOptions = newSearchOptions
+            this.$emit('change', this.conditions, this.searchOptions)
+          }
+        }
+      }
+    },
+    data() {
+      return {
+        conditions: {},
+        searchOptions: []
+      }
+    },
+    computed: {
+      searchCols() {
+        return this.columns.filter(item => item.searchAble)
+      },
+      searchIdPrefix() {
+        return this.table.id + '-ipt-'
+      }
+    },
+    methods: {
+      onCloseClick(e, col) {
+        e.preventDefault()
+        e.stopPropagation()
+        col.search.value = undefined
+        const {backup, value} = col.search
+        if (backup !== value) {
+          this.backupAndEmitChange(col)
+        }
+      },
+      onCancel(col) {
+        col.search.value = col.search.backup
+        col.search.visible = false
+      },
+      onConfirm(col) {
+        const {backup, value} = col.search
+        col.search.visible = false
+        if (backup !== value) {
+          this.backupAndEmitChange(col)
+        }
+      },
+      onSwitchChange(col) {
+        const {backup, value} = col.search
+        if (backup !== value) {
+          this.backupAndEmitChange(col)
+        }
+      },
+      onSelectChange(col) {
+        this.backupAndEmitChange(col)
+      },
+      onCalendarOpenChange(open, col) {
+        col.search.visible = open
+        const {momentEqual, backupAndEmitChange} = this
+        const {value, backup, format} = col.search
+        if (!open && !momentEqual(value, backup, format)) {
+          backupAndEmitChange(col, moment(value))
+        }
+      },
+      onCalendarChange(date, dateStr, col) {
+        const {momentEqual, backupAndEmitChange} = this
+        const {value, backup, format} = col.search
+        if (!col.search.visible && !momentEqual(value, backup, format)) {
+          backupAndEmitChange(col, moment(value))
+        }
+      },
+      onDateChange(col) {
+        const {momentEqual, backupAndEmitChange} = this
+        const {value, backup, format} = col.search
+        if (!momentEqual(value, backup, format)) {
+          backupAndEmitChange(col, moment(value))
+        }
+      },
+      getFormat(col) {
+        if (col.search && col.search.format) {
+          return col.search.format
+        }
+        const dataType = col.dataType
+        switch(dataType) {
+          case 'time': return 'HH:mm:ss'
+          case 'date': return 'YYYY-MM-DD'
+          case 'datetime': return 'YYYY-MM-DD HH:mm:ss'
+          default: return undefined
+        }
+      },
+      backupAndEmitChange(col, backValue = col.search.value) {
+        const {getConditions, getSearchOptions} = this
+        col.search.backup = backValue
+        this.conditions = getConditions(this.searchCols)
+        this.searchOptions = getSearchOptions(this.searchCols)
+        this.$emit('change', this.conditions, this.searchOptions)
+      },
+      getConditions(columns) {
+        const conditions = {}
+        columns.filter(item => item.search.value !== undefined && item.search.value !== '' && item.search.value !== null)
+          .forEach(col => {
+            const {value, format} = col.search
+            if (this.formatConditions && format) {
+              if (typeof format === 'function') {
+                conditions[col.dataIndex] = format(col.search.value)
+              } else if (typeof format === 'string' && value.constructor.name === 'Moment') {
+                conditions[col.dataIndex] = value.format(format)
+              } else {
+                conditions[col.dataIndex] = value
+              }
+            } else {
+              conditions[col.dataIndex] = value
+            }
+          })
+        return conditions
+      },
+      getSearchOptions(columns) {
+        return columns.filter(item => item.search.value !== undefined && item.search.value !== '' && item.search.value !== null)
+          .map(({dataIndex, search}) => ({field: dataIndex, value: search.value, format: search.format}))
+      },
+      onVisibleChange(col, index) {
+        if (!col.search.visible) {
+          col.search.value = col.search.backup
+        } else {
+          let input = document.getElementById(`${this.searchIdPrefix}${index}`)
+          if (input) {
+            setTimeout(() => {input.focus()}, 0)
+          } else {
+            this.$nextTick(() => {
+              input = document.getElementById(`${this.searchIdPrefix}${index}`)
+              input.focus()
+            })
+          }
+        }
+      },
+      momentEqual(target, source, format) {
+        if (target === source) {
+          return true
+        } else if (target && source && target.format(format) === source.format(format)) {
+          return true
+        }
+        return false
+      },
+      formatColumns(columns) {
+        columns.forEach(item => {
+          this.$set(item, 'search', {...item.search, visible: false, value: undefined, format: this.getFormat(item)})
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.search-area{
+  .select-root{
+    text-align: left;
+  }
+  margin: -4px 0;
+  .search-item{
+    margin: 4px 4px;
+    display: inline-block;
+    .title{
+      padding: 4px 8px;
+      cursor: pointer;
+      border-radius: 4px;
+      user-select: none;
+      display: inline-flex;
+      align-items: center;
+      .close{
+        color: @text-color-second;
+        margin-left: 4px;
+        font-size: 12px;
+        vertical-align: middle;
+        :hover{
+          color: @text-color;
+        }
+      }
+      .switch{
+        margin-left: 4px;
+      }
+      .time-picker{
+        margin-left: 4px;
+        width: 96px;
+      }
+      .date-picker{
+        margin-left: 4px;
+        width: 120px;
+      }
+      .datetime-picker{
+        margin-left: 4px;
+        width: 195px;
+      }
+      .value{
+        display: inline-block;
+        overflow: hidden;
+        flex:1;
+        vertical-align: middle;
+        max-width: 144px;
+        text-overflow: ellipsis;
+        word-break: break-all;
+        white-space: nowrap;
+      }
+      &.active{
+        background-color: @layout-bg-color;
+      }
+    }
+    .icon-down{
+      vertical-align: middle;
+      font-size: 12px;
+    }
+  }
+  .search-overlay{
+    padding: 8px 0px;
+    text-align: center;
+  }
+  .select{
+    margin-left: 4px;
+    max-width: 144px;
+    min-width: 96px;
+    text-align: left;
+  }
+  .operations{
+    display: flex;
+    margin: -6px 0;
+    justify-content: space-between;
+    .btn{
+    }
+  }
+}
+</style>

src/components/table/advance/index.js

@@ -0,0 +1,2 @@
+import AdvanceTable from './AdvanceTable'
+export default AdvanceTable

src/components/table/api/ApiTable.vue

@@ -0,0 +1,49 @@
+<template>
+  <a-table :data-source="apiSource" :pagination="false">
+    <h2 v-if="title" style="margin: 0 16px 0" slot="title">{{title}}</h2>
+    <a-table-column width="20%" data-index="param" title="参数">
+      <div slot-scope="text" v-html="text"></div>
+    </a-table-column>
+    <a-table-column width="50%" data-index="desc" title="说明">
+      <div slot-scope="text" v-html="text"></div>
+    </a-table-column>
+    <a-table-column v-if="isApi" width="15%" data-index="type" title="类型">
+      <div slot-scope="text" v-html="text"></div>
+    </a-table-column>
+    <a-table-column v-if="isApi" width="15%" data-index="default" title="默认值">
+      <div slot-scope="text" v-html="text"></div>
+    </a-table-column>
+    <a-table-column v-if="!isApi" width="30%" data-index="callback" title="回调函数">
+      <div slot-scope="text" v-html="text"></div>
+    </a-table-column>
+  </a-table>
+</template>
+
+<script>
+  export default {
+    name: 'ApiTable',
+    props: {
+      title: {
+        type: String,
+        default: 'API'
+      },
+      type: {
+        type: String,
+        default: 'api',
+        validator(value) {
+          return ['api', 'event'].includes(value)
+        }
+      },
+      apiSource: Array
+    },
+    computed: {
+      isApi() {
+        return this.type === 'api'
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/components/tool/AvatarList.vue

@@ -35,7 +35,7 @@ const Item = {
     return h(
       'li',
       {class: 'avatar-item'},
-      [!this.$props.tips ? h(ATooltip, {props: {title: this.$props.tips}}, [avatar]) : avatar]
+      [this.$props.tips ? h(ATooltip, {props: {title: this.$props.tips}}, [avatar]) : avatar]
     )
   }
 }

src/config/config.js

@@ -2,11 +2,11 @@
 module.exports = {
   theme: {
     color: '#13c2c2',
-    mode: 'night'
+    mode: 'dark',
   },
   multiPage: true,
   animate: {
-    name: 'roll',
-    direction: 'default'
+    name: 'lightSpeed',
+    direction: 'left'
   }
 }

src/config/default/antd.config.js

@@ -22,19 +22,22 @@ const ANTD = {
       'component-background': '#fff',
       'heading-color': 'rgba(0, 0, 0, 0.85)',
       'text-color': 'rgba(0, 0, 0, 0.65)',
-      'text-color-inverse': '#fff',
+      'text-color-inverse': '#fefefe',
       'text-color-secondary': 'rgba(0, 0, 0, 0.45)',
       'shadow-color': 'rgba(0, 0, 0, 0.15)',
       'border-color-split': '#f0f0f0',
+      'border-color-base': '#d9d9d9',
       'background-color-light': '#fafafa',
       'background-color-base': '#f5f5f5',
       'table-selected-row-bg': '#fafafa',
+      'table-expanded-row-bg': '#fbfbfb',
       'checkbox-check-color': '#fff',
       'disabled-color': 'rgba(0, 0, 0, 0.25)',
       'menu-dark-color': 'rgba(254, 254, 254, 0.65)',
       'menu-dark-highlight-color': '#fefefe',
+      'menu-dark-selected-item-icon-color': '#fefefe',
       'menu-dark-arrow-color': '#fefefe',
-      'btn-primary-color': '#fff'
+      'btn-primary-color': '#fefefe',
     },
     light: {
       'layout-body-background': '#f0f2f5',
@@ -42,19 +45,22 @@ const ANTD = {
       'component-background': '#fff',
       'heading-color': 'rgba(0, 0, 0, 0.85)',
       'text-color': 'rgba(0, 0, 0, 0.65)',
-      'text-color-inverse': '#fff',
+      'text-color-inverse': '#fefefe',
       'text-color-secondary': 'rgba(0, 0, 0, 0.45)',
       'shadow-color': 'rgba(0, 0, 0, 0.15)',
       'border-color-split': '#f0f0f0',
+      'border-color-base': '#d9d9d9',
       'background-color-light': '#fafafa',
       'background-color-base': '#f5f5f5',
       'table-selected-row-bg': '#fafafa',
+      'table-expanded-row-bg': '#fbfbfb',
       'checkbox-check-color': '#fff',
       'disabled-color': 'rgba(0, 0, 0, 0.25)',
       'menu-dark-color': 'rgba(1, 1, 1, 0.65)',
       'menu-dark-highlight-color': '#fefefe',
+      'menu-dark-selected-item-icon-color': '#fefefe',
       'menu-dark-arrow-color': '#fefefe',
-      'btn-primary-color': '#fff',
+      'btn-primary-color': '#fefefe',
     },
     night: {
       'layout-body-background': '#000',
@@ -62,19 +68,22 @@ const ANTD = {
       'component-background': '#141414',
       'heading-color': 'rgba(255, 255, 255, 0.85)',
       'text-color': 'rgba(255, 255, 255, 0.85)',
-      'text-color-inverse': '#141414',
+      'text-color-inverse': '#fefefe',
       'text-color-secondary': 'rgba(255, 255, 255, 0.45)',
       'shadow-color': 'rgba(255, 255, 255, 0.15)',
       'border-color-split': '#303030',
+      'border-color-base': '#282828',
       'background-color-light': '#ffffff0a',
       'background-color-base': '#2a2a2a',
       'table-selected-row-bg': '#ffffff0a',
+      'table-expanded-row-bg': '#ffffff0b',
       'checkbox-check-color': '#141414',
       'disabled-color': 'rgba(255, 255, 255, 0.25)',
       'menu-dark-color': 'rgba(254, 254, 254, 0.65)',
       'menu-dark-highlight-color': '#fefefe',
+      'menu-dark-selected-item-icon-color': '#fefefe',
       'menu-dark-arrow-color': '#fefefe',
-      'btn-primary-color': '#141414',
+      'btn-primary-color': '#fefefe',
     }
   }
 }

src/config/default/setting.config.js

@@ -4,15 +4,24 @@ module.exports = {
   theme: {                              //主题
     color: '#1890ff',                   //主题色
     mode: 'dark',                       //主题模式 可选 dark、 light 和 night
+    success: '#52c41a',                 //成功色
+    warning: '#faad14',                 //警告色
+    error: '#f5222f',                   //错误色
   },
   layout: 'side',                       //导航布局，可选 side 和 head，分别为侧边导航和顶部导航
   fixedHeader: false,                   //固定头部状态栏，true:固定，false:不固定
   fixedSideBar: true,                   //固定侧边栏，true:固定，false:不固定
+  fixedTabs: false,                      //固定页签头，true:固定，false:不固定
+  pageWidth: 'fixed',                   //内容区域宽度，fixed:固定宽度，fluid:流式宽度
   weekMode: false,                      //色弱模式，true:开启，false:不开启
   multiPage: false,                     //多页签模式，true:开启，false:不开启
+  cachePage: true,                      //是否缓存页面数据，仅多页签模式下生效，true 缓存, false 不缓存
   hideSetting: false,                   //隐藏设置抽屉，true:隐藏，false:不隐藏
   systemName: 'Vue Antd Admin',         //系统名称
-  copyright: '2018 ICZER 工作室出品',    //copyright
+  copyright: '2018 ICZER 工作室出品',     //copyright
+  asyncRoutes: false,                   //异步加载路由，true:开启，false:不开启
+  showPageTitle: true,                  //是否显示页面标题（PageLayout 布局中的页面标题），true:显示，false:不显示
+  filterMenu: true,                    //根据权限过滤菜单，true:过滤，false:不过滤
   animate: {                            //动画设置
     disabled: false,                    //禁用动画，true:禁用，false:启用
     name: 'bounce',                     //动画效果，支持的动画效果可参考 ./animate.config.js

src/config/replacer/resolve.config.js

@@ -19,12 +19,24 @@ const cssResolve = {
       return cssObj.toText()
     }
   },
+  '.ant-tree-checkbox-checked .ant-tree-checkbox-inner::after': {
+    resolve(cssText, cssObj) {
+      cssObj.rules.push('border-top:0', 'border-left:0')
+      return cssObj.toText()
+    }
+  },
   '.ant-checkbox-checked .ant-checkbox-inner:after': {
     resolve(cssText, cssObj) {
       cssObj.rules.push('border-top:0', 'border-left:0')
       return cssObj.toText()
     }
   },
+  '.ant-tree-checkbox-checked .ant-tree-checkbox-inner:after': {
+    resolve(cssText, cssObj) {
+      cssObj.rules.push('border-top:0', 'border-left:0')
+      return cssObj.toText()
+    }
+  },
   '.ant-menu-dark .ant-menu-inline.ant-menu-sub': {
     resolve(cssText, cssObj) {
       cssObj.rules = cssObj.rules.filter(rule => rule.indexOf('box-shadow') == -1)
@@ -37,6 +49,12 @@ const cssResolve = {
       return cssObj.toText()
     }
   },
+  '.ant-menu-horizontal>.ant-menu-item-active,.ant-menu-horizontal>.ant-menu-item-open,.ant-menu-horizontal>.ant-menu-item-selected,.ant-menu-horizontal>.ant-menu-item:hover,.ant-menu-horizontal>.ant-menu-submenu-active,.ant-menu-horizontal>.ant-menu-submenu-open,.ant-menu-horizontal>.ant-menu-submenu-selected,.ant-menu-horizontal>.ant-menu-submenu:hover': {
+    resolve(cssText, cssObj) {
+      cssObj.selector = cssObj.selector.replace(/.ant-menu-horizontal/g, '.ant-menu-horizontal:not(.ant-menu-dark)')
+      return cssObj.toText()
+    }
+  },
   '.ant-layout-sider': {
     resolve(cssText, cssObj) {
       cssObj.selector = '.ant-layout-sider-dark'

src/layouts/AdminLayout.vue

@@ -1,9 +1,10 @@
 <template>
-  <a-layout :class="['admin-layout', fixedSideBar ? 'fixed-side-bar' : '']">
-    <drawer v-if="isMobile" v-model="collapsed">
+  <a-layout :class="['admin-layout', 'beauty-scroll']">
+    <drawer v-if="isMobile" v-model="drawerOpen">
       <side-menu :theme="theme.mode" :menuData="menuData" :collapsed="false" :collapsible="false" @menuSelect="onMenuSelect"/>
     </drawer>
-    <side-menu :theme="theme.mode" v-else-if="layout === 'side'" :menuData="menuData" :collapsed="collapsed" :collapsible="true" />
+    <side-menu :class="[fixedSideBar ? 'fixed-side' : '']" :theme="theme.mode" v-else-if="layout === 'side' || layout === 'mix'" :menuData="sideMenuData" :collapsed="collapsed" :collapsible="true" />
+    <div v-if="fixedSideBar && !isMobile" :style="`width: ${sideMenuWidth}; min-width: ${sideMenuWidth};max-width: ${sideMenuWidth};`" class="virtual-side"></div>
     <drawer v-if="!hideSetting" v-model="showSetting" placement="right">
       <div class="setting" slot="handler">
         <a-icon :type="showSetting ? 'close' : 'setting'"/>
@@ -11,10 +12,10 @@
       <setting />
     </drawer>
     <a-layout class="admin-layout-main beauty-scroll">
-      <admin-header :style="headerStyle" :menuData="menuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
-      <a-layout-header v-if="fixedHeader"></a-layout-header>
-      <a-layout-content class="admin-layout-content">
-        <div :style="`min-height: ${minHeight}px; position: relative`">
+      <admin-header :class="[{'fixed-tabs': fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" :style="headerStyle" :menuData="headMenuData" :collapsed="collapsed" @toggleCollapse="toggleCollapse"/>
+      <a-layout-header :class="['virtual-header', {'fixed-tabs' : fixedTabs, 'fixed-header': fixedHeader, 'multi-page': multiPage}]" v-show="fixedHeader"></a-layout-header>
+      <a-layout-content class="admin-layout-content" :style="`min-height: ${minHeight}px;`">
+        <div style="position: relative">
           <slot></slot>
         </div>
       </a-layout-content>
@@ -31,71 +32,127 @@ import PageFooter from './footer/PageFooter'
 import Drawer from '../components/tool/Drawer'
 import SideMenu from '../components/menu/SideMenu'
 import Setting from '../components/setting/Setting'
-import {mapState} from 'vuex'
+import {mapState, mapMutations, mapGetters} from 'vuex'
 
-const minHeight = window.innerHeight - 64 - 24 - 122
-
-let menuData = []
+// const minHeight = window.innerHeight - 64 - 122
 
 export default {
   name: 'AdminLayout',
   components: {Setting, SideMenu, Drawer, PageFooter, AdminHeader},
   data () {
     return {
-      minHeight: minHeight,
+      minHeight: window.innerHeight - 64 - 122,
       collapsed: false,
-      menuData: menuData,
-      showSetting: false
+      showSetting: false,
+      drawerOpen: false
     }
   },
   provide() {
-    return{
-      layoutMinHeight: minHeight
+    return {
+      adminLayout: this
+    }
+  },
+  watch: {
+    $route(val) {
+      this.setActivated(val)
+    },
+    layout() {
+      this.setActivated(this.$route)
+    },
+    isMobile(val) {
+      if(!val) {
+        this.drawerOpen = false
+      }
     }
   },
   computed: {
-    ...mapState('setting', ['isMobile', 'theme', 'layout', 'footerLinks', 'copyright', 'fixedHeader', 'fixedSideBar', 'hideSetting']),
+    ...mapState('setting', ['isMobile', 'theme', 'layout', 'footerLinks', 'copyright', 'fixedHeader', 'fixedSideBar',
+      'fixedTabs', 'hideSetting', 'multiPage']),
+    ...mapGetters('setting', ['firstMenu', 'subMenu', 'menuData']),
     sideMenuWidth() {
       return this.collapsed ? '80px' : '256px'
     },
     headerStyle() {
-      let width = (this.fixedHeader && this.layout == 'side' && !this.isMobile) ? `calc(100% - ${this.sideMenuWidth})` : '100%'
+      let width = (this.fixedHeader && this.layout !== 'head' && !this.isMobile) ? `calc(100% - ${this.sideMenuWidth})` : '100%'
       let position = this.fixedHeader ? 'fixed' : 'static'
-      let transition = this.fixedHeader ? 'transition: width 0.2s' : ''
-      return `width: ${width}; position: ${position}; ${transition}`
+      return `width: ${width}; position: ${position};`
+    },
+    headMenuData() {
+      const {layout, menuData, firstMenu} = this
+      return layout === 'mix' ? firstMenu : menuData
+    },
+    sideMenuData() {
+      const {layout, menuData, subMenu} = this
+      return layout === 'mix' ? subMenu : menuData
     }
   },
   methods: {
+    ...mapMutations('setting', ['correctPageMinHeight', 'setActivatedFirst']),
     toggleCollapse () {
       this.collapsed = !this.collapsed
     },
     onMenuSelect () {
       this.toggleCollapse()
     },
+    setActivated(route) {
+      if (this.layout === 'mix') {
+        let matched = route.matched
+        matched = matched.slice(0, matched.length - 1)
+        const {firstMenu} = this
+        for (let menu of firstMenu) {
+          if (matched.findIndex(item => item.path === menu.fullPath) !== -1) {
+            this.setActivatedFirst(menu.fullPath)
+            break
+          }
+        }
+      }
+    }
   },
-  beforeCreate () {
-    menuData = this.$router.options.routes.find((item) => item.path === '/').children
+  created() {
+    this.correctPageMinHeight(this.minHeight - 24)
+    this.setActivated(this.$route)
+  },
+  beforeDestroy() {
+    this.correctPageMinHeight(-this.minHeight + 24)
   }
 }
 </script>
 
 <style lang="less" scoped>
   .admin-layout{
-    &.fixed-side-bar{
-      height: 100vh;
-      .admin-layout-main{
-        overflow: scroll;
+    .side-menu{
+      &.fixed-side{
+        position: fixed;
+        height: 100vh;
+        left: 0;
+        top: 0;
+      }
+    }
+    .virtual-side{
+      transition: all 0.2s;
+    }
+    .virtual-header{
+      transition: all 0.2s;
+      opacity: 0;
+      &.fixed-tabs.multi-page:not(.fixed-header){
+        height: 0;
       }
     }
     .admin-layout-main{
       .admin-header{
         top: 0;
         right: 0;
+        overflow: hidden;
+        transition: all 0.2s;
+        &.fixed-tabs.multi-page:not(.fixed-header){
+          height: 0;
+        }
       }
     }
     .admin-layout-content{
       padding: 24px 24px 0;
-      min-height: auto;
+      /*overflow-x: hidden;*/
+      /*min-height: calc(100vh - 64px - 122px);*/
     }
     .setting{
       background-color: @primary-color;

src/layouts/BlankView.vue

@@ -1,9 +1,6 @@
 <template>
   <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <keep-alive :exclude="dustbins" v-if="multiPage">
-      <router-view />
-    </keep-alive>
-    <router-view v-else />
+    <router-view />
   </page-toggle-transition>
 </template>
 
@@ -15,7 +12,7 @@ export default {
   name: 'BlankView',
   components: {PageToggleTransition},
   computed: {
-    ...mapState('setting', ['multiPage', 'animate', 'dustbins'])
+    ...mapState('setting', ['multiPage', 'animate'])
   }
 }
 </script>

src/layouts/PageLayout.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page-layout">
-    <page-header :breadcrumb="breadcrumb" :title="pageTitle" :logo="logo" :avatar="avatar">
+    <page-header ref="pageHeader" :style="`margin-top: ${multiPage ? 0 : -24}px`" :breadcrumb="breadcrumb" :title="pageTitle" :logo="logo" :avatar="avatar">
       <slot name="action"  slot="action"></slot>
       <slot slot="content" name="headerContent"></slot>
       <div slot="content" v-if="!this.$slots.headerContent && desc">
@@ -13,7 +13,7 @@
       </div>
       <slot v-if="this.$slots.extra" slot="extra" name="extra"></slot>
     </page-header>
-    <div ref="page" :class="['page-content', layout]" >
+    <div ref="page" :class="['page-content', layout, pageWidth]" >
       <slot></slot>
     </div>
   </div>
@@ -21,14 +21,17 @@
 
 <script>
 import PageHeader from '@/components/page/header/PageHeader'
-import {mapState} from 'vuex'
+import {mapState, mapMutations} from 'vuex'
+import {getI18nKey} from '@/utils/routerUtil'
+
 export default {
   name: 'PageLayout',
   components: {PageHeader},
   props: ['desc', 'logo', 'title', 'avatar', 'linkList', 'extraImage'],
   data () {
     return {
-      page: {}
+      page: {},
+      pageHeaderHeight: 0,
     }
   },
   watch: {
@@ -36,17 +39,35 @@ export default {
       this.page = this.$route.meta.page
     }
   },
+  updated() {
+    if (!this._inactive) {
+      this.updatePageHeight()
+    }
+  },
+  activated() {
+    this.updatePageHeight()
+  },
+  deactivated() {
+    this.updatePageHeight(0)
+  },
+  mounted() {
+    this.updatePageHeight()
+  },
   created() {
     this.page = this.$route.meta.page
   },
+  beforeDestroy() {
+    this.updatePageHeight(0)
+  },
   computed: {
-    ...mapState('setting', ['layout']),
+    ...mapState('setting', ['layout', 'multiPage', 'pageMinHeight', 'pageWidth', 'customTitles']),
     pageTitle() {
       let pageTitle = this.page && this.page.title
-      return this.title || this.$t(pageTitle) || this.routeName
+      return this.customTitle || (pageTitle && this.$t(pageTitle)) || this.title || this.routeName
     },
     routeName() {
-      return this.$t(this.$route.path.substring(1).replace(new RegExp('/', 'g'), '.') + '.name')
+      const route = this.$route
+      return this.$t(getI18nKey(route.matched[route.matched.length - 1].path))
     },
     breadcrumb() {
       let page = this.page
@@ -60,18 +81,35 @@ export default {
       } else {
         return this.getRouteBreadcrumb()
       }
+    },
+    marginCorrect() {
+      return this.multiPage ? 24 : 0
     }
   },
   methods: {
+    ...mapMutations('setting', ['correctPageMinHeight']),
     getRouteBreadcrumb() {
       let routes = this.$route.matched
+      const path = this.$route.path
       let breadcrumb = []
-      routes.forEach(route => {
-        let path = route.path
-        let key = path.length == 0 ? '/home' : path
-        breadcrumb.push(this.$t(key.substring(1).replace(new RegExp('/', 'g'), '.') + '.name'))
+      routes.filter(item => path.includes(item.path) || item.regex.test(path))
+        .forEach(route => {
+        const path = route.path.length === 0 ? '/home' : route.path
+        breadcrumb.push(this.$t(getI18nKey(path)))
       })
+      let pageTitle = this.page && this.page.title
+      if (this.customTitle || pageTitle) {
+        breadcrumb[breadcrumb.length - 1] = this.customTitle || pageTitle
+      }
       return breadcrumb
+    },
+    /**
+     * 用于计算页面内容最小高度
+     * @param newHeight
+     */
+    updatePageHeight(newHeight = this.$refs.pageHeader.$el.offsetHeight + this.marginCorrect) {
+      this.correctPageMinHeight(this.pageHeaderHeight - newHeight)
+      this.pageHeaderHeight = newHeight
     }
   }
 }
@@ -79,7 +117,7 @@ export default {
 
 <style lang="less">
   .page-header{
-    margin: -24px -24px 0;
+    margin: 0 -24px 0;
   }
   .link{
     /*margin-top: 16px;*/
@@ -98,7 +136,7 @@ export default {
     padding: 24px 0 0;
     &.side{
     }
-    &.head{
+    &.head.fixed{
       margin: 0 auto;
       max-width: 1400px;
     }

src/layouts/PageView.vue

@@ -4,10 +4,7 @@
       <img :src="extraImage"/>
     </div>
     <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-      <keep-alive :exclude="dustbins" v-if="multiPage">
         <router-view ref="page" />
-      </keep-alive>
-      <router-view ref="page" v-else />
     </page-toggle-transition>
   </page-layout>
 </template>
@@ -26,15 +23,15 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['isMobile', 'multiPage', 'animate', 'dustbins']),
+    ...mapState('setting', ['isMobile', 'multiPage', 'animate']),
     desc() {
-      return this.page.desc
+      return this.page?.desc
     },
     linkList() {
-      return this.page.linkList
+      return this.page?.linkList
     },
     extraImage() {
-      return this.page.extraImage
+      return this.page?.extraImage
     }
   },
   mounted () {

src/layouts/footer/PageFooter.vue

@@ -20,12 +20,15 @@ export default {
 
 <style lang="less" scoped>
   .footer{
-    padding: 0 16px;
-    margin: 48px 0 24px;
+    padding: 48px 16px 24px;
+    /*margin: 48px 0 24px;*/
     text-align: center;
     .copyright{
       color: @text-color-second;
       font-size: 14px;
+      i {
+          margin: 0 4px;
+      }
     }
     .links{
       margin-bottom: 8px;

src/layouts/header/AdminHeader.vue

@@ -1,19 +1,19 @@
 <template>
   <a-layout-header :class="[headerTheme, 'admin-header']">
-    <div :class="['admin-header-wide', layout]">
+    <div :class="['admin-header-wide', layout, pageWidth]">
       <router-link v-if="isMobile || layout === 'head'" to="/" :class="['logo', isMobile ? null : 'pc', headerTheme]">
         <img width="32" src="@/assets/img/logo.png" />
         <h1 v-if="!isMobile">{{systemName}}</h1>
       </router-link>
       <a-divider v-if="isMobile" type="vertical" />
-      <a-icon v-if="layout === 'side'" class="trigger" :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggleCollapse"/>
-      <div v-if="layout == 'head' && !isMobile" class="admin-header-menu">
-        <i-menu class="head-menu" style="height: 64px; line-height: 64px;box-shadow: none" :theme="headerTheme" mode="horizontal" :options="menuData" @select="onSelect"/>
+      <a-icon v-if="layout !== 'head'" class="trigger" :type="collapsed ? 'menu-unfold' : 'menu-fold'" @click="toggleCollapse"/>
+      <div v-if="layout !== 'side' && !isMobile" class="admin-header-menu" :style="`width: ${menuWidth};`">
+        <i-menu class="head-menu" :theme="headerTheme" mode="horizontal" :options="menuData" @select="onSelect"/>
       </div>
       <div :class="['admin-header-right', headerTheme]">
-          <header-search class="header-item" />
+          <header-search class="header-item" @active="val => searchActive = val" />
           <a-tooltip class="header-item" title="帮助文档" placement="bottom" >
-            <a>
+            <a href="https://iczer.gitee.io/vue-antd-admin-docs/" target="_blank">
               <a-icon type="question-circle-o" />
             </a>
           </a-tooltip>
@@ -35,7 +35,7 @@
 <script>
 import HeaderSearch from './HeaderSearch'
 import HeaderNotice from './HeaderNotice'
-import HeaderAvatar from './HeaderlAvatar'
+import HeaderAvatar from './HeaderAvatar'
 import IMenu from '@/components/menu/menu'
 import {mapState, mapMutations} from 'vuex'
 
@@ -49,11 +49,12 @@ export default {
         {key: 'CN', name: '简体中文', alias: '简体'},
         {key: 'HK', name: '繁體中文', alias: '繁體'},
         {key: 'US', name: 'English', alias: 'English'}
-      ]
+      ],
+      searchActive: false
     }
   },
   computed: {
-    ...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'lang']),
+    ...mapState('setting', ['theme', 'isMobile', 'layout', 'systemName', 'lang', 'pageWidth']),
     headerTheme () {
       if (this.layout == 'side' && this.theme.mode == 'dark' && !this.isMobile) {
         return 'light'
@@ -63,6 +64,12 @@ export default {
     langAlias() {
       let lang = this.langList.find(item => item.key == this.lang)
       return lang.alias
+    },
+    menuWidth() {
+      const {layout, searchActive} = this
+      const headWidth = layout === 'head' ? '100% - 188px' : '100%'
+      const extraWidth = searchActive ? '600px' : '400px'
+      return `calc(${headWidth} - ${extraWidth})`
     }
   },
   methods: {

src/layouts/header/HeaderAvatar.vue

@@ -14,24 +14,22 @@
         <span>设置</span>
       </a-menu-item>
       <a-menu-divider />
-      <a-menu-item>
-        <a @click="logout">
-          <a-icon type="poweroff" />
-          <span>退出登录</span>
-        </a>
+      <a-menu-item @click="logout">
+        <a-icon style="margin-right: 8px;" type="poweroff" />
+        <span>退出登录</span>
       </a-menu-item>
     </a-menu>
   </a-dropdown>
 </template>
 
 <script>
-import {mapState} from 'vuex'
-import {logout} from '@/services'
+import {mapGetters} from 'vuex'
+import {logout} from '@/services/user'
 
 export default {
   name: 'HeaderAvatar',
   computed: {
-    ...mapState('account', ['user']),
+    ...mapGetters('account', ['user']),
   },
   methods: {
     logout() {

src/layouts/header/HeaderNotice.vue

@@ -56,9 +56,10 @@ export default {
         this.loading = false
         return
       }
-      this.loadding = true
+			if (this.show) return
+      this.loading = true
       setTimeout(() => {
-        this.loadding = false
+        this.loading = false
       }, 1000)
     }
   }

src/layouts/header/HeaderSearch.vue

@@ -3,6 +3,7 @@
     <a-icon type="search" class="search-icon" @click="enterSearchMode"/>
     <a-auto-complete
       ref="input"
+      :getPopupContainer="e => {return e.parentNode || document.body}"
       :dataSource="dataSource"
       :class="['search-input', searchMode ? 'enter' : 'leave']"
       placeholder="站内搜索"
@@ -24,10 +25,12 @@ export default {
   methods: {
     enterSearchMode () {
       this.searchMode = true
+      this.$emit('active', true)
       setTimeout(() => this.$refs.input.focus(), 300)
     },
     leaveSearchMode () {
       this.searchMode = false
+      setTimeout(() => this.$emit('active', false), 300)
     }
   }
 }

src/layouts/header/index.less

@@ -4,6 +4,12 @@
   box-shadow: @shadow-down;
   position: relative;
   background: @base-bg-color;
+  .head-menu{
+    height: 64px;
+    line-height: 64px;
+    vertical-align: middle;
+    box-shadow: none;
+  }
   &.dark{
     background: @header-bg-color-dark;
     color: white;
@@ -14,9 +20,11 @@
     }
   }
   .admin-header-wide{
-    &.head{
+    padding-left: 24px;
+    &.head.fixed{
       max-width: 1400px;
       margin: auto;
+      padding-left: 0;
     }
     &.side{
       padding-right: 12px;

src/layouts/tabs/TabsHead.vue

@@ -0,0 +1,187 @@
+<template>
+  <div :class="['tabs-head', layout, pageWidth]">
+    <a-tabs
+        type="editable-card"
+        :class="['tabs-container', layout, pageWidth, {'affixed' : affixed, 'fixed-header' : fixedHeader, 'collapsed' : adminLayout.collapsed}]"
+        :active-key="active"
+        :hide-add="true"
+    >
+      <a-tooltip placement="left" :title="lockTitle" slot="tabBarExtraContent">
+        <a-icon
+            theme="filled"
+            @click="onLockClick"
+            class="header-lock"
+            :type="fixedTabs ? 'lock' : 'unlock'"
+        />
+      </a-tooltip>
+      <a-tab-pane v-for="page in pageList" :key="page.path">
+        <div slot="tab" class="tab" @contextmenu="e => onContextmenu(page.path, e)">
+          <a-icon @click="onRefresh(page)" :class="['icon-sync', {'hide': page.path !== active && !page.loading}]" :type="page.loading ? 'loading' : 'sync'" />
+          <div class="title" @click="onTabClick(page.path)" >{{pageName(page)}}</div>
+          <a-icon v-if="!page.unclose" @click="onClose(page.path)" class="icon-close" type="close"/>
+        </div>
+      </a-tab-pane>
+    </a-tabs>
+    <div v-if="affixed" class="virtual-tabs"></div>
+  </div>
+</template>
+
+<script>
+  import {mapState, mapMutations} from 'vuex'
+  import {getI18nKey} from '@/utils/routerUtil'
+
+  export default {
+    name: 'TabsHead',
+    i18n: {
+      messages: {
+        CN: {
+          lock: '点击锁定页签头',
+          unlock: '点击解除锁定',
+        },
+        HK: {
+          lock: '點擊鎖定頁簽頭',
+          unlock: '點擊解除鎖定',
+        },
+        US: {
+          lock: 'click to lock the tabs head',
+          unlock: 'click to unlock',
+        }
+      }
+    },
+    props: {
+      pageList: Array,
+      active: String,
+      fixed: Boolean
+    },
+    data() {
+      return {
+        affixed: false,
+      }
+    },
+    inject:['adminLayout'],
+    created() {
+      this.affixed = this.fixedTabs
+    },
+    computed: {
+      ...mapState('setting', ['layout', 'pageWidth', 'fixedHeader', 'fixedTabs', 'customTitles']),
+      lockTitle() {
+        return this.$t(this.fixedTabs ? 'unlock' : 'lock')
+      }
+    },
+    methods: {
+      ...mapMutations('setting', ['setFixedTabs']),
+      onLockClick() {
+        this.setFixedTabs(!this.fixedTabs)
+        if (this.fixedTabs) {
+          setTimeout(() => {
+            this.affixed = true
+          }, 200)
+        } else {
+          this.affixed = false
+        }
+      },
+      onTabClick(key) {
+        if (this.active !== key) {
+          this.$emit('change', key)
+        }
+      },
+      onClose(key) {
+        this.$emit('close', key)
+      },
+      onRefresh(page) {
+        this.$emit('refresh', page.path, page)
+      },
+      onContextmenu(pageKey, e) {
+        this.$emit('contextmenu', pageKey, e)
+      },
+      pageName(page) {
+        const custom = this.customTitles.find(item => item.path === page.path)
+        return (custom && custom.title) || page.title || this.$t(getI18nKey(page.keyPath))
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .tab{
+    margin: 0 -16px;
+    padding: 0 16px;
+    font-size: 14px;
+    user-select: none;
+    transition: all 0.2s;
+    .title{
+      display: inline-block;
+      height: 100%;
+    }
+    .icon-close{
+      font-size: 12px;
+      margin-left: 6px;
+      margin-right: -4px !important;
+      color: @text-color-second;
+      &:hover{
+        color: @text-color;
+      }
+    }
+    .icon-sync{
+      margin-left: -4px;
+      color: @primary-4;
+      transition: all 0.3s ease-in-out;
+      &:hover{
+        color: @primary-color;
+      }
+      font-size: 14px;
+      &.hide{
+        font-size: 0;
+      }
+    }
+  }
+  .tabs-head{
+    margin: 0 auto;
+    &.head.fixed{
+      width: 1400px;
+    }
+  }
+  .tabs-container{
+    margin: -16px auto 8px;
+    transition: top,left 0.2s;
+    .header-lock{
+      font-size: 18px;
+      cursor: pointer;
+      color: @primary-3;
+      &:hover{
+        color: @primary-color;
+      }
+    }
+    &.affixed{
+      margin: 0 auto;
+      top: 0px;
+      padding: 8px 24px 0;
+      position: fixed;
+      height: 48px;
+      z-index: 1;
+      background-color: @layout-body-background;
+      &.side,&.mix{
+        right: 0;
+        left: 256px;
+        &.collapsed{
+          left: 80px;
+        }
+      }
+      &.head{
+        width: inherit;
+        padding: 8px 0 0;
+        &.fluid{
+          left: 0;
+          right: 0;
+          padding: 8px 24px 0;
+        }
+      }
+      &.fixed-header{
+        top: 64px;
+      }
+    }
+  }
+  .virtual-tabs{
+    height: 48px;
+  }
+</style>

src/layouts/tabs/TabsView.vue

@@ -1,26 +1,21 @@
 <template>
   <admin-layout>
     <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect" />
-    <a-tabs
-      v-if="multiPage"
-      type="editable-card"
-      :active-key="activePage"
-      :style="`margin: -16px auto 8px; ${layout == 'head' ? 'max-width: 1400px;' : ''}`"
-      :hide-add="true"
-      @change="changePage"
-      @edit="editPage"
-      @contextmenu="onContextmenu"
-    >
-      <a-tab-pane :key="page.fullPath" v-for="page in pageList">
-        <span slot="tab" :pagekey="page.fullPath">{{pageName(page.path)}}</span>
-      </a-tab-pane>
-    </a-tabs>
-    <div class="tabs-view-content">
+    <tabs-head
+        v-if="multiPage"
+        :active="activePage"
+        :page-list="pageList"
+        @change="changePage"
+        @close="remove"
+        @refresh="refresh"
+        @contextmenu="onContextmenu"
+    />
+    <div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
       <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-        <keep-alive :exclude="dustbins" v-if="multiPage">
-          <router-view />
-        </keep-alive>
-        <router-view v-else />
+        <a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
+          <router-view v-if="!refreshing" ref="tabContent" :key="$route.fullPath" />
+        </a-keep-alive>
+        <router-view ref="tabContent" v-else-if="!refreshing" />
       </page-toggle-transition>
     </div>
   </admin-layout>
@@ -31,163 +26,305 @@ import AdminLayout from '@/layouts/AdminLayout'
 import Contextmenu from '@/components/menu/Contextmenu'
 import PageToggleTransition from '@/components/transition/PageToggleTransition'
 import {mapState, mapMutations} from 'vuex'
+import {getI18nKey} from '@/utils/routerUtil'
+import AKeepAlive from '@/components/cache/AKeepAlive'
+import TabsHead from '@/layouts/tabs/TabsHead'
 
 export default {
   name: 'TabsView',
   i18n: require('./i18n'),
-  components: { PageToggleTransition, Contextmenu, AdminLayout },
+  components: {TabsHead, PageToggleTransition, Contextmenu, AdminLayout , AKeepAlive },
   data () {
     return {
+      clearCaches: [],
       pageList: [],
       activePage: '',
-      menuVisible: false
+      menuVisible: false,
+      refreshing: false,
+      excludeKeys: []
     }
   },
   computed: {
-    ...mapState('setting', ['multiPage', 'animate', 'layout', 'dustbins']),
+    ...mapState('setting', ['multiPage', 'cachePage', 'animate', 'layout', 'pageWidth']),
     menuItemList() {
       return [
         { key: '1', icon: 'vertical-right', text: this.$t('closeLeft') },
         { key: '2', icon: 'vertical-left', text: this.$t('closeRight') },
-        { key: '3', icon: 'close', text: this.$t('closeOthers') }
+        { key: '3', icon: 'close', text: this.$t('closeOthers') },
+        { key: '4', icon: 'sync', text: this.$t('refresh') },
       ]
+    },
+    tabsOffset() {
+      return this.multiPage ? 24 : 0
     }
   },
   created () {
+    this.loadCacheConfig(this.$router?.options?.routes)
+    this.loadCachedTabs()
     const route = this.$route
-    this.pageList.push(route)
+    if (this.pageList.findIndex(item => item.path === route.fullPath) === -1) {
+      this.pageList.push(this.createPage(route))
+    }
     this.activePage = route.fullPath
+    if (this.multiPage) {
+      this.$nextTick(() => {
+        this.setCachedKey(route)
+      })
+      this.addListener()
+    }
+  },
+  mounted () {
+    this.correctPageMinHeight(-this.tabsOffset)
+  },
+  beforeDestroy() {
+    this.removeListener()
+    this.correctPageMinHeight(this.tabsOffset)
   },
   watch: {
+    '$router.options.routes': function (val) {
+      this.excludeKeys = []
+      this.loadCacheConfig(val)
+    },
     '$route': function (newRoute) {
       this.activePage = newRoute.fullPath
-      this.putCache(newRoute)
+      const page = this.pageList.find(item => item.path === newRoute.fullPath)
       if (!this.multiPage) {
-        this.pageList = [newRoute]
-      } else if (this.pageList.findIndex(item => item.fullPath == newRoute.fullPath) == -1) {
-        this.pageList.push(newRoute)
+        this.pageList = [this.createPage(newRoute)]
+      } else if (page) {
+        page.fullPath = newRoute.fullPath
+      } else if (!page) {
+        this.pageList.push(this.createPage(newRoute))
+      }
+      if (this.multiPage) {
+        this.$nextTick(() => {
+          this.setCachedKey(newRoute)
+        })
       }
     },
     'multiPage': function (newVal) {
       if (!newVal) {
-        this.pageList = [this.$route]
+        this.pageList = [this.createPage(this.$route)]
+        this.removeListener()
+      } else {
+        this.addListener()
       }
+    },
+    tabsOffset(newVal, oldVal) {
+      this.correctPageMinHeight(oldVal - newVal)
     }
   },
   methods: {
     changePage (key) {
       this.activePage = key
-      this.$router.push(key)
+      const page = this.pageList.find(item => item.path === key)
+      this.$router.push(page.fullPath)
     },
-    editPage (key, action) {
-      this[action](key) // remove
-    },
-    remove (key) {
+    remove (key, next) {
       if (this.pageList.length === 1) {
         return this.$message.warning(this.$t('warn'))
       }
-      let index = this.pageList.findIndex(item => item.fullPath === key)
-      let pageRoute = this.pageList[index]
-      this.clearCache(pageRoute)
-      this.pageList = this.pageList.filter(item => item.fullPath !== key)
-      if (key === this.activePage) {
+      //清除缓存
+      let index = this.pageList.findIndex(item => item.path === key)
+      this.clearCaches = this.pageList.splice(index, 1).map(page => page.cachedKey)
+      if (next) {
+        this.$router.push(next)
+      } else if (key === this.activePage) {
         index = index >= this.pageList.length ? this.pageList.length - 1 : index
-        this.activePage = this.pageList[index].fullPath
+        this.activePage = this.pageList[index].path
         this.$router.push(this.activePage)
       }
     },
-    onContextmenu (e) {
-      const pageKey = getPageKey(e.target)
+    refresh (key, page) {
+      page = page || this.pageList.find(item => item.path === key)
+      page.loading = true
+      this.clearCache(page)
+      if (key === this.activePage) {
+        this.reloadContent(() => page.loading = false)
+      } else {
+        // 其实刷新很快，加这个延迟纯粹为了 loading 状态多展示一会儿，让用户感知刷新这一过程
+        setTimeout(() => page.loading = false, 500)
+      }
+    },
+    onContextmenu(pageKey, e) {
       if (pageKey) {
         e.preventDefault()
+        e.meta = pageKey
         this.menuVisible = true
       }
     },
-    onMenuSelect (key, target) {
-      let pageKey = getPageKey(target)
+    onMenuSelect (key, target, pageKey) {
       switch (key) {
         case '1': this.closeLeft(pageKey); break
         case '2': this.closeRight(pageKey); break
         case '3': this.closeOthers(pageKey); break
+        case '4': this.refresh(pageKey); break
         default: break
       }
     },
     closeOthers (pageKey) {
-      const index = this.pageList.findIndex(item => item.fullPath === pageKey)
-      // 要关闭的页面清除缓存
-      this.pageList.forEach(item => {
-        if (item.fullPath !== pageKey){
-          this.clearCache(item)
-        }
-      })
-      this.pageList = this.pageList.slice(index, index + 1)
-      this.activePage = this.pageList[0].fullPath
-      this.$router.push(this.activePage)
+      // 清除缓存
+      const clearPages = this.pageList.filter(item => item.path !== pageKey && !item.unclose)
+      this.clearCaches = clearPages.map(item => item.cachedKey)
+      this.pageList = this.pageList.filter(item => !clearPages.includes(item))
+      // 判断跳转
+      if (this.activePage != pageKey) {
+        this.activePage = pageKey
+        this.$router.push(this.activePage)
+      }
     },
     closeLeft (pageKey) {
-      const index = this.pageList.findIndex(item => item.fullPath === pageKey)
+      const index = this.pageList.findIndex(item => item.path === pageKey)
       // 清除缓存
-      this.pageList.forEach((item, i) => {
-        if (i < index) {
-          this.clearCache(item)
-        }
-      })
-      this.pageList = this.pageList.slice(index)
-      if (this.pageList.findIndex(item => item.fullPath === this.activePage) === -1) {
-        this.activePage = this.pageList[0].fullPath
+      const clearPages = this.pageList.filter((item, i) => i < index && !item.unclose)
+      this.clearCaches = clearPages.map(item => item.cachedKey)
+      this.pageList = this.pageList.filter(item => !clearPages.includes(item))
+      // 判断跳转
+      if (!this.pageList.find(item => item.path === this.activePage)) {
+        this.activePage = pageKey
         this.$router.push(this.activePage)
       }
     },
     closeRight (pageKey) {
-      const index = this.pageList.findIndex(item => item.fullPath === pageKey)
       // 清除缓存
-      this.pageList.forEach((item, i) => {
-        if (i > index) {
-          this.clearCache(item)
-        }
-      })
-      this.pageList = this.pageList.slice(0, index + 1)
-      if (this.pageList.findIndex(item => item.fullPath === this.activePage) === -1) {
-        this.activePage = this.pageList[this.pageList.length - 1].fullPath
+      const index = this.pageList.findIndex(item => item.path === pageKey)
+      const clearPages = this.pageList.filter((item, i) => i > index && !item.unclose)
+      this.clearCaches = clearPages.map(item => item.cachedKey)
+      this.pageList = this.pageList.filter(item => !clearPages.includes(item))
+      // 判断跳转
+      if (!this.pageList.find(item => item.path === this.activePage)) {
+        this.activePage = pageKey
         this.$router.push(this.activePage)
       }
     },
-    clearCache(route) {
-      const componentName = route.matched.slice(-1)[0].components.default.name
-      if (this.dustbins.findIndex(item => item === componentName) === -1) {
-        this.setDustbins(this.dustbins.concat(componentName))
+    clearCache(page) {
+      page._init_ = false
+      this.clearCaches = [page.cachedKey]
+    },
+    reloadContent(onLoaded) {
+      this.refreshing = true
+      setTimeout(() => {
+        this.refreshing = false
+        this.$nextTick(() => {
+          this.setCachedKey(this.$route)
+          if (typeof onLoaded === 'function') {
+            onLoaded.apply(this, [])
+          }
+        })
+      }, 200)
+    },
+    pageName(page) {
+      return this.$t(getI18nKey(page.keyPath))
+    },
+    /**
+     * 添加监听器
+     */
+    addListener() {
+      window.addEventListener('page:close', this.closePageListener)
+      window.addEventListener('page:refresh', this.refreshPageListener)
+      window.addEventListener('unload', this.unloadListener)
+    },
+    /**
+     * 移出监听器
+     */
+    removeListener() {
+      window.removeEventListener('page:close', this.closePageListener)
+      window.removeEventListener('page:refresh', this.refreshPageListener)
+      window.removeEventListener('unload', this.unloadListener)
+    },
+    /**
+     * 页签关闭事件监听
+     * @param event 页签关闭事件
+     */
+    closePageListener(event) {
+      const {closeRoute, nextRoute} = event.detail
+      const closePath = typeof closeRoute === 'string' ? closeRoute : closeRoute.path
+      const path = closePath && closePath.split('?')[0]
+      this.remove(path, nextRoute)
+    },
+    /**
+     * 页面刷新事件监听
+     * @param event 页签关闭事件
+     */
+    refreshPageListener(event) {
+      const {pageKey} = event.detail
+      const path = pageKey && pageKey.split('?')[0]
+      this.refresh(path)
+    },
+    /**
+     * 页面 unload 事件监听器，添加页签到 session 缓存，用于刷新时保留页签
+     */
+    unloadListener() {
+      const tabs = this.pageList.map(item => ({...item, _init_: false}))
+      sessionStorage.setItem(process.env.VUE_APP_TBAS_KEY, JSON.stringify(tabs))
+    },
+    createPage(route) {
+      return {
+        keyPath: route.matched[route.matched.length - 1].path,
+        fullPath: route.fullPath, loading: false,
+        path: route.fullPath,
+        title: route.meta && route.meta.page && route.meta.page.title,
+        unclose: route.meta && route.meta.page && (route.meta.page.closable === false),
       }
     },
-    putCache(route) {
-      const componentName = route.matched.slice(-1)[0].components.default.name
-      if (this.dustbins.includes(componentName)) {
-        this.setDustbins(this.dustbins.filter(item => item !== componentName))
+    /**
+     * 设置页面缓存的key
+     * @param route 页面对应的路由
+     */
+    setCachedKey(route) {
+      const page = this.pageList.find(item => item.path === route.fullPath)
+      page.unclose = route.meta && route.meta.page && (route.meta.page.closable === false)
+      if (!page._init_) {
+        const vnode = this.$refs.tabContent.$vnode
+        page.cachedKey = vnode.key + vnode.componentOptions.Ctor.cid
+        page._init_ = true
       }
     },
-    pageName(path) {
-      return this.$t(path.substring(1).replace(new RegExp('/', 'g'), '.') + '.name')
+    /**
+     * 加载缓存的 tabs
+     */
+    loadCachedTabs() {
+      const cachedTabsStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_KEY)
+      if (cachedTabsStr) {
+        try {
+          const cachedTabs = JSON.parse(cachedTabsStr)
+          if (cachedTabs.length > 0) {
+            this.pageList = cachedTabs
+          }
+        } catch (e) {
+          console.warn('failed to load cached tabs, got exception:', e)
+        } finally {
+          sessionStorage.removeItem(process.env.VUE_APP_TBAS_KEY)
+        }
+      }
     },
-    ...mapMutations('setting', ['setDustbins'])
+    loadCacheConfig(routes, pCache = true) {
+      routes.forEach(item => {
+        const cacheAble = item.meta?.page?.cacheAble ?? pCache ?? true
+        if (!cacheAble) {
+          this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*$`))
+        }
+        if (item.children) {
+          this.loadCacheConfig(item.children, cacheAble)
+        }
+      })
+    },
+    ...mapMutations('setting', ['correctPageMinHeight'])
   }
 }
-/**
- * 由于ant-design-vue组件库的TabPane组件暂不支持自定义监听器，无法直接获取到右键target所在标签页的 pagekey 。故增加此方法用于
- * 查询右键target所在标签页的标识 pagekey ，以用于自定义右键菜单的事件处理。
- * 注：TabPane组件支持自定义监听器后可去除该方法并重构 ‘自定义右键菜单的事件处理’
- * @param target 查询开始目标
- * @param depth 查询层级深度 （查找层级最多不超过3层，超过3层深度直接返回 null）
- * @returns {String}
- */
-function getPageKey (target, depth = 0) {
-  if (depth > 2 || !target) {
-    return null
-  }
-  return target.getAttribute('pagekey') || getPageKey(target.firstElementChild, ++depth)
-}
 </script>
 
 <style scoped lang="less">
+  .tabs-view{
+    margin: -16px auto 8px;
+    &.head.fixed{
+      max-width: 1400px;
+    }
+  }
   .tabs-view-content{
     position: relative;
+    &.head.fixed{
+      width: 1400px;
+      margin: 0 auto;
+    }
   }
 </style>

src/layouts/tabs/i18n.js

@@ -4,18 +4,21 @@ module.exports = {
       closeLeft: '关闭左侧',
       closeRight: '关闭右侧',
       closeOthers: '关闭其它',
+      refresh: '刷新页面',
       warn: '这是最后一页，不能再关闭了',
     },
     HK: {
       closeLeft: '關閉左側',
       closeRight: '關閉右側',
       closeOthers: '關閉其它',
+      refresh: '刷新頁面',
       warn: '這是最後一頁，不能再關閉了',
     },
     US: {
       closeLeft: 'close left',
       closeRight: 'close right',
       closeOthers: 'close others',
+      refresh: 'refresh the page',
       warn: 'This is the last page, you can\'t close it',
     },
   }

src/layouts/tabs/index.js

@@ -0,0 +1,2 @@
+import TabsView from './TabsView'
+export default TabsView

src/main.js

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import App from './App.vue'
-import router from './router'
+import {initRouter} from './router'
 import './theme/index.less'
 import Antd from 'ant-design-vue'
 import Viser from 'viser-vue'
@@ -9,13 +9,18 @@ import store from './store'
 import 'animate.css/source/animate.css'
 import Plugins from '@/plugins'
 import {initI18n} from '@/utils/i18n'
+import bootstrap from '@/bootstrap'
+import 'moment/locale/zh-cn'
 
+const router = initRouter(store.state.setting.asyncRoutes)
+const i18n = initI18n('CN', 'US')
+
+Vue.use(Antd)
 Vue.config.productionTip = false
 Vue.use(Viser)
-Vue.use(Antd)
 Vue.use(Plugins)
 
-const i18n = initI18n(router, 'CN', 'US')
+bootstrap({router, store, i18n, message: Vue.prototype.$message})
 
 new Vue({
   router,

src/mock/extend/index.js

@@ -50,6 +50,8 @@ const welcomeMessages = [
   }
 ]
 
+const goods = ['运动鞋', '短裤', 'T恤', '七分裤', '风衣', '寸衫']
+
 Random.extend({
   admin () {
     return this.pick(admins)
@@ -69,6 +71,9 @@ Random.extend({
   position () {
     return this.pick(positions)
   },
+  goods () {
+    return this.pick(goods)
+  },
   saying () {
     return this.pick(sayings)
   },

src/mock/goods/index.js

@@ -0,0 +1,106 @@
+import Mock from 'mockjs'
+import '@/mock/extend'
+import {parseUrlParams} from '@/utils/request'
+
+const current = new Date().getTime()
+
+const goodsList = Mock.mock({
+  'list|100': [{
+    'id|+1': 0,
+    'name': '@GOODS',
+    'orderId': `${current}-@integer(1,100)`,
+    'status|1-4': 1,
+    'send': '@BOOLEAN',
+    'sendTime': '@DATETIME',
+    'orderDate': '@DATE',
+    'auditTime': '@TIME'
+  }]
+})
+
+Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'),'get', ({url}) => {
+  const params = parseUrlParams(decodeURI(url))
+  let {page, pageSize} = params
+  page = eval(page) - 1 || 0
+  pageSize = eval(pageSize) || 10
+  delete params.page
+  delete params.pageSize
+  let result = goodsList.list.filter(item => {
+    for (let [key, value] of Object.entries(params)) {
+      if (item[key] != value) {
+        return false
+      }
+    }
+    return true
+  })
+  const total = result.length
+  if ((page) * pageSize > total) {
+    result = []
+  } else {
+    result = result.slice(page * pageSize, (page + 1) * pageSize)
+  }
+  return {
+    code: 0,
+    message: 'success',
+    data: {
+      page: page + 1,
+      pageSize,
+      total,
+      list: result
+    }
+  }
+})
+
+const columnsConfig = [
+  {
+    title: '商品名称',
+    dataIndex: 'name',
+    searchAble: true
+  },
+  {
+    title: '订单号',
+    dataIndex: 'orderId'
+  },
+  {
+    searchAble: true,
+    dataIndex: 'status',
+    dataType: 'select',
+    slots: {title: 'statusTitle'},
+    scopedSlots: {customRender: 'status'},
+    search: {
+      selectOptions: [
+        {title: '已下单', value: 1},
+        {title: '已付款', value: 2},
+        {title: '已审核', value: 3},
+        // {title: '已发货', value: 4}
+      ]
+    }
+  },
+  {
+    title: '发货',
+    searchAble: true,
+    dataIndex: 'send',
+    dataType: 'boolean',
+    scopedSlots: {customRender: 'send'}
+  },
+  {
+    title: '发货时间',
+    dataIndex: 'sendTime',
+    dataType: 'datetime'
+  },
+  {
+    title: '下单日期',
+    searchAble: true,
+    dataIndex: 'orderDate',
+    dataType: 'date',
+    visible: false
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'auditTime',
+    dataType: 'time',
+  },
+]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
+  return columnsConfig
+})

src/mock/index.js

@@ -3,8 +3,11 @@ import '@/mock/user/current'
 import '@/mock/project'
 import '@/mock/user/login'
 import '@/mock/workplace'
+import '@/mock/user/routes'
+import '@/mock/goods'
+import '@/mock/list'
 
 // 设置全局延时
 Mock.setup({
-  timeout: '300-600'
+  timeout: '200-400'
 })

src/mock/list/index.js

@@ -0,0 +1,52 @@
+import Mock from 'mockjs'
+import '@/mock/extend'
+import {parseUrlParams} from '@/utils/request'
+
+const current = new Date().getTime()
+
+const source = Mock.mock({
+  'list|100': [{
+    'key|+1': 0,
+    'no': `${current}-@integer(1,100)`,
+    'description': '这是一段描述',
+    'callNo|0-50': 5,
+    'status|1-4': 1,
+    'updatedAt': '@DATETIME',
+  }]
+})
+
+Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/list` + '.*'),'get', ({url}) => {
+  const params = parseUrlParams(decodeURI(url))
+  let {page, pageSize} = params
+  page = eval(page) - 1 || 0
+  pageSize = eval(pageSize) || 10
+
+  delete params.page
+  delete params.pageSize
+
+  let result = source.list.filter(item => {
+    for (let [key, value] of Object.entries(params)) {
+      if (item[key] !== value) {
+        return false
+      }
+    }
+    return true
+  })
+  const total = result.length
+  if ((page) * pageSize > total) {
+    result = []
+  } else {
+    result = result.slice(page * pageSize, (page + 1) * pageSize)
+  }
+
+  return {
+    code: 0,
+    message: 'success',
+    data: {
+      page: page + 1,
+      pageSize,
+      total: 100,
+      list: result
+    }
+  }
+})

src/mock/user/login.js

@@ -7,21 +7,33 @@ const user = Mock.mock({
   address: '@CITY',
   position: '@POSITION'
 })
-
-Mock.mock('/login', 'post', ({body}) => {
-  let result = {}
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/login`, 'post', ({body}) => {
+  let result = {data: {}}
   const {name, password} = JSON.parse(body)
 
-  if (name !== 'admin' || password !== '888888') {
-    result.code = -1
-    result.message = '账户名或密码错误（admin/888888）'
+  let success = false
+
+  if (name === 'admin' && password === '888888') {
+    success = true
+    result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+    result.data.roles = [{id: 'admin', operation: ['add', 'edit', 'delete']}]
+  } else if (name === 'test' || password === '888888') {
+    success = true
+    result.data.permissions = [{id: 'queryForm', operation: ['add', 'edit']}]
+    result.data.roles = [{id: 'test', operation: ['add', 'edit', 'delete']}]
   } else {
+    success = false
+  }
+
+  if (success) {
     result.code = 0
     result.message = Mock.mock('@TIMEFIX').CN + '，欢迎回来'
-    result.data = {}
     result.data.user = user
     result.data.token = 'Authorization:' + Math.random()
     result.data.expireAt = new Date(new Date().getTime() + 30 * 60 * 1000)
+  } else {
+    result.code = -1
+    result.message = '账户名或密码错误（admin/888888 or test/888888）'
   }
   return result
 })

src/mock/user/routes.js

@@ -0,0 +1,40 @@
+import Mock from 'mockjs'
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/routes`, 'get', () => {
+  let result = {}
+  result.code = 0
+  result.data = [{
+    router: 'root',
+    children: [
+      {
+        router: 'dashboard',
+        children: ['workplace', 'analysis'],
+      },
+      {
+        router: 'form',
+        children: ['basicForm', 'stepForm', 'advanceForm']
+      },
+      {
+        router: 'basicForm',
+        name: '验权表单',
+        icon: 'file-excel',
+        authority: 'queryForm'
+      },
+      {
+        router: 'antdv',
+        path: 'antdv',
+        name: 'Ant Design Vue',
+        icon: 'ant-design',
+        link: 'https://www.antdv.com/docs/vue/introduce-cn/'
+      },
+      {
+        router: 'document',
+        path: 'document',
+        name: '使用文档',
+        icon: 'file-word',
+        link: 'https://iczer.gitee.io/vue-antd-admin-docs/'
+      }
+    ]
+  }]
+  return result
+})

src/pages/Demo.vue

@@ -0,0 +1,16 @@
+<template>
+  <div>
+    <p>query: {{$route.query}}</p>
+    <p>params: {{$route.params}}</p>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'Demo'
+  }
+</script>
+
+<style scoped>
+
+</style>

src/pages/components/table/Api.vue

@@ -0,0 +1,152 @@
+<template>
+  <div class="api">
+    <div class="introduce">
+      <h2 class="title">说明</h2>
+      <p class="content">
+        AdvanceTable 是基于 Ant Design Vue Table 组件封装，支持其所有 API。<br/>
+        主要添加了<em>列设置</em>及<em>搜索控件配置</em>的功能，可用于一些需要动态配置表格展示、动态配置搜索条件的场景。<br/>
+        使用方式 与 antd table 基本无异。添加了部分API，如下：
+      </p>
+    </div>
+    <api-table :api-source="apiSource" />
+    <api-table type="event" title="事件" :api-source="events" />
+    <api-table title="Column" :api-source="columnApi" />
+    <api-table title="Search" :api-source="searchApi" />
+  </div>
+</template>
+
+<script>
+  import ApiTable from '@/components/table/api/ApiTable'
+  export default {
+    name: 'Api',
+    components: {ApiTable},
+    data() {
+      return {
+        apiSource: [
+          {
+            key: 0,
+            param: '<a href="https://www.antdv.com/components/table-cn/#API" target="_blank">Ant Design Vue Table API</a>',
+            desc: '支持 Ant Design Vue Table 组件 所有 api',
+            type: '--',
+            default: '--',
+          },
+          {
+            key: 1,
+            param: 'title',
+            desc: '表格标题',
+            type: 'string | slot',
+            default: '\'高级表格\''
+          },
+          {
+            key: 2,
+            param: 'formatConditions',
+            desc: `是否格式化搜索条件的值，格式化规则参考 <a>Search 配置</a>。
+                   <br/>false：取搜索输入控件的原值 <br/>true：取搜索输入控件格式化后的值`,
+            type: 'boolean',
+            default: 'false',
+          },
+          {
+            key: 3,
+            param: 'columns',
+            desc: `表格列配置，参考 <a>Column 配置</a>`,
+            type: 'array',
+            default: '--',
+          }
+        ],
+        events: [
+          {
+            key: 0,
+            param: '<a href="https://www.antdv.com/components/table-cn/#API" target="_blank">Ant Design Vue Table Events API</a>',
+            desc: '支持 Ant Design Vue Table 所有事件',
+            callback: '--',
+          },
+          {
+            key: 1,
+            param: 'search',
+            desc: '搜索条件变化时触发',
+            callback: 'Function(conditions, searchOptions: [{field, value, format}])',
+          },
+          {
+            key: 2,
+            param: 'refresh',
+            desc: '表头刷新图标点击时触发',
+            callback: 'Function(conditions, searchOptions: [{field, value, format}])',
+          },
+          {
+            key: 3,
+            param: 'reset',
+            desc: '列配置重置按钮点击时触发',
+            callback: 'Function(conditions, searchOptions: [{field, value, format}])',
+          },
+        ],
+        columnApi: [
+          {
+            key: 0,
+            param: '<a href="https://www.antdv.com/components/table-cn/#API" target="_blank">Ant Design Vue Table Column API</a>',
+            desc: '支持 Ant Design Vue Table 组件 Column 配置所有 api',
+            type: '--',
+            default: '--'
+          },
+          {
+            key: 1,
+            param: 'searchAble',
+            desc: '是否启用列搜索',
+            type: 'boolean',
+            default: 'false'
+          },
+          {
+            key: 2,
+            param: 'dataType',
+            desc: `数据类型，该配置将决定列搜索输入控件的类型，与列搜索输入控件对应关系如下：<br/>
+                   string: 输入框组件<br/>
+                   boolean: 开关组件<br/>
+                   select: 下拉输入框组件<br/>
+                   date: 日期选择器<br/>
+                   time: 时间选择器<br/>
+                   datetime: 带时间选择器的日期选择器`,
+            type: `'string' | 'boolean' | 'select' | 'date' | 'time' | 'datetime'`,
+            default: `'string'`
+          },
+          {
+            key: 3,
+            param: 'search',
+            desc: '列搜索配置，参考 <a>Search 配置</a>',
+            type: 'object',
+            default: '--'
+          },
+        ],
+        searchApi: [
+          {
+            key: 0,
+            param: 'format',
+            desc: `列搜索输入控件值的格式化配置。<br/>如果输入控件支持格式化，则可设置该值为字符串，如日期输入组件，可设为为 'YYYY-MM-DD'。
+                   <br/>不支持格式化的输入控件，可设置为一个接收控件的输入值作为参数的函数，如 (value) => {return \`prefix\${value}\`}。`,
+            type: 'string | Function(value)',
+            default: '取输入控件默认的格式化配置'
+          },
+          {
+            key: 1,
+            param: 'selectOptions',
+            desc: `select 数据类型的下拉输入组件的选项配置，可参考 <a href="https://www.antdv.com/components/select-cn/#API" target="_blank">Ant Design Vue Select Option props Api</a>`,
+            type: 'array',
+            default: '--'
+          }
+        ],
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.api{
+  .introduce{
+    padding: 16px;
+    .content{
+      em{
+        margin: 0 4px;
+        color: @primary-color;
+      }
+    }
+  }
+}
+</style>

src/pages/components/table/Table.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="table">
+    <advance-table
+      :columns="columns"
+      :data-source="dataSource"
+      title="高级表格-Beta"
+      :loading="loading"
+      rowKey="id"
+      @search="onSearch"
+      @refresh="onRefresh"
+      :format-conditions="true"
+      @reset="onReset"
+      :pagination="{
+        current: page,
+        pageSize: pageSize,
+        total: total,
+        showSizeChanger: true,
+        showLessItems: true,
+        showQuickJumper: true,
+        showTotal: (total, range) => `第 ${range[0]}-${range[1]} 条，总计 ${total} 条`,
+        onChange: onPageChange,
+        onShowSizeChange: onSizeChange,
+      }"
+    >
+      <template slot="statusTitle">
+        状态<a-icon style="margin: 0 4px" type="info-circle" />
+      </template>
+      <template slot="send" slot-scope="{text}">
+        {{text ? '是' : '否'}}
+      </template>
+      <template slot="status" slot-scope="{text}">
+        {{text | statusStr}}
+      </template>
+    </advance-table>
+    <api />
+  </div>
+</template>
+
+<script>
+  import AdvanceTable from '@/components/table/advance/AdvanceTable'
+  import {dataSource as ds} from '@/services'
+  import Api from '@/pages/components/table/Api'
+
+  export default {
+    name: 'Table',
+    components: {Api, AdvanceTable},
+    filters: {
+      statusStr(val) {
+        switch (val) {
+          case 1: return '已下单'
+          case 2: return '已付款'
+          case 3: return '已审核'
+          case 4: return '已发货'
+        }
+      }
+    },
+    data() {
+      return {
+        loading: false,
+        page: 1,
+        pageSize: 10,
+        total: 0,
+        columns: [
+          {
+            title: '商品名称',
+            dataIndex: 'name',
+            searchAble: true
+          },
+          {
+            title: '订单号',
+            dataIndex: 'orderId'
+          },
+          {
+            searchAble: true,
+            dataIndex: 'status',
+            dataType: 'select',
+            slots: {title: 'statusTitle'},
+            scopedSlots: {customRender: 'status'},
+            search: {
+              selectOptions: [
+                {title: '已下单', value: 1},
+                {title: '已付款', value: 2},
+                {title: '已审核', value: 3},
+                {title: '已发货', value: 4}
+              ]
+            }
+          },
+          {
+            title: '发货',
+            searchAble: true,
+            dataIndex: 'send',
+            dataType: 'boolean',
+            scopedSlots: {customRender: 'send'},
+            search: {
+              switchOptions: {
+                checkedText: '开',
+                uncheckedText: '关'
+              }
+            }
+          },
+          {
+            title: '审核时间',
+            dataIndex: 'auditTime',
+            dataType: 'time',
+          }
+        ],
+        dataSource: [],
+        conditions: {}
+      }
+    },
+    created() {
+      this.getGoodList()
+      this.getColumns()
+    },
+    methods: {
+      getGoodList() {
+        this.loading = true
+        const {page, pageSize, conditions} = this
+        ds.goodsList({page, pageSize, ...conditions}).then(result => {
+          const {list, page, pageSize, total} = result.data.data
+          this.dataSource = list
+          this.page = page
+          this.total = total
+          this.pageSize = pageSize
+          this.loading = false
+        })
+      },
+      getColumns() {
+        ds.goodsColumns().then(res => {
+          this.columns = res.data
+        })
+      },
+      onSearch(conditions, searchOptions) {
+        console.log(searchOptions)
+        this.page = 1
+        this.conditions = conditions
+        this.getGoodList()
+      },
+      onSizeChange(current, size) {
+        this.page = 1
+        this.pageSize = size
+        this.getGoodList()
+      },
+      onRefresh(conditions) {
+        this.conditions = conditions
+        this.getGoodList()
+      },
+      onReset(conditions) {
+        this.conditions = conditions
+        this.getGoodList()
+      },
+      onPageChange(page, pageSize) {
+        this.page = page
+        this.pageSize = pageSize
+        this.getGoodList()
+      }
+    }
+  }
+</script>
+
+<style scoped lang="less">
+.table{
+  background-color: @base-bg-color;
+  padding: 24px;
+}
+</style>

src/pages/components/table/index.js

@@ -0,0 +1,2 @@
+import Table from './Table'
+export default Table

src/pages/dashboard/analysis/Analysis.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="analysis">
-    <a-row :gutter="[24, 24]">
+    <a-row style="margin-top: 0" :gutter="[24, 24]">
       <a-col :sm="24" :md="12" :xl="6">
         <chart-card :loading="loading" :title="$t('totalSales')" total="￥ 189,345">
           <a-tooltip :title="$t('introduce')" slot="action">