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

Feat 20220608 projectdata

See merge request !34

package-lock.json

@@ -11838,7 +11838,7 @@
     },
     "webpack-dev-server": {
       "version": "4.9.0",
-      "resolved": "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.0.tgz",
       "integrity": "sha512-+Nlb39iQSOSsFv0lWUuUTim3jDQO8nhK3E68f//J2r5rIcp4lULHXz2oZ0UVdEeWXEh5lSzYUlzarZhDAeAVQw==",
       "requires": {
         "@types/bonjour": "^3.5.9",

src/components/mui/MyTreeView.tsx

@@ -10,7 +10,6 @@ interface TreeItemType {
 }
 
 type MyTreeViewProps = {
-  // treeData: RenderTree;
   treeData: Array<TreeItemType>;
   onNodeFocus?: (event: object, value: string) => void; // 点击某一项的回调
   onNodeSelect?: (event: object, value: Array<any> | string) => void; // 点击某一项的回调
@@ -55,20 +54,6 @@ const MyTreeView = (props: MyTreeViewProps) => {
     </TreeItem>
   );
 
-  // const renderTreeArray = (node: TreeItemType, index: number) => {
-  //   return (
-  //     <TreeItem
-  //       key={node.id || `${node.name}${index}`}
-  //       nodeId={String(node.id)}
-  //       label={renderLabel === undefined ? node.name : renderLabel(node.name)}
-  //     >
-  //       {Array.isArray(node.subdirs)
-  //         ? node.subdirs.map((nodeLi: any, i) => renderTreeArray(nodeLi, i))
-  //         : null}
-  //     </TreeItem>
-  //   );
-  // };
-
   return (
     <TreeView
       defaultCollapseIcon={<ArrowRightIcon />}
@@ -79,14 +64,9 @@ const MyTreeView = (props: MyTreeViewProps) => {
       defaultExpanded={defaultExpanded}
       sx={{ ...treeViewSx }}
     >
-      {treeData.length === 0 ? (
-        <div>暂无数据</div>
-      ) : (
-        treeData.map((treeItem, index) => {
-          // return renderTreeArray(treeItem, index);
-          return renderTreeObj(treeItem, index);
-        })
-      )}
+      {treeData.map((treeItem, index) => {
+        return renderTreeObj(treeItem, index);
+      })}
     </TreeView>
   );
 };

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

@@ -135,7 +135,7 @@ const MoveFile = (props: any) => {
             currentOperateFile.name
           }`;
           if (oldPath === newPath) {
-            Message.info("当前目录和目标目录一致，请重新选择目标目录");
+            Message.info("指定的目标路径为数据原路径，无需移动。");
             return;
           }
           CloudEController.JobFileMove(

src/views/Project/ProjectData/index.module.css

@@ -3,6 +3,7 @@
 }
 .projectDataStickyTop {
   padding: 28px 24px;
+  position: relative;
 }
 .projectDataTitle {
   font-size: 18px;
@@ -73,6 +74,10 @@
   align-items: center;
 }
 
+.folderPointer{
+  cursor: pointer;
+}
+
 .folderIcon {
   margin-right: 12px;
 }
@@ -111,4 +116,21 @@
 }
 .showPathSpanActive{
   color: #1370FF;
+}
+
+.noDataBox{
+  background-color: #fff;
+  height: calc(100vh - 377px);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  top: -53px;
+}
+.noDataText{
+  margin-top: 8px;
+  font-size: 14px;
+  line-height: 22px;
+  color: #8A9099;
 }
\ No newline at end of file

src/views/Project/project.ts

@@ -5,9 +5,9 @@ export const getProjectList = async () => {
   return res.data;
 };
 
+// 设置文件服务器指向
 export const setFileServerEndPointLocalStorage = async (zoneId: string) => {
   const res = await hpczone();
-  console.log(res);
   let fileServerEndPoint = "";
   if (Array.isArray(res)) {
     res.forEach((item: any) => {