opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-19 17:58:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !87 from 抓蛙师/auto-7465549-dev-1631095997717

Browse Source
This commit is contained in:
抓蛙师 2021-09-08 10:14:00 +00:00 committed by Gitee
commit c679ebe8c3
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -105,6 +105,18 @@
<span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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) #elseif($column.list && $column.dictType && "" != $column.dictType)
<el-table-column label="${comment}" align="center" prop="${javaField}"> <el-table-column label="${comment}" align="center" prop="${javaField}">
<template slot-scope="scope"> <template slot-scope="scope">

12
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -134,6 +134,18 @@
<span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </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) #elseif($column.list && $column.dictType && "" != $column.dictType)
<el-table-column label="${comment}" align="center" prop="${javaField}"> <el-table-column label="${comment}" align="center" prop="${javaField}">
<template slot-scope="scope"> <template slot-scope="scope">

8
ruoyi-ui/src/assets/styles/ruoyi.scss
View File

@ -60,6 +60,14 @@
color: inherit; color: inherit;
} }
/*超过三行隐藏*/
.line3{
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
overflow: hidden;
}
.el-dialog:not(.is-fullscreen) { .el-dialog:not(.is-fullscreen) {
margin-top: 6vh !important; margin-top: 6vh !important;
} }