v2.2.0 （修复一些Bug）

1、权限示例demo错误 2、权限判断字段名错误 3、异步路由bug
uncleLian · Aug 5, 2019 · 6b9e990 · 6b9e990
1 parent 6562a6f
commit 6b9e990
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "vue-blog",
-    "version": "2.1.0",
+    "version": "2.2.0",
     "private": true,
     "scripts": {
         "dev": "vue-cli-service serve",

diff --git a/src/directive/permission/permission.js b/src/directive/permission/permission.js
@@ -11,7 +11,7 @@ export default {
 }
 
 export function checkPermission(permissionRole) {
-    let currentRole = (store.state.user && store.state.user.role) || 'visitor'
+    let currentRole = (store.state.login.user && store.state.login.user.roles) || 'visitor'
     if (typeof currentRole === 'string') {
         currentRole = [currentRole]
     }

diff --git a/src/language/en.js b/src/language/en.js
@@ -77,8 +77,9 @@ export default {
         duration: 'Duration',
         prefix: 'Prefix',
         suffix: 'Suffix',
-        decimals: 'Decimals',
+        separator: 'Separator',
         decimal: 'Decimal',
+        decimals: 'Decimals',
         autoplay: 'Autoplay',
         ease: 'Ease',
         button: {

diff --git a/src/language/zh.js b/src/language/zh.js
@@ -77,8 +77,9 @@ export default {
         duration: '时长',
         prefix: '前缀',
         suffix: '后缀',
-        decimals: '小数点符号',
-        decimal: '小数点后几位',
+        separator: '分隔符',
+        decimals: '小数点后几位',
+        decimal: '小数点符号',
         autoplay: '自动开始',
         ease: '平滑动画',
         button: {

diff --git a/src/layout/TagsView/index.vue b/src/layout/TagsView/index.vue
@@ -114,10 +114,12 @@ export default {
         scrollToCurrenTag() {
             const tags = this.$refs.tags
             this.$nextTick(() => {
-                for (const tag of tags) {
-                    if (tag.to.path === this.$route.path) {
+                if (tags && tags.length > 0) {
+                    for (const tag of tags) {
+                        if (tag.to.path === this.$route.path) {
                         this.$refs.scrollPane.scrollTo(tag)
-                        break
+                            break
+                        }
                     }
                 }
             })

diff --git a/src/pages/index/children/components-demo/numTo.vue b/src/pages/index/children/components-demo/numTo.vue
@@ -5,7 +5,7 @@
             <a href="/~https://github.com/uncleLian/vue-num-to" target="_blank">vue-num-to</a>
         </div>
         <div class="demo">
-            <vue-num-to class="number" ref="numTo" :startVal="startVal" :endVal="endVal" :duration="duration || 0" :autoplay="autoplay" :prefix="prefix" :suffix="suffix" :decimals="decimals" :decimal="decimal" :ease="ease" @complete="handleComplete">
+            <vue-num-to class="number" ref="numTo" :startVal="startVal" :endVal="endVal" :duration="duration || 0" :autoplay="autoplay" :prefix="prefix" :suffix="suffix" :separator="separator" :decimals="decimals" :decimal="decimal" :ease="ease" @complete="handleComplete">
             </vue-num-to>
         </div>
         <div class="demo">
@@ -39,6 +39,12 @@
                     <template #prepend>{{$t('numTo.suffix')}}</template>
                 </el-input>
             </div>
+            <!-- separator -->
+            <div class="demo-item">
+                <el-input :clearable="true" v-model.trim="separator">
+                    <template #prepend>{{$t('numTo.separator')}}</template>
+                </el-input>
+            </div>
             <!-- decimal -->
             <div class="demo-item">
                 <el-input :clearable="true" v-model.trim="decimal">
@@ -69,15 +75,16 @@ export default {
     name: 'numTo_view',
     data() {
         return {
-            startVal: 0,
-            endVal: new Date().getFullYear(),
-            duration: 3000,
-            prefix: '￥',
-            suffix: '',
-            decimal: '.',
-            decimals: 0,
-            autoplay: true,
-            ease: true
+            startVal: 0, // 开始值
+            endVal: new Date().getFullYear(), // 结束值
+            duration: 3000, // 时长
+            prefix: '￥', // 前缀
+            suffix: '', // 后缀
+            separator: ',', // 分隔符
+            decimal: '.', // 小数点符号
+            decimals: 0, // 小数点后几位
+            autoplay: true, // 是否自动开始
+            ease: true // 是否平滑过渡
         }
     },
     methods: {

diff --git a/src/router/index.js b/src/router/index.js
@@ -11,7 +11,7 @@ Vue.use(Router)
 * icon: ''                      菜单图标（支持svg-icon、el-icon）
 * title: ''                     菜单标题
 * login: false                  是否需要登录
-* role: 'admin' || ['admin']    是否需要权限
+* ss: 'admin' || ['admin']    是否需要权限
 * keep: false                   是否需要缓存（需要name才能生效）
 * hidden: false                 是否显示在菜单
 * open: false                   是否展开菜单（有子菜单前提下）
@@ -51,7 +51,7 @@ export const asyncRoutes = [
         component: () => import('@/pages/index/children/permission/permission'),
         meta: {
             icon: 'lock',
-            role: 'admin'
+            roles: 'admin'
         }
     },
     {

diff --git a/src/store/modules/login.js b/src/store/modules/login.js
@@ -13,7 +13,7 @@ export default {
         },
         // 只做权限测试页使用
         SET_ROLE(state, val) {
-            state.user.role = val
+            state.user.roles = val
         }
     },
     actions: {

diff --git a/src/store/modules/routes.js b/src/store/modules/routes.js
@@ -17,8 +17,9 @@ export default {
     actions: {
         generateRoutes({ commit }) {
             return new Promise(resolve => {
-                asyncParentRoutes.children = [...asyncRoutes, extraPanentRoutes]
-                const sideRoutes = setRedirect([asyncParentRoutes])
+                let finalAsyncParentRoutes = { ...asyncParentRoutes }
+                finalAsyncParentRoutes.children = [...asyncRoutes, extraPanentRoutes]
+                const sideRoutes = setRedirect([finalAsyncParentRoutes])
                 const addRoutes = [...sideRoutes, extraGlobalRoutes] // 实际动态添加的路由
                 const allRoutes = [...localRoutes, ...addRoutes] // 所有路由
                 commit('SET_SIDE_ROUTES', sideRoutes)