fix: 修改上版本的bug

src/store/modules/fileList.ts

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-13 17:00:19
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-14 21:47:28
+ * @LastEditTime: 2022-06-15 15:24:44
  * @FilePath: /bkunyun/src/store/modules/upload.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -12,6 +12,7 @@ import {  makeAutoObservable, observable, action } from "mobx";
 interface IUploadInfo {
   id: string,
   open: boolean,
+  file: File,
   list: any,
   isPermanence: boolean,
 }
@@ -34,27 +35,24 @@ class FileList {
   newFileList: IUploadInfo[] = [];
 
   /** 设置最新需要上传的文件列表 */
-  setNewFileList (val: IUploadInfo[]) {
+  setNewFileList = (val: IUploadInfo[]) => {
     this.fileList = this.fileList.concat(val)
-
     this.newFileList = val
-
   }
 
 
   /** 设置文件上传信息 */
-  setUploadInfo(id: string, val: IUploadInfo) {
-    console.log(val,id,'22222')
+  setUploadInfo = (id: string, val: IUploadInfo) => {
+    console.log(id, val,'2222')
     const newFileList = this.fileList?.map((item)=>{
       if(item.id === id){
-        console.log('3333',item)
         return val
       } return item
     })
     this.fileList = newFileList
   }
 
-  setUploadInfoOpen(id: string, val: boolean) {
+  setUploadInfoOpen = (id: string, val: boolean) => {
     const newFileList = this.fileList?.map((item)=>{
         if(item.id === id){
           return {...item,open: val};
@@ -64,7 +62,7 @@ class FileList {
       this.fileList = newFileList
   }
 
-  setUploadInfoList(id: string, val: any) {
+  setUploadInfoList = (id: string, val: any) => {
     const newFileList = this.fileList?.map((item)=>{
         if(item.id === id){
           return {...item, list: val}
@@ -73,7 +71,7 @@ class FileList {
       this.fileList = newFileList
   }
 
-  setUploadInfoIsPermanence(id: string, val: boolean) {
+  setUploadInfoIsPermanence = (id: string, val: boolean) => {
     const newFileList = this.fileList?.map((item)=>{
         if(item.id === id){
           return {...item, isPermanence: val}

src/utils/Upload/tusUpload.js

@@ -8,7 +8,6 @@ import {
 import { getDataFileToken } from "@/api/project_api";
 import useMyRequest from "@/hooks/useMyRequest";
 import { getTokenInfo } from "@/utils/util";
-import ConsoleLayout from "@/views/ConsoleLayout";
 
 const UseTusUpload = (props) => {
   const { fileListStore: uploadInfoStore, currentProjectStore } = props;
@@ -31,16 +30,15 @@ const UseTusUpload = (props) => {
     });
   }, []);
 
+  const { fileList } = uploadInfoStore;
+
   const uploadFile = (item, file, url, filepath, callBack) => {
-    for (let i in localStorage) {
-      if (i.indexOf("tus::tus-br") > -1) {
-        localStorage.removeItem(i);
-      }
-    }
     uploadInfoStore?.setUploadInfoIsPermanence(item.id, false);
+    console.log(fileList);
 
     if (!verifyLettersNumbersCertainChars4(file.name)) {
-      let json1 = uploadInfoStore?.uploadInfo?.list.concat({
+      console.log(222);
+      let json1 = item?.list.concat({
         name: file.name,
         bytesUploaded: 0,
         bytesTotal: 0,
@@ -56,6 +54,7 @@ const UseTusUpload = (props) => {
           "上传失败，文件或文件夹的命名长度不超过127字节，不支持特殊符号、空格。",
       });
       uploadInfoStore?.setUploadInfo(item.id, {
+        ...item,
         open: true,
         list: json1,
         isPermanence: false,
@@ -84,90 +83,50 @@ const UseTusUpload = (props) => {
       },
       onProgress: function (bytesUploaded, bytesTotal, a) {
         var percentage = ((bytesUploaded / bytesTotal) * 100).toFixed(2);
-        let fliterJson = item.list?.filter((item) => item.id === timeId);
-        let json = [];
-        if (fliterJson.length === 0) {
-          json = item.list.concat({
-            name: upload.file.name,
-            bytesUploaded: bytesUploaded,
-            bytesTotal: bytesTotal,
-            percentage: percentage,
-            startTime: new Date().getTime(),
-            endTime: new Date().getTime() + 1000,
-            bytesUploaded2: bytesUploaded,
-            id: timeId,
-            statusMsg: "正在上传",
-            upload,
-            dir: "/home/cloudam/",
-          });
-          uploadInfoStore?.setUploadInfo(item.id, {
-            open: true,
-            list: json,
-            isPermanence: uploadInfoStore?.uploadInfo?.isPermanence,
-          });
-        } else {
-          let a = item.list;
-          let time = new Date().getTime();
-          a.map((element) => {
-            if (element.id === timeId) {
-              element["bytesUploaded"] = bytesUploaded;
-              element["bytesTotal"] = bytesTotal;
-              element["percentage"] = percentage;
-              element["bytesUploaded2"] =
-                parseInt((parseInt(time) - parseInt(element.endTime)) / 1000) >=
-                2
-                  ? bytesUploaded
-                  : element["bytesUploaded2"];
-              element["endTime"] =
-                parseInt((parseInt(time) - parseInt(element.endTime)) / 1000) >=
-                2
-                  ? time
-                  : element["endTime"];
-            }
-          });
-          uploadInfoStore?.setUploadInfo(item.id, {
-            open: true,
-            list: a.concat([]),
-            isPermanence: item.isPermanence,
-          });
-        }
+        const json = item.list.concat({
+          name: upload.file.name,
+          bytesUploaded: bytesUploaded,
+          bytesTotal: bytesTotal,
+          percentage: percentage,
+          startTime: new Date().getTime(),
+          endTime: new Date().getTime() + 1000,
+          bytesUploaded2: bytesUploaded,
+          id: timeId,
+          statusMsg: "正在上传",
+          upload,
+          dir: "/home/cloudam/",
+        });
+        console.log(item, "0111111");
+        uploadInfoStore?.setUploadInfo(item.id, {
+          ...item,
+          open: true,
+          list: json || [],
+          isPermanence: item.isPermanence,
+        });
       },
       onSuccess: function () {
-        let fliterJson = item.list.filter((item) => item.id === timeId);
-        console.log(upload.file, "9999999");
-        if (fliterJson.length === 0 && upload.file["size"] === 0) {
-          console.log("000011111");
-          let json = [];
-          json = item.list.concat({
-            name: upload.file.name,
-            bytesUploaded: 0,
-            bytesTotal: 0,
-            id: timeId,
-            percentage: 100,
-            startTime: new Date().getTime(),
-            endTime: new Date().getTime() + 1000,
-            bytesUploaded2: 0,
-            statusMsg: "上传成功",
-            upload,
-          });
-          uploadInfoStore?.setUploadInfo(item.id, {
-            open: true,
-            list: json,
-            isPermanence: item.isPermanence,
-          });
-        } else {
-          console.log(item.list, "000022222");
-          item.list.map((item) => {
-            if (item.id === timeId) {
-              item["statusMsg"] = "上传成功";
-            }
-          });
-          uploadInfoStore?.setUploadInfo(item.id, {
-            open: true,
-            list: item.list,
-            isPermanence: item.isPermanence,
-          });
-        }
+        let json = [];
+
+        json = item.list.concat({
+          name: upload.file.name,
+          bytesUploaded: 0,
+          bytesTotal: 0,
+          id: timeId,
+          percentage: 100,
+          startTime: new Date().getTime(),
+          endTime: new Date().getTime() + 1000,
+          bytesUploaded2: 0,
+          statusMsg: "上传成功",
+          upload,
+        });
+        console.log(json, item.list, "0222222");
+        uploadInfoStore?.setUploadInfo(item.id, {
+          ...item,
+          open: true,
+          list: json,
+          isPermanence: item.isPermanence,
+        });
+
         callBack && callBack(upload, filepath);
       },
     });

src/utils/util.ts

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-07 18:37:53
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-14 17:21:52
+ * @LastEditTime: 2022-06-15 17:49:27
  * @FilePath: /bkunyun/src/utils/util.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -29,6 +29,22 @@ export const uuid = () => {
   return pwd;
 };
 
+/** 格式化时间 xx小时xx分钟xx秒
+ * params: item: 毫秒的时间戳
+ */
+export const formatTime = (time: number) => {
+  const newTime =  Math.floor( time / 1000) ;
+  const hours = Math.floor(newTime / 3600);
+  const minutes = Math.floor((newTime % 3600) / 60);
+  const seconds = newTime % 60;
+
+  const hoursString = hours ? `${hours}小时` : '';
+  const minutesString = minutes ? `${minutes}分钟` : '';
+  const secondsString = seconds ? `${seconds}秒` : '';
+
+  return `${hoursString}${minutesString}${secondsString}`;
+};
+
 // 获取用户信息
 export const getUserInfo = () => {
   let val: any;

src/views/ConsoleLayout/components/FileItem/index.tsx

-import { observer } from "mobx-react-lite";
-// import { any } from "@/store/modules/fileList";
-// toJS(currentProjectStore.currentProjectInfo.id);
+import { toJS } from "mobx";
+
+import { LinearProgress } from "@mui/material";
+
+import styles from "./index.module.css";
+import { useMemo } from "react";
+import { formatTime, storageUnitFromB } from "@/utils/util";
 
 /*
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-11 15:46:42
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-14 21:35:09
+ * @LastEditTime: 2022-06-15 18:03:31
  * @FilePath: /bkunyun/src/views/ConsoleLayout/components/FileItem/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -16,8 +20,63 @@ interface IProps {
 }
 const FileItem = (props: IProps) => {
   const { fileItemInfo } = props;
-  console.log(fileItemInfo, 2222);
-  return <div>dd</div>;
+  const itemInfo = toJS(fileItemInfo);
+  const lastInfo = itemInfo?.list[itemInfo.list?.length - 1];
+  const firstInfo = itemInfo?.list[0];
+  const lastMsg = lastInfo?.statusMsg;
+
+  const TimeText = useMemo(() => {
+    const val = lastInfo.endTime - firstInfo.startTime;
+    return formatTime(val);
+  }, [firstInfo.startTime, lastInfo.endTime]);
+
+  const text = useMemo(() => {
+    let result = "";
+    if (lastMsg === "上传失败") {
+      result = "重新上传";
+    }
+    if (lastMsg === "正在上传") {
+      result = "暂停";
+    }
+    if (lastMsg === "上传成功") {
+      result = "查看文件";
+    }
+    return result;
+  }, [itemInfo?.list, lastMsg]);
+
+  return (
+    <div className={styles.itemBox}>
+      <div className={styles.leftBox}>
+        <img />
+        <div>
+          <div>
+            <b style={{ fontSize: 14 }}>{firstInfo?.name || ""}</b>
+            {lastMsg === "上传失败" ? (
+              <span
+                className={styles.span}
+                style={{ marginLeft: 16, color: "#FF4E4E" }}
+              >{`(${lastMsg})`}</span>
+            ) : (
+              <span className={styles.span} style={{ marginLeft: 16 }}>
+                {TimeText}
+              </span>
+            )}
+          </div>
+          <LinearProgress
+            sx={{ width: 300, borderRadius: 2, margin: "2px 0", color: "red" }}
+            variant="determinate"
+            value={50}
+          />
+          <div>
+            <span className={styles.span}>{`700MB/${storageUnitFromB(
+              500000
+            )}`}</span>
+          </div>
+        </div>
+      </div>
+      <div className={styles.rightBox}>{text}</div>
+    </div>
+  );
 };
 
 export default FileItem;

src/views/ConsoleLayout/index.tsx

@@ -7,6 +7,7 @@ import Add from "@mui/icons-material/Add";
 import Avatar from "@mui/material/Avatar";
 import { Box, Menu, MenuItem } from "@mui/material";
 
+import uploadIcon from "@/assets/img/uploadIcon.svg";
 import globalText from "@/utils/globalText_CN";
 import useIndex from "./useIndex";
 import { useStores } from "@/store/index";
@@ -18,7 +19,7 @@ import TranSferList from "./components/TransferList";
 import style from "./index.module.css";
 import useGlobalStore from "@/hooks/useGlobalStore";
 import { toJS } from "mobx";
-import { urlToken } from "@/api/fileserver/raysyncApi";
+import { APIOPTION, urlToken } from "@/api/fileserver/raysyncApi";
 import UseTusUpload from "@/utils/Upload/tusUpload";
 import useMyRequest from "@/hooks/useMyRequest";
 import { getDataFileToken } from "@/api/project_api";
@@ -54,7 +55,8 @@ const ConsoleLayout = observer(() => {
   const { run: getDataFileTokenRun } = useMyRequest(getDataFileToken, {
     onSuccess: (res: any) => {
       let url =
-        "https://fileserver.cloudam.cn/parallelupload/" +
+        APIOPTION() +
+        "/parallelupload/" +
         urlToken(
           res?.data || "",
           currentProjectStore?.currentProjectInfo?.id as string
@@ -62,7 +64,7 @@ const ConsoleLayout = observer(() => {
       fileList?.newFileList?.forEach((item: any) => {
         uploadFile(
           item,
-          item?.list,
+          item?.file,
           url,
           "/",
           (upload: any, filepath: string) => console.log(upload, filepath, 1111)
@@ -73,6 +75,7 @@ const ConsoleLayout = observer(() => {
 
   useDeepEffect(() => {
     if (fileList?.newFileList?.length) {
+      console.log(111, 222);
       getDataFileTokenRun({
         id: currentProjectStore?.currentProjectInfo.id || "",
       });
@@ -148,7 +151,11 @@ const ConsoleLayout = observer(() => {
             }}
           >
             <Box className={style.topRightItem}>
-              <Add />
+              <img
+                src={uploadIcon}
+                alt=""
+                style={{ verticalAlign: "middle" }}
+              />
             </Box>
           </MyPopover>
           <Box className={style.topRightItem}>

src/views/Project/ProjectData/UpLoaderFile/index.tsx

@@ -103,11 +103,11 @@ const UpLoaderFile = observer((props: any) => {
         return {
           id: uuid(),
           open: false,
-          list: item,
+          list: [],
+          file: item,
           isPermanence: true,
         };
       }) || [];
-    console.log(newFileList);
     toJS(fileListStore?.setNewFileList)(newFileList);
   };
 

src/views/Project/ProjectSetting/ProjectMembers/components/AddMember.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-05-31 10:18:13
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-11 15:24:15
+ * @LastEditTime: 2022-06-15 19:04:11
  * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -35,16 +35,9 @@ const AddMember = observer((props: IProps) => {
   const [projectMember, setProjectMember] = useState("");
   const [filterTableData, setFilterTableData] = useState([]);
   const [checkData, setCheckData] = useState<string[]>([]);
+  const [selectOptions, setSelectOptions] = useState<IOption[]>([]);
   const Message = useMessage();
 
-  const selectOptions = useMemo(() => {
-    return [
-      { value: "VIEWER", label: "查看者" },
-      { value: "DEVELOPER", label: "研发者" },
-      { value: "MANAGER", label: "管理者" },
-    ];
-  }, []);
-
   const changePermission = useCallback(
     (val: IOption, index: number) => {
       const tableDataIndex = tableData[index] as any;
@@ -56,34 +49,54 @@ const AddMember = observer((props: IProps) => {
     [tableData]
   );
 
-  const columns = [
-    { id: "checkbox", width: 50 },
-    { id: "username", label: "项目成员", width: 160 },
-    {
-      id: "projectRole",
-      label: "项目权限",
-      width: 160,
-      render: (item: string, row: any, index: number) => {
-        const defaultValue = selectOptions.filter(
-          (every) => every.value === item
-        );
-        return (
-          <MySelect
-            input={<OutlinedInput />}
-            value={
-              defaultValue?.length
-                ? defaultValue[0]
-                : { value: "VIEWER", label: "查看者" }
-            }
-            onChange={(val) => changePermission(val, index)}
-            options={selectOptions}
-            size="small"
-          />
-        );
+  const columns = useMemo(() => {
+    return [
+      { id: "checkbox", width: 50 },
+      { id: "username", label: "项目成员", width: 160 },
+      {
+        id: "projectRole",
+        label: "项目权限",
+        width: 160,
+        render: (item: string, row: any, index: number) => {
+          const defaultValue = selectOptions.filter(
+            (every) => every.value === item
+          );
+          console.log(selectOptions, defaultValue, "111");
+          return (
+            <MySelect
+              input={<OutlinedInput />}
+              value={
+                defaultValue?.length
+                  ? defaultValue[0]
+                  : { value: "VIEWER", label: "查看者" }
+              }
+              onChange={(val) => changePermission(val, index)}
+              options={selectOptions}
+              size="small"
+            />
+          );
+        },
       },
-    },
-  ];
+    ];
+  }, [changePermission, selectOptions]);
 
+  useEffect(() => {
+    if (addMemberDialog) {
+      http.get<IResponse<any>>("/cpp/project/listroles").then((res) => {
+        const arr = [];
+        const { data } = res;
+        for (const key in data) {
+          arr.push({
+            label: String(data[key]),
+            value: key,
+          });
+        }
+        setSelectOptions(arr);
+      });
+    }
+  }, [addMemberDialog, http]);
+
+  /** 过滤表格数据 */
   useEffect(() => {
     if (!!projectMember) {
       const newVal =
@@ -96,6 +109,7 @@ const AddMember = observer((props: IProps) => {
     }
   }, [projectMember, tableData]);
 
+  /** 获取表格数据 */
   useEffect(() => {
     if (!addMemberDialog) return;
     const projectInfo = toJS(currentProjectStore?.currentProjectInfo);
@@ -104,9 +118,7 @@ const AddMember = observer((props: IProps) => {
         params: { id: projectInfo?.id || "" },
       })
       .then((res) => {
-        if (res.data.length) {
-          setTableData(res?.data);
-        }
+        setTableData(res?.data);
       });
   }, [currentProjectStore?.currentProjectInfo, http, addMemberDialog]);
 

src/views/Project/ProjectSetting/ProjectMembers/components/RemoveItem.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-05-31 10:18:13
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-07 15:55:26
+ * @LastEditTime: 2022-06-15 13:50:54
  * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -34,10 +34,6 @@ const RemoveItem = observer((props: IProps) => {
   };
   const onConfirm = () => {
     const projectInfo = toJS(currentProjectStore?.currentProjectInfo);
-    console.log(111111, {
-      id: projectInfo?.id || "",
-      username: removeDialog.username,
-    });
     http
       .del<IResponse<any>>(
         `/cpp/project/removemember?id=${projectInfo?.id || ""}&username=${

src/views/Project/ProjectSetting/ProjectMembers/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-05-31 10:18:13
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-10 18:08:00
+ * @LastEditTime: 2022-06-15 18:53:01
  * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -154,7 +154,7 @@ const ProjectMembers = () => {
           sx={{ width: 340, height: 32 }}
           endAdornment={<SearchIcon style={{ color: "#8A9099" }} />}
         />
-        {isProjectOwner(projectOwner) ? (
+        {currentProjectStore?.currentProjectInfo?.projectRole === "OWNER" ? (
           <Button
             style={{ backgroundColor: "#1370FF " }}
             variant="contained"