Merge pull request #13 from open-mmlab/dev

Kerwin-L · web-flow · commit 431320923e16 · 2022-01-13T20:16:50.000+08:00
Copy Project / Import Config from clipboard
diff --git a/electron/main.ts b/electron/main.ts
@@ -1,7 +1,7 @@
 import { ipcListen } from './ipcEvent';
 const electron = require('electron');
 const platform = require('os').platform(); // 获取平台：https://nodejs.org/api/os.html#os_os_platform
-const version = '0.1.0';
+const version = '0.1.1';
 
 // 控制app生命周期.
 const app = electron.app;
diff --git a/src/ProjectPlatform/CreateProjectModal/MultiStep/index.tsx b/src/ProjectPlatform/CreateProjectModal/MultiStep/index.tsx
@@ -1,7 +1,7 @@
 // cl 2021/9/13 09:53
 import React, { useEffect, useMemo, useState } from 'react';
 import { Col, Row, Select, Button, Form, message } from 'antd';
-import { isNumber, omit, pick } from 'lodash';
+import { isNumber, omit, pick, maxBy } from 'lodash';
 import { IStepInfo } from '@/store';
 import { EToolName, TOOL_NAME } from '@/constant/store';
 import SelectTool, { annotationTypeList, Itool } from '../SelectTool';
@@ -64,9 +64,10 @@ const MultiStep: React.FC<IProps> = ({ stepId, stepList, setStepLIst, changeTask
       );
       const index = stepList.findIndex((item) => item.id === stepInfo?.id);
       const newStepList = [...stepList];
+      const maxStep = maxBy(stepList, 'step')?.step ?? 0;
       if (index === -1) {
         newStepList.push({
-          step: stepList.length + 1,
+          step: maxStep + 1,
           dataSourceStep,
           tool: toolName,
           id: uuid(),
diff --git a/src/ProjectPlatform/CreateProjectModal/index.tsx b/src/ProjectPlatform/CreateProjectModal/index.tsx
@@ -8,7 +8,7 @@ import MultiStep from './MultiStep';
 import SelectTool from './SelectTool';
 import TaskStep from '@/ProjectPlatform/CreateProjectModal/TaskStep';
 import { IStepInfo, useAnnotation } from '../../store';
-import { EToolName } from '@/constant/store';
+import { EToolName, TOOL_NAME } from '@/constant/store';
 import DefaultConfig from './ToolConfig/DefaultConfig';
 import { getCreateProjectCmt } from '@/utils/tool/common';
 import { repeatInputList } from '@/utils/tool/editTool';
@@ -171,6 +171,44 @@ const CreateProjectModal: React.FC<IProps> = ({ type, visible, onCancel }) => {
     }
   }, [form, visible]);
 
+  const importFromClipboard = () => {
+    const promise = navigator.clipboard.readText();
+    promise.then((res) => {
+      try {
+        const clipboardData = JSON.parse(res);
+        const toolNames = Object.keys(TOOL_NAME);
+        const newData: any = [];
+        // 过滤掉质检步骤、暂不支持的工具、依赖过滤掉的工具
+        const filteredStep: any = [];
+        clipboardData.forEach((element: any) => {
+          const { id = uuid(), tool, type, dataSourceStep, step, config } = element;
+          if (
+            type === 2 ||
+            type === 3 ||
+            !toolNames.includes(tool) ||
+            filteredStep.includes(dataSourceStep)
+          ) {
+            filteredStep.push(step);
+          } else {
+            newData.push({
+              id,
+              tool,
+              step,
+              config,
+              dataSourceStep,
+            });
+          }
+        });
+
+        setStepList((pre) => {
+          return [...pre, ...newData];
+        });
+      } catch (error) {
+        message.error(t('PleaseCopyTheCorrectStepList'));
+      }
+    });
+  };
+
   return (
     <div>
       <Modal
@@ -219,7 +257,19 @@ const CreateProjectModal: React.FC<IProps> = ({ type, visible, onCancel }) => {
                   setStepLIst={setStepList}
                   setStepId={setStepId}
                   changeTaskVisible={changeTaskVisible}
-                  footer={<Button onClick={changeTaskVisible}>{t('New')}</Button>}
+                  footer={
+                    <>
+                      <Button
+                        onClick={importFromClipboard}
+                        style={{
+                          marginRight: 16,
+                        }}
+                      >
+                        {t('ImportFromClipboard')}
+                      </Button>
+                      <Button onClick={changeTaskVisible}>{t('New')}</Button>
+                    </>
+                  }
                 />
                 <Modal
                   destroyOnClose={true}
diff --git a/src/ProjectPlatform/ProjectList/index.tsx b/src/ProjectPlatform/ProjectList/index.tsx
@@ -1,20 +1,21 @@
 // cl 2021/8/5 19:12
 import React, { useEffect, useState } from 'react';
 import { IFileInfo, IProjectInfo, IStepInfo, useAnnotation } from '@/store';
-import { message, Popconfirm, Tag, Spin } from 'antd';
+import { message, Popconfirm, Tag, Spin, Tooltip } from 'antd';
 import { EToolName, TOOL_NAME } from '@/constant/store';
 import {
   DeleteOutlined,
   QuestionCircleOutlined,
   EditOutlined,
   FolderOpenOutlined,
   DeliveredProcedureOutlined,
+  CopyOutlined,
 } from '@ant-design/icons';
 import SelectFolder from '@/ProjectPlatform/CreateProjectModal/SelectFolder';
 import ExportData from './ExportData';
 import styles from '../index.module.scss';
 import { EIpcEvent } from '@/constant/event';
-import { formatDate, jsonParser } from '@/utils/tool/common';
+import { copyText, formatDate, jsonParser } from '@/utils/tool/common';
 import { IProjectType } from '@/ProjectPlatform';
 import IconRect from '@/assets/toolIcon/icon_rect.svg';
 import IconLine from '@/assets/toolIcon/icon_line.svg';
@@ -254,22 +255,37 @@ const ProjectList: React.FC<IProps> = ({ createProject }) => {
                 </div>
                 {hoverIndex === i && (
                   <div className={styles.deleteButton}>
-                    <DeliveredProcedureOutlined
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        setProjectInfo(info);
-                      }}
-                      className={styles.icon}
-                      style={{ marginRight: 12 }}
-                    />
-                    <EditOutlined
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        editProject(info);
-                      }}
-                      className={styles.icon}
-                      style={{ marginRight: 12 }}
-                    />
+                    <Tooltip title={t('CopyProjectConfig')}>
+                      <CopyOutlined
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          copyText(JSON.stringify(info.stepList));
+                          message.success(t('CopyConfigSuccessfully'));
+                        }}
+                        className={styles.icon}
+                        style={{ marginRight: 12 }}
+                      />
+                    </Tooltip>
+                    <Tooltip title={t('ExportAnnotationResults')}>
+                      <DeliveredProcedureOutlined
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          setProjectInfo(info);
+                        }}
+                        className={styles.icon}
+                        style={{ marginRight: 12 }}
+                      />
+                    </Tooltip>
+                    <Tooltip title={t('ModifyConfig')}>
+                      <EditOutlined
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          editProject(info);
+                        }}
+                        className={styles.icon}
+                        style={{ marginRight: 12 }}
+                      />
+                    </Tooltip>
                     <span
                       onClick={(e) => {
                         e.stopPropagation();
diff --git a/src/i18n.ts b/src/i18n.ts
@@ -90,6 +90,14 @@ const resources = {
       MultiSelect: 'multi-select',
       DefaultOption: 'Default Option',
       MessageBeforeExport: 'Exporting, please wait',
+      ImportFromClipboard: 'Import from clipboard',
+      PleaseCopyTheCorrectStepList: 'Please copy the correct step list',
+      CopyConfigSuccessfully: 'Copy project config Successfully',
+
+      // Project Operation
+      CopyProjectConfig: 'Copy project config',
+      ExportAnnotationResults: 'Export annotation results',
+      ModifyConfig: 'Modify config',
     },
   },
   cn: {
@@ -177,6 +185,14 @@ const resources = {
       MultiSelect: '多选',
       DefaultOption: '默认选择',
       MessageBeforeExport: '导出中，请稍后',
+      ImportFromClipboard: '剪切板导入',
+      PleaseCopyTheCorrectStepList: '请复制正确的步骤列表',
+      CopyConfigSuccessfully: '复制项目配置成功',
+
+      // Project Operation
+      CopyProjectConfig: '复制项目配置',
+      ExportAnnotationResults: '导出标注结果',
+      ModifyConfig: '修改配置',
     },
   },
 };
diff --git a/src/utils/DataTransfer.ts b/src/utils/DataTransfer.ts
@@ -215,6 +215,12 @@ export default class DataTransfer {
               category_id,
             };
 
+            let area = 0;
+            if (rect.width && rect.height) {
+              area = rect.width * rect.height;
+            }
+            Object.assign(defaultData, { area });
+
             if (rect.textAttribute) {
               Object.assign(defaultData, { textAttribute: rect.textAttribute });
             }
diff --git a/src/utils/tool/common.ts b/src/utils/tool/common.ts
@@ -10,33 +10,33 @@ export function checkNumber(v: string) {
   return false;
 }
 
-export function formatDate(date: Date, fmt: string){
-  if(/(y+)/.test(fmt)){
-    fmt = fmt.replace(RegExp.$1, (date.getFullYear()+'').substr(4-RegExp.$1.length));
+export function formatDate(date: Date, fmt: string) {
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
   }
   let o = {
-    'M+': date.getMonth()+1,
+    'M+': date.getMonth() + 1,
     'd+': date.getDate(),
     'h+': date.getHours(),
     'm+': date.getMinutes(),
-    's+': date.getSeconds()
-  }
-  for(let k in o){
+    's+': date.getSeconds(),
+  };
+  for (let k in o) {
     // @ts-ignore
-    let str = o[k]+'';
-    if(new RegExp(`(${k})`).test(fmt)){
-      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length===1)?str:padLeftZero(str));
+    let str = o[k] + '';
+    if (new RegExp(`(${k})`).test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : padLeftZero(str));
     }
   }
   return fmt;
-};
+}
 
-function padLeftZero(str: string){
-  return ('00'+str).substr(str.length);
+function padLeftZero(str: string) {
+  return ('00' + str).substr(str.length);
 }
 
 export function getCreateProjectCmt(showBase: boolean, Base: ReactNode, Step: ReactNode) {
-  return showBase ? Base : Step
+  return showBase ? Base : Step;
 }
 
 export const jsonParser = (content: any, defaultValue: any = {}) => {
@@ -49,4 +49,27 @@ export const jsonParser = (content: any, defaultValue: any = {}) => {
   } catch (e) {
     return defaultValue;
   }
-};
+};
+
+/**
+ * 复制文本
+ * @param text
+ * @param element
+ */
+export const copyText = (text: string, element: 'input' | 'textarea' = 'input') => {
+  const copyInput = document.createElement(element);
+  copyInput.setAttribute(
+    'style',
+    `
+      display: 'none'
+    `,
+  );
+
+  document.body.appendChild(copyInput);
+
+  copyInput.value = text;
+  copyInput.select();
+
+  document.execCommand('copy');
+  document.body.removeChild(copyInput);
+};
diff --git a/src/utils/tool/task.ts b/src/utils/tool/task.ts
@@ -76,7 +76,7 @@ export function deleteStep(step: number, stepList: IStepInfo[]) {
   const deleteStepList: any = stepList
     .filter((item) => deleteList.some((i) => i === item.step))
     .map(
-      (item: any) => `${i18n.t('NStep')}
+      (item: any) => `${i18n.t('NStep', { step: item.step })}
     ：${i18n.t(TOOL_NAME[item.tool])}`,
     );
 
