From d04ec69df4f6e73a99ab70ec6aecf4c48ade4f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E4=BF=8A=E4=B8=9C?= <1172482914@qq.com> Date: Fri, 10 Jul 2020 12:52:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=B7=B2=E6=9C=89=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=9C=AA=E8=87=AA=E5=8A=A8=E5=8B=BE=E9=80=89=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/role/index.vue | 26 +++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue index 658efc61..1739f0a7 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -368,16 +368,16 @@ export default { }, /** 根据角色ID查询菜单树结构 */ getRoleMenuTreeselect(roleId) { - roleMenuTreeselect(roleId).then(response => { + return roleMenuTreeselect(roleId).then(response => { this.menuOptions = response.menus; - this.$refs.menu.setCheckedKeys(response.checkedKeys); + return response; }); }, /** 根据角色ID查询部门树结构 */ getRoleDeptTreeselect(roleId) { - roleDeptTreeselect(roleId).then(response => { + return roleDeptTreeselect(roleId).then(response => { this.deptOptions = response.depts; - this.$refs.dept.setCheckedKeys(response.checkedKeys); + return response; }); }, // 角色状态修改 @@ -450,24 +450,30 @@ export default { handleUpdate(row) { this.reset(); const roleId = row.roleId || this.ids - this.$nextTick(() => { - this.getRoleMenuTreeselect(roleId); - }); + const roleMenu = this.getRoleMenuTreeselect(roleId); getRole(roleId).then(response => { this.form = response.data; this.open = true; + this.$nextTick(() => { + roleMenu.then(res => { + this.$refs.menu.setCheckedKeys(res.checkedKeys); + }); + }); this.title = "修改角色"; }); }, /** 分配数据权限操作 */ handleDataScope(row) { this.reset(); - this.$nextTick(() => { - this.getRoleDeptTreeselect(row.roleId); - }); + const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId); getRole(row.roleId).then(response => { this.form = response.data; this.openDataScope = true; + this.$nextTick(() => { + roleDeptTreeselect.then(res => { + this.$refs.dept.setCheckedKeys(res.checkedKeys); + }); + }); this.title = "分配数据权限"; }); }, From ec096965123b1e341f1ec80ea674c3d7de485d2e Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 10 Jul 2020 14:47:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Excel=E6=94=AF=E6=8C=81sort=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/utils/poi/ExcelUtil.java | 13 ++++++++----- .../framework/aspectj/lang/annotation/Excel.java | 5 +++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index f0ab5e7d..3211ac55 100644 --- a/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -11,11 +11,13 @@ import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import java.util.stream.Collectors; import org.apache.poi.hssf.usermodel.HSSFDateUtil; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.Cell; @@ -39,17 +41,17 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFDataValidation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.exception.CustomException; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.reflect.ReflectUtils; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type; import com.ruoyi.framework.aspectj.lang.annotation.Excels; import com.ruoyi.framework.config.RuoYiConfig; import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.CustomException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; /** * Excel相关处理 @@ -768,6 +770,7 @@ public class ExcelUtil } } } + this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList()); } /** diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java index 8037cb8b..de25b1cf 100644 --- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java +++ b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java @@ -14,6 +14,11 @@ import java.lang.annotation.Target; @Target(ElementType.FIELD) public @interface Excel { + /** + * 导出时在excel中排序 + */ + public int sort() default Integer.MAX_VALUE; + /** * 导出到Excel中的名字. */ From a691da0c975eba5a71b888cb0687ee4d21b84dc9 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Fri, 10 Jul 2020 16:36:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=94=A8=E6=88=B7=E5=90=8E=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=87=BA=E7=8E=B0404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/layout/components/Navbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index 22427a81..db46ec55 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -94,7 +94,7 @@ export default { type: 'warning' }).then(() => { this.$store.dispatch('LogOut').then(() => { - location.reload() + location.href = '/index'; }) }) }