merge

src/components/common/report/reportEditer/components/img.vue

@@ -104,7 +104,7 @@ const titleKey = ref(props.keyValue);
 const fileList = ref<any>([]);
 const isFocus = ref(false);
 const PasteContentRef = ref();
-const contenteditable = ref(true);
+const contenteditable = ref(false);
 const paramsData = ref(cloneDeep(props.params));
 if (!paramsData.value.colNum) {
   paramsData.value.colNum = 1;
@@ -164,12 +164,12 @@ const focusFun = (event: any) => {
 };
 
 const delFun = (index: any) => {
-  contenteditable.value = false;
+  // contenteditable.value = false;
   nextTick(() => {
     PasteContentRef.value.click();
     PasteContentRef.value.focus();
     fileList.value.splice(index, 1);
-    contenteditable.value = true;
+    // contenteditable.value = true;
     emit('update:value', fileList.value);
   });
 };
@@ -187,6 +187,7 @@ const pasteFun = (event: any) => {
   const clipboardData = event.clipboardData || win.clipboardData;
   const items = clipboardData.items;
   if (!items) return;
+  contenteditable.value = true;
   for (let i = 0; i < items.length; i++) {
     const item = items[i];
     if (item.kind === 'file' && item.type.startsWith('image/')) {
@@ -204,6 +205,7 @@ const pasteFun = (event: any) => {
       break;
     }
   }
+  contenteditable.value = false;
 };
 
 const inputFun = () => {

src/components/taskDetail/taskPerformance.vue

@@ -152,7 +152,7 @@ import { importSimulationPerformanceApi } from '@/api/project/task';
 
 const props = defineProps({
   taskId: {
-    type: Number,
+    type: [Number, String],
     default: 0,
   },
   runInfo: {

src/views/data/analysis/index.vue

@@ -512,7 +512,7 @@ const actionList = ref<any>([
       previewFileFun(row);
     },
     hide: (row: any) => {
-      return !row.id;
+      return !row.id || ['仿真任务', '仿真算例', '数据指标'].includes(currentModel.value);
     },
   },
   // 算例的谱系图

src/views/task/projectDetail/components/taskDetail.vue

@@ -211,7 +211,7 @@ import reviewData from '@/components/taskDetail/reviewData.vue';
 const emits = defineEmits(['closeFn', 'updateFn']);
 const props = defineProps({
   taskId: {
-    type: Number,
+    type: [Number, String],
     default: 0,
   },
   currentTaskInfo: {