Browse Source

优化前端代码

tags/v3.3.0
RuoYi 3 years ago
parent
commit
337d1bab02
  1. 2
      ruoyi-ui/package.json
  2. 2
      ruoyi-ui/src/components/Breadcrumb/index.vue
  3. 2
      ruoyi-ui/src/components/RuoYi/Doc/index.vue
  4. 2
      ruoyi-ui/src/components/RuoYi/Git/index.vue
  5. 3
      ruoyi-ui/src/components/SizeSelect/index.vue
  6. 2
      ruoyi-ui/src/layout/components/Sidebar/Logo.vue
  7. 2
      ruoyi-ui/src/layout/index.vue
  8. 2
      ruoyi-ui/src/main.js
  9. 10
      ruoyi-ui/src/router/index.js
  10. 4
      ruoyi-ui/src/store/modules/permission.js
  11. 2
      ruoyi-ui/src/store/modules/settings.js
  12. 2
      ruoyi-ui/src/utils/dict/index.js

2
ruoyi-ui/package.json

@ -56,7 +56,7 @@
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-cropper": "0.5.5", "vue-cropper": "0.5.5",
"vue-router": "3.4.9", "vue-router": "3.4.9",
"vue-meta": "^2.4.0", "vue-meta": "2.4.0",
"vuedraggable": "2.24.3", "vuedraggable": "2.24.3",
"vuex": "3.6.0" "vuex": "3.6.0"
}, },

2
ruoyi-ui/src/components/Breadcrumb/index.vue

@ -2,7 +2,7 @@
<el-breadcrumb class="app-breadcrumb" separator="/"> <el-breadcrumb class="app-breadcrumb" separator="/">
<transition-group name="breadcrumb"> <transition-group name="breadcrumb">
<el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path"> <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
<span v-if="item.redirect==='noRedirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span> <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
<a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
</el-breadcrumb-item> </el-breadcrumb-item>
</transition-group> </transition-group>

2
ruoyi-ui/src/components/RuoYi/Doc/index.vue

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<svg-icon icon-class="question" @click="goto"/> <svg-icon icon-class="question" @click="goto" />
</div> </div>
</template> </template>

2
ruoyi-ui/src/components/RuoYi/Git/index.vue

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<svg-icon icon-class="github" @click="goto"/> <svg-icon icon-class="github" @click="goto" />
</div> </div>
</template> </template>

3
ruoyi-ui/src/components/SizeSelect/index.vue

@ -5,8 +5,7 @@
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value"> <el-dropdown-item v-for="item of sizeOptions" :key="item.value" :disabled="size===item.value" :command="item.value">
{{ {{ item.label }}
item.label }}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>

2
ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@ -29,7 +29,7 @@ export default {
variables() { variables() {
return variables; return variables;
}, },
sideTheme() { sideTheme() {
return this.$store.state.settings.sideTheme return this.$store.state.settings.sideTheme
} }
}, },

2
ruoyi-ui/src/layout/index.vue

@ -98,7 +98,7 @@ export default {
} }
.hideSidebar .fixed-header { .hideSidebar .fixed-header {
width: calc(100% - 54px) width: calc(100% - 54px);
} }
.mobile .fixed-header { .mobile .fixed-header {

2
ruoyi-ui/src/main.js

@ -10,7 +10,7 @@ import '@/assets/styles/ruoyi.scss' // ruoyi css
import App from './App' import App from './App'
import store from './store' import store from './store'
import router from './router' import router from './router'
import directive from './directive' //directive import directive from './directive' // directive
import plugins from './plugins' // plugins import plugins from './plugins' // plugins
import { download } from '@/utils/request' import { download } from '@/utils/request'

10
ruoyi-ui/src/router/index.js

@ -95,7 +95,7 @@ export const constantRoutes = [
path: 'role/:userId(\\d+)', path: 'role/:userId(\\d+)',
component: (resolve) => require(['@/views/system/user/authRole'], resolve), component: (resolve) => require(['@/views/system/user/authRole'], resolve),
name: 'AuthRole', name: 'AuthRole',
meta: { title: '分配角色', activeMenu: '/system/user'} meta: { title: '分配角色', activeMenu: '/system/user' }
} }
] ]
}, },
@ -108,7 +108,7 @@ export const constantRoutes = [
path: 'user/:roleId(\\d+)', path: 'user/:roleId(\\d+)',
component: (resolve) => require(['@/views/system/role/authUser'], resolve), component: (resolve) => require(['@/views/system/role/authUser'], resolve),
name: 'AuthUser', name: 'AuthUser',
meta: { title: '分配用户', activeMenu: '/system/role'} meta: { title: '分配用户', activeMenu: '/system/role' }
} }
] ]
}, },
@ -121,7 +121,7 @@ export const constantRoutes = [
path: 'index/:dictId(\\d+)', path: 'index/:dictId(\\d+)',
component: (resolve) => require(['@/views/system/dict/data'], resolve), component: (resolve) => require(['@/views/system/dict/data'], resolve),
name: 'Data', name: 'Data',
meta: { title: '字典数据', activeMenu: '/system/dict'} meta: { title: '字典数据', activeMenu: '/system/dict' }
} }
] ]
}, },
@ -134,7 +134,7 @@ export const constantRoutes = [
path: 'index', path: 'index',
component: (resolve) => require(['@/views/monitor/job/log'], resolve), component: (resolve) => require(['@/views/monitor/job/log'], resolve),
name: 'JobLog', name: 'JobLog',
meta: { title: '调度日志', activeMenu: '/monitor/job'} meta: { title: '调度日志', activeMenu: '/monitor/job' }
} }
] ]
}, },
@ -147,7 +147,7 @@ export const constantRoutes = [
path: 'index', path: 'index',
component: (resolve) => require(['@/views/tool/gen/editTable'], resolve), component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
name: 'GenEdit', name: 'GenEdit',
meta: { title: '修改生成配置', activeMenu: '/tool/gen'} meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
} }
] ]
} }

4
ruoyi-ui/src/store/modules/permission.js

@ -1,7 +1,7 @@
import { constantRoutes } from '@/router' import { constantRoutes } from '@/router'
import { getRouters } from '@/api/menu' import { getRouters } from '@/api/menu'
import Layout from '@/layout/index' import Layout from '@/layout/index'
import ParentView from '@/components/ParentView'; import ParentView from '@/components/ParentView'
import InnerLink from '@/layout/components/InnerLink' import InnerLink from '@/layout/components/InnerLink'
const permission = { const permission = {
@ -24,7 +24,7 @@ const permission = {
// 顶部导航菜单默认添加统计报表栏指向首页 // 顶部导航菜单默认添加统计报表栏指向首页
const index = [{ const index = [{
path: 'index', path: 'index',
meta: { title: '统计报表', icon: 'dashboard'} meta: { title: '统计报表', icon: 'dashboard' }
}] }]
state.topbarRouters = routes.concat(index); state.topbarRouters = routes.concat(index);
}, },

2
ruoyi-ui/src/store/modules/settings.js

@ -8,7 +8,7 @@ const state = {
theme: storageSetting.theme || '#409EFF', theme: storageSetting.theme || '#409EFF',
sideTheme: storageSetting.sideTheme || sideTheme, sideTheme: storageSetting.sideTheme || sideTheme,
showSettings: showSettings, showSettings: showSettings,
topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,

2
ruoyi-ui/src/utils/dict/index.js

@ -5,7 +5,7 @@ export default function(Vue, options) {
mergeOptions(options) mergeOptions(options)
Vue.mixin({ Vue.mixin({
data() { data() {
if (this.$options.dicts === undefined || this.$options.dicts === null) { if (this.$options === undefined || this.$options.dicts === undefined || this.$options.dicts === null) {
return {} return {}
} }
const dict = new Dict() const dict = new Dict()

Loading…
Cancel
Save