Forráskód Böngészése

修复了没有group id和logo宽度的bug

Shellmiao 4 éve
szülő
commit
2b0ea14cf8

BIN
build.zip


+ 9 - 2
src/components/Page/DiskPage.js

@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import {Space, Slider, message, Breadcrumb} from 'antd';
+import {Space, Slider, message, Breadcrumb, Tooltip} from 'antd';
 import Folder from "./Folder";
 import File from "./File";
 import {apiFolderList, apiGroupRoot, apiRootFolderId} from "../../services/API/API";
@@ -148,7 +148,14 @@ class DiskPage extends Component {
     renderBread(addressList) {
         return addressList.map((ele, index) => {
             return (
-                <Breadcrumb.Item
+                this.props.type === 'team' ? <Tooltip title={'Current Group ID : ' + this.props.group_id}>
+                    <Breadcrumb.Item
+                        key={ele.name}
+                        className="breadcrumb-line"
+                        onClick={(ev) => this.cdFolder(ele.id, ele.name)}>
+                        <a>{ele.name}</a>
+                    </Breadcrumb.Item>
+                </Tooltip> : <Breadcrumb.Item
                     key={ele.name}
                     className="breadcrumb-line"
                     onClick={(ev) => this.cdFolder(ele.id, ele.name)}>

+ 7 - 5
src/components/Page/GroupModal.js

@@ -1,4 +1,4 @@
-import {Modal, Button, Tabs, Form, Input, message} from 'antd';
+import {Modal, Button, Tabs, Form, Input, message, Tooltip} from 'antd';
 import React, {Component} from "react";
 import './add-folder-modal.less'
 import {UsergroupAddOutlined, UserOutlined} from "@ant-design/icons";
@@ -139,10 +139,12 @@ class GroupModal extends Component {
                                         />
                                     </Form.Item>
                                     <Form.Item style={{marginBottom: '10px'}}>
-                                        <Button size="large" type="primary" htmlType="submit"
-                                                style={{width: '100%',}}>
-                                            Join
-                                        </Button>
+                                        {
+                                            <Button size="large" type="primary" htmlType="submit"
+                                                    style={{width: '100%',}}>
+                                                Join
+                                            </Button>
+                                        }
                                     </Form.Item>
                                 </Form>
                             </TabPane>

+ 4 - 4
src/components/Sider/MySider.js

@@ -29,9 +29,9 @@ class MySider extends Component {
     render() {
         return (
             <Sider collapsible collapsed={this.state.collapsed} onCollapse={this.onCollapse}>
-                <div className={'st-logo-div'} onClick={this.handleClickLogo}>
-                    <div className="st-logo">
-                        <a style={{color:'white'}}>
+                <div className={this.state.collapsed ? 'st-logo-div-collapsed' : 'st-logo-div'} onClick={this.handleClickLogo}>
+                    <div className={this.state.collapsed ? 'st-logo-collapsed' : "st-logo"}>
+                        <a style={{color: 'white'}}>
                             <CloudServerOutlined/>
                         </a>
                         {
@@ -39,7 +39,7 @@ class MySider extends Component {
                                 <div className={'st-title'}>
                                     <QueueAnim>
                                         <div className={'st-title'} key={'st-title'}>
-                                            <a style={{color:'white'}}>&nbsp;STCloud</a>
+                                            <a style={{color: 'white'}}>&nbsp;STCloud</a>
                                         </div>
                                     </QueueAnim>
                                 </div>

+ 15 - 0
src/components/Sider/MySider.less

@@ -12,6 +12,16 @@
   margin-top: 1vh;
 }
 
+.st-logo-collapsed{
+  font-size: 5vh;
+  font-weight: bolder;
+  color: white;
+  float: left;
+  margin-left: 3vh;
+  width: 10vh;
+  margin-top: 1vh;
+}
+
 .st-title {
   font-size: 3vh;
   font-weight: bolder;
@@ -23,4 +33,9 @@
 .st-logo-div {
   height: 10vh;
   width: 20vh;
+}
+
+.st-logo-div-collapsed {
+  height: 10vh;
+  width: 10vh;
 }