From 6bb7db31aaabf2aa5d04d0fe3953652b86b9ad82 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 08 六月 2020 12:01:19 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/permission.js | 2
ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml | 2
ruoyi-ui/src/components/HeaderSearch/index.vue | 12 +++++-
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm | 4 +-
ruoyi-ui/src/views/system/user/index.vue | 2
ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml | 7 ++-
ruoyi-ui/src/components/IconSelect/index.vue | 3 -
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java | 2
ruoyi-ui/src/assets/styles/ruoyi.scss | 20 ++++++----
ruoyi-ui/src/views/monitor/job/index.vue | 4 +-
ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 7 +++
ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml | 2
ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java | 13 ------
ruoyi/src/main/resources/vm/vue/index.vue.vm | 4 +-
ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml | 2
15 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss
index 0c2919b..a5bcbb9 100644
--- a/ruoyi-ui/src/assets/styles/ruoyi.scss
+++ b/ruoyi-ui/src/assets/styles/ruoyi.scss
@@ -57,12 +57,16 @@
margin-top: 6vh !important;
}
-.el-table .el-table__header-wrapper th {
- word-break: break-word;
- background-color: #f8f8f9;
- color: #515a6e;
- height: 40px;
- font-size: 13px;
+.el-table {
+ .el-table__header-wrapper, .el-table__fixed-header-wrapper {
+ th {
+ word-break: break-word;
+ background-color: #f8f8f9;
+ color: #515a6e;
+ height: 40px;
+ font-size: 13px;
+ }
+ }
}
/** 琛ㄥ崟甯冨眬 **/
@@ -138,7 +142,7 @@
padding-left: 15px;
margin-bottom: 10px;
}
-
+
/* text color */
.text-navy {
color: #1ab394;
@@ -194,4 +198,4 @@
opacity: .8;
color: #fff!important;
background: #42b983!important;
-}
+}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index af04716..3b4790d 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -70,7 +70,12 @@
this.show = false
},
change(val) {
- this.$router.push(val.path)
+ if(this.ishttp(val.path)) {
+ // http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
+ window.open(val.path, "_blank");
+ } else {
+ this.$router.push(val.path)
+ }
this.search = ''
this.options = []
this.$nextTick(() => {
@@ -104,7 +109,7 @@
if (router.hidden) { continue }
const data = {
- path: path.resolve(basePath, router.path),
+ path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
title: [...prefixTitle]
}
@@ -134,6 +139,9 @@
} else {
this.options = []
}
+ },
+ ishttp(url) {
+ return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
}
}
}
diff --git a/ruoyi-ui/src/components/IconSelect/index.vue b/ruoyi-ui/src/components/IconSelect/index.vue
index 0611dc5..b0ec9fa 100644
--- a/ruoyi-ui/src/components/IconSelect/index.vue
+++ b/ruoyi-ui/src/components/IconSelect/index.vue
@@ -25,10 +25,9 @@
},
methods: {
filterIcons() {
+ this.iconList = icons
if (this.name) {
this.iconList = this.iconList.filter(item => item.includes(this.name))
- } else {
- this.iconList = icons
}
},
selectedIcon(name) {
diff --git a/ruoyi-ui/src/permission.js b/ruoyi-ui/src/permission.js
index d4f6ae4..00c2f3e 100644
--- a/ruoyi-ui/src/permission.js
+++ b/ruoyi-ui/src/permission.js
@@ -53,7 +53,7 @@
// 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
next()
} else {
- next(`/login?redirect=${to.path}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+ next(`/login?redirect=${to.fullPath}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
NProgress.done()
}
}
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index c5f2f40..061dfbe 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -133,7 +133,7 @@
<!-- 娣诲姞鎴栦慨鏀瑰畾鏃朵换鍔″璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="浠诲姟鍚嶇О" prop="jobName">
@@ -481,4 +481,4 @@
}
}
};
-</script>
+</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index ec0a789..c9e89c1 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -208,7 +208,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
- <treeselect v-model="form.deptId" :options="deptOptions" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
+ <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
</el-form-item>
</el-col>
<el-col :span="12">
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index c976d95..3ca634d 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -52,6 +52,11 @@
*/
public static final String DATA_SCOPE_SELF = "5";
+ /**
+ * 鏁版嵁鏉冮檺杩囨护鍏抽敭瀛�
+ */
+ public static final String DATA_SCOPE = "dataScope";
+
// 閰嶇疆缁囧叆鐐�
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataScope)")
public void dataScopePointCut()
@@ -138,7 +143,7 @@
if (StringUtils.isNotBlank(sqlString.toString()))
{
BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];
- baseEntity.setDataScope(" AND (" + sqlString.substring(4) + ")");
+ baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
}
}
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
index 24beda0..028d295 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
@@ -36,9 +36,6 @@
/** 澶囨敞 */
private String remark;
- /** 鏁版嵁鏉冮檺 */
- private String dataScope;
-
/** 寮�濮嬫椂闂� */
@JsonIgnore
private String beginTime;
@@ -108,16 +105,6 @@
public void setRemark(String remark)
{
this.remark = remark;
- }
-
- public String getDataScope()
- {
- return dataScope;
- }
-
- public void setDataScope(String dataScope)
- {
- this.dataScope = dataScope;
}
public String getBeginTime()
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index 5bce6a6..5d17f5e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -48,7 +48,7 @@
}
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
+ @PreAuthorize("@ss.hasPermi('system:post:export')")
@GetMapping("/export")
public AjaxResult export(SysPost post)
{
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
index a07d8a0..32d11ae 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDeptMapper.xml
@@ -40,7 +40,7 @@
AND status = #{status}
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${dataScope}
+ ${params.dataScope}
order by d.parent_id, d.order_num
</select>
diff --git a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
index 0b341a7..8221d6e 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysDictDataMapper.xml
@@ -38,6 +38,7 @@
AND status = #{status}
</if>
</where>
+ order by dict_sort asc
</select>
<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
@@ -73,7 +74,7 @@
<update id="updateDictData" parameterType="SysDictData">
update sys_dict_data
<set>
- <if test="dictSort != null and dictSort != ''">dict_sort = #{dictSort},</if>
+ <if test="dictSort != null">dict_sort = #{dictSort},</if>
<if test="dictLabel != null and dictLabel != ''">dict_label = #{dictLabel},</if>
<if test="dictValue != null and dictValue != ''">dict_value = #{dictValue},</if>
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
@@ -94,7 +95,7 @@
<insert id="insertDictData" parameterType="SysDictData">
insert into sys_dict_data(
- <if test="dictSort != null and dictSort != ''">dict_sort,</if>
+ <if test="dictSort != null">dict_sort,</if>
<if test="dictLabel != null and dictLabel != ''">dict_label,</if>
<if test="dictValue != null and dictValue != ''">dict_value,</if>
<if test="dictType != null and dictType != ''">dict_type,</if>
@@ -106,7 +107,7 @@
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
- <if test="dictSort != null and dictSort != ''">#{dictSort},</if>
+ <if test="dictSort != null">#{dictSort},</if>
<if test="dictLabel != null and dictLabel != ''">#{dictLabel},</if>
<if test="dictValue != null and dictValue != ''">#{dictValue},</if>
<if test="dictType != null and dictType != ''">#{dictType},</if>
diff --git a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
index 954d070..e396eac 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysRoleMapper.xml
@@ -47,7 +47,7 @@
and date_format(r.create_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${dataScope}
+ ${params.dataScope}
order by r.role_sort
</select>
diff --git a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
index 4ee6d8f..449fa03 100644
--- a/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/system/SysUserMapper.xml
@@ -78,7 +78,7 @@
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{deptId},ancestors) ))
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${dataScope}
+ ${params.dataScope}
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
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 ffea736..fb10ed6 100644
--- a/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
@@ -146,7 +146,7 @@
v-for="dict in ${field}Options"
:key="dict.dictValue"
:label="dict.dictLabel"
- #if($column.javaType == "Integer"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+ #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
></el-option>
</el-select>
@@ -163,7 +163,7 @@
<el-radio
v-for="dict in ${field}Options"
:key="dict.dictValue"
- #if($column.javaType == "Integer"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+ #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
diff --git a/ruoyi/src/main/resources/vm/vue/index.vue.vm b/ruoyi/src/main/resources/vm/vue/index.vue.vm
index 8cf19f4..273135f 100644
--- a/ruoyi/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi/src/main/resources/vm/vue/index.vue.vm
@@ -174,7 +174,7 @@
v-for="dict in ${field}Options"
:key="dict.dictValue"
:label="dict.dictLabel"
- #if($column.javaType == "Integer"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
+ #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
></el-option>
</el-select>
@@ -191,7 +191,7 @@
<el-radio
v-for="dict in ${field}Options"
:key="dict.dictValue"
- #if($column.javaType == "Integer"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
+ #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
--
Gitblit v1.9.3