feat:修改资料云盘层级限制

8babb222 · zhangleyuan · 81d33c35 · 8babb222 · 8babb222 · 8babb222
Commit 8babb222 authored Jun 10, 2021 by zhangleyuan
Showing with 45 additions and 27 deletions

src/bu-components/CopyFileModal.jsx
+5 -2

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

src/modules/resource-disk/components/FolderManage.jsx
+38 -23

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

No files found.
--- a/src/bu-components/CopyFileModal.jsx
+++ b/src/bu-components/CopyFileModal.jsx
@@ -80,7 +80,7 @@ class CopyFileModal extends React.Component {
    // const { folderPathList, folderList } = this.state;
    const { folderPathList, disk } = this.state;
    const { dataInfo } = this.props;
-    const { id, createId, folderName } = dataInfo;
+    const { id, createId, folderName,folderType} = dataInfo;
    const newParentId = folderPathList[folderPathList.length-1].id;
    const _params = {
      copyIds : [id],                     // 复制文件的ID
@@ -99,7 +99,10 @@ class CopyFileModal extends React.Component {
      }
      return allowCopy;
    })
+    if(folderPathList.length > 9 && folderType === 'FOLDER'){
+      allowCopy = 1;
+      message.warning('不能将文件夹复制到10级目录下');
+    }
    if (allowCopy === 0) {
      Service.Hades('public/hadesStore/copyFolder', _params).then((res) => {
        if (res.success) {

--- a/src/modules/resource-disk/components/FolderList.jsx
+++ b/src/modules/resource-disk/components/FolderList.jsx
@@ -762,7 +762,7 @@ class FolderList extends React.Component {
          }}
          onMove={(query) => {
            this.setState({ showSelectFileModal: false });
-            this.props.onMove(query, [currentFile.id]);
+            this.props.onMove(query, [currentFile.id],[currentFile.folderType]);
          }}
        />
        {

--- a/src/modules/resource-disk/components/FolderManage.jsx
+++ b/src/modules/resource-disk/components/FolderManage.jsx
@@ -47,6 +47,7 @@ class FolderManage extends React.Component {
      folderPathList: [props.currentRootDisk],
      selectedFileIds: [],                  // 已被选择的文件
      selectedFileRights: [],               // 已被选择的文件对应权限
+      selectedFileType:[], //  已选择的文件的类型
      folderList: [],                       // 当前目录下的文件
      searchKey: null,                      // 搜索关键字
      totalCount: 0,                        // 该磁盘总共有的文件个数
@@ -200,10 +201,12 @@ class FolderManage extends React.Component {
  handleChangeRow = (selectedRowKeys) => {
    const { folderList } = this.state;
    let _selectedFileRights = [];
+    let _selectedFileType = [];
    selectedRowKeys.map(folderId => {
      folderList.map(item => {
        if (item.id === folderId) {
          _selectedFileRights.push(item.rights);
+          _selectedFileType.push(item.folderType);
        }
        return _selectedFileRights;
      })
@@ -211,7 +214,8 @@ class FolderManage extends React.Component {
    })
    this.setState({
      selectedFileIds: selectedRowKeys,
-      selectedFileRights: _selectedFileRights
+      selectedFileRights: _selectedFileRights,
+      selectedFileType:_selectedFileType
    })
  }
@@ -255,12 +259,13 @@ class FolderManage extends React.Component {
  }
  // 移动文件
-  handleMove = (query, sourceFileIds = this.state.selectedFileIds) => {
+  handleMove = (query, sourceFileIds = this.state.selectedFileIds,selectedFileTypes=this.state.selectedFileType) => {
    const { targetFolder, selectFolderPathList } = query;
    const { currentRootDisk: { disk} } = this.props;
    const { folderPathList } = this.state;
    const currentFolder = folderPathList[folderPathList.length - 1];
    const { id } = targetFolder;
+    let canRemove = true;
    // 将selectedFileIds移动到targetFolder
    let params = {
      disk,
@@ -271,28 +276,38 @@ class FolderManage extends React.Component {
    if (selectFolderPathList.length > 1) {
      params.newParentId = id
    }
-    Service.Hades('public/hadesStore/moveFolder', params).then((res) => {
+    if(selectFolderPathList.length > 9){
+      selectedFileTypes.map((item)=>{
-      // 判断是否将文件移动到了自身或者子目录
+        //判定是否存在文件夹
-      const { result = {} } = res;
+        if(item==="FOLDER"){
-      const { code, message: _message } = result;
+          canRemove = false;
-      if (code === 'PARAM_ERROR') {
+          message.warning('不能将文件夹移动到10级目录下');
-        message.warning(_message);
+        }
-        return;
+      })
-      }
+    }
-      if (id == null) {
+    if(canRemove){
-        Modal.success({
+      Service.Hades('public/hadesStore/moveFolder', params).then((res) => {
-          title: '文件移动成功',
+        // 判断是否将文件移动到了自身或者子目录
-          content: '移动到一级目录的文件仅自己可以查看，如需其他成员查看请设置权限'
+        const { result = {} } = res;
-        })
+        const { code, message: _message } = result;
-      } else {
+        if (code === 'PARAM_ERROR') {
-        message.success('文件移动成功');
+          message.warning(_message);
-      }
+          return;
+        }
+        if (id == null) {
+          Modal.success({
+            title: '文件移动成功',
+            content: '移动到一级目录的文件仅自己可以查看，如需其他成员查看请设置权限'
+          })
+        } else {
+          message.success('文件移动成功');
+        }
-      // 移动成功之后需要将selectedFileIds置为空
+        // 移动成功之后需要将selectedFileIds置为空
-      this.setState({ selectedFileIds: [] });
+        this.setState({ selectedFileIds: [] });
-      this.handleFetchFolderList({ parentId: currentFolder.id, current: 1});
+        this.handleFetchFolderList({ parentId: currentFolder.id, current: 1});
-    })
+      })
+    }
  }
  // 修改文件路径

--- a/src/modules/resource-disk/components/OperateArea.jsx
+++ b/src/modules/resource-disk/components/OperateArea.jsx
@@ -70,7 +70,7 @@ class OperateArea extends React.Component {
    // 判断当前目录是否在第10层，如果是的话提示最多只能创建10层文件夹
    const { folderPathList } = this.props;
-    if (folderPathList.length > 10) {
+    if (folderPathList.length > 9) {
      message.warning('最多只能创建10层文件夹');
      return;
    }