From 3a07e6e42bd1a85b2c210df89fa6296fe0e01a39 Mon Sep 17 00:00:00 2001 From: seaheart Date: Sat, 8 Jul 2023 17:26:15 +0800 Subject: [PATCH] change share matter page --- src/common/model/share/Share.ts | 5 ++++- src/pages/matter/List.tsx | 1 + src/pages/share/Detail.tsx | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/common/model/share/Share.ts b/src/common/model/share/Share.ts index 5a12d0e..afbcabb 100644 --- a/src/common/model/share/Share.ts +++ b/src/common/model/share/Share.ts @@ -22,6 +22,7 @@ export default class Share extends BaseEntity { dirMatter: Matter = new Matter(); //当前share对应的matters matters: Matter[] = []; + spaceUuid: string | null = null; //当前分享正在查看的根目录matter的uuid。前端辅助字段。 rootUuid: string = Matter.MATTER_ROOT; @@ -33,6 +34,7 @@ export default class Share extends BaseEntity { static URL_BROWSE = '/api/share/browse'; static URL_DELETE_BATCH = '/api/share/delete/batch'; static URL_ZIP = '/api/share/zip'; + static URL_MATTER_PAGE = '/api/share/matter/page'; constructor(reactComponent?: React.Component) { super(reactComponent); @@ -112,7 +114,8 @@ export default class Share extends BaseEntity { let that = this; const form = { - matterUuids: matterUuids, + matterUuids, + spaceUuid: this.spaceUuid, expireInfinity: this.expireOption === ShareExpireOption.INFINITY, expireTime: DateUtil.simpleDateTime(this.getExpireTime()), }; diff --git a/src/pages/matter/List.tsx b/src/pages/matter/List.tsx index 9048cf2..c18f14f 100644 --- a/src/pages/matter/List.tsx +++ b/src/pages/matter/List.tsx @@ -414,6 +414,7 @@ export default class List extends TankComponent { shareBatch() { const uuids = this.selectedMatters.map((i) => i.uuid).join(','); ShareOperationModal.open((share: Share) => { + share.spaceUuid = this.getSpaceUuid(); share.httpCreate(uuids, () => { ShareDialogModal.open(share); }); diff --git a/src/pages/share/Detail.tsx b/src/pages/share/Detail.tsx index 5b79203..4c65cd1 100644 --- a/src/pages/share/Detail.tsx +++ b/src/pages/share/Detail.tsx @@ -58,7 +58,7 @@ export default class Detail extends TankComponent { //如果query中有rootUuid那么就更新. this.share.rootUuid = BrowserUtil.getQueryByName('shareRootUuid') || this.share.rootUuid; - + this.pager.urlPage = Share.URL_MATTER_PAGE; this.pager.enableHistory(); this.refresh(); }