Merge branch 'feature/maolipeng/youhua' into 'master'

Feature/maolipeng/youhua

See merge request !65

src/modules/college-manage/CollegeInfoPage.jsx

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

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

@@ -436,7 +436,7 @@ class SelectPrepareFileModal extends React.Component {
       selectType,
       multiple,
       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;
 
     const selectedFileLength = selectedFileList.length;

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

@@ -809,7 +809,7 @@ class FolderList extends React.Component {
                       <Choose>
                         <When condition={hasManagementAuthority}>
                           <div className="lottie-icon-title">你还没有上传文件，点击
-                            <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4">
+                            <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4，上传后默认私密，可邀请其他成员协作，支持批量上传文件">
                               <span
                                 className="upload-btn"
                                 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"
             onChange={(e) => this.handleUpload(e)}
           />
-          <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4，上传后默认私密，可邀请其他成员协作">
+          <Tooltip title="支持文件类型：ppt、word、excel、pdf、jpg、mp3、mp4，上传后默认私密，可邀请其他成员协作，支持批量上传文件">
             <Button
               type={!showResultPage?"primary":""}
               disabled={showResultPage}

src/modules/root/Menu.tsx

@@ -11,6 +11,7 @@ import StoreService from '@/domains/store-domain/storeService';
 import classNames from 'classnames';
 import User from "@/common/js/user"
 import _ from 'underscore';
+import tBus from '@/core/tbus'
 import "./Menu.less";
 import { display } from 'html2canvas/dist/types/css/property-descriptors/display';
 import ContactWidget from '@/components/ContactWidget';
@@ -138,11 +139,20 @@ function Aside(props: any) {
         });
       }
       return item;
-    });
-  }, [props.location.pathname]);
-  useEffect(() => {
-    getTopLeftLogo();
-  }, []);
+    })
+  }, [props.location.pathname])
+
+  useEffect(()=> {
+    getTopLeftLogo()
+    tBus.bind("updateCollegeInfo",updateCollegeInfo)
+    return ()=> {
+      tBus.unbind("updateCollegeInfo",updateCollegeInfo)
+    }
+  },[])
+
+  function updateCollegeInfo() {
+    getTopLeftLogo()
+  }
 
   function getTopLeftLogo() {
     if (User.getToken()) {