Merge branch 'hotfix/zhangleyuan/20210619/storeuserId' into dev

src/bu-components/ChooseMembersModal.jsx

@@ -205,7 +205,6 @@ class ChooseMembersModal extends React.Component {
         title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
         key: 'avatar',
         dataIndex: 'avatar',
-        width: '30%',
         render: (value, record) => {
           const { adminName } = record;
           return (
@@ -304,10 +303,9 @@ class ChooseMembersModal extends React.Component {
                     columns={this.selectedColumnsLeft()}               
                     pagination={false}
                     scroll={{ y: 290}}
-                    // bordered={true}
                     size={'small'}
                     rowSelection={{
-                      columnWidth : 24,
+                      columnWidth : 63,
                       selectedRowKeys,
                       onChange : this.onChangeRow,
                       getCheckboxProps : this.getCheckboxProps,

src/components/WatchDataHeader.tsx

+/*
+ * @Author: wufan
+ * @Date: 2021-05-26 10:29:56
+ * @LastEditors: wufan
+ * @LastEditTime: 2021-06-17 14:15:00
+ * @Description: Description
+ */
 import React from "react";
-import { Tag } from 'antd'
 import "./WatchDataHeader.less";
 
 interface WatchDataHeaderProps {

src/modules/college-manage/modal/ChooseMembersModal.jsx

@@ -252,7 +252,6 @@ class ChooseMembersModal extends React.Component {
         title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
         key: 'avatar',
         dataIndex: 'avatar',
-        width: '40%',
         render: (value, record) => {
           const { name } = record;
 
@@ -371,7 +370,7 @@ class ChooseMembersModal extends React.Component {
                     }}
                     size={'small'}
                     rowSelection={{
-                      columnWidth : 24,
+                      columnWidth : 63,
                       selectedRowKeys,
                       onChange : this.onChangeRow,
                       getCheckboxProps : this.getCheckboxProps,

src/modules/course-manage/modal/ManageCoursewareModal.jsx

@@ -4,15 +4,15 @@
  * @Last Modified by: chenshu
  * @Last Modified time: 2021-06-08 18:18:46
  */
-import React, { useEffect, useState } from 'react';
-import { Modal, Button, Table, Progress, message, Tooltip, Spin, Popconfirm } from 'antd';
+import React from 'react';
+import { Modal, Button, Table, message, Tooltip, Spin, Popconfirm } from 'antd';
 import { QuestionCircleOutlined,LoadingOutlined} from "@ant-design/icons";
 import _ from 'underscore';
 import moment from 'moment';
 import Lottie from "lottie-web";
 import User from '@/common/js/user';
-import { suffixType, DEFAULT_SIZE_UNIT, SupportFileType } from '@/common/constants/academic/liveEnum';
-import { FileVerifyMap, FileTypeIcon, DISK_MAP } from '@/common/constants/academic/lessonEnum';
+import { suffixType, DEFAULT_SIZE_UNIT } from '@/common/constants/academic/liveEnum';
+import { FileVerifyMap, FileTypeIcon } from '@/common/constants/academic/lessonEnum';
 import ScanFileModal from '@/modules/prepare-lesson/modal/ScanFileModal'
 import SelectPrepareFileModal from '@/modules/prepare-lesson/modal/SelectPrepareFileModal';
 import Service from '@/common/js/service';
@@ -229,14 +229,18 @@ class ManageCoursewareModal extends React.Component {
           const antIcon = <LoadingOutlined/>;
           const type = FileVerifyMap[fileType].type;
           return <div className="courseware-name" onClick={() => this.handleScanFile(item)}>
-            {(type === 'JPG' || type === 'PNG') && item.progress ?
-              <Spin indicator={antIcon} />
-              :<img  
-                src={FileTypeIcon[FileVerifyMap[fileType].type] || (item.docUrls[0] || {}).conversionFileUrl}
-                alt=""
-                className="item-img"
-              />
-            }
+              <Choose>
+                <When condition={(type === 'JPG' || type === 'PNG') && item.progress}>
+                  <Spin indicator={antIcon} />
+                </When>
+                <Otherwise>
+                  <img  
+                  src={FileTypeIcon[FileVerifyMap[fileType].type] || (item.docUrls[0] || {}).conversionFileUrl}
+                  alt=""
+                  className="item-img"
+                />
+                </Otherwise>
+              </Choose>
             <Tooltip title={item.fileName}><span className="name">{item.fileName}</span></Tooltip>
           </div>
         },
@@ -270,7 +274,7 @@ class ManageCoursewareModal extends React.Component {
         width: "16%",
         dataIndex: "control",
         render: (_value, item) => {
-          const { uploadObject, failObject, cancelObject } = this.state;
+          const { failObject } = this.state;
           const uploadFail = failObject[item.id];
 
           // 上课前45分钟/上课中/已结束的情况下都不可操作
@@ -295,7 +299,7 @@ class ManageCoursewareModal extends React.Component {
     const {
       list, scanFileModal, editData, cancelObject,
       showSelectFileModal, selectedFileList,
-      diskList, currentRootDisk, isLessonPermission
+      diskList
     } = this.state;
     const _list = _.reject(list, (item) => cancelObject[item.id]);
     return (

src/modules/plan-manage/components/ExpiredCourseList.jsx

 import React from 'react';
-import { Button } from 'antd';
 import { withRouter } from 'react-router-dom';
-import User from '@/common/js/user';
 import './ExpiredCourseList.less';
 
 function ExpiredCourseList(props) {

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

@@ -9,8 +9,7 @@
 import React from 'react';
 import { Table, Menu, Dropdown, Modal, message,Tooltip } from 'antd';
 import _ from 'underscore';
-// import * as lodash from 'lodash';
-import { PageControl, LottieIcon } from 'xiaomai-b-components';
+import { PageControl } from 'xiaomai-b-components';
 import { XMTable } from '@/components';
 import Service from '@/common/js/service';
 import { formatDate } from '@/domains/basic-domain/utils';

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

@@ -13,7 +13,7 @@ import _ from 'underscore';
 import Service from '@/common/js/service';
 import { getEllipsText } from '@/domains/basic-domain/utils';
 
-import { DEFAULT_SIZE_UNIT, LOCAL_FILE_TYPE_MAP,FILR_VERIFY_MAP,SUPPORT_FILE_TYPE_MAP} from '@/domains/resource-disk/constants';
+import { DEFAULT_SIZE_UNIT,FILR_VERIFY_MAP,SUPPORT_FILE_TYPE_MAP} from '@/domains/resource-disk/constants';
 import { getFileTypeByName } from '@/domains/resource-disk/utils';
 
 import UploadProgressModal from '@/bu-components/UploadProgressModal';

src/modules/resource-disk/index.jsx

@@ -29,25 +29,6 @@ class PrepareLessonPage extends React.Component {
     }
   }
 
-  componentWillMount() {
-    // this.handleFetchDiskList();
-  }
-
-  handleFetchDiskList = async () => {
-    const res = await Service.Hades('public/apollo/getUserDisk', {});
-    const { result = [] } = res;
-    const diskList = result.map((item) => {
-      return {
-        ...item,
-        folderName: DISK_MAP[item.disk]
-      }
-    });
-    this.setState({
-      diskList,
-      currentRootDisk: diskList[0] || defaultRootDisk
-    });
-  }
-
   handleChangeDisk = (disk) => {
     this.setState({
       currentRootDisk: disk

src/modules/resource-disk/modal/CreateFolderModal.jsx

 import React from 'react';
-import { Modal, Input, Form, message } from 'antd';
-import ShowTips from '@/bu-components/ShowTip';
+import { Modal, Input, Form } from 'antd';
 import './CreateFolderModal.less';
 
 class CreateFolderModal extends React.Component {
@@ -107,5 +106,4 @@ class CreateFolderModal extends React.Component {
   }
 }
 
-// export default Form.create()(CreateFolderModal);
 export default CreateFolderModal;
\ No newline at end of file

src/modules/root/CollegeManagePage.jsx

@@ -179,6 +179,7 @@ export default class CollegeManagePage extends React.Component {
                       return null;
                     };
                     User.setStoreId(item.id);
+                    User.setStoreUserId(item.storeUserId);
                     window.RCHistory.push('/home')
                   }}
                 >
@@ -196,6 +197,7 @@ export default class CollegeManagePage extends React.Component {
                           e.preventDefault();
                           e.stopPropagation();
                           User.setStoreId(item.id);
+                          User.setStoreUserId(item.storeUserId);
                           window.RCHistory.push('/college-info')
                         }}
                       >编辑</span>
@@ -250,6 +252,7 @@ export default class CollegeManagePage extends React.Component {
                       return null;
                     };
                     User.setStoreId(item.id);
+                    User.setStoreUserId(item.storeUserId);
                     window.RCHistory.push('/home')
                   }}
                 >
@@ -267,6 +270,7 @@ export default class CollegeManagePage extends React.Component {
                           e.preventDefault();
                           e.stopPropagation();
                           User.setStoreId(item.id);
+                          User.setStoreUserId(item.storeUserId);
                           window.RCHistory.push('/college-info')
                         }}
                       >编辑</span>

src/modules/root/Menu.tsx

@@ -10,6 +10,7 @@ import StoreService from "@/domains/store-domain/storeService";
 import User from "@/common/js/user";
 import _ from 'underscore';
 import "./Menu.less";
+console.log('2021-06-17')
 
 const { SubMenu } = Menu;
 function Aside(props: any) {
@@ -64,7 +65,6 @@ function Aside(props: any) {
     }
   }
   function handleMenu() {
-    
     handleMenuType();
   }
   useEffect(()=> {
@@ -72,7 +72,7 @@ function Aside(props: any) {
       return
     }
     if (!menuType) {
-      if (topLogoUrl.indexOf("xiaomaiketang.com") < 0 && topLogoUrl.indexOf("qlogo.cn") < 0) {
+      if (topLogoUrl.indexOf("xiaomaiketang.com") < 0) {
           logoImg0Ref.current.style.display = "none"
           logoImg1Ref.current.style.display = "none"
       } else {

src/modules/teach-tool/examination-manager/ExamShareModal.jsx

 import React from 'react';
-import { Modal, Button, message } from 'antd';
+import { Modal, message } from 'antd';
 import html2canvas from 'html2canvas';
 import User from "../../../common/js/user";
 import QRCode from '../../../libs/qrcode/qrcode';
@@ -27,7 +27,6 @@ class ExamShareModal extends React.Component {
 
     handleConvertShortUrl = () => {
         const longUrl = `${LIVE_SHARE}test_detail/${this.props.data.examId}?id=${User.getStoreId()}`
-        console.log(longUrl)
         // 发请求
         Service.Sales('public/businessShow/convertShortUrls', {
             urls: [longUrl]