Merge branch 'feature/zahngleyuan/20210607/cloud-cass-remodel' into 'master'

Feature/zahngleyuan/20210607/cloud cass remodel

See merge request !43

src/bu-components/ChooseMembersModal.jsx

@@ -155,7 +155,7 @@ class ChooseMembersModal extends React.Component {
     let rightsList = [];            // 保存新加进去的成员
     selectUserList.map((item) => {
       rightsList.push({
-        rights: "LOOK_DOWNLOAD",
+        rights: "LOOK",
         userId: item.userId
       })
       return rightsList
@@ -203,10 +203,9 @@ class ChooseMembersModal extends React.Component {
         title: '全选',             // 实际为头像，但在表格上这行要求显示为全选
         key: 'avatar',
         dataIndex: 'avatar',
-        width: '40%',
+        width: '30%',
         render: (value, record) => {
           const { adminName } = record;
-
           return (
             <div className='avatar'>
               {
@@ -232,7 +231,7 @@ class ChooseMembersModal extends React.Component {
         title: '学员名',
         key: 'adminNameRight',
         dataIndex: 'adminName',
-        width: '70%',
+        width: '65%',
         render: (value, record) => {
           const { adminName = '', avatar } = record;
           return (

src/bu-components/ChooseMembersModal.less

@@ -37,7 +37,7 @@
             >tr >td {
               border-bottom: none;
               background-color: #fff !important;
-
+              padding:8px 8px !important;
             }
           }
         }

src/bu-components/ManagingMembersModal.jsx

@@ -19,7 +19,7 @@ class ManagingMembersModal extends React.Component {
       addManagingMember: false,                     // 是否点击了添加成员
       storeId :User.getStoreId() ,   // 学院Id
       iconRotateList: [],
-      userAuthority : ['可编辑', '可查看/下载', '仅可查看', '', '创建者', '学院管理员'] ,  // 空 代表删除
+      userAuthority : ['可编辑', '可下载', '可查看', '', '创建者', '学院管理员'] ,  // 空 代表删除
     } 
   }
   componentDidMount() {
@@ -64,7 +64,7 @@ class ManagingMembersModal extends React.Component {
 
   // 修改成员权限
   updateFileUserAuthority = (params, newRights = 1) => {
-    const rightList =  ['EDIT', 'LOOK_DOWNLOAD', ''];
+    const rightList =  ['EDIT', 'LOOK_DOWNLOAD', 'LOOK'];
     let { iconRotateList } = this.state;
     let _params = params;
     _params.rights = rightList[newRights]; 
@@ -173,10 +173,10 @@ class ManagingMembersModal extends React.Component {
             <span className='menu-bottom'>下载、复制</span>
           </div>
         </Menu.Item>
-        {/* <Menu.Item key="LOOK" >
-          <div onClick={() => this.updateFileUserAuthority(params, 2)}>仅可查看</div>
-          <span className='menu-bottom'>{userAuthority[2]}</span>
-        </Menu.Item> */}
+        <Menu.Item key="LOOK" >
+          <div onClick={() => this.updateFileUserAuthority(params, 2)}>{userAuthority[2]}</div>
+          <span className='menu-bottom'>查看</span>
+        </Menu.Item>
         <Menu.Divider key='LINE'/>
         <Menu.Item key="REMOVE" >
           <div className='remove' onClick={() => this.removeUser(params, userAuthority[3])}>移除</div>
@@ -247,6 +247,8 @@ class ManagingMembersModal extends React.Component {
               num = 1;
             } else if (record.rights === "EDIT") {
               num = 0;
+            }else if(record.rights=="LOOK"){
+              num = 2;
             }
           }
           return (

src/bu-components/ManagingMembersModal.less

@@ -35,6 +35,9 @@
     .ant-table-row{
       background-color: #fff !important;
     }
+    tr:first-child{
+      display: none;
+    }
     .ant-table-row:hover{
       background-color: #E9E9E9;
     }

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

+import React from 'react';
+import "./PreviewFileModal.less";
+import { Spin } from 'antd'
+class PreviewFileModal extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+  cancelPreView = ()=>{
+    this.props.onCancel();
+  }
+  toPreView = (url)=>{
+    const a = document.createElement('a');
+    document.body.appendChild(a);
+    a.setAttribute('href', url);
+    a.setAttribute('target', '_blank');
+    a.click();
+    document.body.removeChild(a);
+    this.props.onCancel();
+  }
+  render() {
+    const { previewStatus,url} = this.props
+    return (
+        <div className="preview-modal">
+            <div className="preview-modal-content">
+                <div className="load-img-box">
+                {previewStatus === "UPLOAD" && 
+                  <Spin size="large"/>
+                }
+                {previewStatus === "UPLOAD_SUCCESS" && 
+                  <img className="load-img" src="https://image.xiaomaiketang.com/xm/jJRK3bTEdc.png"></img>
+                }
+                </div>
+                <div className="load-text-box">
+                {previewStatus === "UPLOAD" && 
+                  <div className="load-text-box-title">预览生成中</div>
+                }
+                {previewStatus === "UPLOAD_SUCCESS" && 
+                  <div className="load-text-box-title">预览生成成功</div>
+                }
+                </div>
+                <div className="operate">
+                    <span className="btn cancel-preview-btn" onClick={()=>this.cancelPreView()}>取消预览</span>
+                    {previewStatus === "UPLOAD" &&
+                     <span className="btn to-preview-btn__disabled to-preview-btn">去查看</span>
+                    }
+                    {previewStatus === "UPLOAD_SUCCESS" &&
+                     <span className="btn to-preview-btn" onClick={()=>this.toPreView(url)}>去查看</span>
+                    }
+                </div>
+            </div>
+        </div>
+    );
+  }
+}
+
+export default PreviewFileModal;

src/modules/resource-disk/modal/PreviewFileModal.less

+.preview-modal{
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 102;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.7);
+    .preview-modal-content{
+        position:absolute;
+        left:calc(50% - 133px);
+        top:calc(50% - 87px);
+        color:#FFF;
+        text-align:center;
+        width:266px;
+        height:174px;
+        .ant-spin-dot-item{
+            background-color: #FFF;
+        }
+        .load-img-box{
+            .load-img{
+                width:44px;
+                height:44px;
+            }
+        }
+        .load-text-box{
+            margin-top:23px;
+            font-size:16px;
+            color:#FFF;
+            .load-text-box-title{
+                margin-bottom:8px;
+            }
+        }
+        .operate{
+            margin-top:24px;
+            .btn {
+                padding:5px 12px;
+                border:1px solid #E8E8E8;
+                border-radius:2px;
+            }
+            .cancel-preview-btn{
+                margin-right:8px;
+            }
+            .to-preview-btn__disabled{
+                border:1px solid #E8E8E8;
+                opacity: 0.4;
+                
+            }
+
+        }
+    }
+}
\ No newline at end of file