Commit 5d5ace48 authored by chenshouchao's avatar chenshouchao

Merge branch 'feat-20220608-projectdata' into 'release'

Feat 20220608 projectdata

See merge request !45
parents 29fa2987 1d039edc
......@@ -102,6 +102,13 @@ const ProjectData = observer(() => {
}
}, [list, dataSetList, activeTab]);
// 是否全是文件夹
const isAllDirectory = useMemo(() => {
return showList.every((li: any) => {
return li.type === "directory";
});
}, [showList]);
// 全(文件、文件夹、数据集)列表
const allList = useMemo(() => {
return [...list, ...dataSetList];
......@@ -341,13 +348,17 @@ const ProjectData = observer(() => {
const renderButtons = (item: any) => {
return (
<span>
{item.type !== "dataSet" && item.type !== "directory" && (
{!isAllDirectory && (
<Button
sx={{
position: "relative",
left: "-4px",
minWidth: "10px",
marginRight: "10px",
visibility:
item.type !== "dataSet" && item.type !== "directory"
? "visible"
: "hidden",
}}
variant="text"
size="small"
......
......@@ -50,6 +50,19 @@ const BaseInfo = observer(() => {
const currentUserName = JSON.parse(
localStorage.getItem("userInfo") || "{}"
).name;
const hasEditAuth = useMemo(() => {
if (!currentUserName) {
return false;
} else if (!projectInfo.members) {
return false;
} else {
return projectInfo.members.some((item: any) => {
return (
item.username === currentUserName && item.projectRole === "OWNER"
);
});
}
}, [currentUserName, projectInfo]);
const { run, loading } = useMyRequest(getProject, {
onSuccess: (result: any) => {
setProjectInfo(result.data);
......@@ -236,7 +249,7 @@ const BaseInfo = observer(() => {
<Loading />
</div>
);
} else if (currentUserName !== projectInfo.owner) {
} else if (!hasEditAuth) {
return <InformationDisplay infoList={infoList} />;
} else {
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