Commitf3aefe5

committed

refine theme color

1 parenta80999e commitf3aefe5Copy full SHA for f3aefe5

File tree

5 files changed

+41

-17

lines changed

src
- main.js
- store/modules
  - permission.js
- styles
  - element-variables.scss
- views/table
  - complexTable.vue
vue.config.js

5 files changed

+41

-17

lines changed

`‎src/main.js`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import Cookies from 'js-cookie'`
`5`	`5`	`import'normalize.css/normalize.css'// A modern alternative to CSS resets`
`6`	`6`
`7`	`7`	`importElementfrom'element-ui'`
`8`		`-import'element-ui/lib/theme-chalk/index.css'`
	`8`	`+import'./styles/element-variables.scss'`
`9`	`9`
`10`	`10`	`import'@/styles/index.scss'// global css`
`11`	`11`

`‎src/store/modules/permission.js`

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import{asyncRouterMap,constantRouterMap}from'@/router'`
	`1`	`+import{asyncRoutes,constantRoutes}from'@/router'`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* 通过meta.role判断是否与当前用户权限匹配`
`@@ -15,17 +15,17 @@ function hasPermission(roles, route) {`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* 递归过滤异步路由表，返回符合用户角色权限的路由表`
`18`		`- *@param routesasyncRouterMap`
	`18`	`+ *@param routesasyncRoutes`
`19`	`19`	`*@param roles`
`20`	`20`	`*/`
`21`		`-functionfilterAsyncRouter(routes,roles){`
	`21`	`+exportfunctionfilterAsyncRoutes(routes,roles){`
`22`	`22`	`constres=[]`
`23`	`23`
`24`	`24`	`routes.forEach(route=>{`
`25`	`25`	`consttmp={ ...route}`
`26`	`26`	`if(hasPermission(roles,tmp)){`
`27`	`27`	`if(tmp.children){`
`28`		`-tmp.children=filterAsyncRouter(tmp.children,roles)`
	`28`	`+tmp.children=filterAsyncRoutes(tmp.children,roles)`
`29`	`29`	`}`
`30`	`30`	`res.push(tmp)`
`31`	`31`	`}`
`@@ -36,27 +36,27 @@ function filterAsyncRouter(routes, roles) {`
`36`	`36`
`37`	`37`	`constpermission={`
`38`	`38`	`state:{`
`39`		`-routers:[],`
`40`		`-addRouters:[]`
	`39`	`+routes:[],`
	`40`	`+addRoutes:[]`
`41`	`41`	`},`
`42`	`42`	`mutations:{`
`43`		`-SET_ROUTERS:(state,routers)=>{`
`44`		`-state.addRouters=routers`
`45`		`-state.routers=constantRouterMap.concat(routers)`
	`43`	`+SET_ROUTES:(state,routes)=>{`
	`44`	`+state.addRoutes=routes`
	`45`	`+state.routes=constantRoutes.concat(routes)`
`46`	`46`	`}`
`47`	`47`	`},`
`48`	`48`	`actions:{`
`49`	`49`	`GenerateRoutes({ commit},data){`
`50`	`50`	`returnnewPromise(resolve=>{`
`51`	`51`	`const{ roles}=data`
`52`		`-letaccessedRouters`
	`52`	`+letaccessedRoutes`
`53`	`53`	`if(roles.includes('admin')){`
`54`		`-accessedRouters=asyncRouterMap`
	`54`	`+accessedRoutes=asyncRoutes`
`55`	`55`	`}else{`
`56`		`-accessedRouters=filterAsyncRouter(asyncRouterMap,roles)`
	`56`	`+accessedRoutes=filterAsyncRoutes(asyncRoutes,roles)`
`57`	`57`	`}`
`58`		`-commit('SET_ROUTERS',accessedRouters)`
`59`		`-resolve()`
	`58`	`+commit('SET_ROUTES',accessedRoutes)`
	`59`	`+resolve(accessedRoutes)`
`60`	`60`	`})`
`61`	`61`	`}`
`62`	`62`	`}`

`‎src/styles/element-variables.scss`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,25 @@`
	`1`	`+/**`
	`2`	`+* I think element-ui's default theme color is too light for long-term use.`
	`3`	`+* So I modified the default color and you can modify it to your liking.`
	`4`	`+**/`
	`5`	`+`
	`6`	`+/* theme color*/`
	`7`	`+$--color-primary:#1890ff;`
	`8`	`+$--color-success:#13ce66;`
	`9`	`+$--color-warning:#FFBA00;`
	`10`	`+$--color-danger:#ff4949;`
	`11`	`+// $--color-info: #1E1E1E;`
	`12`	`+`
	`13`	`+$--button-font-weight:400;`
	`14`	`+`
	`15`	`+// $--color-text-regular: #1f2d3d;`
	`16`	`+`
	`17`	`+$--border-color-light:#dfe4ed;`
	`18`	`+$--border-color-lighter:#e6ebf5;`
	`19`	`+`
	`20`	`+$--table-border:1pxsolid#dfe6ec;`
	`21`	`+`
	`22`	`+/* icon font path, required*/`
	`23`	`+$--font-path:'~element-ui/lib/theme-chalk/fonts';`
	`24`	`+`
	`25`	`+@import"~element-ui/packages/theme-chalk/src/index";`

`‎src/views/table/complexTable.vue`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`style="width:100%;"`
`36`	`36`	`@sort-change="sortChange"`
`37`	`37`	`>`
`38`		`- <el-table-column:label="$t('table.id')"prop="id"sortable="custom"align="center"width="65">`
	`38`	`+ <el-table-column:label="$t('table.id')"prop="id"sortable="custom"align="center"width="80">`
`39`	`39`	`<template slot-scope="scope">`
`40`	`40`	`<span>{{ scope.row.id }}</span>`
`41`	`41`	`</template>`

`‎vue.config.js`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ module.exports = {`
`55`	`55`	`// import ES2015 module from common.js module`
`56`	`56`	`const{default:mocks}=require('./mock')`
`57`	`57`	`for(constmockofmocks){`
`58`		`-console.log(mock,mock.response)`
`59`	`58`	`app.all(mock.route,mock.response)`
`60`	`59`	`}`
`61`	`60`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf3aefe5

File tree

5 files changed

5 files changed

`‎src/main.js`

`‎src/store/modules/permission.js`

`‎src/styles/element-variables.scss`

`‎src/views/table/complexTable.vue`

`‎vue.config.js`

0 commit comments