From 1dae7c9bc944880863e81438d46f36ccb6865ca0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 29 四月 2020 09:16:29 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/store/modules/permission.js | 2 +-
ruoyi-ui/src/views/tool/gen/index.vue | 8 ++++++--
ruoyi/src/main/resources/vm/java/domain.java.vm | 2 +-
ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java | 1 +
ruoyi/src/main/resources/vm/vue/index.vue.vm | 2 +-
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm | 2 +-
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java | 3 ++-
ruoyi-ui/src/router/index.js | 18 +++++++++---------
ruoyi-ui/src/assets/styles/ruoyi.scss | 7 +++----
README.md | 2 +-
ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 ++--
11 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index 9a5bb93..526d956 100644
--- a/README.md
+++ b/README.md
@@ -81,4 +81,4 @@
## 鑻ヤ緷鍓嶅悗绔垎绂讳氦娴佺兢
-QQ缇わ細 [ [ [鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file
+QQ缇わ細 [ [ [ [ 鐐瑰嚮鎸夐挳鍏ョ兢銆�
\ No newline at end of file
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index ccddfff..c78051f 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -53,7 +53,7 @@
margin-left: 20px;
}
-.el-dialog {
+.el-dialog:not(.is-fullscreen){
margin-top: 6vh !important;
}
@@ -138,7 +138,7 @@
padding-left: 15px;
margin-bottom: 10px;
}
-
+
/* text color */
.text-navy {
color: #1ab394;
@@ -189,10 +189,9 @@
overflow: hidden;
}
-
/* 鎷栨嫿鍒楁牱寮� */
.sortable-ghost{
opacity: .8;
color: #fff!important;
background: #42b983!important;
-}
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 7f06c26..4af90e7 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -33,23 +33,23 @@
children: [
{
path: '/redirect/:path(.*)',
- component: () => import('@/views/redirect')
+ component: (resolve) => require(['@/views/redirect'], resolve)
}
]
},
{
path: '/login',
- component: () => import('@/views/login'),
+ component: (resolve) => require(['@/views/login'], resolve),
hidden: true
},
{
path: '/404',
- component: () => import('@/views/error/404'),
+ component: (resolve) => require(['@/views/error/404'], resolve),
hidden: true
},
{
path: '/401',
- component: () => import('@/views/error/401'),
+ component: (resolve) => require(['@/views/error/401'], resolve),
hidden: true
},
{
@@ -59,7 +59,7 @@
children: [
{
path: 'index',
- component: () => import('@/views/index'),
+ component: (resolve) => require(['@/views/index'], resolve),
name: '棣栭〉',
meta: { title: '棣栭〉', icon: 'dashboard', noCache: true, affix: true }
}
@@ -73,7 +73,7 @@
children: [
{
path: 'profile',
- component: () => import('@/views/system/user/profile/index'),
+ component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
name: 'Profile',
meta: { title: '涓汉涓績', icon: 'user' }
}
@@ -86,7 +86,7 @@
children: [
{
path: 'type/data/:dictId(\\d+)',
- component: () => import('@/views/system/dict/data'),
+ component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'Data',
meta: { title: '瀛楀吀鏁版嵁', icon: '' }
}
@@ -99,7 +99,7 @@
children: [
{
path: 'log',
- component: () => import('@/views/monitor/job/log'),
+ component: (resolve) => require(['@/views/monitor/job/log'], resolve),
name: 'JobLog',
meta: { title: '璋冨害鏃ュ織' }
}
@@ -112,7 +112,7 @@
children: [
{
path: 'edit',
- component: () => import('@/views/tool/gen/editTable'),
+ component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
meta: { title: '淇敼鐢熸垚閰嶇疆' }
}
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index df319e9..cf18fcf 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -48,7 +48,7 @@
}
export const loadView = (view) => { // 璺敱鎳掑姞杞�
- return () => import(`@/views/${view}`)
+ return (resolve) => require([`@/views/${view}`], resolve)
}
export default permission
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 4e8623c..233e156 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -80,7 +80,11 @@
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column label="搴忓彿" align="center" prop="tableId" width="60px" />
+ <el-table-column label="搴忓彿" type="index" width="50" align="center">
+ <template slot-scope="scope">
+ <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
<el-table-column
label="琛ㄥ悕绉�"
align="center"
@@ -284,4 +288,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
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 27652fe..f0ab5e7 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
@@ -174,7 +174,7 @@
for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
{
Cell cell = heard.getCell(i);
- if (StringUtils.isNotNull(cell != null))
+ if (StringUtils.isNotNull(cell))
{
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
@@ -827,7 +827,7 @@
try
{
Cell cell = row.getCell(column);
- if (cell != null)
+ if (StringUtils.isNotNull(cell))
{
if (cell.getCellTypeEnum() == CellType.NUMERIC || cell.getCellTypeEnum() == CellType.FORMULA)
{
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
index 45898d7..6501949 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.exception.CustomException;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import com.ruoyi.project.system.domain.SysRole;
import com.ruoyi.project.system.domain.SysRoleDept;
@@ -82,7 +83,7 @@
*/
public List<SysRole> selectRoleAll()
{
- return roleMapper.selectRoleAll();
+ return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
}
/**
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
index cd89f73..e464974 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java
@@ -196,6 +196,7 @@
if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
{
importList.add("java.util.Date");
+ importList.add("com.fasterxml.jackson.annotation.JsonFormat");
}
else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
{
diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm
index 39697b7..ef7cc8b 100644
--- a/ruoyi/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi/src/main/resources/vm/java/domain.java.vm
@@ -23,7 +23,7 @@
/**
* ${functionName}瀵硅薄 ${tableName}
- *
+ *
* @author ${author}
* @date ${datetime}
*/
diff --git a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
index 0cbdd3b..6c33b9f 100644
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@@ -88,7 +88,7 @@
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}) }}</span>
+ <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
#elseif($column.list && "" != $column.dictType)
diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm
index dcb5527..0d2ca8c 100644
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm
@@ -112,7 +112,7 @@
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.${javaField}) }}</span>
+ <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
#elseif($column.list && "" != $column.dictType)
--
Gitblit v1.9.3