Merge pull request #8 from LollipopsAndWine/feat/ade/dev

feat: vite config

projects/web/src/api/oss.ts

@@ -68,7 +68,6 @@ export const customUploadToOss = async (
   otherUploadOptions: IUploadOptions
 ) => {
   const { openRead, fileType, uploadType = "local" } = otherUploadOptions;
-  console.log("test-options", options.file);
   const uploadFile = async () => {
     switch (uploadType) {
       case "oss":

projects/web/src/components/SaveStatus.tsx

@@ -11,6 +11,7 @@ interface SaveStatusProps {
 
 export interface SaveStatusRef {
   triggerSave: () => void;
+  reset: () => void; // 新增的重置方法
 }
 
 const SaveStatus = forwardRef<SaveStatusRef, SaveStatusProps>(
@@ -24,6 +25,12 @@ const SaveStatus = forwardRef<SaveStatusRef, SaveStatusProps>(
         setLastSaveTime(new Date());
         setShowSaved(true);
       },
+      reset: () => {
+        // 新增的重置方法
+        setLastSaveTime(null);
+        setShowSaved(false);
+        setTimeSinceLastSave("");
+      },
     }));
 
     useEffect(() => {

projects/web/src/components/code-mirror/index.tsx

@@ -54,12 +54,8 @@ const CodeMirror: React.FC<PropsWithChildren<IProps>> = ({
       editable={editable}
       extensions={extensions}
       onChange={(v) => {
-        console.log("test-rest-change", v);
         onChange?.(v);
       }}
-      onBeforeInput={(v) => {
-        console.log("test-onBeforeInput", v);
-      }}
     />
   );
 };

projects/web/src/pages/extract-side/index.tsx

@@ -29,7 +29,7 @@ export const ExtractorSide = ({ className = "" }: IExtractorSideProps) => {
   const params = useParams();
   const location = useLocation();
   const { messages } = useIntl();
-  console.log("test-params-jobID", params.jobID);
+
   const menuClass =
     "px-2 py-2.5 mb-1 text-[0.875rem] text-[#121316]/[0.8] font-semibold rounded h-10 flex items-center cursor-pointer hover:bg-[#0d53de]/[0.05]";
 

projects/web/src/pages/extract/components/extractor-guide/index.tsx

@@ -20,7 +20,7 @@ const ExtractorGuide = () => {
 
   const EXTRACTOR_GUIDE_ITEM_LIST = (messages?.["extractor.side.guide_list"] ||
     []) as unknown as GuideItem[];
-  console.log("test-EXTRACTOR_GUIDE_ITEM_LIST", EXTRACTOR_GUIDE_ITEM_LIST);
+
   const content = (
     <div>
       <div className="text-[1.25rem] font-semibold mt-3 mb-2  ml-4">

projects/web/src/pages/extract/components/extractor-queue/index.tsx

@@ -24,7 +24,7 @@ const ExtractorQueue: React.FC<ExtractorQueueProps> = ({ className }) => {
   const navigate = useNavigate();
 
   const params = useParams();
-  console.log("test-params", params);
+
   const { data: taskList, mutate } = useRequest(() => {
     return getExtractorHistory({
       pageNo: 1,
@@ -62,9 +62,7 @@ const ExtractorQueue: React.FC<ExtractorQueueProps> = ({ className }) => {
       ? taskList?.[deleteIndex + 1]
       : taskList?.[deleteIndex - 1];
     mutate(taskList?.filter((i) => i.id !== id));
-    console.log("test-next-job", nextJob);
     deleteExtractJob(id).then(() => {
-      console.log("test-delete-job", id);
       message.success(formatMessage({ id: "extractor.queue.delete.success" }));
     });
     if (timeout) {
@@ -120,7 +118,7 @@ const ExtractorQueue: React.FC<ExtractorQueueProps> = ({ className }) => {
   useEffect(() => {
     mutate(taskListRef?.current);
   }, [locale]);
-  console.log("test-dd", params);
+
   return (
     <div className={cls("w-full flex flex-col mb-3", className)}>
       <header className="flex items-center px-2 py-[0.625rem] text-[#121316]/[0.8] text-[0.875rem] font-semibold">

projects/web/src/pages/extract/components/image-layer-viwer/index.tsx

-import React, { useEffect, useRef, useState, useMemo, forwardRef, useImperativeHandle, useCallback } from 'react';
-import cls from 'classnames';
-import { isObjEqual } from '@/utils/render';
-import { useSize } from 'ahooks';
+import React, {
+  useEffect,
+  useRef,
+  useState,
+  useMemo,
+  forwardRef,
+  useImperativeHandle,
+  useCallback,
+} from "react";
+import cls from "classnames";
+import { isObjEqual } from "@/utils/render";
+import { useSize } from "ahooks";
 
 interface IImageLayersViewerProps {
   imageUrl: string;
@@ -27,8 +35,23 @@ export interface ImageLayerViewerRef {
   updateScaleAndPosition: () => void;
 }
 
-const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps>(
-  ({ imageUrl, imageHeight, imageWidth, onChange, layout, disableZoom, className = '', layerVisible = true }, ref) => {
+const ImageLayerViewer = forwardRef<
+  ImageLayerViewerRef,
+  IImageLayersViewerProps
+>(
+  (
+    {
+      imageUrl,
+      imageHeight,
+      imageWidth,
+      onChange,
+      layout,
+      disableZoom,
+      className = "",
+      layerVisible = true,
+    },
+    ref
+  ) => {
     const containerRef = useRef<HTMLDivElement>(null);
     const imageCanvasRef = useRef<HTMLCanvasElement>(null);
     const overlayCanvasRef = useRef<HTMLCanvasElement>(null);
@@ -53,7 +76,8 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
     }, [imageUrl]);
 
     const calculateInitialScaleAndPosition = useCallback(() => {
-      if (!containerRef.current) return { initialScale: 1, initialPosition: { x: 0, y: 0 } };
+      if (!containerRef.current)
+        return { initialScale: 1, initialPosition: { x: 0, y: 0 } };
       const containerWidth = containerRef.current.clientWidth;
       const containerHeight = containerRef.current.clientHeight;
 
@@ -66,14 +90,15 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
 
       const initialPosition = {
         x: (containerWidth - scaledWidth) / 2,
-        y: (containerHeight - scaledHeight) / 2
+        y: (containerHeight - scaledHeight) / 2,
       };
 
       return { initialScale, initialPosition };
     }, [imageWidth, imageHeight]);
 
     const updateScaleAndPosition = useCallback(() => {
-      const { initialScale, initialPosition } = calculateInitialScaleAndPosition();
+      const { initialScale, initialPosition } =
+        calculateInitialScaleAndPosition();
       setScale(initialScale);
       setPosition(initialPosition);
       setPadding({ left: 0, top: 0 });
@@ -84,7 +109,7 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
     }, [imageWidth, imageHeight]);
 
     const drawImage = useCallback(() => {
-      const ctx = imageCanvasRef.current?.getContext('2d');
+      const ctx = imageCanvasRef.current?.getContext("2d");
       if (!ctx || !image.complete) return;
 
       const scaledWidth = imageWidth * scale;
@@ -102,7 +127,7 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
     }, [image, imageWidth, imageHeight, scale, dpr]);
 
     const drawLayout = useCallback(() => {
-      const ctx = overlayCanvasRef.current?.getContext('2d');
+      const ctx = overlayCanvasRef.current?.getContext("2d");
       if (!ctx) return;
 
       const scaledWidth = imageWidth * scale;
@@ -118,28 +143,30 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
       ctx.clearRect(0, 0, scaledWidth, scaledHeight);
 
       layout?.forEach((item) => {
-        const [x1, y1, x2, y2, x3, y3, x4, y4] = item.poly.map((coord) => coord * scale);
+        const [x1, y1, x2, y2, x3, y3, x4, y4] = item.poly.map(
+          (coord) => coord * scale
+        );
 
         switch (item.category_id) {
           case 9:
-            ctx.fillStyle = 'rgba(230, 113, 230, 0.4)';
-            ctx.strokeStyle = 'rgba(230, 113, 230, 1)';
+            ctx.fillStyle = "rgba(230, 113, 230, 0.4)";
+            ctx.strokeStyle = "rgba(230, 113, 230, 1)";
             break;
           case 8:
-            ctx.fillStyle = 'rgba(240, 240, 124, 0.4)';
-            ctx.strokeStyle = 'rgba(240, 240, 124, 1)';
+            ctx.fillStyle = "rgba(240, 240, 124, 0.4)";
+            ctx.strokeStyle = "rgba(240, 240, 124, 1)";
             break;
           case 13:
-            ctx.fillStyle = 'rgba(150, 232, 172, 0.4)';
-            ctx.strokeStyle = 'rgba(150, 232, 172, 1)';
+            ctx.fillStyle = "rgba(150, 232, 172, 0.4)";
+            ctx.strokeStyle = "rgba(150, 232, 172, 1)";
             break;
           case 14:
-            ctx.fillStyle = 'rgba(230, 122, 171, 0.4)';
-            ctx.strokeStyle = 'rgba(230, 122, 171, 1)';
+            ctx.fillStyle = "rgba(230, 122, 171, 0.4)";
+            ctx.strokeStyle = "rgba(230, 122, 171, 1)";
             break;
           default:
-            ctx.fillStyle = 'transparent';
-            ctx.strokeStyle = 'transparent';
+            ctx.fillStyle = "transparent";
+            ctx.strokeStyle = "transparent";
         }
 
         ctx.beginPath();
@@ -168,8 +195,14 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
           const newScaledHeight = imageHeight * newScale;
 
           let newPosition = {
-            x: position.x - ((x - position.x) * (newScaledWidth - prevScaledWidth)) / prevScaledWidth,
-            y: position.y - ((y - position.y) * (newScaledHeight - prevScaledHeight)) / prevScaledHeight
+            x:
+              position.x -
+              ((x - position.x) * (newScaledWidth - prevScaledWidth)) /
+                prevScaledWidth,
+            y:
+              position.y -
+              ((y - position.y) * (newScaledHeight - prevScaledHeight)) /
+                prevScaledHeight,
           };
 
           // Center the image if it's smaller than the container
@@ -186,7 +219,7 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
           // Calculate new padding
           const newPadding = {
             left: Math.max(0, -newPosition.x),
-            top: Math.max(0, -newPosition.y)
+            top: Math.max(0, -newPosition.y),
           };
           setPadding(newPadding);
         }
@@ -212,7 +245,9 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
 
     const handleCenterZoom = useCallback(
       (zoomIn: boolean) => {
-        const newScale = zoomIn ? scale * (1 + zoomStep) : scale / (1 + zoomStep);
+        const newScale = zoomIn
+          ? scale * (1 + zoomStep)
+          : scale / (1 + zoomStep);
         const boundedNewScale = Math.max(minZoom, Math.min(newScale, maxZoom));
 
         if (containerRef.current) {
@@ -241,7 +276,7 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
         zoomIn,
         zoomOut,
         scale,
-        updateScaleAndPosition
+        updateScaleAndPosition,
       }),
       [zoomIn, zoomOut, scale]
     );
@@ -257,10 +292,10 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
         }
       };
 
-      container.addEventListener('wheel', handleWheel, { passive: false });
+      container.addEventListener("wheel", handleWheel, { passive: false });
 
       return () => {
-        container.removeEventListener('wheel', handleWheel);
+        container.removeEventListener("wheel", handleWheel);
       };
     }, [handleZoom]);
 
@@ -268,7 +303,7 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
       if (containerRef?.current) {
         containerRef.current?.scrollTo({
           left: padding.left,
-          top: padding.top
+          top: padding.top,
         });
       }
     }, [padding]);
@@ -288,7 +323,7 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
 
     useEffect(() => {
       if (overlayCanvasRef.current) {
-        overlayCanvasRef.current.style.opacity = layerVisible ? '1' : '0';
+        overlayCanvasRef.current.style.opacity = layerVisible ? "1" : "0";
       }
     }, [layerVisible]);
 
@@ -296,13 +331,18 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
       onChange?.({ scale });
     }, [scale]);
 
-    console.log('test-render');
     return (
-      <div className={cls(className, 'w-full h-full overflow-auto scrollbar-thin relative')} ref={containerRef}>
+      <div
+        className={cls(
+          className,
+          "w-full h-full overflow-auto scrollbar-thin relative"
+        )}
+        ref={containerRef}
+      >
         <div
           style={{
             paddingLeft: `${padding.left}px`,
-            paddingTop: `${padding.top}px`
+            paddingTop: `${padding.top}px`,
           }}
         >
           <div
@@ -310,14 +350,14 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
             style={{
               width: `${imageWidth * scale}px`,
               height: `${imageHeight * scale}px`,
-              transform: `translate(${position.x}px, ${position.y}px)`
+              transform: `translate(${position.x}px, ${position.y}px)`,
             }}
           >
             <canvas
               ref={imageCanvasRef}
               style={{
                 width: `${imageWidth * scale}px`,
-                height: `${imageHeight * scale}px`
+                height: `${imageHeight * scale}px`,
               }}
             />
             <canvas
@@ -325,7 +365,7 @@ const ImageLayerViewer = forwardRef<ImageLayerViewerRef, IImageLayersViewerProps
               className="absolute top-0 left-0"
               style={{
                 width: `${imageWidth * scale}px`,
-                height: `${imageHeight * scale}px`
+                height: `${imageHeight * scale}px`,
               }}
             />
           </div>

projects/web/src/pages/extract/components/md-viewer/index.tsx

@@ -138,6 +138,7 @@ const MdViewer: React.FC<IMdViewerProps> = ({
     if (taskInfo?.markdownUrl) {
       setMdUrlArr(taskInfo?.markdownUrl);
     }
+    statusRef?.current?.reset();
   }, [taskInfo?.markdownUrl, params?.jobID]);
 
   const handleContentChange = (val: string, index: number) => {

projects/web/src/pages/extract/components/pdf-upload-button/index.tsx

@@ -71,7 +71,6 @@ export const ExtractorUploadButton = ({
   };
   const onChange = async (pdfFile: any) => {
     if (pdfFile?.file?.status === "done") {
-      console.log("test-pdf", pdfFile);
       const res =
         submitType === "reUpload"
           ? await postReUploadExtractTask(String(urlParams?.jobID))

projects/web/vite.config.ts

@@ -8,8 +8,7 @@ export default defineConfig({
   server: {
     proxy: {
       "/api": {
-        // target: "https://staging.openxlab.org.cn/datasets",
-        target: "http://10.6.16.169:5559",
+        target: "http://localhost:5559",
         changeOrigin: true,
       },
     },