github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:y_project/RuoYi

pull/176/MERGE
Awen 2020-07-12 15:09:38 +08:00
parent 8b4aef15cf d56d6ac5ac
commit 1aa2d7a5cc
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-admin/src/main/resources/static/css/style.css
View File

@ -4921,6 +4921,7 @@ dd.project-people {
font-size: 10px; font-size: 10px;
text-transform: uppercase; text-transform: uppercase;
} }
/* Chat view */ /* Chat view */
.message-input { .message-input {
height: 90px !important; height: 90px !important;
@ -4954,9 +4955,10 @@ dd.project-people {
margin-left: -30px; margin-left: -30px;
} }
@media ( max-width : 992px) { @media (max-width: 992px) {
.chat-users, .chat-statistic { .chat-users,
margin-left: 0px; .chat-statistic {
margin-left: 0;
} }
} }
@ -4976,12 +4978,12 @@ dd.project-people {
margin-top: 1px; margin-top: 1px;
} }
.chat-discussion .chat-message:nth-child(2n+1) .message-avatar { .chat-discussion .chat-message.left .message-avatar {
float: left; float: left;
margin-right: 10px; margin-right: 10px;
} }
.chat-discussion .chat-message:nth-child(2n) .message-avatar { .chat-discussion .chat-message.right .message-avatar {
float: right; float: right;
margin-left: 10px; margin-left: 10px;
} }
@ -4996,20 +4998,20 @@ dd.project-people {
border-radius: 4px; border-radius: 4px;
} }
.chat-discussion .chat-message:nth-child(2n+1) .message-date { .chat-discussion .chat-message.left .message-date {
float: right; float: right;
} }
.chat-discussion .chat-message:nth-child(2n) .message-date { .chat-discussion .chat-message.right .message-date {
float: left; float: left;
} }
.chat-discussion .chat-message:nth-child(2n+1) .message { .chat-discussion .chat-message.left .message {
text-align: left; text-align: left;
margin-left: 55px; margin-left: 55px;
} }
.chat-discussion .chat-message:nth-child(2n) .message { .chat-discussion .chat-message.right .message {
text-align: right; text-align: right;
margin-right: 55px; margin-right: 55px;
} }
@ -5038,6 +5040,7 @@ dd.project-people {
.chat-message-form .form-group { .chat-message-form .form-group {
margin-bottom: 0; margin-bottom: 0;
} }
/* jsTree */ /* jsTree */
.jstree-open>.jstree-anchor>.fa-folder:before { .jstree-open>.jstree-anchor>.fa-folder:before {
content: "\f07c"; content: "\f07c";

2
ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
View File

@ -346,7 +346,7 @@ label.error {
right: 3px right: 3px
} }
.Validform_error,input.error,select.error { .Validform_error,input.error,textarea.error,select.error {
background-color: #fbe2e2; background-color: #fbe2e2;
border-color: #c66161; border-color: #c66161;
color: #c00 color: #c00

5
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
View File

@ -14,6 +14,11 @@ import java.lang.annotation.Target;
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
public @interface Excel public @interface Excel
{ {
/**
* 导出时在excel中排序
*/
public int sort() default Integer.MAX_VALUE;
/** /**
* 导出到Excel中的名字. * 导出到Excel中的名字.
*/ */

3
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
View File

@ -11,11 +11,13 @@ import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Cell;
@ -844,6 +846,7 @@ public class ExcelUtil<T>
} }
} }
} }
this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
} }
/** /**