From 94ba4f30561983d66ba7d53759f727ac497d7f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Wed, 28 Apr 2021 15:44:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?update=20=E6=98=8E=E7=A1=AE=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/assets/style/lib/margin.less | 16 ++++++++++++++++
 Web/src/components/yoTable/index.js  |  5 ++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Web/src/assets/style/lib/margin.less b/Web/src/assets/style/lib/margin.less
index 567a16c..8f5e8bb 100644
--- a/Web/src/assets/style/lib/margin.less
+++ b/Web/src/assets/style/lib/margin.less
@@ -6,6 +6,10 @@
     @position: extract(@margin-padding-position, @i);
     @name: extract(@margin-padding-position-name, @i);
 
+    .m@{name}-xl {
+        margin@{position}: @padding-xl  !important;
+    }
+
     .m@{name}-lg {
         margin@{position}: @padding-lg  !important;
     }
@@ -22,6 +26,14 @@
         margin@{position}: @padding-xs  !important;
     }
 
+    .m@{name}-xxs {
+        margin@{position}: @padding-xxs  !important;
+    }
+
+    .p@{name}-xl {
+        padding@{position}: @padding-xl  !important;
+    }
+
     .p@{name}-lg {
         padding@{position}: @padding-lg  !important;
     }
@@ -38,6 +50,10 @@
         padding@{position}: @padding-xs  !important;
     }
 
+    .p@{name}-xxs {
+        padding@{position}: @padding-xxs  !important;
+    }
+
     .m@{name}-none {
         margin@{position}: 0 !important;
     }
diff --git a/Web/src/components/yoTable/index.js b/Web/src/components/yoTable/index.js
index 4f05893..e0ce949 100644
--- a/Web/src/components/yoTable/index.js
+++ b/Web/src/components/yoTable/index.js
@@ -128,7 +128,10 @@ export default {
 
     onTableChange(pagination, filters, sorter) {
       this.pagination = pagination
-      this.sorter = sorter
+      this.sorter = {
+        sortField: sorter.field,
+        sortOrder: sorter.order,
+      }
       this.onLoadData()
     },
 

From aac183749bcafcee21a172d07e7491a4fe6aa4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Wed, 28 Apr 2021 16:24:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update=20=E6=9B=B4=E6=94=B9queue=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/public/doc-code/seed/query.vue        | 4 ++--
 Web/src/common/api/index.js               | 4 ++--
 Web/src/pages/system/_seed/index.vue      | 4 ++--
 Web/src/pages/system/app/index.vue        | 4 ++--
 Web/src/pages/system/dict/index.vue       | 2 +-
 Web/src/pages/system/log/oplog/index.vue  | 2 +-
 Web/src/pages/system/log/vislog/index.vue | 2 +-
 Web/src/pages/system/menu/form.vue        | 6 +++---
 Web/src/pages/system/menu/index.vue       | 6 +++---
 Web/src/pages/system/role/orgForm.vue     | 2 +-
 Web/src/pages/system/user/index.vue       | 4 ++--
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Web/public/doc-code/seed/query.vue b/Web/public/doc-code/seed/query.vue
index c88a70c..6d561bc 100644
--- a/Web/public/doc-code/seed/query.vue
+++ b/Web/public/doc-code/seed/query.vue
@@ -128,8 +128,8 @@ export default {
     onLoadCodes() {
       this.$api
         .$queue([
-          this.$api.sysDictTypeDropDownWait({ code: 'code1' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'code2' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'code1' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'code2' }),
         ])
         .then(([code1, code2]) => {
           this.codes.code1 = code1.data;
diff --git a/Web/src/common/api/index.js b/Web/src/common/api/index.js
index 069ad1e..907d351 100644
--- a/Web/src/common/api/index.js
+++ b/Web/src/common/api/index.js
@@ -94,7 +94,7 @@ for (let key in urls) {
         }
     }
 
-    api[`${key}Wait`] = function (params = {}) {
+    api[`${key}Await`] = function (params = {}) {
         if (method === 'post') {
             return initInstance(options).post(url, params)
         } else {
@@ -106,7 +106,7 @@ for (let key in urls) {
 
     api[key] = function (params = {}) {
         return new Promise((reslove, reject) => {
-            api[`${key}Wait`](params)
+            api[`${key}Await`](params)
                 .then((res) => {
                     const { data } = res
                     if (errerCodes.indexOf(data.code) >= 0) {
diff --git a/Web/src/pages/system/_seed/index.vue b/Web/src/pages/system/_seed/index.vue
index a3d8c57..9d2d8bc 100644
--- a/Web/src/pages/system/_seed/index.vue
+++ b/Web/src/pages/system/_seed/index.vue
@@ -128,8 +128,8 @@ export default {
     onLoadCodes() {
       this.$api
         .$queue([
-          this.$api.sysDictTypeDropDownWait({ code: 'code1' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'code2' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'code1' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'code2' }),
         ])
         .then(([code1, code2]) => {
           this.codes.code1 = code1.data;
diff --git a/Web/src/pages/system/app/index.vue b/Web/src/pages/system/app/index.vue
index 6b41d4b..a969211 100644
--- a/Web/src/pages/system/app/index.vue
+++ b/Web/src/pages/system/app/index.vue
@@ -166,8 +166,8 @@ export default {
     onLoadCodes() {
       this.$api
         .$queue([
-          this.$api.sysDictTypeDropDownWait({ code: 'yes_or_no' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'common_status' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'yes_or_no' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'common_status' }),
         ])
         .then(([yesOrNo, commonStatus]) => {
           this.codes.find((p) => p.code === 'yes_or_no').values = yesOrNo.data;
diff --git a/Web/src/pages/system/dict/index.vue b/Web/src/pages/system/dict/index.vue
index 4b66429..eedcb5d 100644
--- a/Web/src/pages/system/dict/index.vue
+++ b/Web/src/pages/system/dict/index.vue
@@ -170,7 +170,7 @@ export default {
      * 如果不需要获取相应的字典数据,此方法内容可空
      */
     onLoadCodes() {
-      this.$api.$queue([this.$api.sysDictTypeDropDownWait({ code: 'common_status' })]).then(([commonStatus]) => {
+      this.$api.$queue([this.$api.sysDictTypeDropDownAwait({ code: 'common_status' })]).then(([commonStatus]) => {
         this.codes.commonStatus = commonStatus.data;
       });
     },
diff --git a/Web/src/pages/system/log/oplog/index.vue b/Web/src/pages/system/log/oplog/index.vue
index 38ffa4f..4c3d81f 100644
--- a/Web/src/pages/system/log/oplog/index.vue
+++ b/Web/src/pages/system/log/oplog/index.vue
@@ -173,7 +173,7 @@ export default {
      * 加载字典数据时的必要方法
      */
     onLoadCodes() {
-      this.$api.$queue([this.$api.sysDictTypeDropDownWait({ code: 'op_type' })]).then(([commonStatus]) => {
+      this.$api.$queue([this.$api.sysDictTypeDropDownAwait({ code: 'op_type' })]).then(([commonStatus]) => {
         this.codes.opTypeDict = commonStatus.data;
       });
     },
diff --git a/Web/src/pages/system/log/vislog/index.vue b/Web/src/pages/system/log/vislog/index.vue
index a6b1f3c..9e4690d 100644
--- a/Web/src/pages/system/log/vislog/index.vue
+++ b/Web/src/pages/system/log/vislog/index.vue
@@ -165,7 +165,7 @@ export default {
      * 加载字典数据时的必要方法
      */
     onLoadCodes() {
-      this.$api.$queue([this.$api.sysDictTypeDropDownWait({ code: 'vis_type' })]).then(([commonStatus]) => {
+      this.$api.$queue([this.$api.sysDictTypeDropDownAwait({ code: 'vis_type' })]).then(([commonStatus]) => {
         this.codes.visTypeDict = commonStatus.data;
       });
     },
diff --git a/Web/src/pages/system/menu/form.vue b/Web/src/pages/system/menu/form.vue
index 22b79e5..f805047 100644
--- a/Web/src/pages/system/menu/form.vue
+++ b/Web/src/pages/system/menu/form.vue
@@ -260,9 +260,9 @@ export default {
     onLoadCodes() {
       return this.$api
         .$queue([
-          this.$api.sysDictTypeDropDownWait({ code: 'menu_type' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'menu_weight' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'open_type' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'menu_type' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'menu_weight' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'open_type' }),
         ])
         .then(([menuType, menuWerght, openType]) => {
           return {
diff --git a/Web/src/pages/system/menu/index.vue b/Web/src/pages/system/menu/index.vue
index a6cb903..ee64e1a 100644
--- a/Web/src/pages/system/menu/index.vue
+++ b/Web/src/pages/system/menu/index.vue
@@ -156,9 +156,9 @@ export default {
     onLoadCodes() {
       this.$api
         .$queue([
-          this.$api.sysDictTypeDropDownWait({ code: 'menu_type' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'menu_weight' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'open_type' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'menu_type' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'menu_weight' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'open_type' }),
         ])
         .then(([menuType, menuWerght, openType]) => {
           this.codes.find((p) => p.code === 'menu_type').values = menuType.data;
diff --git a/Web/src/pages/system/role/orgForm.vue b/Web/src/pages/system/role/orgForm.vue
index 0a847c8..08480ec 100644
--- a/Web/src/pages/system/role/orgForm.vue
+++ b/Web/src/pages/system/role/orgForm.vue
@@ -88,7 +88,7 @@ export default {
      */
     onLoadCodes() {
       return this.$api
-        .$queue([this.$api.sysDictTypeDropDownWait({ code: 'data_scope_type' })])
+        .$queue([this.$api.sysDictTypeDropDownAwait({ code: 'data_scope_type' })])
         .then(([dataScopeType]) => {
           this.dataScopeTypeData = dataScopeType.data;
         });
diff --git a/Web/src/pages/system/user/index.vue b/Web/src/pages/system/user/index.vue
index 127e7e9..fa6519d 100644
--- a/Web/src/pages/system/user/index.vue
+++ b/Web/src/pages/system/user/index.vue
@@ -218,8 +218,8 @@ export default {
     onLoadCodes() {
       this.$api
         .$queue([
-          this.$api.sysDictTypeDropDownWait({ code: 'sex' }),
-          this.$api.sysDictTypeDropDownWait({ code: 'common_status' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'sex' }),
+          this.$api.sysDictTypeDropDownAwait({ code: 'common_status' }),
         ])
         .then(([sex, commonStatus]) => {
           this.codes.find((p) => p.code === 'sex').values = sex.data;

From 8c429bcde6603a217c5865a8ce32ad61763be115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Wed, 28 Apr 2021 17:08:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?update=20=E5=AE=8C=E5=96=84=E4=BA=86?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=BC=80=E5=8F=91=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/public/doc-code/api/queue.js              |  15 ++
 Web/public/doc-code/api/setting.js            |  14 ++
 Web/public/doc-code/api/usage.js              |  11 ++
 Web/public/doc-code/auth/index.vue            |  14 ++
 Web/src/common/login/index.js                 |  12 --
 Web/src/main.js                               |   2 +-
 Web/src/pages/system/doc/api/index.vue        |   5 +
 Web/src/pages/system/doc/api/queue.vue        |  26 ++++
 Web/src/pages/system/doc/api/setting.vue      |  23 +++
 Web/src/pages/system/doc/api/usage.vue        |  21 +++
 Web/src/pages/system/doc/auth/index.vue       |  26 ++++
 Web/src/pages/system/doc/database/index.vue   |   3 +
 .../pages/system/doc/database/migrations.vue  |  77 ++++++++++
 Web/src/pages/system/doc/functions/index.vue  |  44 ++++++
 Web/src/pages/system/doc/globalinfo/index.vue | 122 +++++++++++++++
 Web/src/pages/system/doc/index.vue            | 145 +++++++++++++-----
 Web/src/pages/system/doc/seed/index.vue       |   5 +
 Web/src/pages/system/doc/seed/query.vue       |   4 +
 Web/src/pages/system/doc/storage/index.vue    |   3 +
 Web/src/pages/system/doc/window/close.vue     |  23 +++
 Web/src/pages/system/doc/window/index.vue     |  27 ++++
 Web/src/pages/system/doc/window/open.vue      |  59 +++++++
 Web/src/views/main/index.vue                  |   2 +-
 23 files changed, 633 insertions(+), 50 deletions(-)
 create mode 100644 Web/public/doc-code/api/queue.js
 create mode 100644 Web/public/doc-code/api/setting.js
 create mode 100644 Web/public/doc-code/api/usage.js
 create mode 100644 Web/public/doc-code/auth/index.vue
 create mode 100644 Web/src/pages/system/doc/api/index.vue
 create mode 100644 Web/src/pages/system/doc/api/queue.vue
 create mode 100644 Web/src/pages/system/doc/api/setting.vue
 create mode 100644 Web/src/pages/system/doc/api/usage.vue
 create mode 100644 Web/src/pages/system/doc/auth/index.vue
 create mode 100644 Web/src/pages/system/doc/database/index.vue
 create mode 100644 Web/src/pages/system/doc/database/migrations.vue
 create mode 100644 Web/src/pages/system/doc/functions/index.vue
 create mode 100644 Web/src/pages/system/doc/globalinfo/index.vue
 create mode 100644 Web/src/pages/system/doc/storage/index.vue
 create mode 100644 Web/src/pages/system/doc/window/close.vue
 create mode 100644 Web/src/pages/system/doc/window/index.vue
 create mode 100644 Web/src/pages/system/doc/window/open.vue

diff --git a/Web/public/doc-code/api/queue.js b/Web/public/doc-code/api/queue.js
new file mode 100644
index 0000000..5551ab8
--- /dev/null
+++ b/Web/public/doc-code/api/queue.js
@@ -0,0 +1,15 @@
+/* 使用关键字await */
+async function doc() {
+    const res1 = await this.$api.apiName1(params1)
+    const res2 = await this.$api.apiName2(params2)
+}
+
+/* 使用$queue */
+this.$api
+    .$queue([
+        this.$api.apiName1Await(params1),
+        this.$api.apiName2Await(params2),
+    ])
+    .then(([_res1, _res2]) => {
+        /* ... */
+    })
\ No newline at end of file
diff --git a/Web/public/doc-code/api/setting.js b/Web/public/doc-code/api/setting.js
new file mode 100644
index 0000000..81bf4f8
--- /dev/null
+++ b/Web/public/doc-code/api/setting.js
@@ -0,0 +1,14 @@
+export default {
+    /* 自定义的接口名称 */
+    apiName: [
+        /* 接口地址 */
+        url,
+        /* 请求类型 [get | post] */
+        'get',
+        /* axios所需的设置参数 */
+        options,
+    ],
+
+    /* 默认为post的接口 */
+    apiPostName: postUrl
+}
\ No newline at end of file
diff --git a/Web/public/doc-code/api/usage.js b/Web/public/doc-code/api/usage.js
new file mode 100644
index 0000000..158c948
--- /dev/null
+++ b/Web/public/doc-code/api/usage.js
@@ -0,0 +1,11 @@
+this.$api
+    .apiName(params)
+    .then((res) => {
+        /* ... */
+    })
+    .catch((error) => {
+        /* catch */
+    })
+    .finally(() => {
+        /* finally */
+    })
\ No newline at end of file
diff --git a/Web/public/doc-code/auth/index.vue b/Web/public/doc-code/auth/index.vue
new file mode 100644
index 0000000..075a52a
--- /dev/null
+++ b/Web/public/doc-code/auth/index.vue
@@ -0,0 +1,14 @@
+<template>
+  <section>
+    <!-- 简单的权限标识 -->
+    <Auth auth="sysApp:page">
+      <a-button>按钮1</a-button>
+    </Auth>
+    <!-- 多个并且关系的权限标识 -->
+    <Auth :auth="['sysApp:page', 'sysApp:add']"></Auth>
+    <!-- 多个或者关系的权限标识 -->
+    <Auth :auth="[['sysApp:page'], ['sysApp:add']]"></Auth>
+    <!-- 前缀简化 -->
+    <Auth :auth="{ sysApp: ['page', 'add'] }"></Auth>
+  </section>
+</template>
\ No newline at end of file
diff --git a/Web/src/common/login/index.js b/Web/src/common/login/index.js
index ca4f285..f2f3473 100644
--- a/Web/src/common/login/index.js
+++ b/Web/src/common/login/index.js
@@ -70,21 +70,9 @@ const doLogout = () => {
     })
 }
 
-const doCheck = () => {
-    return new Promise((resolve, reject) => {
-        api.checkLogin().then(({ result }) => {
-            setGlobal(result)
-            resolve()
-        }).catch(() => {
-            reject()
-        })
-    })
-}
-
 export {
     doLogin,
     doLogout,
-    doCheck,
 
     setGlobal,
     getGlobal
diff --git a/Web/src/main.js b/Web/src/main.js
index 731d3a5..75a1e97 100644
--- a/Web/src/main.js
+++ b/Web/src/main.js
@@ -26,7 +26,7 @@ SwiperClass.use([Pagination, Mousewheel, Autoplay, Scrollbar])
 Vue.use(getAwesomeSwiper(SwiperClass))
 
 import hljs from 'highlight.js'
-import 'highlight.js/styles/vs2015.css'
+import 'highlight.js/styles/monokai-sublime.css'
 Vue.use(hljs.vuePlugin);
 
 /**
diff --git a/Web/src/pages/system/doc/api/index.vue b/Web/src/pages/system/doc/api/index.vue
new file mode 100644
index 0000000..98ad48b
--- /dev/null
+++ b/Web/src/pages/system/doc/api/index.vue
@@ -0,0 +1,5 @@
+<template>
+  <section>
+    <p>在本框架中，只需要进行简单的接口配置，就可以实现调用。</p>
+  </section>
+</template>
diff --git a/Web/src/pages/system/doc/api/queue.vue b/Web/src/pages/system/doc/api/queue.vue
new file mode 100644
index 0000000..974aed8
--- /dev/null
+++ b/Web/src/pages/system/doc/api/queue.vue
@@ -0,0 +1,26 @@
+<template>
+  <section>
+    <p>有些场景下，需要对几个接口同时进行调用，并且同时返回数据。</p>
+    <p>
+      当然可以直接使用关键字
+      <a-tag class="mr-none" color="orange">await</a-tag>；也可以使用已经封装好的
+      <a-tag class="mr-none" color="orange">$queue</a-tag>，并在接口函数后增加
+      <a-tag class="mr-none" color="orange">Await</a-tag>后缀。
+    </p>
+    <Highlight :code="codes['/api/queue.js']" language="javascript" />
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/api/setting.vue b/Web/src/pages/system/doc/api/setting.vue
new file mode 100644
index 0000000..c5c937a
--- /dev/null
+++ b/Web/src/pages/system/doc/api/setting.vue
@@ -0,0 +1,23 @@
+<template>
+  <section>
+    <p>
+      维护接口地址在
+      <a-tag class="mr-none" color="orange">@/src/common/api/requests</a-tag>中
+    </p>
+    <Highlight :code="codes['/api/setting.js']" language="javascript" />
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/api/usage.vue b/Web/src/pages/system/doc/api/usage.vue
new file mode 100644
index 0000000..9e0018b
--- /dev/null
+++ b/Web/src/pages/system/doc/api/usage.vue
@@ -0,0 +1,21 @@
+<template>
+  <section>
+    <p>调用时可以直接使用全局函数。</p>
+    <p>接口的函数名对应到上面配置的接口名称即可。</p>
+    <Highlight :code="codes['/api/usage.js']" language="javascript" />
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/auth/index.vue b/Web/src/pages/system/doc/auth/index.vue
new file mode 100644
index 0000000..510e9dc
--- /dev/null
+++ b/Web/src/pages/system/doc/auth/index.vue
@@ -0,0 +1,26 @@
+<template>
+  <section>
+    <p>在不少业务组件中，时常需要做到权限控制一些按钮的显示隐藏。如果只使用样式来隐藏按钮，是不安全的。</p>
+    <p>所以在本框架中，推荐将按钮用全局的权限组件包裹来控制是否渲染。</p>
+    <Highlight :code="codes['/auth/index.vue']" language="html" />
+    <p>
+      权限标识会读取全局用户信息中的
+      <a-tag class="mr-none" color="orange">permissions</a-tag>进行比对。
+    </p>
+    <p>权限组件插槽内的可以是任何元素，只要不符合条件，将不会渲染。</p>
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/database/index.vue b/Web/src/pages/system/doc/database/index.vue
new file mode 100644
index 0000000..e5e6a79
--- /dev/null
+++ b/Web/src/pages/system/doc/database/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <div></div>
+</template>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/database/migrations.vue b/Web/src/pages/system/doc/database/migrations.vue
new file mode 100644
index 0000000..ed59bc0
--- /dev/null
+++ b/Web/src/pages/system/doc/database/migrations.vue
@@ -0,0 +1,77 @@
+<template>
+  <section>
+    <p>在建立或修改了实体类之后，可以将实体类更新到数据库。</p>
+    <p>
+      在Visual Studio中选择
+      <a-breadcrumb separator=">">
+        <a-breadcrumb-item>工具</a-breadcrumb-item>
+        <a-breadcrumb-item>NuGet 包管理器</a-breadcrumb-item>
+        <a-breadcrumb-item>程序包管理控制台</a-breadcrumb-item>
+      </a-breadcrumb>之后在打开的程序包管理控制台中，默认项目选择
+      <a-tag class="mr-none" color="orange">Ewide.Database.Migrations</a-tag>，并在控制台中输入命令。
+    </p>
+    <h4>生成迁移文件</h4>
+    <Highlight :code="'add-migration init -c \'DefaultDbContext\''" language="c++" />
+    <p>其中</p>
+    <ul>
+      <li>
+        <p>
+          <a-tag color="blue">add-migration</a-tag>是固定的命令。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">init</a-tag>是自定义的数据库版本号。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">-c</a-tag>是固定的参数。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">'DefaultDbContext'</a-tag>是对应的DbContext。
+        </p>
+      </li>
+    </ul>
+    <h4>更新迁移到数据库</h4>
+    <p>
+      在确保
+      <a-tag class="mr-none" color="orange">Ewide.Database.Migrations</a-tag>中已经生成迁移文件之后，可以运行更新命令。
+    </p>
+    <Highlight :code="'update-database -context \'DefaultDbContext\''" language="c++" />
+    <p>其中</p>
+    <ul>
+      <li>
+        <p>
+          <a-tag color="blue">update-database</a-tag>是固定的命令。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">-context</a-tag>是固定的参数。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">'DefaultDbContext'</a-tag>是对应的DbContext。
+        </p>
+      </li>
+    </ul>
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/functions/index.vue b/Web/src/pages/system/doc/functions/index.vue
new file mode 100644
index 0000000..018e4a1
--- /dev/null
+++ b/Web/src/pages/system/doc/functions/index.vue
@@ -0,0 +1,44 @@
+<template>
+  <section>
+    <p>
+      现在已经将众多常用的函数挂载到
+      <a-tag class="mr-none" color="orange">Vue</a-tag>原型链中，方便在任意业务组件中直接通过
+      <a-tag class="mr-none" color="orange">this</a-tag>调用。
+    </p>
+    <ul>
+      <li>
+        <p>
+          <a-tag color="blue">$api</a-tag>可直接调用webapi，详见
+          <a href="#doc-4">接口</a>。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">$_</a-tag>调用实用的工具库
+          <a-tag class="mr-none" color="orange">Lodash</a-tag>，使用方式详见
+          <a href="https://www.lodashjs.com/" target="_blank">官方文档</a>。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">$moment</a-tag>调用轻便的时间工具库
+          <a-tag class="mr-none" color="orange">Moment.js</a-tag>，使用方式详见
+          <a href="http://momentjs.cn/docs/" target="_blank">官方文档</a>。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag class="mr-none" color="blue">onOpenContentWindow</a-tag>和
+          <a-tag color="blue">closeContentWindow</a-tag>打开和关闭窗口，详见
+          <a href="#doc-2">窗口</a>。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">$auth</a-tag>权限渲染组件的函数版，可以用于在js中的权限处理，并返回布尔值。参数格式详见
+          <a href="#doc-5">权限渲染</a>。
+        </p>
+      </li>
+    </ul>
+  </section>
+</template>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/globalinfo/index.vue b/Web/src/pages/system/doc/globalinfo/index.vue
new file mode 100644
index 0000000..17f8b41
--- /dev/null
+++ b/Web/src/pages/system/doc/globalinfo/index.vue
@@ -0,0 +1,122 @@
+<template>
+  <section>
+    <p>
+      在进入主页时，默认会调用
+      <a-tag class="mr-none" color="orange">getLoginUser</a-tag>接口来获取当前登录用户基本信息。
+    </p>
+    <p>此时这些基本信息将会被挂载到全局，方便使用。</p>
+    <Highlight :code="'this.$root.global.info'" language="javascript" />
+    <h4>可用的基本信息</h4>
+    <ul>
+      <li>
+        <p>
+          <a-tag color="blue">account</a-tag>登录帐号。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">adminType</a-tag>帐号管理类型。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">avatar</a-tag>用户头像。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">birthday</a-tag>生日。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">email</a-tag>邮箱。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">id</a-tag>帐号ID。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">lastLoginAddress</a-tag>上次登录的物理地址。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">lastLoginBrowser</a-tag>上次登录使用的浏览器。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">lastLoginIp</a-tag>上次登录的IP地址。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">lastLoginOs</a-tag>上次登录使用的操作系统。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">lastLoginTime</a-tag>上次登录时间。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">loginEmpInfo</a-tag>用户相关组织和附加信息。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">name</a-tag>用户名。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">nickName</a-tag>昵称。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">permissions</a-tag>权限。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">phone</a-tag>手机号。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">roles</a-tag>所属角色。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">sex</a-tag>性别。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="blue">tel</a-tag>电话。
+        </p>
+      </li>
+    </ul>
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/index.vue b/Web/src/pages/system/doc/index.vue
index aa6ca76..c31f41f 100644
--- a/Web/src/pages/system/doc/index.vue
+++ b/Web/src/pages/system/doc/index.vue
@@ -3,10 +3,15 @@
     <container>
       <a-row :gutter="16" type="flex">
         <a-col flex="auto">
-          <container mode="container">
-            <section :id="`doc-${index}`" :key="index" v-for="(doc, index) in docs">
+          <container
+            :id="`doc-${index}`"
+            :key="index"
+            mode="container"
+            v-for="(doc, index) in docs"
+          >
+            <section>
               <h1>{{ doc.title }}</h1>
-              <component :codes="codes" :is="doc.component" v-if="doc.name" />
+              <component :codes="codes" :is="doc.component" v-if="doc.path" />
               <template v-if="doc.children">
                 <section
                   :id="`doc-${index}-${_index}`"
@@ -14,10 +19,11 @@
                   v-for="(_doc, _index) in doc.children"
                 >
                   <h3>{{ _doc.title }}</h3>
-                  <component :codes="codes" :is="_doc.component" v-if="_doc.name" />
+                  <component :codes="codes" :is="_doc.component" v-if="_doc.path" />
                 </section>
               </template>
             </section>
+            <a-divider v-if="index < docs.length - 1" />
           </container>
         </a-col>
         <a-col flex="240px">
@@ -48,59 +54,126 @@
   </a-card>
 </template>
 <script>
+const docs = [
+  {
+    title: '数据库',
+    path: '/database',
+    children: [
+      {
+        title: '实体(N)',
+      },
+      {
+        title: '迁移',
+        path: '/database/migrations',
+      },
+    ],
+  },
+  {
+    title: '数据传输对象',
+  },
+  {
+    title: '窗口',
+    path: '/window',
+    children: [
+      {
+        title: '打开窗口',
+        path: '/window/open',
+      },
+      {
+        title: '关闭窗口',
+        path: '/window/close',
+      },
+    ],
+  },
+  {
+    title: '全局函数',
+    path: '/functions',
+  },
+  {
+    title: '接口',
+    path: '/api',
+    children: [
+      {
+        title: '配置',
+        path: '/api/setting',
+      },
+      {
+        title: '调用',
+        path: '/api/usage',
+      },
+      {
+        title: '队列',
+        path: '/api/queue',
+      },
+    ],
+  },
+  {
+    title: '权限渲染',
+    path: '/auth',
+  },
+  {
+    title: '种子',
+    path: '/seed',
+    children: [
+      {
+        title: '查询表格',
+        path: '/seed/query',
+      },
+      {
+        title: '编辑窗口',
+        path: '/seed/form',
+      },
+    ],
+  },
+  {
+    title: '全局用户信息',
+    path: '/globalinfo',
+  },
+  {
+    title: '内置组件(N)',
+  },
+  {
+    title: '本地存储(N)',
+    path: '/storage',
+  },
+  {
+    title: '工具(N)',
+  },
+];
+
 export default {
   data() {
     return {
-      docs: [
-        {
-          title: '开始使用',
-          name: '/usage',
-        },
-        {
-          title: '窗口',
-        },
-        {
-          title: '种子',
-          name: '/seed',
-          children: [
-            {
-              title: '查询表格',
-              name: '/seed/query',
-            },
-            {
-              title: '编辑窗口',
-              name: '/seed/form',
-            },
-          ],
-        },
-      ],
+      docs: null,
+
       codes: {},
     };
   },
   mounted() {
-    this.docs.forEach((doc) => {
-      if (doc.name) {
-        this.$set(doc, 'component', () => import(`.${doc.name}`));
+    docs.forEach((doc) => {
+      if (doc.path) {
+        doc.component = () => import(`.${doc.path}`);
       }
       if (doc.children) {
         doc.children.forEach((_doc) => {
-          this.$set(_doc, 'component', () => import(`.${_doc.name}`));
+          _doc.component = () => import(`.${_doc.path}`);
         });
       }
     });
 
+    this.docs = docs;
+
     // 读取doc-code下所有文件内容
-    const files = require.context('@/../public/doc-code', true, /\.(js|html|vue|css|less|json)(\?.*)?$/);
+    const files = require.context('@/../public/doc-code', true, /\.(js|jsx|html|vue|css|less|json|cs)(\?.*)?$/);
     const codes = {};
     files.keys().forEach((p) => {
-      const fileName = p.slice(1);
+      const filepath = p.slice(1);
       const xhr = new XMLHttpRequest();
-      xhr.open('GET', `./doc-code${fileName}`, false);
+      xhr.open('GET', `./doc-code${filepath}`, false);
       xhr.overrideMimeType('text/plain;charset=utf-8');
       xhr.send(null);
-      codes[fileName] = xhr.responseText;
+      codes[filepath] = xhr.responseText;
     });
-    console.log(codes);
     this.codes = codes;
   },
   methods: {
diff --git a/Web/src/pages/system/doc/seed/index.vue b/Web/src/pages/system/doc/seed/index.vue
index ac99884..09d381a 100644
--- a/Web/src/pages/system/doc/seed/index.vue
+++ b/Web/src/pages/system/doc/seed/index.vue
@@ -21,6 +21,11 @@
           </a-breadcrumb>输入
           <a-tag class="mr-none" color="orange">vue.json</a-tag>并回车，将会打开针对vue文件的用户片段配置JSON。
         </p>
+        <p>
+          注意：在模版字符串中如果使用到了
+          <a-tag class="mr-none" color="orange">$</a-tag>，就请使用
+          <a-tag class="mr-none" color="orange">$$</a-tag>对其进行转义。
+        </p>
       </li>
     </ul>
     <Highlight :code="codes['/seed/vue.json']" language="json" />
diff --git a/Web/src/pages/system/doc/seed/query.vue b/Web/src/pages/system/doc/seed/query.vue
index 6d2555f..596ee01 100644
--- a/Web/src/pages/system/doc/seed/query.vue
+++ b/Web/src/pages/system/doc/seed/query.vue
@@ -1,5 +1,9 @@
 <template>
   <section>
+    <p>
+      当前版本
+      <a-tag>1.0</a-tag>
+    </p>
     <Highlight :code="codes['/seed/query.vue']" language="html" />
   </section>
 </template>
diff --git a/Web/src/pages/system/doc/storage/index.vue b/Web/src/pages/system/doc/storage/index.vue
new file mode 100644
index 0000000..a24b643
--- /dev/null
+++ b/Web/src/pages/system/doc/storage/index.vue
@@ -0,0 +1,3 @@
+<template>
+  <section></section>
+</template>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/window/close.vue b/Web/src/pages/system/doc/window/close.vue
new file mode 100644
index 0000000..39b6435
--- /dev/null
+++ b/Web/src/pages/system/doc/window/close.vue
@@ -0,0 +1,23 @@
+<template>
+  <section>
+    <Highlight :code="'this.closeContentWindow(key)'" language="javascript" />
+    <h4>key</h4>
+    <p>
+      <a-tag>String | Number</a-tag>非必传参数。指定关闭窗口的键。如果未指定键，则关闭当前选中的窗口。
+    </p>
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/window/index.vue b/Web/src/pages/system/doc/window/index.vue
new file mode 100644
index 0000000..4a5705b
--- /dev/null
+++ b/Web/src/pages/system/doc/window/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <section>
+    <p>
+      本框架是以
+      <b>页签</b>形式打开业务组件（一般意义上的页面）。当然其中也有使用到路由，但只用于登录与主页的跳转。
+    </p>
+    <p>
+      所有业务组件都放置于
+      <a-tag class="mr-none" color="orange">@/src/pages</a-tag>目录下，打开窗口时默认只读取该目录下的组件。
+    </p>
+    <p>目前已对打开和关闭窗口的方法进行了全局化处理，可以在任何组件内轻松地使用。</p>
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/pages/system/doc/window/open.vue b/Web/src/pages/system/doc/window/open.vue
new file mode 100644
index 0000000..ad4fab2
--- /dev/null
+++ b/Web/src/pages/system/doc/window/open.vue
@@ -0,0 +1,59 @@
+<template>
+  <section>
+    <Highlight :code="'this.onOpenContentWindow(settings)'" language="javascript" />
+    <h4>settings</h4>
+    <ul>
+      <li>
+        <p>
+          <a-tag color="red">key</a-tag>
+          <a-tag>String | Number</a-tag>非必要，窗口的唯一键。当下一次打开同键的窗口时，只切换到该窗口。如果未指定唯一键，将会自动生成随机键。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="red">icon</a-tag>
+          <a-tag>String</a-tag>非必要，窗口页签的图标。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="red">title</a-tag>
+          <a-tag>String</a-tag>非必要，窗口页签的标题。如果不指定标题，讲会以“新建窗口”显示。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="red">path</a-tag>
+          <a-tag>String</a-tag>必要，组件路径。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="red">param</a-tag>
+          <a-tag>Object</a-tag>非必要，传递参数。在业务组件中通过
+          <a-tag class="mr-none" color="orange">props</a-tag>接收。
+        </p>
+      </li>
+      <li>
+        <p>
+          <a-tag color="red">closable</a-tag>
+          <a-tag>Boolean</a-tag>非必要，设置是否可关闭窗口。默认为可关闭。
+        </p>
+      </li>
+    </ul>
+  </section>
+</template>
+<script>
+import Highlight from '../highlight';
+
+export default {
+  components: {
+    Highlight,
+  },
+  props: {
+    codes: {
+      type: Object,
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/views/main/index.vue b/Web/src/views/main/index.vue
index b58603f..fad068b 100644
--- a/Web/src/views/main/index.vue
+++ b/Web/src/views/main/index.vue
@@ -144,7 +144,7 @@ export default {
 
     onCloseContentWindow(key) {
       key = key || this.tabActived;
-      const i = this.$_.findIndex(this.panes, (p) => p.key === key && p.closable);
+      const i = this.$_.findIndex(this.panes, (p) => p.key === key);
       this.panes.splice(i, 1);
 
       if (this.panes.length) {