Merge branch 'dev' of…

Merge branch 'dev' of ssh://xmgit.ixm5.cn:10022/xiaomai-cloud-class/xiaomai-cloud-class-web into dev

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

@@ -734,14 +734,13 @@ class FolderList extends React.Component {
               <Menu.Divider key="administration-bottom"/>
             ]
           }
-          {
-            folderType === 'FILE' && 
+          {(folderType === 'FILE' && (rights === "LOOK_DOWNLOAD" || rights === 'EDIT') ) &&
             <Menu.Item key="download">
               <span onClick={() => { this.handleDownload(record) }}>下载</span>
             </Menu.Item>
           }
-          {
-            currentRootDisk.disk === 'COMMON' && 
+          {(currentRootDisk.disk === 'COMMON' && (rights === "LOOK_DOWNLOAD" || rights === 'EDIT') ) &&
+           
             <Menu.Item key="copy">
               <span onClick={() => this.handleShowCopyFileModal(record)}>复制到</span>
             </Menu.Item>