From a3504dac6e4c5d1ab04bf835be2f7417e6ced576 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 20 十二月 2021 09:47:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/store/modules/permission.js | 22 +++++++
ruoyi-ui/package.json | 1
ruoyi-ui/src/components/ImagePreview/index.vue | 67 ++++++++++++++++++++++
ruoyi-ui/src/main.js | 3 +
ruoyi-ui/vue.config.js | 7 ++
ruoyi-ui/src/views/system/menu/index.vue | 2
ruoyi-ui/src/router/index.js | 39 ++++++++----
7 files changed, 125 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 662bfb0..bd95701 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -65,6 +65,7 @@
"@vue/cli-plugin-eslint": "4.4.6",
"@vue/cli-service": "4.4.6",
"babel-eslint": "10.1.0",
+ "babel-plugin-dynamic-import-node": "2.3.3",
"chalk": "4.1.0",
"connect": "3.6.6",
"eslint": "7.15.0",
diff --git a/ruoyi-ui/src/components/ImagePreview/index.vue b/ruoyi-ui/src/components/ImagePreview/index.vue
new file mode 100644
index 0000000..44e27aa
--- /dev/null
+++ b/ruoyi-ui/src/components/ImagePreview/index.vue
@@ -0,0 +1,67 @@
+<template>
+ <el-image :src="`${realSrc}`" fit="cover" :style="`width:${realWidth};height:${realHeight};`" :preview-src-list="[`${realSrc}`]">
+ <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div>
+ </el-image>
+</template>
+
+<script>
+import { isExternal } from '@/utils/validate'
+
+export default {
+ name: 'ImagePreview',
+ props: {
+ src: {
+ type: String,
+ required: true
+ },
+ width: {
+ type: [Number, String],
+ default: ''
+ },
+ height: {
+ type: [Number, String],
+ default: ''
+ }
+ },
+ computed: {
+ realSrc() {
+ if (isExternal(this.src)) {
+ return this.src
+ }
+ return process.env.VUE_APP_BASE_API + this.src
+ },
+ realWidth() {
+ return typeof this.width == 'string' ? this.width : `${this.width}px`
+ },
+ realHeight() {
+ return typeof this.height == 'string' ? this.height : `${this.height}px`
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.el-image {
+ border-radius: 5px;
+ background-color: #ebeef5;
+ box-shadow: 0 0 5px 1px #ccc;
+ ::v-deep .el-image__inner {
+ transition: all 0.3s;
+ cursor: pointer;
+ &:hover {
+ transform: scale(1.2);
+ }
+ }
+ ::v-deep .image-slot {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ height: 100%;
+ color: #909399;
+ font-size: 30px;
+ }
+}
+</style>
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 29c4022..13c6cf2 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -29,6 +29,8 @@
import FileUpload from "@/components/FileUpload"
// 鍥剧墖涓婁紶缁勪欢
import ImageUpload from "@/components/ImageUpload"
+// 鍥剧墖棰勮缁勪欢
+import ImagePreview from "@/components/ImagePreview"
// 瀛楀吀鏍囩缁勪欢
import DictTag from '@/components/DictTag'
// 澶撮儴鏍囩缁勪欢
@@ -54,6 +56,7 @@
Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload)
+Vue.component('ImagePreview', ImagePreview)
Vue.use(directive)
Vue.use(plugins)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index cda6d4c..3fb685d 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -17,6 +17,8 @@
* redirect: noRedirect // 褰撹缃� noRedirect 鐨勬椂鍊欒璺敱鍦ㄩ潰鍖呭睉瀵艰埅涓笉鍙鐐瑰嚮
* name:'router-name' // 璁惧畾璺敱鐨勫悕瀛楋紝涓�瀹氳濉啓涓嶇劧浣跨敤<keep-alive>鏃朵細鍑虹幇鍚勭闂
* query: '{"id": 1, "name": "ry"}' // 璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁�
+ * roles: ['admin', 'common'] // 璁块棶璺敱鐨勮鑹叉潈闄�
+ * permissions: ['a:a:a', 'b:b:b'] // 璁块棶璺敱鐨勮彍鍗曟潈闄�
* meta : {
noCache: true // 濡傛灉璁剧疆涓簍rue锛屽垯涓嶄細琚� <keep-alive> 缂撳瓨(榛樿 false)
title: 'title' // 璁剧疆璇ヨ矾鐢卞湪渚ц竟鏍忓拰闈㈠寘灞戜腑灞曠ず鐨勫悕瀛�
@@ -35,28 +37,28 @@
children: [
{
path: '/redirect/:path(.*)',
- component: (resolve) => require(['@/views/redirect'], resolve)
+ component: () => import('@/views/redirect')
}
]
},
{
path: '/login',
- component: (resolve) => require(['@/views/login'], resolve),
+ component: () => import('@/views/login'),
hidden: true
},
{
path: '/register',
- component: (resolve) => require(['@/views/register'], resolve),
+ component: () => import('@/views/register'),
hidden: true
},
{
path: '/404',
- component: (resolve) => require(['@/views/error/404'], resolve),
+ component: () => import('@/views/error/404'),
hidden: true
},
{
path: '/401',
- component: (resolve) => require(['@/views/error/401'], resolve),
+ component: () => import('@/views/error/401'),
hidden: true
},
{
@@ -66,7 +68,7 @@
children: [
{
path: 'index',
- component: (resolve) => require(['@/views/index'], resolve),
+ component: () => import('@/views/index'),
name: 'Index',
meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
}
@@ -80,20 +82,25 @@
children: [
{
path: 'profile',
- component: (resolve) => require(['@/views/system/user/profile/index'], resolve),
+ component: () => import('@/views/system/user/profile/index'),
name: 'Profile',
meta: { title: '涓汉涓績', icon: 'user' }
}
]
- },
+ }
+]
+
+// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
+export const dynamicRoutes = [
{
path: '/system/user-auth',
component: Layout,
hidden: true,
+ permissions: ['system:user:edit'],
children: [
{
path: 'role/:userId(\\d+)',
- component: (resolve) => require(['@/views/system/user/authRole'], resolve),
+ component: () => import('@/views/system/user/authRole'),
name: 'AuthRole',
meta: { title: '鍒嗛厤瑙掕壊', activeMenu: '/system/user' }
}
@@ -103,10 +110,11 @@
path: '/system/role-auth',
component: Layout,
hidden: true,
+ permissions: ['system:role:edit'],
children: [
{
path: 'user/:roleId(\\d+)',
- component: (resolve) => require(['@/views/system/role/authUser'], resolve),
+ component: () => import('@/views/system/role/authUser'),
name: 'AuthUser',
meta: { title: '鍒嗛厤鐢ㄦ埛', activeMenu: '/system/role' }
}
@@ -116,10 +124,11 @@
path: '/system/dict-data',
component: Layout,
hidden: true,
+ permissions: ['system:dict:list'],
children: [
{
path: 'index/:dictId(\\d+)',
- component: (resolve) => require(['@/views/system/dict/data'], resolve),
+ component: () => import('@/views/system/dict/data'),
name: 'Data',
meta: { title: '瀛楀吀鏁版嵁', activeMenu: '/system/dict' }
}
@@ -129,12 +138,13 @@
path: '/system/oss-config',
component: Layout,
hidden: true,
+ permissions: ['system:oss:list'],
children: [
{
path: 'index',
- component: (resolve) => require(['@/views/system/oss/config'], resolve),
+ component: () => import('@/views/system/oss/config'),
name: 'OssConfig',
- meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss'}
+ meta: { title: '閰嶇疆绠＄悊', activeMenu: '/system/oss' }
}
]
},
@@ -142,10 +152,11 @@
path: '/tool/gen-edit',
component: Layout,
hidden: true,
+ permissions: ['tool:gen:edit'],
children: [
{
path: 'index',
- component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
+ component: () => import('@/views/tool/gen/editTable'),
name: 'GenEdit',
meta: { title: '淇敼鐢熸垚閰嶇疆', activeMenu: '/tool/gen' }
}
diff --git a/ruoyi-ui/src/store/modules/permission.js b/ruoyi-ui/src/store/modules/permission.js
index 8d84fff..6f08c6f 100644
--- a/ruoyi-ui/src/store/modules/permission.js
+++ b/ruoyi-ui/src/store/modules/permission.js
@@ -1,4 +1,5 @@
-import { constantRoutes } from '@/router'
+import auth from '@/plugins/auth'
+import router, { constantRoutes, dynamicRoutes } from '@/router'
import { getRouters } from '@/api/menu'
import Layout from '@/layout/index'
import ParentView from '@/components/ParentView'
@@ -42,7 +43,9 @@
const rdata = JSON.parse(JSON.stringify(res.data))
const sidebarRoutes = filterAsyncRouter(sdata)
const rewriteRoutes = filterAsyncRouter(rdata, false, true)
+ const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
rewriteRoutes.push({ path: '*', redirect: '/404', hidden: true })
+ router.addRoutes(asyncRoutes);
commit('SET_ROUTES', rewriteRoutes)
commit('SET_SIDEBAR_ROUTERS', constantRoutes.concat(sidebarRoutes))
commit('SET_DEFAULT_ROUTES', sidebarRoutes)
@@ -106,6 +109,23 @@
return children
}
+// 鍔ㄦ�佽矾鐢遍亶鍘嗭紝楠岃瘉鏄惁鍏峰鏉冮檺
+export function filterDynamicRoutes(routes) {
+ const res = []
+ routes.forEach(route => {
+ if (route.permissions) {
+ if (auth.hasPermiOr(route.permissions)) {
+ res.push(route)
+ }
+ } else if (route.roles) {
+ if (auth.hasRoleOr(route.roles)) {
+ res.push(route)
+ }
+ }
+ })
+ return res
+}
+
export const loadView = (view) => {
if (process.env.NODE_ENV === 'development') {
return (resolve) => require([`@/views/${view}`], resolve)
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index d65773a..5c1f85a 100644
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -128,7 +128,7 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.menuType != 'F'">
- <el-form-item label="鑿滃崟鍥炬爣">
+ <el-form-item label="鑿滃崟鍥炬爣" prop="icon">
<el-popover
placement="bottom-start"
width="460"
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 73c2177..bb28e13 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -42,6 +42,13 @@
},
disableHostCheck: true
},
+ css: {
+ loaderOptions: {
+ sass: {
+ sassOptions: { outputStyle: "expanded" }
+ }
+ }
+ },
configureWebpack: {
name: name,
resolve: {
--
Gitblit v1.9.3