From a896c8ab3aab898f0dfd3358a54aaa6845636375 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Sat, 6 Sep 2025 18:36:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/vue/index.vue.vm    | 51 ++++++++++++-------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 2ddc2ae..5778fcc 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -163,23 +163,23 @@
     <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
 
      <!-- 导入EXCEL组件 -->
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-              <div class="el-upload__tip text-left" slot="tip">
-                  <div class="el-upload__tip" slot="tip">
-                      <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的${functionName}
-                  </div>
-                  <p style="color: red">1、仅允许导入xls、xlsx格式文件；</p>
-                  <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip text-left" slot="tip">
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的${functionName}
               </div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
+              <p style="color: red">1、仅允许导入xls、xlsx格式文件；</p>
+              <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
           </div>
-      </el-dialog>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+     </el-dialog>
 
       <!-- 查看${functionName}对话框 -->
       <el-dialog :title="title" :visible.sync="viewOpen" width="800px" append-to-body>
@@ -194,8 +194,25 @@
 #else
 #set($comment=$column.columnComment)
 #end
-#set($dictType=$column.dictType)
-           <el-descriptions-item label="${comment}">{{ form.${field} }}</el-descriptions-item>
+           <el-descriptions-item label="${comment}">
+#if($column.htmlType == "imageUpload")
+               <div v-if="!!form.${field}">
+                   <el-tooltip effect="light" :content="item" placement="bottom" v-for="(item, index) in form.${field}.split(',')" :key="index">
+                       <el-image style="height: 64px; width: 64px; margin: 2px; display: inline-block;" fit="scale-down" :src="this.baseRoutingUrll + item" :preview-src-list="form.${field}.split(',').map((x) => this.baseRoutingUrll + x)"/>
+                   </el-tooltip>
+               </div>
+#elseif($column.htmlType == "editor")
+               <el-tooltip placement="bottom" effect="light"><div slot="content" v-html="form.${field}"/><div style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 230px;">{{ form.${field} }}</div></el-tooltip>
+#elseif($column.htmlType == "fileUpload")
+               <div v-if="!!form.${field}">
+                   <el-tooltip effect="light" :content="item.substr(item.lastIndexOf('/') + 1)" placement="bottom" v-for="(item, index) in form.${field}.split(',')" :key="index">
+                       <a :href="this.baseRoutingUrll + item" target="_blank" style="height: 48px; width: 48px; margin: 2px; display: inline-block; text-align: center;"><img :src="getFileIcon(item)" style="height: 100%;"/></a>
+                   </el-tooltip>
+               </div>
+#else
+               {{ form.${field} }}
+ #end
+           </el-descriptions-item>
 #end
 #end
 #end