feat(lb-components): Add skipBeforePageTurning

open-mmlab · Aug 30, 2022 · 12673fe · 12673fe
1 parent b7347ee
commit 12673fe
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 3 deletions.
diff --git a/packages/lb-components/src/App.tsx b/packages/lb-components/src/App.tsx
@@ -60,6 +60,9 @@ export interface AppProps {
   defaultLang: 'en' | 'cn'; // 国际化设置
   leftSider?: () => React.ReactNode | React.ReactNode;
 
+  // data Correction
+  skipBeforePageTurning?: (pageTurning: Function) => void;
+
   // 标注信息扩展的功能
   dataInjectionAtCreation: (annotationData: any) => {};
   // 渲染增强
@@ -87,6 +90,7 @@ const App: React.FC<AppProps> = (props) => {
     pageSize = 10,
     loadFileList,
     defaultLang = 'cn',
+    skipBeforePageTurning,
   } = props;
 
   useEffect(() => {
@@ -101,6 +105,7 @@ const App: React.FC<AppProps> = (props) => {
         onSave,
         onPageChange,
         onStepChange,
+        skipBeforePageTurning,
       }),
     );
 

diff --git a/packages/lb-components/src/components/customResizeHook/index.tsx b/packages/lb-components/src/components/customResizeHook/index.tsx
@@ -29,7 +29,12 @@ export const viewportContext = React.createContext<{
 });
 
 export const ViewportProviderComponent = (props: any) => {
-  const { children, dispatch } = props;
+  const {
+    children,
+    dispatch,
+    annotation: { skipBeforePageTurning },
+  } = props;
+  console.log('viewport', props);
   const [width] = useState(window.innerWidth);
   const [height] = useState(window.innerHeight);
 
@@ -40,10 +45,19 @@ export const ViewportProviderComponent = (props: any) => {
 
     if (!e.shiftKey || !e.ctrlKey) {
       if (e.keyCode === EKeyCode.A) {
+        if (skipBeforePageTurning) {
+          skipBeforePageTurning(() => dispatch(PageBackward()));
+          return;
+        }
+
         dispatch(PageBackward());
       }
 
       if (e.keyCode === EKeyCode.D) {
+        if (skipBeforePageTurning) {
+          skipBeforePageTurning(() => dispatch(PageForward()));
+          return;
+        }
         dispatch(PageForward());
       }
       if (e.keyCode === EKeyCode.R) {
@@ -77,7 +91,7 @@ export const ViewportProviderComponent = (props: any) => {
     return () => {
       window.removeEventListener('keydown', keydown);
     };
-  }, [props.annotation.annotationEngine]);
+  }, [props.annotation.annotationEngine, props.annotation.skipBeforePageTurning]);
 
   const size = useMemo(() => ({ width, height }), [width, height]);
 

diff --git a/packages/lb-components/src/store/Actions.ts b/packages/lb-components/src/store/Actions.ts
@@ -24,7 +24,7 @@ export const ANNOTATION_ACTIONS = {
   SET_BASIC_INDEX: '@@SET_BASIC_INDEX',
   CALC_STEP_PROGRESS: '@@CALC_STEP_PROGRESS',
   SET_TRIGGER_EVENT_AFTER_INDEX_CHANGED: '@@SET_TRIGGER_EVENT_AFTER_INDEX_CHANGED',
-
+  SKIP_BEFORE_PAGE_TURNING: '@@SKIP_BEFORE_PAGE_TURNING',
   SET_LOADING: '@@SET_LOADING',
 };
 

diff --git a/packages/lb-components/src/store/annotation/actionCreators.ts b/packages/lb-components/src/store/annotation/actionCreators.ts
@@ -158,6 +158,15 @@ export function UpdateRotate(): AnnotationActionTypes {
   };
 }
 
+export function UpdateSkipBeforePageTurning(skipBeforePageTurning: (pageTurning: Function) => {}): AnnotationActionTypes {
+  return {
+    type: ANNOTATION_ACTIONS.SKIP_BEFORE_PAGE_TURNING,
+    payload: {
+      skipBeforePageTurning,
+    },
+  };
+}
+
 export function CopyBackWordResult(): AnnotationActionTypes {
   return {
     type: ANNOTATION_ACTIONS.COPY_BACKWARD_RESULT,
@@ -178,6 +187,7 @@ export function InitTaskData({
   loadFileList,
   step,
   stepList,
+  skipBeforePageTurning
 }: any): any {
   const tasks: any[] = [];
 
@@ -207,6 +217,10 @@ export function InitTaskData({
     tasks.push(UpdatePageSize(pageSize));
   }
 
+  if (skipBeforePageTurning) {
+    tasks.push(UpdateSkipBeforePageTurning(skipBeforePageTurning));
+  }
+
   tasks.push(SetTaskConfig({ stepList, step }));
 
   tasks.push({
@@ -417,6 +431,7 @@ export const DispatcherTurning = async (
         return;
       }
     }
+
     annotationStore.onPageChange?.(fileIndex);
     const index =
       submitType === ESubmitType.Backward

diff --git a/packages/lb-components/src/store/annotation/reducer.ts b/packages/lb-components/src/store/annotation/reducer.ts
@@ -525,6 +525,13 @@ export const annotationReducer = (
       };
     }
 
+    case ANNOTATION_ACTIONS.SKIP_BEFORE_PAGE_TURNING: {
+      return {
+        ...state,
+        skipBeforePageTurning: action.payload.skipBeforePageTurning,
+      };
+    }
+
     case ANNOTATION_ACTIONS.SET_FILE_DATA: {
       const { fileData, index } = action.payload;
       const { imgList } = state;

diff --git a/packages/lb-components/src/store/annotation/types.ts b/packages/lb-components/src/store/annotation/types.ts
@@ -33,6 +33,7 @@ interface CommonActions {
   payload?: any;
 }
 
+
 export interface AnnotationState {
   toolInstance: ToolInstance | null;
   annotationEngine: AnnotationEngine | null;
@@ -57,6 +58,8 @@ export interface AnnotationState {
   loading: boolean; // 用于图片加载
   /** 阻止文件切换后的事件 */
   triggerEventAfterIndexChanged: boolean;
+
+  skipBeforePageTurning?: (pageTurning: Function) => void;
 }
 
 interface UpdateToolInstance {

diff --git a/packages/lb-components/src/views/MainView/toolFooter/index.tsx b/packages/lb-components/src/views/MainView/toolFooter/index.tsx
@@ -28,6 +28,8 @@ interface IProps {
   basicIndex: number;
   mode?: FooterTheme; // 后面通过 context 的形式进行编写
   footer?: RenderFooter;
+
+  skipBeforePageTurning?: (pageTurning: Function) => void;
 }
 
 export const footerCls = `${prefix}-footer`;
@@ -72,6 +74,7 @@ const ToolFooter: React.FC<IProps> = (props: IProps) => {
     basicIndex,
     mode = 'light',
     footer = renderFooter,
+    skipBeforePageTurning,
   } = props;
 
   const dispatch = useDispatch();
@@ -80,10 +83,19 @@ const ToolFooter: React.FC<IProps> = (props: IProps) => {
   const hasSourceStep = !!stepInfo.dataSourceStep;
 
   const pageBackward = () => {
+    if (skipBeforePageTurning) {
+      skipBeforePageTurning(() => dispatch(PageBackward()));
+      return;
+    }
+
     dispatch(PageBackward());
   };
 
   const pageForward = () => {
+    if (skipBeforePageTurning) {
+      skipBeforePageTurning(() => dispatch(PageForward()));
+      return;
+    }
     dispatch(PageForward());
   };
 
@@ -144,6 +156,7 @@ const mapStateToProps = (state: AppState) => ({
   step: state.annotation.step,
   basicIndex: state.annotation.basicIndex,
   basicResultList: state.annotation.basicResultList,
+  skipBeforePageTurning: state.annotation.skipBeforePageTurning,
 });
 
 export default connect(mapStateToProps)(ToolFooter);