结构优化

18b86274 · guwd · 734b8c0c · 18b86274 · 18b86274 · 734b8c0c
Commit 18b86274 authored Sep 07, 2020 by guwd
18 changed files
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -91,7 +91,7 @@
                <div class="ms-admin-header-right">
                    <el-menu menu-trigger="hover" class="ms-admin-header-menu"
                             mode="horizontal">
-                        <el-submenu style="height: 100%;" popper-class="theme-select">
+                        <el-submenu style="height: 100%;" popper-class="ms-admin-header-menu-item">
                            <template slot="title">
                                <i class="iconfont icon-pifu" style="font-size: 18px"></i>
                            </template>
@@ -118,8 +118,8 @@
                    <#--                    </el-dropdown>-->

                    <el-menu menu-trigger="hover" class="ms-admin-header-menu " mode="horizontal">
-                        <el-submenu>
-                            <template slot="title" >
+                        <el-submenu popper-class="ms-admin-header-menu-item">
+                            <template slot="title">
                                <span class="ms-admin-people-head"
                                      v-text="peopleInfo.managerName && peopleInfo.managerName.substr(0, 2)"></span>
                                <span v-text='peopleInfo.managerName'></span>
@@ -151,8 +151,8 @@
                                 :name="item.modelTitle"
                                 :data-modelId='item.modelId' :data-modelModelId='item.modelModelId'>
                        <keep-alive>
-                            <!--iframe :src='item.isStore?item.modelUrl:ms.manager+"/"+item.modelUrl+(item.modelUrl.indexOf("?")==-1?"?":"&")+"modelId="+item.modelId+"&modelCode="+item.modelCode+"&modelTitle="+encodeURI(item.modelTitle)'
-                                    :ref="item.modelTitle"></iframe-->
+                            <iframe :src='item.isStore?item.modelUrl:ms.manager+"/"+item.modelUrl+(item.modelUrl.indexOf("?")==-1?"?":"&")+"modelId="+item.modelId+"&modelCode="+item.modelCode+"&modelTitle="+encodeURI(item.modelTitle)'
+                                    :ref="item.modelTitle"></iframe>
                        </keep-alive>
                    </el-tab-pane>
                </el-tabs>
@@ -540,29 +540,58 @@
 </script>
 <style>

-    .adminhead {
-        margin-top: 10px \0;
+    .ms-admin-logo {
+        display: flex;
+        align-items: center;
+        overflow: hidden;
    }

-    .item {
-        margin-right: 19px;
+    .ms-admin-logo img {
+        padding: 14px 0;
+        width: 50px;
    }

-    .ms-notice-menu {
-        padding: 0px;
-        width: 400px;
+    .ms-admin-logo > div {
+        display: flex;
+        align-items: center;
    }

-    .ms-notice-menu-type {
-        color: #ccc;
-        font-weight: 500;
-        font-family: 黑体 !important;
+    .ms-admin-logo > div span {
+        margin-top: -6px;
+        position: absolute;
+        margin-left: 10px;
+        font-size: 12px;
+
    }

-    .ms-notice-menu-border {
-        border-bottom: 1px solid rgb(239, 239, 239);
-        font-weight: bold;
-        font-family: 黑体 !important;
+    .ms-admin-logo .iconfont {
+        color: #fff;
+        margin-left: auto;
+        margin-right: 20px;
+        cursor: pointer;
+    }
+
+
+    .ms-admin-header-right {
+        margin-left: auto;
+        min-width: 200px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        padding: 0;
+        line-height: 1;
+    }
+
+    .ms-admin-header-right .ms-admin-people-head {
+        width: 30px !important;
+        height: 30px !important;
+        margin-right: 10px;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #0099ff;
+        color: #fff;
    }

    .ms-admin-header-menu-shrink {
@@ -588,6 +617,43 @@
        height: 100vh;
    }

+    .ms-admin-menu-aside {
+        width: auto !important;
+        height: 100%;
+        position: relative;
+        overflow: visible;
+    }
+
+
+    .ms-admin-menu-aside .ms-admin-menu .el-menu--inline .is-active {
+        border-left: 2px solid #0099ff;
+    }
+
+
+
+
+    .ms-admin-menu-aside .ms-menu-expand i {
+        font-weight: bolder;
+        font-size: 14px;
+        color: #333;
+        position: absolute;
+        transform: rotate(90deg);
+        right: 40%;
+    }
+
+    .ms-admin-menu-aside .ms-menu-expand::before {
+        border-color: transparent transparent #eee;
+        border-style: none solid solid;
+        border-width: 0 30px 22px;
+        content: "";
+        display: block;
+        height: 0;
+        left: -10px;
+        width: 30px;
+    }
+
+
+
    .ms-admin-menu-aside .el-submenu__title,
    .ms-admin-menu-aside .el-menu-item {
        color: rgba(255, 255, 255, 1);
@@ -607,6 +673,50 @@
        color: rgba(255, 255, 255, 1) !important;
    }

+
+    .ms-admin-header {
+        display: flex;
+        padding: 0;
+        background-color: rgba(255, 255, 255, 1);
+        height: 50px !important;
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+        z-index: 1;
+    }
+
+    .ms-admin-header .ms-admin-header-menu {
+        border-bottom: none;
+        position: relative;
+    }
+
+    .ms-admin-header .ms-admin-header-menu > .ms-admin-menu-item > * {
+        height: 50px !important;
+        line-height: 50px !important;
+        border-bottom: none !important;
+        font-size: 1em;
+    }
+
+
+
+    .ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu > li {
+        margin: 0;
+        padding: 0 20px;
+        text-align: left;
+        display: -webkit-inline-box;
+        display: inline-block;
+        height: 50px;
+        line-height: 50px;
+        font-weight: normal;
+        font-size: 14px;
+        color: #333;
+    }
+
+    .ms-admin-header .ms-admin-header-menu .ms-admin-shortcut-menu > li:hover {
+        cursor: pointer;
+        color: #0099ff;
+    }
+
+
+
    .ms-admin-header-menu .el-submenu__title {
        height: 50px !important;
        line-height: 50px !important;
@@ -614,24 +724,29 @@
        align-items: center;

    }
+
+
    .ms-admin-header-menu .el-submenu__title:hover {
        background-color: #F2F6FC !important;
-        color:#409EFF !important;
+        color: #409EFF !important;
    }

-    .ms-admin-header-menu .el-submenu__title:hover i{
-        color:#409EFF !important;
+    .ms-admin-header-menu .el-submenu__title:hover i {
+        color: #409EFF !important;
    }

    .ms-admin-header-menu .el-submenu__icon-arrow {
        margin-top: 4px !important;
    }

-    .ms-admin-header-menu .el-menu-item:focus, .ms-admin-header-menu .el-menu-item:hover {
+    .ms-admin-header-menu-item .el-menu-item:hover {
        background-color: #F2F6FC !important;
-        color:#409EFF !important;
+        color: #409EFF !important;
    }

+    .ms-admin-header-menu-item .el-menu-item:hover i {
+        color: #409EFF !important;
+    }


    .ms-admin-header-menu-all {
@@ -681,10 +796,6 @@
    }


-    .ms-admin-login-down {
-        top: 55px !important;
-    }
-
    .ms-admin-menu-aside-submenu .el-menu-item {
        line-height: 40px;
        height: 40px;
@@ -734,7 +845,79 @@
        min-width: 162px;
    }

-    .ms-admin-login-down {
-        top: 55px !important;
+
+    .ms-admin-container {
+        height: auto;
+    }
+
+    .ms-admin-container > .ms-admin-main {
+        padding: 0;
+        background-color: #fff;
+        z-index: 0;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs {
+        height: calc(100vh - 50px);
+        display: flex;
+        flex-direction: column;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content {
+        height: 100%;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content .el-tab-pane {
+        height: 100%;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__header {
+        background: #fafafa;
+        margin-bottom: 0;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__header .el-tabs__nav-scroll .el-tabs__nav {
+        border-left: none;
+        border-radius: 0;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .ms-admin-refresh {
+        float: right;
+        width: 40px;
+        height: 40px;
+        text-align: center;
+        border-left: 1px solid #e6e6e6;
+        cursor: pointer;
+        position: relative;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .ms-admin-refresh::before {
+        position: absolute;
+        left: 34%;
+        top: 50%;
+        transform: translateY(-50%);
+        color: #999;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-next,
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-prev {
+        width: 40px;
+        height: 40px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-next {
+        border-left: 1px solid #e6e6e6;
+    }
+
+    .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-prev {
+        border-right: 1px solid #e6e6e6;
+    }
+
+    .ms-admin-container > .ms-admin-main iframe {
+        width: 100%;
+        height: 100%;
+        border: none !important;
    }
 </style>
--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/main.ftl
@@ -11,7 +11,7 @@
  <meta name="app-mobile-web-app-status-bar-style" content="black-translucent"/>
  <script src="${base}/static/plugins/vue/2.6.9/vue.min.js"></script>
  <!--通用图标-->
-  <link rel="stylesheet" href="${base}/static/ms-admin/5.0.0/iconfont/iconfont.css" />
+  <link rel="stylesheet" href="${base}/static/plugins/iconfont/1.0.0/iconfont.css" />
  <script src="${base}/static/plugins/element-ui/2.12.0/index.js"></script>
  <link rel="stylesheet" href="${base}/static/plugins/element-ui/2.12.0/index.css" />
  <!--网络请求框架-->

--- a/src/main/webapp/static/ms-admin/5.0.0/css/index.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/index.css
--- a/src/main/webapp/static/ms-admin/5.0.0/css/login.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/css/login.css
-/*
-*这里的值严格按照UI设计图标注值来进行设置
-*/
-/*
-*颜色
-*/
-/*
-*页面的边距
-*/
-/*
-*字体
-*/
-/*
-*头像
-*/
-/*
- * 按钮
- */
-/*
-*对常见的多行样式进行了方法封装，方便调用，加快开发效率
-*/
-html,
-body {
-  min-height: 100vh;
-  width: 100vw;
-  background-color: #eee;
-  margin: 0;
-  display: flex;
-  font-weight: initial !important;
-  font-size: 14px !important;
-  color: #333 !important;
-}
-html *,
-body * {
-  text-decoration: none !important;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  box-sizing: border-box;
-}
-.ms-ellipsis {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  display: block;
-}
-.ms-align-center {
-  display: flex;
-  align-items: center;
-}
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  font-weight: initial;
-  font-size: 12px;
-  color: #aaa;
-  resize: none;
-}
-*::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-/*定义滚动条轨道 内阴影+圆角*/
-*::-webkit-scrollbar-track {
-  border-radius: 10px;
-  /*滚动条的背景区域的圆角*/
-  background-color: #eee;
-  /*滚动条的背景颜色*/
-}
-/*定义滑块 内阴影+圆角*/
-*::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  /*滚动条的圆角*/
-  background-color: #ddd;
-  /*滚动条的背景颜色*/
-}
-.ms-container {
-  margin: 12px;
-  height: calc(100% - 24px);
-  padding: 14px 14px 0 14px;
-  background: #fff;
-}
-.ms-header {
-  padding: 10px;
-  margin: 0;
-  border-bottom: 1px solid #ddd;
-  background: #fff;
-  height: 50px;
-}
-.ms-pagination {
-  padding: 20px 0;
-  text-align: right;
-}
-.ms-fr {
-  float: right;
-}
-.ms-tr {
-  text-align: right;
-}
-.ms-weixin-content {
-  width: calc(100% - 140px);
-}
-.ms-weixin-dialog .el-dialog__header {
-  height: 55px;
-  box-sizing: border-box;
-  padding: 10px 10px 25px 10px;
-  border-bottom: 1px solid #ddd;
-}
-.ms-weixin-dialog .el-dialog__header .el-dialog__title {
-  font-weight: bold;
-  font-size: 14px;
-  color: #333;
-}
-.ms-weixin-dialog .el-dialog__footer {
-  border-top: 1px solid #ddd;
-  padding: 15px !important;
-}
-.login {
-  width: 100vw;
-  height: 100vh;
-}
-.login .ms-admin-login-container {
-  height: 100%;
-  background: url('../images/login-bg.jpg') center no-repeat;
-  background-size: cover;
-}
-.login .ms-admin-login-container .ms-admin-login-main {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 680px;
-  height: 320px;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp > img {
-  flex: 1;
-  display: inline-block;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form {
-  flex: 1;
-  height: 320px;
-  background: #fff;
-  padding: 20px  54px;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 {
-  line-height: 1;
-  font-weight: initial;
-  font-size: 12px;
-  color: #999999;
-  margin: 0 0 20px 0;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form h1 span {
-  font-weight: initial;
-  font-size: 16px;
-  color: #0099ff;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item {
-  margin-bottom: 20px;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item > div {
-  margin-left: 0 !important;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item .el-form-item__content,
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item .el-input,
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item input {
-  height: 34px !important;
-  line-height: 34px !important;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content {
-  display: flex;
-  justify-content: space-between;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input__inner,
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content .el-input {
-  width: 97px;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content > img {
-  width: 66px;
-  height: 34px;
-  margin: 0 6px;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p {
-  display: flex;
-  justify-content: space-between;
-  line-height: 17px;
-  flex-direction: column;
-  margin: 0;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p span:nth-of-type(1) {
-  font-weight: initial;
-  font-size: 10px;
-  color: #999999;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-code .el-form-item__content p span:nth-of-type(2) {
-  font-weight: initial;
-  font-size: 10px;
-  color: #0099ff;
-  cursor: pointer;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout .el-form-item__content,
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout .el-input,
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-form-item-checkout input {
-  height: auto !important;
-  line-height: 1px !important;
-}
-.login .ms-admin-login-container .ms-admin-login-main .ms-admin-login-warp .ms-admin-login-form .ms-admin-login-btn {
-  width: 100%;
-  height: 34px;
-  line-height: 5px;
-}
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.css
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.css
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.js
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.js
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff2
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.woff2
--- a/src/main/webapp/static/plugins/iconfont/1.0.0/demo.css
+++ b/src/main/webapp/static/plugins/iconfont/1.0.0/demo.css
+/* Logo 字体 */
+@font-face {
+  font-family: "iconfont logo";
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
+  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+}
+
+.logo {
+  font-family: "iconfont logo";
+  font-size: 160px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* tabs */
+.nav-tabs {
+  position: relative;
+}
+
+.nav-tabs .nav-more {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  height: 42px;
+  line-height: 42px;
+  color: #666;
+}
+
+#tabs {
+  border-bottom: 1px solid #eee;
+}
+
+#tabs li {
+  cursor: pointer;
+  width: 100px;
+  height: 40px;
+  line-height: 40px;
+  text-align: center;
+  font-size: 16px;
+  border-bottom: 2px solid transparent;
+  position: relative;
+  z-index: 1;
+  margin-bottom: -1px;
+  color: #666;
+}
+
+
+#tabs .active {
+  border-bottom-color: #f00;
+  color: #222;
+}
+
+.tab-container .content {
+  display: none;
+}
+
+/* 页面布局 */
+.main {
+  padding: 30px 100px;
+  width: 960px;
+  margin: 0 auto;
+}
+
+.main .logo {
+  color: #333;
+  text-align: left;
+  margin-bottom: 30px;
+  line-height: 1;
+  height: 110px;
+  margin-top: -50px;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.main .logo a {
+  font-size: 160px;
+  color: #333;
+}
+
+.helps {
+  margin-top: 40px;
+}
+
+.helps pre {
+  padding: 20px;
+  margin: 10px 0;
+  border: solid 1px #e7e1cd;
+  background-color: #fffdef;
+  overflow: auto;
+}
+
+.icon_lists {
+  width: 100% !important;
+  overflow: hidden;
+  *zoom: 1;
+}
+
+.icon_lists li {
+  width: 100px;
+  margin-bottom: 10px;
+  margin-right: 20px;
+  text-align: center;
+  list-style: none !important;
+  cursor: default;
+}
+
+.icon_lists li .code-name {
+  line-height: 1.2;
+}
+
+.icon_lists .icon {
+  display: block;
+  height: 100px;
+  line-height: 100px;
+  font-size: 42px;
+  margin: 10px auto;
+  color: #333;
+  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
+  -moz-transition: font-size 0.25s linear, width 0.25s linear;
+  transition: font-size 0.25s linear, width 0.25s linear;
+}
+
+.icon_lists .icon:hover {
+  font-size: 100px;
+}
+
+.icon_lists .svg-icon {
+  /* 通过设置 font-size 来改变图标大小 */
+  width: 1em;
+  /* 图标和文字相邻时，垂直对齐 */
+  vertical-align: -0.15em;
+  /* 通过设置 color 来改变 SVG 的颜色/fill */
+  fill: currentColor;
+  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
+      normalize.css 中也包含这行 */
+  overflow: hidden;
+}
+
+.icon_lists li .name,
+.icon_lists li .code-name {
+  color: #666;
+}
+
+/* markdown 样式 */
+.markdown {
+  color: #666;
+  font-size: 14px;
+  line-height: 1.8;
+}
+
+.highlight {
+  line-height: 1.5;
+}
+
+.markdown img {
+  vertical-align: middle;
+  max-width: 100%;
+}
+
+.markdown h1 {
+  color: #404040;
+  font-weight: 500;
+  line-height: 40px;
+  margin-bottom: 24px;
+}
+
+.markdown h2,
+.markdown h3,
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  color: #404040;
+  margin: 1.6em 0 0.6em 0;
+  font-weight: 500;
+  clear: both;
+}
+
+.markdown h1 {
+  font-size: 28px;
+}
+
+.markdown h2 {
+  font-size: 22px;
+}
+
+.markdown h3 {
+  font-size: 16px;
+}
+
+.markdown h4 {
+  font-size: 14px;
+}
+
+.markdown h5 {
+  font-size: 12px;
+}
+
+.markdown h6 {
+  font-size: 12px;
+}
+
+.markdown hr {
+  height: 1px;
+  border: 0;
+  background: #e9e9e9;
+  margin: 16px 0;
+  clear: both;
+}
+
+.markdown p {
+  margin: 1em 0;
+}
+
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
+  width: 80%;
+}
+
+.markdown ul>li {
+  list-style: circle;
+}
+
+.markdown>ul li,
+.markdown blockquote ul>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown>ul li p,
+.markdown>ol li p {
+  margin: 0.6em 0;
+}
+
+.markdown ol>li {
+  list-style: decimal;
+}
+
+.markdown>ol li,
+.markdown blockquote ol>li {
+  margin-left: 20px;
+  padding-left: 4px;
+}
+
+.markdown code {
+  margin: 0 3px;
+  padding: 0 5px;
+  background: #eee;
+  border-radius: 3px;
+}
+
+.markdown strong,
+.markdown b {
+  font-weight: 600;
+}
+
+.markdown>table {
+  border-collapse: collapse;
+  border-spacing: 0px;
+  empty-cells: show;
+  border: 1px solid #e9e9e9;
+  width: 95%;
+  margin-bottom: 24px;
+}
+
+.markdown>table th {
+  white-space: nowrap;
+  color: #333;
+  font-weight: 600;
+}
+
+.markdown>table th,
+.markdown>table td {
+  border: 1px solid #e9e9e9;
+  padding: 8px 16px;
+  text-align: left;
+}
+
+.markdown>table th {
+  background: #F7F7F7;
+}
+
+.markdown blockquote {
+  font-size: 90%;
+  color: #999;
+  border-left: 4px solid #e9e9e9;
+  padding-left: 0.8em;
+  margin: 1em 0;
+}
+
+.markdown blockquote p {
+  margin: 0;
+}
+
+.markdown .anchor {
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  margin-left: 8px;
+}
+
+.markdown .waiting {
+  color: #ccc;
+}
+
+.markdown h1:hover .anchor,
+.markdown h2:hover .anchor,
+.markdown h3:hover .anchor,
+.markdown h4:hover .anchor,
+.markdown h5:hover .anchor,
+.markdown h6:hover .anchor {
+  opacity: 1;
+  display: inline-block;
+}
+
+.markdown>br,
+.markdown>p>br {
+  clear: both;
+}
+
+
+.hljs {
+  display: block;
+  background: white;
+  padding: 0.5em;
+  color: #333333;
+  overflow-x: auto;
+}
+
+.hljs-comment,
+.hljs-meta {
+  color: #969896;
+}
+
+.hljs-string,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-strong,
+.hljs-emphasis,
+.hljs-quote {
+  color: #df5000;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-type {
+  color: #a71d5d;
+}
+
+.hljs-literal,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-attribute {
+  color: #0086b3;
+}
+
+.hljs-section,
+.hljs-name {
+  color: #63a35c;
+}
+
+.hljs-tag {
+  color: #333333;
+}
+
+.hljs-title,
+.hljs-attr,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #795da3;
+}
+
+.hljs-addition {
+  color: #55a532;
+  background-color: #eaffea;
+}
+
+.hljs-deletion {
+  color: #bd2c00;
+  background-color: #ffecec;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
+
+/* 代码高亮 */
+/* PrismJS 1.15.0
+https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
+/**
+ * prism.js default theme for JavaScript, CSS and HTML
+ * Based on dabblet (http://dabblet.com)
+ * @author Lea Verou
+ */
+code[class*="language-"],
+pre[class*="language-"] {
+  color: black;
+  background: none;
+  text-shadow: 0 1px white;
+  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
+  text-align: left;
+  white-space: pre;
+  word-spacing: normal;
+  word-break: normal;
+  word-wrap: normal;
+  line-height: 1.5;
+
+  -moz-tab-size: 4;
+  -o-tab-size: 4;
+  tab-size: 4;
+
+  -webkit-hyphens: none;
+  -moz-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+}
+
+pre[class*="language-"]::-moz-selection,
+pre[class*="language-"] ::-moz-selection,
+code[class*="language-"]::-moz-selection,
+code[class*="language-"] ::-moz-selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+pre[class*="language-"]::selection,
+pre[class*="language-"] ::selection,
+code[class*="language-"]::selection,
+code[class*="language-"] ::selection {
+  text-shadow: none;
+  background: #b3d4fc;
+}
+
+@media print {
+
+  code[class*="language-"],
+  pre[class*="language-"] {
+    text-shadow: none;
+  }
+}
+
+/* Code blocks */
+pre[class*="language-"] {
+  padding: 1em;
+  margin: .5em 0;
+  overflow: auto;
+}
+
+:not(pre)>code[class*="language-"],
+pre[class*="language-"] {
+  background: #f5f2f0;
+}
+
+/* Inline code */
+:not(pre)>code[class*="language-"] {
+  padding: .1em;
+  border-radius: .3em;
+  white-space: normal;
+}
+
+.token.comment,
+.token.prolog,
+.token.doctype,
+.token.cdata {
+  color: slategray;
+}
+
+.token.punctuation {
+  color: #999;
+}
+
+.namespace {
+  opacity: .7;
+}
+
+.token.property,
+.token.tag,
+.token.boolean,
+.token.number,
+.token.constant,
+.token.symbol,
+.token.deleted {
+  color: #905;
+}
+
+.token.selector,
+.token.attr-name,
+.token.string,
+.token.char,
+.token.builtin,
+.token.inserted {
+  color: #690;
+}
+
+.token.operator,
+.token.entity,
+.token.url,
+.language-css .token.string,
+.style .token.string {
+  color: #9a6e3a;
+  background: hsla(0, 0%, 100%, .5);
+}
+
+.token.atrule,
+.token.attr-value,
+.token.keyword {
+  color: #07a;
+}
+
+.token.function,
+.token.class-name {
+  color: #DD4A68;
+}
+
+.token.regex,
+.token.important,
+.token.variable {
+  color: #e90;
+}
+
+.token.important,
+.token.bold {
+  font-weight: bold;
+}
+
+.token.italic {
+  font-style: italic;
+}
+
+.token.entity {
+  cursor: help;
+}
--- a/src/main/webapp/static/plugins/iconfont/1.0.0/demo_index.html
+++ b/src/main/webapp/static/plugins/iconfont/1.0.0/demo_index.html
--- a/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.css
+++ b/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.css
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.eot
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.eot
--- a/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.js
+++ b/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.js
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.json
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.json
@@ -5,6 +5,342 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "12330036",
+      "name": "加载",
+      "font_class": "jiazai1",
+      "unicode": "e7df",
+      "unicode_decimal": 59359
+    },
+    {
+      "icon_id": "4437603",
+      "name": "下箭头",
+      "font_class": "xiajiantou1",
+      "unicode": "e7db",
+      "unicode_decimal": 59355
+    },
+    {
+      "icon_id": "36534",
+      "name": "图层",
+      "font_class": "tuceng",
+      "unicode": "e7dc",
+      "unicode_decimal": 59356
+    },
+    {
+      "icon_id": "2815710",
+      "name": "复制",
+      "font_class": "fuzhi1",
+      "unicode": "e7dd",
+      "unicode_decimal": 59357
+    },
+    {
+      "icon_id": "3248687",
+      "name": "粘贴",
+      "font_class": "niantie",
+      "unicode": "e7de",
+      "unicode_decimal": 59358
+    },
+    {
+      "icon_id": "12685022",
+      "name": "标记",
+      "font_class": "icon_huabanfuben",
+      "unicode": "e7e0",
+      "unicode_decimal": 59360
+    },
+    {
+      "icon_id": "9673150",
+      "name": "编辑",
+      "font_class": "bianji1",
+      "unicode": "e7da",
+      "unicode_decimal": 59354
+    },
+    {
+      "icon_id": "1789990",
+      "name": "右对齐",
+      "font_class": "youduiqi1",
+      "unicode": "e7d6",
+      "unicode_decimal": 59350
+    },
+    {
+      "icon_id": "1789992",
+      "name": "左对齐",
+      "font_class": "zuoduiqi1",
+      "unicode": "e7d7",
+      "unicode_decimal": 59351
+    },
+    {
+      "icon_id": "7550246",
+      "name": "组件",
+      "font_class": "zujian",
+      "unicode": "e7d8",
+      "unicode_decimal": 59352
+    },
+    {
+      "icon_id": "15952262",
+      "name": "居中对齐",
+      "font_class": "juzhongduiqi",
+      "unicode": "e7d9",
+      "unicode_decimal": 59353
+    },
+    {
+      "icon_id": "880393",
+      "name": "关闭",
+      "font_class": "guanbi2",
+      "unicode": "e7d4",
+      "unicode_decimal": 59348
+    },
+    {
+      "icon_id": "15925450",
+      "name": "两端对齐",
+      "font_class": "liangduanduiqi1",
+      "unicode": "e7d5",
+      "unicode_decimal": 59349
+    },
+    {
+      "icon_id": "11976281",
+      "name": "两端对齐",
+      "font_class": "liangduanduiqi",
+      "unicode": "e7d3",
+      "unicode_decimal": 59347
+    },
+    {
+      "icon_id": "11328937",
+      "name": "无边框",
+      "font_class": "wubiankuang",
+      "unicode": "e7cc",
+      "unicode_decimal": 59340
+    },
+    {
+      "icon_id": "11328961",
+      "name": "外边框",
+      "font_class": "waibiankuang",
+      "unicode": "e7cd",
+      "unicode_decimal": 59341
+    },
+    {
+      "icon_id": "11329509",
+      "name": "下边框",
+      "font_class": "xiabiankuang",
+      "unicode": "e7ce",
+      "unicode_decimal": 59342
+    },
+    {
+      "icon_id": "11329510",
+      "name": "上边框",
+      "font_class": "shangbiankuang",
+      "unicode": "e7cf",
+      "unicode_decimal": 59343
+    },
+    {
+      "icon_id": "11329593",
+      "name": "左边框",
+      "font_class": "zuobiankuang",
+      "unicode": "e7d0",
+      "unicode_decimal": 59344
+    },
+    {
+      "icon_id": "11329596",
+      "name": "右边框",
+      "font_class": "youbiankuang",
+      "unicode": "e7d2",
+      "unicode_decimal": 59346
+    },
+    {
+      "icon_id": "3294798",
+      "name": "设置圆角",
+      "font_class": "yuanjiao",
+      "unicode": "e7ca",
+      "unicode_decimal": 59338
+    },
+    {
+      "icon_id": "609771",
+      "name": "字体",
+      "font_class": "zitifont8",
+      "unicode": "e7c8",
+      "unicode_decimal": 59336
+    },
+    {
+      "icon_id": "4800130",
+      "name": "字体",
+      "font_class": "ziti",
+      "unicode": "e7c9",
+      "unicode_decimal": 59337
+    },
+    {
+      "icon_id": "445409",
+      "name": "按键分割线",
+      "font_class": "anjianfengexian",
+      "unicode": "e7c6",
+      "unicode_decimal": 59334
+    },
+    {
+      "icon_id": "12719940",
+      "name": "换行",
+      "font_class": "huanhang",
+      "unicode": "e7c7",
+      "unicode_decimal": 59335
+    },
+    {
+      "icon_id": "634467",
+      "name": "框架_frame23",
+      "font_class": "kuangjiaframe23",
+      "unicode": "e7b8",
+      "unicode_decimal": 59320
+    },
+    {
+      "icon_id": "1335471",
+      "name": "线框",
+      "font_class": "icon-xiankuang",
+      "unicode": "e7c1",
+      "unicode_decimal": 59329
+    },
+    {
+      "icon_id": "2409162",
+      "name": "框选",
+      "font_class": "box-select",
+      "unicode": "e7c2",
+      "unicode_decimal": 59330
+    },
+    {
+      "icon_id": "10863611",
+      "name": "下框线",
+      "font_class": "xiakuangxian",
+      "unicode": "e895",
+      "unicode_decimal": 59541
+    },
+    {
+      "icon_id": "10863952",
+      "name": "上框线",
+      "font_class": "shangkuangxian",
+      "unicode": "e896",
+      "unicode_decimal": 59542
+    },
+    {
+      "icon_id": "10864077",
+      "name": "左框线",
+      "font_class": "zuokuangxian",
+      "unicode": "e897",
+      "unicode_decimal": 59543
+    },
+    {
+      "icon_id": "10864086",
+      "name": "右框线",
+      "font_class": "youkuangxian",
+      "unicode": "e898",
+      "unicode_decimal": 59544
+    },
+    {
+      "icon_id": "10864189",
+      "name": "外侧框线",
+      "font_class": "waicekuangxian",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "12561206",
+      "name": "垂直间距",
+      "font_class": "chuizhijianju-",
+      "unicode": "e7c4",
+      "unicode_decimal": 59332
+    },
+    {
+      "icon_id": "12561542",
+      "name": "水平间距",
+      "font_class": "shuipingjianju-",
+      "unicode": "e7c5",
+      "unicode_decimal": 59333
+    },
+    {
+      "icon_id": "7522927",
+      "name": "不可视",
+      "font_class": "bukeshi",
+      "unicode": "e7bf",
+      "unicode_decimal": 59327
+    },
+    {
+      "icon_id": "7522930",
+      "name": "可视",
+      "font_class": "keshi",
+      "unicode": "e7c0",
+      "unicode_decimal": 59328
+    },
+    {
+      "icon_id": "7239677",
+      "name": "colum-height",
+      "font_class": "colum-height",
+      "unicode": "e7bd",
+      "unicode_decimal": 59325
+    },
+    {
+      "icon_id": "14772668",
+      "name": "column-width",
+      "font_class": "column-width",
+      "unicode": "e7be",
+      "unicode_decimal": 59326
+    },
+    {
+      "icon_id": "657586",
+      "name": "垂直居中对齐",
+      "font_class": "chuizhijuzhongduiqi",
+      "unicode": "e7b2",
+      "unicode_decimal": 59314
+    },
+    {
+      "icon_id": "657590",
+      "name": "水平居中对齐",
+      "font_class": "shuipingjuzhongduiqi",
+      "unicode": "e7b3",
+      "unicode_decimal": 59315
+    },
+    {
+      "icon_id": "657594",
+      "name": "右对齐",
+      "font_class": "youduiqi",
+      "unicode": "e7b5",
+      "unicode_decimal": 59317
+    },
+    {
+      "icon_id": "657595",
+      "name": "左对齐",
+      "font_class": "zuoduiqi",
+      "unicode": "e7b6",
+      "unicode_decimal": 59318
+    },
+    {
+      "icon_id": "10253174",
+      "name": "网页",
+      "font_class": "wangye1",
+      "unicode": "e7b7",
+      "unicode_decimal": 59319
+    },
+    {
+      "icon_id": "11727657",
+      "name": "顶部对齐",
+      "font_class": "dingbuduiqi",
+      "unicode": "e7b9",
+      "unicode_decimal": 59321
+    },
+    {
+      "icon_id": "11727658",
+      "name": "底部对齐",
+      "font_class": "dibuduiqi",
+      "unicode": "e7ba",
+      "unicode_decimal": 59322
+    },
+    {
+      "icon_id": "12550443",
+      "name": "水平等距分布",
+      "font_class": "shuipingdengjufenbu",
+      "unicode": "e7bb",
+      "unicode_decimal": 59323
+    },
+    {
+      "icon_id": "12550445",
+      "name": "垂直等距分布",
+      "font_class": "chuizhidengjufenbu",
+      "unicode": "e7bc",
+      "unicode_decimal": 59324
+    },
    {
      "icon_id": "4749586",
      "name": "邮箱",

--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.svg
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.svg
--- a/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.ttf
+++ b/src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.ttf
--- a/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.woff
+++ b/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.woff
--- a/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.woff2
+++ b/src/main/webapp/static/plugins/iconfont/1.0.0/iconfont.woff2