Merge branch 'feature/maolipeng/youhua' into dev

# Conflicts:
#	yarn.lock

src/modules/college-manage/CollegeInfoPage.jsx

@@ -182,6 +182,7 @@ class CollegeInfoPage extends React.Component {
       User.setStoreName(storeName);
       User.setStoreName(storeName);
       Bus.trigger('storeNameChange',storeName);
       Bus.trigger('storeNameChange',storeName);
       message.success('保存成功');
       message.success('保存成功');
+      Bus.trigger("updateCollegeInfo")
     });
     });
   }
   }
   render() {
   render() {

src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx

@@ -436,7 +436,7 @@ class SelectPrepareFileModal extends React.Component {
       selectType,
       selectType,
       multiple,
       multiple,
       accept = ".ppt,.pptx,.doc,.docx,.pdf,.jpg,.jpeg,.png,.mp3,.mp4,.xlsx,.xls",
       accept = ".ppt,.pptx,.doc,.docx,.pdf,.jpg,.jpeg,.png,.mp3,.mp4,.xlsx,.xls",
-      tooltip = '支持文件类型：ppt、word、excel、pdf、jpg、jpeg、png、mp3、mp4'
+      tooltip = '支持文件类型：ppt、word、excel、pdf、jpg、jpeg、png、mp3、mp4，支持批量上传文件'
     } = this.props;
     } = this.props;
 
 
     const selectedFileLength = selectedFileList.length;
     const selectedFileLength = selectedFileList.length;

src/modules/resource-disk/components/FolderList.jsx

@@ -809,7 +809,7 @@ class FolderList extends React.Component {
                       <Choose>
                       <Choose>
                         <When condition={hasManagementAuthority}>
                         <When condition={hasManagementAuthority}>
                           <div className="lottie-icon-title">你还没有上传文件，点击
                           <div className="lottie-icon-title">你还没有上传文件，点击
-                            <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4">
+                            <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4，上传后默认私密，可邀请其他成员协作，支持批量上传文件">
                               <span
                               <span
                                 className="upload-btn"
                                 className="upload-btn"
                                 onClick={this.handleChooseFile}
                                 onClick={this.handleChooseFile}

src/modules/resource-disk/components/OperateArea.jsx

@@ -314,7 +314,7 @@ class OperateArea extends React.Component {
             accept=".ppt,.pptx,.doc,.docx,.pdf,.jpg,.jpeg,.png,.mp3,.mp4,.xlsx,.xls"
             accept=".ppt,.pptx,.doc,.docx,.pdf,.jpg,.jpeg,.png,.mp3,.mp4,.xlsx,.xls"
             onChange={(e) => this.handleUpload(e)}
             onChange={(e) => this.handleUpload(e)}
           />
           />
-          <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4，上传后默认私密，可邀请其他成员协作">
+          <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4，上传后默认私密，可邀请其他成员协作，支持批量上传文件">
             <Button
             <Button
               type={!showResultPage?"primary":""}
               type={!showResultPage?"primary":""}
               disabled={showResultPage}
               disabled={showResultPage}

src/modules/root/Menu.tsx

@@ -6,6 +6,7 @@ import classNames from 'classnames';
 import React, { Key, useContext, useEffect, useMemo, useState } from 'react';
 import React, { Key, useContext, useEffect, useMemo, useState } from 'react';
 import { withRouter } from 'react-router-dom';
 import { withRouter } from 'react-router-dom';
 import _ from 'underscore';
 import _ from 'underscore';
+import Bus from '@/core/tbus';
 import { menuList } from '../../routes//config/menuList';
 import { menuList } from '../../routes//config/menuList';
 import { VersionContext, XMContext } from '../../store/context';
 import { VersionContext, XMContext } from '../../store/context';
 import './Menu.less';
 import './Menu.less';
@@ -132,11 +133,20 @@ function Aside(props: any) {
         });
         });
       }
       }
       return item;
       return item;
-    });
-  }, [props.location.pathname]);
-  useEffect(() => {
-    getTopLeftLogo();
-  }, []);
+    })
+  }, [props.location.pathname])
+
+  useEffect(()=> {
+    getTopLeftLogo()
+    Bus.bind("updateCollegeInfo",updateCollegeInfo)
+    return ()=> {
+      Bus.unbind("updateCollegeInfo",updateCollegeInfo)
+    }
+  },[])
+
+  function updateCollegeInfo() {
+    getTopLeftLogo()
+  }
 
 
   function getTopLeftLogo() {
   function getTopLeftLogo() {
     if (User.getToken()) {
     if (User.getToken()) {

yarn.lock

@@ -6376,7 +6376,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
 
-
 hoist-non-react-statics@^3.1.0:
 hoist-non-react-statics@^3.1.0:
   version "3.3.2"
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -8446,14 +8445,6 @@ mini-css-extract-plugin@0.9.0:
     schema-utils "^1.0.0"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
     webpack-sources "^1.1.0"
 
 
-mini-store@^3.0.1:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/mini-store/-/mini-store-3.0.6.tgz#44b86be5b2877271224ce0689b3a35a2dffb1ca9"
-  integrity sha512-YzffKHbYsMQGUWQRKdsearR79QsMzzJcDDmZKlJBqt5JNkqpyJHYlK6gP61O36X+sLf76sO9G6mhKBe83gIZIQ==
-  dependencies:
-    hoist-non-react-statics "^3.3.2"
-    shallowequal "^1.0.2"
-
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -10787,7 +10778,6 @@ rc-table@~7.15.1:
     "@babel/runtime" "^7.10.1"
     "@babel/runtime" "^7.10.1"
     classnames "^2.2.5"
     classnames "^2.2.5"
     rc-resize-observer "^1.0.0"
     rc-resize-observer "^1.0.0"
-
     rc-util "^5.13.0"
     rc-util "^5.13.0"
     shallowequal "^1.1.0"
     shallowequal "^1.1.0"