0) {
const tmpPath = path.substring(1, path.length);
activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
@@ -100,7 +100,7 @@ export default {
}
var routes = this.activeRoutes(activePath);
if (routes.length === 0) {
- activePath = this.currentIndex || this.routers[0].path
+ activePath = this.currentIndex || this.defaultRouter()
this.activeRoutes(activePath);
}
return activePath;
@@ -121,6 +121,17 @@ export default {
const width = document.body.getBoundingClientRect().width / 3;
this.visibleNumber = parseInt(width / 85);
},
+ // 默认激活的路由
+ defaultRouter() {
+ let router;
+ Object.keys(this.routers).some((key) => {
+ if (!this.routers[key].hidden) {
+ router = this.routers[key].path;
+ return true;
+ }
+ });
+ return router;
+ },
// 菜单选择事件
handleSelect(key, keyPath) {
this.currentIndex = key;
@@ -158,25 +169,27 @@ export default {
diff --git a/ruoyi-ui/src/directive/dialog/drag.js b/ruoyi-ui/src/directive/dialog/drag.js
new file mode 100644
index 00000000..2e823465
--- /dev/null
+++ b/ruoyi-ui/src/directive/dialog/drag.js
@@ -0,0 +1,64 @@
+/**
+* v-dialogDrag 弹窗拖拽
+* Copyright (c) 2019 ruoyi
+*/
+
+export default {
+ bind(el, binding, vnode, oldVnode) {
+ const value = binding.value
+ if (value == false) return
+ // 获取拖拽内容头部
+ const dialogHeaderEl = el.querySelector('.el-dialog__header');
+ const dragDom = el.querySelector('.el-dialog');
+ dialogHeaderEl.style.cursor = 'move';
+ // 获取原有属性 ie dom元素.currentStyle 火狐谷歌 window.getComputedStyle(dom元素, null);
+ const sty = dragDom.currentStyle || window.getComputedStyle(dragDom, null);
+ dragDom.style.position = 'absolute';
+ dragDom.style.marginTop = 0;
+ let width = dragDom.style.width;
+ if (width.includes('%')) {
+ width = +document.body.clientWidth * (+width.replace(/\%/g, '') / 100);
+ } else {
+ width = +width.replace(/\px/g, '');
+ }
+ dragDom.style.left = `${(document.body.clientWidth - width) / 2}px`;
+ // 鼠标按下事件
+ dialogHeaderEl.onmousedown = (e) => {
+ // 鼠标按下，计算当前元素距离可视区的距离 (鼠标点击位置距离可视窗口的距离)
+ const disX = e.clientX - dialogHeaderEl.offsetLeft;
+ const disY = e.clientY - dialogHeaderEl.offsetTop;
+
+ // 获取到的值带px 正则匹配替换
+ let styL, styT;
+
+ // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
+ if (sty.left.includes('%')) {
+ styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
+ styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
+ } else {
+ styL = +sty.left.replace(/\px/g, '');
+ styT = +sty.top.replace(/\px/g, '');
+ };
+
+ // 鼠标拖拽事件
+ document.onmousemove = function (e) {
+ // 通过事件委托，计算移动的距离 （开始拖拽至结束拖拽的距离）
+ const l = e.clientX - disX;
+ const t = e.clientY - disY;
+
+ let finallyL = l + styL
+ let finallyT = t + styT
+
+ // 移动当前元素
+ dragDom.style.left = `${finallyL}px`;
+ dragDom.style.top = `${finallyT}px`;
+
+ };
+
+ document.onmouseup = function (e) {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ };
+ }
+ }
+};
\ No newline at end of file
diff --git a/ruoyi-ui/src/directive/index.js b/ruoyi-ui/src/directive/index.js
new file mode 100644
index 00000000..550109b4
--- /dev/null
+++ b/ruoyi-ui/src/directive/index.js
@@ -0,0 +1,18 @@
+import hasRole from './permission/hasRole'
+import hasPermi from './permission/hasPermi'
+import dialogDrag from './dialog/drag'
+
+const install = function(Vue) {
+ Vue.directive('hasRole', hasRole)
+ Vue.directive('hasPermi', hasPermi)
+ Vue.directive('dialogDrag', dialogDrag)
+}
+
+if (window.Vue) {
+ window['hasRole'] = hasRole
+ window['hasPermi'] = hasPermi
+ window['dialogDrag'] = dialogDrag
+ Vue.use(install); // eslint-disable-line
+}
+
+export default install
diff --git a/ruoyi-ui/src/directive/permission/hasPermi.js b/ruoyi-ui/src/directive/permission/hasPermi.js
index 74f9d325..799e0153 100644
--- a/ruoyi-ui/src/directive/permission/hasPermi.js
+++ b/ruoyi-ui/src/directive/permission/hasPermi.js
@@ -1,5 +1,5 @@
/**
- * 操作权限处理
+ * v-hasPermi 操作权限处理
* Copyright (c) 2019 ruoyi
*/
diff --git a/ruoyi-ui/src/directive/permission/hasRole.js b/ruoyi-ui/src/directive/permission/hasRole.js
index ea966a34..406b9435 100644
--- a/ruoyi-ui/src/directive/permission/hasRole.js
+++ b/ruoyi-ui/src/directive/permission/hasRole.js
@@ -1,5 +1,5 @@
/**
- * 角色权限处理
+ * v-hasRole 角色权限处理
* Copyright (c) 2019 ruoyi
*/
diff --git a/ruoyi-ui/src/layout/components/InnerLink/index.vue b/ruoyi-ui/src/layout/components/InnerLink/index.vue
new file mode 100644
index 00000000..227ff2a7
--- /dev/null
+++ b/ruoyi-ui/src/layout/components/InnerLink/index.vue
@@ -0,0 +1,27 @@
+
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 4acdcb96..eae4cdd6 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -10,7 +10,7 @@ import '@/assets/styles/ruoyi.scss' // ruoyi css
import App from './App'
import store from './store'
import router from './router'
-import permission from './directive/permission'
+import directive from './directive' //directive
import { download } from '@/utils/request'
import './assets/icons' // icon
@@ -21,6 +21,12 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
import Pagination from "@/components/Pagination";
// 自定义表格工具组件
import RightToolbar from "@/components/RightToolbar"
+// 富文本组件
+import Editor from "@/components/Editor"
+// 文件上传组件
+import FileUpload from "@/components/FileUpload"
+// 图片上传组件
+import ImageUpload from "@/components/ImageUpload"
// 字典标签组件
import DictTag from '@/components/DictTag'
// 头部标签组件
@@ -53,8 +59,11 @@ Vue.prototype.msgInfo = function (msg) {
Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar)
+Vue.component('Editor', Editor)
+Vue.component('FileUpload', FileUpload)
+Vue.component('ImageUpload', ImageUpload)
-Vue.use(permission)
+Vue.use(directive)
Vue.use(VueMeta)
/**
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 0de4c2fd..b593898e 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -5,7 +5,6 @@ Vue.use(Router)
/* Layout */
import Layout from '@/layout'
-import ParentView from '@/components/ParentView';
/**
* Note: 路由配置项
@@ -22,6 +21,7 @@ import ParentView from '@/components/ParentView';
title: 'title' // 设置该路由在侧边栏和面包屑中展示的名字
icon: 'svg-name' // 设置该路由的图标，对应路径src/assets/icons/svg
breadcrumb: false // 如果设置为false，则不会在breadcrumb面包屑中显示
+ activeMenu: '/system/user' // 当路由设置了该属性，则会高亮相对应的侧边栏。
}
*/
@@ -43,6 +43,11 @@ export const constantRoutes = [
component: (resolve) => require(['@/views/login'], resolve),
hidden: true
},
+ {
+ path: '/register',
+ component: (resolve) => require(['@/views/register'], resolve),
+ hidden: true
+ },
{
path: '/404',
component: (resolve) => require(['@/views/error/404'], resolve),
@@ -81,7 +86,7 @@ export const constantRoutes = [
]
},
{
- path: '/auth',
+ path: '/system/user-auth',
component: Layout,
hidden: true,
children: [
@@ -89,12 +94,12 @@ export const constantRoutes = [
path: 'role/:userId(\\d+)',
component: (resolve) => require(['@/views/system/user/authRole'], resolve),
name: 'AuthRole',
- meta: { title: '分配角色'}
+ meta: { title: '分配角色', activeMenu: '/system/user'}
}
]
},
{
- path: '/auth',
+ path: '/system/role-auth',
component: Layout,
hidden: true,
children: [
@@ -102,46 +107,46 @@ export const constantRoutes = [
path: 'user/:roleId(\\d+)',
component: (resolve) => require(['@/views/system/role/authUser'], resolve),
name: 'AuthUser',
- meta: { title: '分配用户'}
+ meta: { title: '分配用户', activeMenu: '/system/role'}
}
]
},
{
- path: '/dict',
+ path: '/system/dict-data',
component: Layout,
hidden: true,
children: [
{
- path: 'type/data/:dictId(\\d+)',
+ path: 'index/:dictId(\\d+)',
component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'Data',
- meta: { title: '字典数据', icon: '' }
+ meta: { title: '字典数据', activeMenu: '/system/dict'}
}
]
},
{
- path: '/job',
+ path: '/monitor/job-log',
component: Layout,
hidden: true,
children: [
{
- path: 'log',
+ path: 'index',
component: (resolve) => require(['@/views/monitor/job/log'], resolve),
name: 'JobLog',
- meta: { title: '调度日志' }
+ meta: { title: '调度日志', activeMenu: '/monitor/job'}
}
]
},
{
- path: '/gen',
+ path: '/tool/gen-edit',
component: Layout,
hidden: true,
children: [
{
- path: 'edit/:tableId(\\d+)',
+ path: 'index/:tableId(\\d+)',
component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit',
- meta: { title: '修改生成配置' }
+ meta: { title: '修改生成配置', activeMenu: '/tool/gen'}
}
]
}
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index f3a1d11f..340524ab 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -2,6 +2,7 @@ import { constantRoutes } from '@/router'
import { getRouters } from '@/api/menu'
import Layout from '@/layout/index'
import ParentView from '@/components/ParentView';
+import InnerLink from '@/layout/components/InnerLink'
const permission = {
state: {
@@ -65,6 +66,8 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
route.component = Layout
} else if (route.component === 'ParentView') {
route.component = ParentView
+ } else if (route.component === 'InnerLink') {
+ route.component = InnerLink
} else {
route.component = loadView(route.component)
}
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 14879eb0..8e8cd1ac 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -23,22 +23,7 @@ service.interceptors.request.use(config => {
}
// get请求映射params参数
if (config.method === 'get' && config.params) {
- let url = config.url + '?';
- for (const propName of Object.keys(config.params)) {
- const value = config.params[propName];
- var part = encodeURIComponent(propName) + "=";
- if (value !== null && typeof(value) !== "undefined") {
- if (typeof value === 'object') {
- for (const key of Object.keys(value)) {
- let params = propName + '[' + key + ']';
- var subPart = encodeURIComponent(params) + "=";
- url += subPart + encodeURIComponent(value[key]) + "&";
- }
- } else {
- url += part + encodeURIComponent(value) + "&";
- }
- }
- }
+ let url = config.url + '?' + tansParams(config.params);
url = url.slice(0, -1);
config.params = {};
config.url = url;
@@ -66,6 +51,7 @@ service.interceptors.response.use(res => {
location.href = '/index';
})
}).catch(() => {});
+ return Promise.reject()
} else if (code === 500) {
Message({
message: msg,
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 22e1ebf4..ee01f9b3 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -179,11 +179,21 @@ export function handleTree(data, id, parentId, children) {
* @param {*} params 参数
*/
export function tansParams(params) {
- let result = ''
- Object.keys(params).forEach((key) => {
- if (!Object.is(params[key], undefined) && !Object.is(params[key], null) && !Object.is(JSON.stringify(params[key]), '{}')) {
- result += encodeURIComponent(key) + '=' + encodeURIComponent(params[key]) + '&'
- }
- })
- return result
+ let result = ''
+ for (const propName of Object.keys(params)) {
+ const value = params[propName];
+ var part = encodeURIComponent(propName) + "=";
+ if (value !== null && typeof(value) !== "undefined") {
+ if (typeof value === 'object') {
+ for (const key of Object.keys(value)) {
+ let params = propName + '[' + key + ']';
+ var subPart = encodeURIComponent(params) + "=";
+ result += subPart + encodeURIComponent(value[key]) + "&";
+ }
+ } else {
+ result += part + encodeURIComponent(value) + "&";
+ }
+ }
+ }
+ return result
}
diff --git a/ruoyi-ui/src/utils/zipdownload.js b/ruoyi-ui/src/utils/zipdownload.js
index ac2745bc..8a1b8198 100644
--- a/ruoyi-ui/src/utils/zipdownload.js
+++ b/ruoyi-ui/src/utils/zipdownload.js
@@ -32,9 +32,11 @@ export function resolveBlob(res, mimeType) {
var result = patt.exec(contentDisposition)
var fileName = result[1]
fileName = fileName.replace(/\"/g, '')
+ aLink.style.display = 'none'
aLink.href = URL.createObjectURL(blob)
aLink.setAttribute('download', fileName) // 设置下载文件名称
document.body.appendChild(aLink)
aLink.click()
+ URL.revokeObjectURL(aLink.href);//清除引用
document.body.removeChild(aLink);
}
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 69d144d2..df9a5a0f 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -119,9 +119,9 @@
QQ群：满42799195
- 满170157040 满130643120
-
- 225920371满170157040 满130643120 满225920371
+
+ 201705537
@@ -146,6 +146,61 @@
更新日志
+
+
+ - 支持配置XSS跨站脚本过滤
+ - 支持配置验证码开关&类型
+ - 新增是否开启用户注册功能
+ - 用户管理新增分配角色功能
+ - 角色管理新增分配用户功能
+ - 系统布局配置支持动态标题开关
+ - 增加字典标签样式回显dict组件
+ - FileUpload组件支持多文件上传
+ - ImageUpload组件支持多图片上传
+ - 封装通用iframe组件
+ - 菜单路由配置支持内链访问
+ - 全局注册通用组件
+ - 富文本默认上传返回url类型
+ - 富文本新增上传文件大小限制
+ - 增加自定义弹窗拖拽指令
+ - 顶部菜单排除隐藏的默认路由
+ - 跳转路由高亮相对应的菜单栏
+ - 日志列表支持排序操作
+ - 分页组件新增pagerCount属性
+ - 定时任务屏蔽http(s)远程调用
+ - 文件服务本地资源允许跨域访问
+ - 升级spring-boot到最新版本2.5.3
+ - 升级spring-boot-admin到最新版2.4.3
+ - 升级spring-boot-mybatis到最新版2.2.0
+ - 升级nacos到最新版2.0.3
+ - 升级pagehelper到最新版1.3.1
+ - 升级minio到最新版本8.2.2
+ - 升级tobato到最新版本1.27.2
+ - 升级dynamic-ds到最新版本3.4.1
+ - 升级commons.io到最新版本v2.11.0
+ - 升级common-pool到最新版本2.10.0
+ - 升级commons.fileupload到最新版本v1.4
+ - 升级element-ui到最新版本2.15.3
+ - 优化统一网关错误码响应
+ - 修复导出含params属性对象参数问题
+ - 修复任意账户越权问题
+ - 修复定时任务日志执行状态显示
+ - 修改登录失效返回值code401
+ - 用户信息长度校验限制
+ - 角色&菜单新增字段属性提示信息
+ - 修复用户搜索分页变量错误
+ - 优化部门父级启用状态
+ - 启用部门状态排除顶级节点
+ - 定时任务新增更多操作
+ - 优化代码生成模板
+ - 优化顶部菜单显示样式
+ - 优化导入用户显示样式
+ - 优化用户不能删除自己
+ - 密码框新增显示切换密码图标
+ - BLOB下载时清除URL对象引用
+ - 其他细节优化
+
+
- 新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）
@@ -505,7 +560,7 @@ export default {
data() {
return {
// 版本号
- version: "3.0.0",
+ version: "3.1.0",
};
},
methods: {
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 8ec1aca4..255eafca 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -18,7 +18,7 @@
-
+
登 录
登 录 中...
+
+ 立即注册
+
@@ -73,14 +76,18 @@ export default {
},
loginRules: {
username: [
- { required: true, trigger: "blur", message: "用户名不能为空" }
+ { required: true, trigger: "blur", message: "请输入您的账号" }
],
password: [
- { required: true, trigger: "blur", message: "密码不能为空" }
+ { required: true, trigger: "blur", message: "请输入您的密码" }
],
- code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
+ code: [{ required: true, trigger: "change", message: "请输入验证码" }]
},
loading: false,
+ // 验证码开关
+ captchaOnOff: true,
+ // 注册开关
+ register: false,
redirect: undefined
};
},
@@ -99,8 +106,11 @@ export default {
methods: {
getCode() {
getCodeImg().then(res => {
- this.codeUrl = "data:image/gif;base64," + res.img;
- this.loginForm.uuid = res.uuid;
+ this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
+ if (this.captchaOnOff) {
+ this.codeUrl = "data:image/gif;base64," + res.img;
+ this.loginForm.uuid = res.uuid;
+ }
});
},
getCookie() {
@@ -130,7 +140,9 @@ export default {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
this.loading = false;
- this.getCode();
+ if (this.captchaOnOff) {
+ this.getCode();
+ }
});
}
});
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index 424286af..9583f70a 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -114,17 +114,30 @@
执行一次
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['monitor:job:edit']"
+ >修改
详细
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['monitor:job:remove']"
+ >删除
+
+
+ 更多
+
+
+ 执行一次
+ 任务详细
+ 调度日志
+
+