Merge remote-tracking branch 'origin/dev' into dev

xtreme1-io · Apr 25, 2023 · 643911e · 643911e
2 parents ceb8254 + 47a1b40
commit 643911e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/frontend/main/src/views/datasets/datasetContent/components/upload/UploadProgress.vue b/frontend/main/src/views/datasets/datasetContent/components/upload/UploadProgress.vue
@@ -175,6 +175,7 @@
       list.filter(
         (item) =>
           item.status !== UploadResultStatus.SUCCESS &&
+          item.status !== UploadResultStatus.SUCCESS_WITH_ERROR &&
           item.status !== UploadResultStatus.ERROR &&
           item.status !== UploadResultStatus.CANCELED,
       ) ?? [];
@@ -312,6 +313,7 @@
       list.filter(
         (item) =>
           item.status !== UploadResultStatus.SUCCESS &&
+          item.status !== UploadResultStatus.SUCCESS_WITH_ERROR &&
           item.status !== UploadResultStatus.ERROR &&
           item.status !== UploadResultStatus.CANCELED,
       ) ?? [];

diff --git a/frontend/pc-tool/src/api/common.ts b/frontend/pc-tool/src/api/common.ts
@@ -25,7 +25,6 @@ export async function saveObject(config: any) {
     let url = '/api/annotate/data/save';
     let data = await post(url, config);
     data = data.data || [];
-    console.log(data);
     let keyMap = {} as Record<string, Record<string, string>>;
     data.forEach((e: any) => {
         let dataId = e.dataId;

diff --git a/frontend/pc-tool/src/common/Editor.ts b/frontend/pc-tool/src/common/Editor.ts
@@ -93,6 +93,7 @@ export default class Editor extends BaseEditor {
             });
             this.showMsg('success', this.lang('save-ok'));
         } catch (e: any) {
+            console.error(e);
             this.showMsg('error', this.lang('save-error'));
         }
         bsState.saving = false;
@@ -102,19 +103,19 @@ export default class Editor extends BaseEditor {
         Object.keys(keyMap).forEach((dataId) => {
             let dataKeyMap = keyMap[dataId];
             let annotates = this.dataManager.getFrameObject(dataId) || [];
-            annotates.forEach((annotate:any) => {
+            annotates.forEach((annotate: any) => {
                 let frontId = annotate.uuid;
                 let backId = dataKeyMap[frontId];
                 if (!backId) return;
-                annotate.id = backId;
+                annotate.userData.backId = backId;
                 // annotate.uuid = backId;
             });
         });
     }
     async getResultSources(frame?: IFrame) {
         let { state } = this;
         frame = frame || this.getCurrentFrame();
-        if(!frame.sources){
+        if (!frame.sources) {
             let sources = await api.getResultSources(frame.id);
             sources.unshift({
                 name: 'Without Task',
@@ -125,7 +126,6 @@ export default class Editor extends BaseEditor {
         }
         this.setSources(frame.sources);
 
-
         // let sourceMap = {};
         // sources.forEach((e) => {
         //     sourceMap[e.sourceId] = true;

diff --git a/frontend/pc-tool/src/packages/pc-editor/utils/classification.ts b/frontend/pc-tool/src/packages/pc-editor/utils/classification.ts
@@ -223,7 +223,6 @@ export function classificationToSave(classification: IClassification) {
         };
     });
 
-    console.log(data);
     return data;
 }
 export function isAttrVisible(
-Original file line number
+Diff line change
@@ Expand Up @@
             };
         });
-        console.log(data);
         return data;
     }
     export function isAttrVisible(
@@ Expand Down @@