Merge branch 'main' of http://192.168.65.198:3000/Front_Team/SPDM

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

@@ -2,6 +2,8 @@
   <div class="img-content">
     <Toper
       title="图片"
+      :modeKey="titleKey"
+      :modeTitle="params.placeholder"
       :btns="['edit', 'del']"
       :disabled="mode !== 'edit'"
       @edit="diaShow = true"

src/components/common/report/reportEdit/index.vue

@@ -72,6 +72,7 @@
                   <div class="textarea">
                     <Toper
                       title="文本"
+                      :modeKey="unit.key"
                       :btns="['del']"
                       :disabled="modeType === 'input'"
                       @del="delFun(paragraphIndex, sectionIndex, unitIndex)"

src/components/common/report/reportEdit/table.vue

@@ -2,6 +2,7 @@
   <div class="table-content">
     <Toper
       title="表格"
+      :modeKey="titleKey"
       :btns="['edit', 'del']"
       :disabled="mode !== 'edit'"
       @edit="diaShow = true"
@@ -19,7 +20,7 @@
           <el-input v-model="scope.row[item.key]" clearable @input="inputFun" />
         </template>
       </el-table-column>
-      <el-table-column v-if="mode === 'input'" prop="actions" label="操作" width="60">
+      <el-table-column v-if="mode === 'input'" prop="actions" label="操作" fixed="right" width="60">
         <template #default="scope">
           <el-link type="danger" @click="delDataFun(scope.$index)">删除</el-link>
         </template>
@@ -37,7 +38,7 @@
           <el-form-item label="表格类型">
             <el-select v-model="paramsData.tableType">
               <el-option label="指标" value="performance" />
-              <el-option label="普通" value="" />
+              <el-option label="普通" value="normal" />
             </el-select>
           </el-form-item>
         </el-form>

src/components/common/report/reportEdit/toper.vue

@@ -1,6 +1,8 @@
 <template>
   <div v-if="title || !disabled" class="type-toper">
-    <div :class="['type-title', { 'no-title': !title }]">{{ title }}</div>
+    <div :class="['type-title', { 'no-title': !title }]">
+      {{ title }}{{ modeKey ? `-${modeKey}` : '' }}{{ modeTitle ? `-${modeTitle}` : '' }}
+    </div>
     <div v-if="!disabled" class="type-options">
       <el-dropdown placement="bottom-end">
         <div class="btn">
@@ -28,12 +30,16 @@ import { MoreFilled } from '@element-plus/icons-vue';
 
 interface Props {
   title: string;
+  modeKey?: any;
+  modeTitle?: any;
   btns?: any;
   disabled: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
   title: '',
+  modeKey: '',
+  modeTitle: '',
   btns: [],
   disabled: false,
 });