xzc пре 1 недеља
родитељ
комит
be01479f8f

+ 2 - 2
yudao-ui-admin-vue3/src/components/DynamicReport/BatchUploadFile.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button type="primary" plain @click="handleShowUploadDialog">批量插入图片</el-button>
+  <el-button type="primary" plain @click="handleShowUploadDialog">插入图片</el-button>
   <el-dialog
     title="上传文件"
     v-model="showUploadDialog"
@@ -153,6 +153,6 @@ const emit = defineEmits(['uploadImg'])
 }
 
 button.el-button--default {
-  margin-right: 12px;
+  margin-right: 0;
 }
 </style>

+ 1 - 5
yudao-ui-admin-vue3/src/components/DynamicReport/SpreadViewer.vue

@@ -18,11 +18,6 @@
                   <el-button type="warning" plain style="margin-right: 12px;">生成续页</el-button>
                 </div>
               </el-dropdown-item>
-              <el-dropdown-item>
-                <div class="dropdown-item-content">
-                  <BatchUploadFile @uploadImg="addPic" :colList="colListData" />
-                </div>
-              </el-dropdown-item>
               <el-dropdown-item @click="openWingdingsDialog">
                 <div class="dropdown-item-content">
                   <el-button type="info" plain style="margin-right: 12px;">插入特殊符号</el-button>
@@ -37,6 +32,7 @@
           </template>
         </el-dropdown>
         <el-button type="success" @click="handleSave">保存</el-button>
+        <BatchUploadFile @uploadImg="addPic" :colList="colListData" />
         <el-button type="primary" @click="openPdf">预览 PDF</el-button>
         <el-button type="danger" @click="close">关闭</el-button>
       </div>