Merge remote-tracking branch 'origin/v4.7.0dev' into v5.0.0dev

template/admin/src/components/main/components/side-menu/side-menu.less

@@ -7,10 +7,14 @@
 .side-menu-wrapper {
   user-select: none;
   height: 100%;
+  ::-webkit-scrollbar{width:0;}
+  -ms-overflow-style: none;
   .menu-collapsed {
     height: 100%;
     background-color: @side-dark-theme;
     color: #fff !important;
+    overflow-y: scroll;
+    
     .ivu-dropdown {
       width: 100%;
       .ivu-dropdown-rel a {

template/admin/src/pages/setting/setSystem/index.vue

@@ -206,8 +206,10 @@ export default {
       })
         .then((res) => {
           this.$Message.success(res.msg);
-          localStorage.setItem('ADMIN_TITLE', formData.site_name);
-          window.document.title = `${formData.site_name} - 系统设置`;
+          if (formData.site_name) {
+            localStorage.setItem('ADMIN_TITLE', formData.site_name);
+            window.document.title = `${formData.site_name} - 系统设置`;
+          }
         })
         .catch((res) => {
           this.$Message.error(res.msg);
@@ -224,9 +226,10 @@ export default {
 
 .fromBox {
   min-height: calc(100vh - 200px);
-  margin-top: 0px !important ;
+  margin-top: 0px !important;
 }
-.article-manager /deep/ .ivu-form-item{
+
+.article-manager /deep/ .ivu-form-item {
   margin-bottom: 20px !important;
 }
 </style>