-
+
-
-
![]()
+
+
{ // 遍历后台传来的路由
router.component = loadView(component)
}
}
+ router.name && fillMeta(router)
if (router.children && router.children.length) {
router.children = filterAsyncRouter(router.children)
}
@@ -66,6 +67,14 @@ export const filterAsyncRouter = (routers) => { // 遍历后台传来的路由
})
}
+// 后台设计时未考虑activeMenu字段 这里先前端处理一下
+export const fillMeta = (router) => {
+ router.name.includes('system-user-form') && (router.meta.activeMenu = '/system/user')
+ router.name.includes('system-role-form') && (router.meta.activeMenu = '/system/role')
+ router.name.includes('system-dept-form') && (router.meta.activeMenu = '/system/dept')
+ // return router
+}
+
// 包装一层父级目录
export const decorate = (router) => {
const parent = {
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 0239e81b91..36c8250e6d 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -275,3 +275,7 @@ div:focus {
padding-top: 10px;
}
+.m-colorPicker .box {
+ bottom:20px;
+}
+
diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
index cf98d8293f..6b5163e66b 100644
--- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
@@ -21,21 +21,21 @@
-
+
-
+
-
+
-
+
diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue
index a3e86c78a6..8dfcf84ef7 100644
--- a/frontend/src/views/login/index.vue
+++ b/frontend/src/views/login/index.vue
@@ -40,9 +40,9 @@
-
-
-
+
+
+
@@ -95,7 +95,8 @@ export default {
redirect: undefined,
uiInfo: null,
loginImageUrl: null,
- loginLogoUrl: null
+ loginLogoUrl: null,
+ axiosFinished: false
}
},
computed: {
@@ -115,6 +116,14 @@ export default {
this.$store.dispatch('user/getUI').then(() => {
// const uiLists = this.$store.state.user.uiInfo
// this.uiInfo = format(uiLists)
+ this.axiosFinished = true
+ this.showLoginImage()
+ }).catch(err => {
+ console.error(err)
+ })
+ },
+ methods: {
+ showLoginImage() {
this.uiInfo = getSysUI()
if (this.uiInfo['ui.loginImage'] && this.uiInfo['ui.loginImage'].paramValue) {
this.loginImageUrl = '/system/ui/image/' + this.uiInfo['ui.loginImage'].paramValue
@@ -122,11 +131,7 @@ export default {
if (this.uiInfo['ui.loginLogo'] && this.uiInfo['ui.loginLogo'].paramValue) {
this.loginLogoUrl = '/system/ui/image/' + this.uiInfo['ui.loginLogo'].paramValue
}
- }).catch(err => {
- console.error(err)
- })
- },
- methods: {
+ },
handleLogin() {
this.$refs.loginForm.validate(valid => {
if (valid) {
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index e79075897f..a071f833d6 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -47,7 +47,7 @@