Commit 8babb222 by zhangleyuan

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

parent 81d33c35
...@@ -80,7 +80,7 @@ class CopyFileModal extends React.Component { ...@@ -80,7 +80,7 @@ class CopyFileModal extends React.Component {
// const { folderPathList, folderList } = this.state; // const { folderPathList, folderList } = this.state;
const { folderPathList, disk } = this.state; const { folderPathList, disk } = this.state;
const { dataInfo } = this.props; const { dataInfo } = this.props;
const { id, createId, folderName } = dataInfo; const { id, createId, folderName,folderType} = dataInfo;
const newParentId = folderPathList[folderPathList.length-1].id; const newParentId = folderPathList[folderPathList.length-1].id;
const _params = { const _params = {
copyIds : [id], // 复制文件的ID copyIds : [id], // 复制文件的ID
...@@ -99,7 +99,10 @@ class CopyFileModal extends React.Component { ...@@ -99,7 +99,10 @@ class CopyFileModal extends React.Component {
} }
return allowCopy; return allowCopy;
}) })
if(folderPathList.length > 9 && folderType === 'FOLDER'){
allowCopy = 1;
message.warning('不能将文件夹复制到10级目录下');
}
if (allowCopy === 0) { if (allowCopy === 0) {
Service.Hades('public/hadesStore/copyFolder', _params).then((res) => { Service.Hades('public/hadesStore/copyFolder', _params).then((res) => {
if (res.success) { if (res.success) {
......
...@@ -762,7 +762,7 @@ class FolderList extends React.Component { ...@@ -762,7 +762,7 @@ class FolderList extends React.Component {
}} }}
onMove={(query) => { onMove={(query) => {
this.setState({ showSelectFileModal: false }); this.setState({ showSelectFileModal: false });
this.props.onMove(query, [currentFile.id]); this.props.onMove(query, [currentFile.id],[currentFile.folderType]);
}} }}
/> />
{ {
......
...@@ -47,6 +47,7 @@ class FolderManage extends React.Component { ...@@ -47,6 +47,7 @@ class FolderManage extends React.Component {
folderPathList: [props.currentRootDisk], folderPathList: [props.currentRootDisk],
selectedFileIds: [], // 已被选择的文件 selectedFileIds: [], // 已被选择的文件
selectedFileRights: [], // 已被选择的文件对应权限 selectedFileRights: [], // 已被选择的文件对应权限
selectedFileType:[], // 已选择的文件的类型
folderList: [], // 当前目录下的文件 folderList: [], // 当前目录下的文件
searchKey: null, // 搜索关键字 searchKey: null, // 搜索关键字
totalCount: 0, // 该磁盘总共有的文件个数 totalCount: 0, // 该磁盘总共有的文件个数
...@@ -200,10 +201,12 @@ class FolderManage extends React.Component { ...@@ -200,10 +201,12 @@ class FolderManage extends React.Component {
handleChangeRow = (selectedRowKeys) => { handleChangeRow = (selectedRowKeys) => {
const { folderList } = this.state; const { folderList } = this.state;
let _selectedFileRights = []; let _selectedFileRights = [];
let _selectedFileType = [];
selectedRowKeys.map(folderId => { selectedRowKeys.map(folderId => {
folderList.map(item => { folderList.map(item => {
if (item.id === folderId) { if (item.id === folderId) {
_selectedFileRights.push(item.rights); _selectedFileRights.push(item.rights);
_selectedFileType.push(item.folderType);
} }
return _selectedFileRights; return _selectedFileRights;
}) })
...@@ -211,7 +214,8 @@ class FolderManage extends React.Component { ...@@ -211,7 +214,8 @@ class FolderManage extends React.Component {
}) })
this.setState({ this.setState({
selectedFileIds: selectedRowKeys, selectedFileIds: selectedRowKeys,
selectedFileRights: _selectedFileRights selectedFileRights: _selectedFileRights,
selectedFileType:_selectedFileType
}) })
} }
...@@ -255,12 +259,13 @@ class FolderManage extends React.Component { ...@@ -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 { targetFolder, selectFolderPathList } = query;
const { currentRootDisk: { disk} } = this.props; const { currentRootDisk: { disk} } = this.props;
const { folderPathList } = this.state; const { folderPathList } = this.state;
const currentFolder = folderPathList[folderPathList.length - 1]; const currentFolder = folderPathList[folderPathList.length - 1];
const { id } = targetFolder; const { id } = targetFolder;
let canRemove = true;
// 将selectedFileIds移动到targetFolder // 将selectedFileIds移动到targetFolder
let params = { let params = {
disk, disk,
...@@ -271,8 +276,17 @@ class FolderManage extends React.Component { ...@@ -271,8 +276,17 @@ class FolderManage extends React.Component {
if (selectFolderPathList.length > 1) { if (selectFolderPathList.length > 1) {
params.newParentId = id params.newParentId = id
} }
if(selectFolderPathList.length > 9){
selectedFileTypes.map((item)=>{
//判定是否存在文件夹
if(item==="FOLDER"){
canRemove = false;
message.warning('不能将文件夹移动到10级目录下');
}
})
}
if(canRemove){
Service.Hades('public/hadesStore/moveFolder', params).then((res) => { Service.Hades('public/hadesStore/moveFolder', params).then((res) => {
// 判断是否将文件移动到了自身或者子目录 // 判断是否将文件移动到了自身或者子目录
const { result = {} } = res; const { result = {} } = res;
const { code, message: _message } = result; const { code, message: _message } = result;
...@@ -294,6 +308,7 @@ class FolderManage extends React.Component { ...@@ -294,6 +308,7 @@ class FolderManage extends React.Component {
this.handleFetchFolderList({ parentId: currentFolder.id, current: 1}); this.handleFetchFolderList({ parentId: currentFolder.id, current: 1});
}) })
} }
}
// 修改文件路径 // 修改文件路径
handleChangeFolderPath = (folderPathList, hasRootDisk = true) => { handleChangeFolderPath = (folderPathList, hasRootDisk = true) => {
......
...@@ -70,7 +70,7 @@ class OperateArea extends React.Component { ...@@ -70,7 +70,7 @@ class OperateArea extends React.Component {
// 判断当前目录是否在第10层,如果是的话提示最多只能创建10层文件夹 // 判断当前目录是否在第10层,如果是的话提示最多只能创建10层文件夹
const { folderPathList } = this.props; const { folderPathList } = this.props;
if (folderPathList.length > 10) { if (folderPathList.length > 9) {
message.warning('最多只能创建10层文件夹'); message.warning('最多只能创建10层文件夹');
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment