diff --git a/src/pages/matter/List.less b/src/pages/matter/List.less index 9502f2a..6348d4d 100644 --- a/src/pages/matter/List.less +++ b/src/pages/matter/List.less @@ -5,4 +5,8 @@ .ant-upload { display: inline-block; } + .buttons { + display: flex; + flex-wrap: wrap; + } } diff --git a/src/pages/matter/List.tsx b/src/pages/matter/List.tsx index e91b1b5..b06cc61 100644 --- a/src/pages/matter/List.tsx +++ b/src/pages/matter/List.tsx @@ -10,7 +10,7 @@ import Director from "./widget/Director"; import SortDirection from "../../common/model/base/SortDirection"; import MatterPanel from "./widget/MatterPanel"; import UploadMatterPanel from "./widget/UploadMatterPanel"; -import { Col, Modal, Row, Upload } from "antd"; +import { Col, Modal, Row, Upload, Tree, Button, Space } from "antd"; import MessageBoxUtil from "../../common/util/MessageBoxUtil"; import { ExclamationCircleFilled } from "@ant-design/icons"; import ImagePreviewer from "../widget/previewer/ImagePreviewer"; @@ -46,6 +46,8 @@ export default class List extends TankComponent { //分享的弹框 shareDialogVisible = false; + moveModalVisible = false; + newMatterRef = React.createRef(); constructor(props: IProps) { @@ -154,8 +156,9 @@ export default class List extends TankComponent { this.matter.downloadZip(uuids); }; - moveBatch = () => { - console.log("moveBatch"); + toggleMoveBatch = () => { + this.moveModalVisible = !this.moveModalVisible; + this.updateUI(); }; triggerUpload = (fileObj: any) => { @@ -229,88 +232,106 @@ export default class List extends TankComponent { }; render() { - const { pager, director, selectedMatters, uploadMatters } = this; + const { pager, director, selectedMatters, uploadMatters, moveModalVisible } = this; return (
- - {selectedMatters.length !== pager.data.length ? ( - + ) : null} + {pager.data.length && + selectedMatters.length === pager.data.length ? ( + + ) : null} + {selectedMatters.length ? ( + <> + + + + + + + + + ) : null} + + - 全选 - - ) : null} - {pager.data.length && - selectedMatters.length === pager.data.length ? ( - + + - ) : null} - {selectedMatters.length ? ( - <> - + 新建 + - + + - - - - - ) : null} - - - - - - - - - + + + + + {Children.toArray( uploadMatters.map((m) => ) )}