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

Feat 20220608 projectdata

See merge request sunyihao/bkunyun!46

src/assets/img/bkunyunFile.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38px" height="48px" viewBox="0 0 38 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>img_bky.0c94999e备份 5</title>
+    <defs>
+        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
+            <stop stop-color="#EEF5FF" offset="0%"></stop>
+            <stop stop-color="#D8E7FF" offset="100%"></stop>
+        </linearGradient>
+        <polygon id="path-2" points="0 0 23.8553102 0 23.8553102 6.97165479 0 6.97165479"></polygon>
+    </defs>
+    <g id="上线UI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="项目数据—传输列表" transform="translate(-853.000000, -292.000000)">
+            <g id="编组-13" transform="translate(829.000000, 172.000000)">
+                <g id="编组-54" transform="translate(0.000000, 67.000000)">
+                    <g id="编组-52" transform="translate(0.000000, 36.000000)">
+                        <g id="编组-20" transform="translate(24.000000, 16.000000)">
+                            <g id="img_bky.0c94999e备份-5" transform="translate(0.000000, 1.000000)">
+                                <path d="M4,0 L34,0 C36.209139,0 38,1.790861 38,4 L38,36 L38,36 L28,48 L4,48 C1.790861,48 0,46.209139 0,44 L0,4 C0,1.790861 1.790861,0 4,0 Z" id="矩形" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
+                                <g id="编组" opacity="0.800000012" transform="translate(3.000000, 16.000000)">
+                                    <path d="M19.5440063,7.16876077 C19.5440063,7.16876077 17.7817143,6.14587449 16.5897729,5.46257202 C14.3574699,4.18194596 11.7171006,3.17507407 9.08500973,3.58317846 C13.1105773,4.31203006 15.7261828,7.27081968 16.7502019,8.14045351 L19.5440063,7.16876077 Z" id="Fill-1" fill="#00CCCC" fill-rule="nonzero"></path>
+                                    <g transform="translate(7.138353, 5.028345)" id="Fill-3-Clipped">
+                                        <mask id="mask-3" fill="white">
+                                            <use xlink:href="#path-2"></use>
+                                        </mask>
+                                        <g id="path-2"></g>
+                                        <path d="M23.8475341,1.30693225 C23.7854464,0.676529763 21.2051666,-0.388952164 16.9246113,0.145167087 C10.9941641,0.884848085 7.93902039,3.69347 0,2.7499337 C0.969567451,3.35237664 2.14623668,3.98507627 3.54527983,4.62046684 C9.66384563,7.39870079 15.4135961,7.60025894 19.3981287,5.82699353 C23.3887273,4.05070901 23.931745,2.16468655 23.8475341,1.30693225" id="Fill-3" fill="#0066FF" fill-rule="nonzero" mask="url(#mask-3)"></path>
+                                    </g>
+                                    <path d="M30.9736907,6.28008688 C30.6298533,8.44006041 25.3893647,8.30971378 20.0153519,4.38211926 C16.2335679,1.61819325 11.5168998,-0.705730866 7.16933256,0.198360149 C12.714265,0.895970559 16.0337454,4.16480925 19.1989342,6.65826274 C22.9154191,9.58528611 26.772993,10.748167 29.483086,9.08424577 C29.9538108,8.7146678 31.1956365,7.49987138 30.9736907,6.28008688" id="Fill-5" fill="#00CCCC" fill-rule="nonzero"></path>
+                                    <path d="M3.51830379,6.10049601 C2.21967146,5.72619249 1.51715254,6.10679675 0.0979130386,5.88646764 C2.2898948,7.01777921 4.86839043,7.53496521 7.13837434,7.77826578 C7.7971464,7.84947731 8.55254692,8.01736586 9.56764536,7.96052791 C8.88111225,7.89253239 8.14812039,7.57034126 7.16927547,6.79869712 C5.66461184,5.61225405 3.3792844,3.90370252 0,3.63053905 C1.96033036,4.42088852 2.46738003,5.39264689 3.51830379,6.10049601" id="Fill-7" fill="#0066FF" fill-rule="nonzero"></path>
+                                </g>
+                                <polygon id="矩形" fill="#FFFFFF" fill-rule="nonzero" opacity="0.5" points="28 36 38 36 33 42 28 48"></polygon>
+                            </g>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

src/components/Material.Ui/Table.jsx

-import React from "react";
-
+import React, { useCallback} from "react";
 import Table from "@mui/material/Table";
 import TableBody from "@mui/material/TableBody";
 import TableCell from "@mui/material/TableCell";
@@ -100,6 +99,18 @@ export default function EnhancedTable(props) {
 
   const emptyRows = rowsPerPage - Math.min(rowsPerPage, rows.length - page * rowsPerPage);
 
+  const renderTableCellValue = useCallback(((item, row, index)=>{
+    if(
+      item.render
+    ) {
+      return <>{item.render(row[item.id], row, index)}</>
+    } else if(row[item.id]) {
+      return row[item.id] || '-'
+    } else {
+      return '-'
+    }
+  }),[])
+
   return (
     <div className={classes.root}>
       <Paper sx={{
@@ -189,8 +200,7 @@ export default function EnhancedTable(props) {
                               body: props.bodyTableCell || classes.bodyTableCell
                             }}
                           > {
-                              item.render ? <>{item.render(row[item.id], row, index)}</> :
-                                row[item.id]
+                            renderTableCellValue(item, row, index)
                             }
                           </TableCell>
                         )

src/components/mui/MyPopover.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-06-11 09:33:46
  * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
- * @LastEditTime: 2022-06-16 11:50:31
+ * @LastEditTime: 2022-06-16 14:21:00
  * @FilePath: /bkunyun/src/components/mui/MyPopover.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

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

@@ -8,6 +8,7 @@ import { formatTime, storageUnitFromB } from "@/utils/util";
 import useGlobalStore from "@/hooks/useGlobalStore";
 import { IUploadInfo } from "@/store/modules/fileList";
 import { useMessage } from "@/components/MySnackbar";
+import bkunyunFile from "@/assets/img/bkunyunFile.svg";
 
 import styles from "./index.module.css";
 
@@ -80,7 +81,7 @@ const FileItem = observer((props: IProps) => {
   return (
     <div className={styles.itemBox}>
       <div className={styles.leftBox}>
-        <img />
+        <img src={bkunyunFile} alt="" style={{ marginRight: 16 }} />
         <div>
           <div>
             <b className={styles.fileNameBox} title={itemInfo?.name || ""}>

src/views/Project/ProjectData/index.tsx

@@ -88,6 +88,7 @@ const ProjectData = observer(() => {
   useEffect(() => {
     const locationInfo: any = location?.state;
     setPath(locationInfo?.pathName || "");
+    handleRefresh();
   }, [location]);
 
   // 列表展示的数据

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-16 11:30:25
+ * @LastEditTime: 2022-06-16 17:26:40
  * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -65,7 +65,7 @@ const ProjectMembers = observer(() => {
         label: "操作",
         width: 160,
         render: (item: any, row: any) => {
-          return projectOwner === row?.username ? null : (
+          return item.projectRole === "OWNER" ? null : (
             <>
               <span
                 style={{ color: "#1370FF", cursor: "pointer" }}