修复cloudcloudIDE层级 问题，提交后刷新 版本

src/forge/Newfile/codeReview/index.jsx

@@ -55,6 +55,7 @@ const CodeReview = (props) => {
     IDEMode,
     toggleViewerType,
     annotationPacks,
+    setAcrFlag,
   } = useAcr();
   const fileReadMarkChange$ = useFileReadMarkChange$(
     diffsPack && diffsPack.diffs || [],
@@ -93,7 +94,7 @@ const CodeReview = (props) => {
   }, [pluginActivated, diffsPack]);
 
   if (!diffsPack) {
-    return  <Spin style={{height:"100vh"}} spinning={true}></Spin>
+    return <Spin style={{ height: "100vh" }} spinning={true}></Spin>
   }
 
   const propsIDE = {
@@ -156,11 +157,25 @@ const CodeReview = (props) => {
         branch: header.branch,
         message: header.commitMessage,
       };
-      
+
       if (pr && pr.forkProject) {
-        projectService.bulkChangeFiles(pr.forkProject.identifier, pr.forkProject.login, data);
+        projectService.bulkChangeFiles(pr.forkProject.identifier, pr.forkProject.login, data).then(res => {
+          if (res) {
+            // gitea底层同步commit是异步，延迟查询才能获取修改后的结果
+            setTimeout(()=>{
+              setAcrFlag({});
+            },8000)
+          }
+        })
       } else {
-        projectService.bulkChangeFiles(projectsId, owner, data);
+        projectService.bulkChangeFiles(projectsId, owner, data).then(res => {
+          if (res) {
+             // gitea底层同步commit是异步，延迟查询才能获取修改后的结果
+             setTimeout(()=>{
+              setAcrFlag({});
+            },8000)
+          }
+        })
       }
     },
     // 菜单栏
@@ -207,16 +222,16 @@ const CodeReview = (props) => {
   console.log('propsIDE:');
   console.log(propsIDE);
   return (
-   
-      <div style={{ height: '100%' ,lineHeight:'1.4'}}>
-        {/* <div className="controller">
+
+    <div style={{ height: '100%', lineHeight: '1.4' }}>
+      {/* <div className="controller">
         {!IDEMode && (
           <>
             IDE 模式: <Switch checked={IDEMode} onChange={toggleViewerType} />
           </>
         )}
       </div> */}
-        {/* <div className="pr-head">
+      {/* <div className="pr-head">
         <div>{pr.description}</div>
         <div>
           评审人：
@@ -229,12 +244,12 @@ const CodeReview = (props) => {
           合并人：{pr.assignee && pr.assignee.name}
         </div>
       </div> */}
-        {IDEMode && (
-          <div style={IDEContainerStyle}>
-            {visible && <ACR {...propsIDE} key={count} />}
-          </div>
-        )}
-      </div>
+      {IDEMode && (
+        <div style={IDEContainerStyle}>
+          {visible && <ACR {...propsIDE} key={count} />}
+        </div>
+      )}
+    </div>
 
   );
 };

src/forge/Newfile/codeReview/mock/component/index.jsx

@@ -25,7 +25,6 @@ import {
 import { Link } from "react-router-dom";
 import { usePersistFn } from "ahooks";
 import { getImageUrl, timeAgo } from "educoder";
-import { camelcaseToUnderscore } from '../utils/camelcase-convert';
 import "./style.module.less";
 import { useAcr, useNote, useGlobal, usePr } from "../../model";
 const AnnotationStatus = {
@@ -366,12 +365,16 @@ export const Menubar = memo((props) => {
     </Menu>
   );
 
+  const MenuStyle = {
+    zIndex: 1200,
+  };
+
   return (
     <div className="arc-menubar">
       <div className={'group'}>
         {versions.length !== 0 && (
           <div className={'versionContainer'}>
-            <Dropdown overlay={menuFrom} trigger={["click"]}>
+            <Dropdown overlay={menuFrom} trigger={["click"]} overlayStyle={MenuStyle}>
               <div className={'versionItem'}>
                 <span>{idToVerbose.get(fromId)}</span>
                 <Icon type="down" />
@@ -380,7 +383,7 @@ export const Menubar = memo((props) => {
             <div>
               <Icon type="arrow-right" />
             </div>
-            <Dropdown overlay={menuTo} trigger={["click"]}>
+            <Dropdown overlay={menuTo} trigger={["click"]} overlayStyle={MenuStyle}>
               <div className={'versionItem'}>
                 <span>{idToVerbose.get(toId)}</span>
                 <Icon type="down" />

src/forge/Newfile/codeReview/mock/pr.service.js

@@ -183,12 +183,6 @@ export const prService = {
       item.pullRequestId=mergeId;
     }
     return reviews;
-    // for (const item of res.data.files) {
-    //   item.newPath = item.name;
-    //   item.file_path_sha2 = item.file_path_sha;
-    //   item.file_path_sha = sha1(item.newPath)
-    // }
-    // return underscoreToCamelcase(res.data.files);
   },
 
   async commitReview(projectsId, owner, mergeId, body) {

src/forge/Newfile/codeReview/model.jsx

@@ -399,14 +399,6 @@ const [ReadMarkProvider, useReadMark] = createContainer(() => {
     return map;
   }, [readMarks]);
 
-  // const readMarkMap2 = useMemo(() => {
-  //   const map = new Map();
-  //   if (!readMarks) return map;
-  //   for (const mark of readMarks) {
-  //     map.set(mark.name, mark.filePathSha2);
-  //   }
-  //   return map;
-  // }, [readMarks]);
 
   const memoizedSha1 = useMemo(() => memoize(sha1), []);
 
@@ -414,7 +406,6 @@ const [ReadMarkProvider, useReadMark] = createContainer(() => {
     const data = await prService.markFileAsRead(
       projectsId, owner, mergeId,
       { file_path_sha: Base64.encode(filePath) }
-      // { file_path_sha: readMarkMap2.get(filePath) }
     );
     updateFlag({});
     return data;
@@ -424,7 +415,6 @@ const [ReadMarkProvider, useReadMark] = createContainer(() => {
     const data = await prService.markFileAsUnread(
       projectsId, owner, mergeId,
       { file_path_sha: Base64.encode(filePath) }
-      // { file_path_sha: readMarkMap2.get(filePath) }
     );
     updateFlag({});
     return data;
@@ -457,6 +447,7 @@ const [ReadMarkProvider, useReadMark] = createContainer(() => {
 });
 
 const [AcrProvider, useAcr] = createContainer(() => {
+  const [acrflag, setAcrFlag] = useState({});
   const { params } = useGlobal();
   const { pr } = usePr();
   const { charsetName } = useSetting();
@@ -501,7 +492,7 @@ const [AcrProvider, useAcr] = createContainer(() => {
 
   const versions = useRequest(
     async () => await prService.getDiffVersions(projectsId, owner, mergeId),
-    { initial: [] }
+    { initial: [],deps:[acrflag] }
   );
 
 
@@ -634,6 +625,7 @@ const [AcrProvider, useAcr] = createContainer(() => {
     IDEMode,
     toggleViewerType,
     updateQuery,
+    setAcrFlag,
     annotationPacks,
   };
 });