From 67a146d30c9e566f999ff59968a72cdbdaab01e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Wed, 8 Sep 2021 18:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9,table=E8=AF=86=E5=88=AB=E5=9B=BE=E7=89=87=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=9B=BE=E7=89=87=E8=80=8C?=
 =?UTF-8?q?=E9=9D=9E=E9=93=BE=E6=8E=A5,=E8=AF=86=E5=88=ABtextarea=E5=92=8C?=
 =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E8=AE=BE=E7=BD=AE=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E4=B8=89=E8=A1=8C=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/vue/index-tree.vue.vm      | 12 ++++++++++++
 .../src/main/resources/vm/vue/index.vue.vm           | 12 ++++++++++++
 ruoyi-ui/src/assets/styles/ruoyi.scss                |  8 ++++++++
 3 files changed, 32 insertions(+)

diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index 89852509d..aad3b2aec 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -105,6 +105,18 @@
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+         <template slot-scope="scope">
+           <el-image :src="scope.row.${javaField}" v-if="scope.row.${javaField}" style="width: 60px;height: 60px"/>
+         </template>
+      </el-table-column>
+#elseif($column.list && ($column.htmlType == "editor" || $column.htmlType == "textarea"))
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+         <template slot-scope="scope">
+           <span class="line3">{{ scope.row.${javaField}}}</span>
+         </template>
+      </el-table-column>
 #elseif($column.list && $column.dictType && "" != $column.dictType)
       <el-table-column label="${comment}" align="center" prop="${javaField}">
         <template slot-scope="scope">
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 4b055faa0..43d329f66 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -134,6 +134,18 @@
           <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+         <template slot-scope="scope">
+           <el-image :src="scope.row.${javaField}" v-if="scope.row.${javaField}" style="width: 60px;height: 60px"/>
+         </template>
+      </el-table-column>
+#elseif($column.list && ($column.htmlType == "editor" || $column.htmlType == "textarea"))
+      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+        <template slot-scope="scope">
+           <span class="line3">{{ scope.row.${javaField}}}</span>
+        </template>
+      </el-table-column>
 #elseif($column.list && $column.dictType && "" != $column.dictType)
       <el-table-column label="${comment}" align="center" prop="${javaField}">
         <template slot-scope="scope">
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 8fe1961b2..c74ba35da 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -60,6 +60,14 @@
 	color: inherit;
 }
 
+ /*超过三行隐藏*/
+ .line3{
+	 display: -webkit-box;
+	 -webkit-line-clamp: 3;
+	 -webkit-box-orient: vertical;
+	 overflow: hidden;
+ }
+
 .el-dialog:not(.is-fullscreen) {
 	margin-top: 6vh !important;
 }