Merge branch 'feature/maolipeng/youhua' into gray

# Conflicts: # src/modules/home/Home.jsx

Merge branch 'feature/maolipeng/youhua' into gray
# Conflicts: # src/modules/home/Home.jsx
282636bb · maolipeng · 2214f415 · 310ca455 · 282636bb · 282636bb
Commit 282636bb authored Jul 08, 2021 by maolipeng
8 changed files
--- a/src/modules/college-manage/CollegeInfoPage.jsx
+++ b/src/modules/college-manage/CollegeInfoPage.jsx
@@ -175,6 +175,7 @@ class CollegeInfoPage extends React.Component {
      User.setStoreName(storeName);
      Bus.trigger('storeNameChange',storeName);
      message.success('保存成功');
+      Bus.trigger("updateCollegeInfo")
    });
  }
  render() {

--- a/src/modules/home/Home.jsx
+++ b/src/modules/home/Home.jsx
-import Service from '@/common/js/service';
+import React, { useEffect, useState } from 'react';
-import User from '@/common/js/user';
+import { Select, Tooltip, Carousel, Popover } from 'antd';
-import DataSet from '@antv/data-set';
+import DataSet from "@antv/data-set";
 import { Chart as G2Chart } from '@antv/g2';
-import { Select, Tooltip } from 'antd';
+import {
-import { Axis, Chart, Coord, Geom, Guide, Tooltip as G2Tooltip } from 'bizcharts';
+  G2,
-import moment from 'moment';
+  Chart,
-import React from 'react';
+  Geom,
+  Axis,
+  Tooltip as G2Tooltip,
+  Coord,
+  Label,
+  Legend,
+  View,
+  Guide,
+  Shape,
+  Facet,
+  Util
+} from "bizcharts";
+import moment from 'moment'
+import Service from "@/common/js/service";
+import User from '@/common/js/user';
 import HomeTip from './HomeTip';
 import './Home.less';

--- a/src/modules/prepare-lesson/modal/SelectPrepareFileModal.jsx
+++ b/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;

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/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}

--- a/src/modules/resource-disk/components/OperateArea.jsx
+++ b/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}

--- a/src/modules/root/Header.less
+++ b/src/modules/root/Header.less
@@ -346,7 +346,7 @@
            width: 216px;
            height: 260px;
            top: 49px;
-            left: 0;
+            left: -50px;
            background-color: #fff;
            flex-wrap: wrap;
            box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);

--- a/src/modules/root/Menu.tsx
+++ b/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]);
+  }, [props.location.pathname])
-  useEffect(() => {
-    getTopLeftLogo();
+  useEffect(()=> {
-  }, []);
+    getTopLeftLogo()
+    tBus.bind("updateCollegeInfo",updateCollegeInfo)
+    return ()=> {
+      tBus.unbind("updateCollegeInfo",updateCollegeInfo)
+    }
+  },[])
+  function updateCollegeInfo() {
+    getTopLeftLogo()
+  }
  function getTopLeftLogo() {
    if (User.getToken()) {

--- a/yarn.lock
+++ b/yarn.lock
@@ -2451,10 +2451,10 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
    "@types/color-name" "^1.1.1"
    color-convert "^2.0.1"
-antd@4.16.5:
+antd@^4.16.3:
-  version "4.16.5"
+  version "4.16.6"
-  resolved "https://registry.nlark.com/antd/download/antd-4.16.5.tgz#6105bd848fb2e468e0d1d3ec024c82d2516587ef"
+  resolved "https://registry.nlark.com/antd/download/antd-4.16.6.tgz?cache=0&sync_timestamp=1624946614894&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fantd%2Fdownload%2Fantd-4.16.6.tgz#5f79fa103bbd8be30fac74142ef1bbf8bc872491"
-  integrity sha1-YQW9hI+y5Gjg0dPsAkyC0lFlh+8=
+  integrity sha1-X3n6EDu9i+MPrHQULvG7+LyHJJE=
  dependencies:
    "@ant-design/colors" "^6.0.0"
    "@ant-design/icons" "^4.6.2"
@@ -2491,7 +2491,7 @@ antd@4.16.5:
    rc-tabs "~11.9.1"
    rc-textarea "~0.3.0"
    rc-tooltip "~5.1.1"
-    rc-tree "~4.1.0"
+    rc-tree "~4.2.1"
    rc-tree-select "~4.3.0"
    rc-trigger "^5.2.1"
    rc-upload "~4.3.0"
@@ -6578,9 +6578,9 @@ humanize-ms@^1.2.0, humanize-ms@^1.2.1:
  dependencies:
    ms "^2.0.0"
-husky@^4.3.0:
+husky@^4.2.5:
  version "4.3.8"
-  resolved "https://registry.npm.taobao.org/husky/download/husky-4.3.8.tgz?cache=0&sync_timestamp=1617004245593&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhusky%2Fdownload%2Fhusky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
+  resolved "https://registry.nlark.com/husky/download/husky-4.3.8.tgz#31144060be963fd6850e5cc8f019a1dfe194296d"
  integrity sha1-MRRAYL6WP9aFDlzI8Bmh3+GUKW0=
  dependencies:
    chalk "^4.0.0"
@@ -10822,7 +10822,7 @@ rc-tree-select@~4.3.0:
    rc-tree "^4.0.0"
    rc-util "^5.0.5"
-rc-tree@^4.0.0, rc-tree@~4.1.0:
+rc-tree@^4.0.0:
  version "4.1.5"
  resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-4.1.5.tgz#734ab1bfe835e78791be41442ca0e571147ab6fa"
  integrity sha512-q2vjcmnBDylGZ9/ZW4F9oZMKMJdbFWC7um+DAQhZG1nqyg1iwoowbBggUDUaUOEryJP+08bpliEAYnzJXbI5xQ==
@@ -10833,6 +10833,17 @@ rc-tree@^4.0.0, rc-tree@~4.1.0:
    rc-util "^5.0.0"
    rc-virtual-list "^3.0.1"
+rc-tree@~4.2.1:
+  version "4.2.2"
+  resolved "https://registry.nlark.com/rc-tree/download/rc-tree-4.2.2.tgz#4429187cbbfbecbe989714a607e3de8b3ab7763f"
+  integrity sha1-RCkYfLv77L6YlxSmB+Peizq3dj8=
+  dependencies:
+    "@babel/runtime" "^7.10.1"
+    classnames "2.x"
+    rc-motion "^2.0.1"
+    rc-util "^5.0.0"
+    rc-virtual-list "^3.0.1"
 rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.1:
  version "5.2.8"
  resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.8.tgz#27c8291c24518b8f11d76c848f5424e0c429e94a"
@@ -13105,7 +13116,7 @@ vary@~1.1.2:
  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
-vconsole-webpack-plugin@^1.6.1:
+vconsole-webpack-plugin@^1.5.2:
  version "1.6.1"
  resolved "https://registry.nlark.com/vconsole-webpack-plugin/download/vconsole-webpack-plugin-1.6.1.tgz#7a9ee82c0a90d58964034f6d6bd349242ce65a70"
  integrity sha1-ep7oLAqQ1YlkA09ta9NJJCzmWnA=