Merge branch 'rc' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into rc

src/bu-components/UploadProgressModal.jsx

@@ -98,6 +98,7 @@ class UploadProgressModal extends React.Component {
     // 开始上传之前初始化OssClient
     // 开始上传之前初始化OssClient
     this.initOssClient(id, resourceName).then((result) => {
     this.initOssClient(id, resourceName).then((result) => {
       const { ossClient, resourceId, callBack, callbackBody, ossUri } = result;
       const { ossClient, resourceId, callBack, callbackBody, ossUri } = result;
+      console.log('type',type);
       ossClient.multipartUpload(ossUri, fileContent, {
       ossClient.multipartUpload(ossUri, fileContent, {
         callback: {
         callback: {
           url: callBack,
           url: callBack,

src/modules/root/Header.less

@@ -378,7 +378,7 @@
               .name,
               .name,
               .tip {
               .tip {
                 width: 70px;
                 width: 70px;
-                font-size: 14px;
+                font-size: 13px;
                 color: #333333;
                 color: #333333;
                 line-height: 52px;
                 line-height: 52px;
                 margin: 0 auto;
                 margin: 0 auto;

src/modules/root/Menu.less

@@ -97,7 +97,7 @@
         margin: 6px 8px;
         margin: 6px 8px;
         width: calc(100% - 15px);
         width: calc(100% - 15px);
         &:hover {
         &:hover {
-          background: #f3f6fa;
+          background: rgba(41, 102, 255, .05);
           border-radius: 2px;
           border-radius: 2px;
           color: #333;
           color: #333;
         }
         }
@@ -109,6 +109,7 @@
         &.single-menu {
         &.single-menu {
           background: rgba(41, 102, 255, .1) !important;
           background: rgba(41, 102, 255, .1) !important;
           color: @active-color;
           color: @active-color;
+          font-weight:500;
         }
         }
       }
       }
       .ant-menu-submenu {
       .ant-menu-submenu {
@@ -118,6 +119,9 @@
         }
         }
         .ant-menu-item {
         .ant-menu-item {
           padding-left: 46px !important;
           padding-left: 46px !important;
+          &:hover {
+            color: #333!important;
+          }
         }
         }
       }
       }
 
 
@@ -126,13 +130,21 @@
 
 
         .ant-menu-item-selected {
         .ant-menu-item-selected {
           color: @active-color;
           color: @active-color;
+          font-weight: 500;
+          &:hover {
+            color: @active-color!important;
+          }
           .listType {
           .listType {
             background: @active-color;
             background: @active-color;
           }
           }
         }
         }
+        .ant-menu-submenu-arrow {
+          right: 10px!important;
+          color: @active-color;
+        }
       }
       }
       .ant-menu-submenu-arrow {
       .ant-menu-submenu-arrow {
-        right: 22px;
+        right: 10px!important;
         color: #5e606a;
         color: #5e606a;
       }
       }
     }
     }
@@ -268,8 +280,26 @@
     left: 74px;
     left: 74px;
   }
   }
 }
 }
-.ant-menu-submenu-open.ant-menu-submenu-inline > .ant-menu-submenu-title > .ant-menu-submenu-arrow {
-  color: #2966FF;
+
+.ant-menu-inline .ant-menu-item, .ant-menu-inline .ant-menu-submenu-title {
+  width: calc(100% - 15px)!important;
+}
+.ant-menu-submenu:hover {
+  // background: rgba(41, 102, 255, .05) !important;
+  &.ant-menu-submenu-title:hover {
+    color: #333333!important;
+  }
+ .ant-menu-submenu-title > .ant-menu-submenu-arrow {
+   color: #5e606a!important;
+ }
+  
+  &.icon-img-box {
+    background-color: rgba(41, 102, 255, .05)!important;
+  }
+}
+.ant-menu-light .ant-menu-submenu-title:hover {
+  color: #333!important;
+  background: rgba(41, 102, 255, .05) !important;
 }
 }
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
 .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
   background: rgba(41, 102, 255, .1) !important;
   background: rgba(41, 102, 255, .1) !important;

src/modules/root/Menu.tsx

@@ -241,7 +241,7 @@ function Aside(props: any) {
                           <img src={item.img} className='icon-img' />
                           <img src={item.img} className='icon-img' />
                         </div>
                         </div>
                       ) : (
                       ) : (
-                        <div className='icon-img-box' style={{ backgroundColor: '#fff', width: '40px', height: '40px', display: 'inline-block' }}>
+                        <div className='icon-img-box' style={{ width: '40px', height: '40px', display: 'inline-block' }}>
                           <img src={item.img} className='icon-img' />
                           <img src={item.img} className='icon-img' />
                         </div>
                         </div>
                       )
                       )

src/modules/teach-tool/paper-manage/OperatePaper.jsx

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-03-27 16:15:13
  * @Date: 2021-03-27 16:15:13
  * @LastEditors: yuananting
  * @LastEditors: yuananting
- * @LastEditTime: 2021-07-14 14:23:00
+ * @LastEditTime: 2021-07-15 11:31:26
  * @Description: 助学工具-新建/复制/编辑试卷
  * @Description: 助学工具-新建/复制/编辑试卷
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */