Merge pull request #237 from aspnetboilerplate/issue-235

Issue 235
aspnetboilerplate · May 14, 2018 · 33306f9 · 33306f9
2 parents 88b8bd2 + 3fa10b9
commit 33306f9
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 38 deletions.
diff --git a/vue/src/components/lockscreen/components/locking-page.vue b/vue/src/components/lockscreen/components/locking-page.vue
@@ -25,7 +25,7 @@ export default {
             lockScreenBack.style.zIndex = -1;
             lockScreenBack.style.boxShadow = '0 0 0 0 #667aa6 inset';
             this.$router.push({
-                name: Cookies.get('last_page_name')  // 解锁之后跳转到锁屏之前的页面
+                name: Cookies.get('last_page_name')
             });
         }
     },

diff --git a/vue/src/components/lockscreen/components/unlock.vue b/vue/src/components/lockscreen/components/unlock.vue
@@ -68,7 +68,7 @@ export default class UnLock extends AbpBase {
             Cookies.set('locking', '0');
             this.$emit('on-unlock');
         } else {
-            this.$Message.error('密码错误,请重新输入');
+            this.$Message.error('WrongPassword,Wrong password');
         }
     }
     unlockMousedown () {

diff --git a/vue/src/components/lockscreen/lockscreen.vue b/vue/src/components/lockscreen/lockscreen.vue
@@ -26,7 +26,7 @@ export default class LockScreen extends AbpBase {
         lockScreenBack.style.boxShadow = '0 0 0 ' + this.lockScreenSize + 'px #667aa6 inset';
         this.showUnlock = true;
         let name=this.$route.name?this.$route.name:'';
-        Cookies.set('last_page_name', name); // 本地存储锁屏之前打开的页面以便解锁后打开
+        Cookies.set('last_page_name', name);
         setTimeout(() => {
             lockScreenBack.style.transition = 'all 0s';
             this.$router.push({

diff --git a/vue/src/components/tags-page-opened.vue b/vue/src/components/tags-page-opened.vue
@@ -131,12 +131,9 @@ export default class TagsPageOpened extends AbpBase {
     moveToView (tag:any) {
         let scrollCon=this.$refs.scrollCon as any;
         if (tag.offsetLeft < -this.tagBodyLeft) {
-                // 标签在可视区域左侧
             this.tagBodyLeft = -tag.offsetLeft + 10;
         } else if (tag.offsetLeft + 10 > -this.tagBodyLeft && tag.offsetLeft + tag.offsetWidth < -this.tagBodyLeft + scrollCon.offsetWidth - 100) {
-                // 标签在可视区域
         } else {
-            // 标签在可视区域右侧
             this.tagBodyLeft = -(tag.offsetLeft - (scrollCon.offsetWidth - 100 - tag.offsetWidth) + 20);
         }
     }
@@ -149,7 +146,7 @@ export default class TagsPageOpened extends AbpBase {
                     this.moveToView(tag);
                 }
             })
-        }, 1);  // 这里不设定时器就会有偏移bug
+        }, 1);
         this.tagsCount = this.tagsList.length;
     }
     @Watch('$route')

diff --git a/vue/src/main.ts b/vue/src/main.ts
@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import App from './App.vue'
+import App from './app.vue'
 import iView from 'iview'
 import {router} from './router/index';
 //import 'iview/dist/styles/iview.css';
@@ -39,7 +39,6 @@ Ajax.get('/AbpUserConfiguration/GetAll').then(data=>{
         }
       }
       this.$store.commit('app/initCachepage');
-      // 权限菜单过滤相关
       this.$store.commit('app/updateMenulist');
     },
     created () {

diff --git a/vue/src/router/index.ts b/vue/src/router/index.ts
@@ -18,35 +18,35 @@ export const router = new VueRouter(RouterConfig);
 router.beforeEach((to, from, next) => {
     iView.LoadingBar.start();
     Util.title(to.meta.title);
-    if (Cookies.get('locking') === '1' && to.name !== 'locking') { // 判断当前是否是锁定状态
+    if (Cookies.get('locking') === '1' && to.name !== 'locking') {
         next({
             replace: true,
             name: 'locking'
         });
     }else if (Cookies.get('locking') === '0' && to.name === 'locking') {
         next(false);
     } else {
-        if (!Util.abp.session.userId&& to.name !== 'login') { // 判断是否已经登录且前往的页面不是登录页
+        if (!Util.abp.session.userId&& to.name !== 'login') {
             next({
                 name: 'login'
             });
-        } else if (!!Util.abp.session.userId && to.name === 'login') { // 判断是否已经登录且前往的是登录页
+        } else if (!!Util.abp.session.userId && to.name === 'login') {
             Util.title(to.meta.title);
             next({
                 name: 'home'
             });
         } else {
             const curRouterObj = Util.getRouterObjByName([otherRouters, ...appRouters], to.name);
-            if (curRouterObj && curRouterObj.permission) { // 需要判断权限的路由
+            if (curRouterObj && curRouterObj.permission) {
                 if (window.abp.auth.hasPermission(curRouterObj.permission)) {
-                    Util.toDefaultPage([otherRouters, ...appRouters], to.name, router, next); // 如果在地址栏输入的是一级菜单则默认打开其第一个二级菜单的页面
+                    Util.toDefaultPage([otherRouters, ...appRouters], to.name, router, next);
                 } else {
                     next({
                         replace: true,
                         name: 'error-403'
                     });
                 }
-            } else { // 没有配置权限的路由, 直接通过
+            } else {
                 Util.toDefaultPage([...routers], to.name, router, next);
             }
         }

diff --git a/vue/src/store/modules/app.ts b/vue/src/store/modules/app.ts
@@ -10,12 +10,12 @@ interface AppState{
     cachePage:Array<any>;
     lang:string;
     isFullScreen: boolean;
-    openedSubmenuArr: Array<any>;  // 要展开的菜单数组
-    menuTheme: string; // 主题
+    openedSubmenuArr: Array<any>;
+    menuTheme: string;
     themeColor: string,
     pageOpenedList:Array<any>;
     currentPageName: string;
-    currentPath:Array<any>;  // 面包屑数组
+    currentPath:Array<any>;
     menuList: Array<any>;
     routers:Array<any>;
     tagsList: Array<any>;
@@ -29,8 +29,8 @@ class AppModule implements Module<AppState,any>{
         cachePage: [],
         lang: '',
         isFullScreen: false,
-        openedSubmenuArr: [],  // 要展开的菜单数组
-        menuTheme: 'dark', // 主题
+        openedSubmenuArr: [], 
+        menuTheme: 'dark',
         themeColor: '',
         pageOpenedList: [{
             meta:{title: 'HomePage'},
@@ -44,7 +44,7 @@ class AppModule implements Module<AppState,any>{
                 path: '',
                 name: 'home'
             }
-        ],  // 面包屑数组
+        ],
         menuList: [],
         routers: [
             otherRouters,
@@ -53,7 +53,7 @@ class AppModule implements Module<AppState,any>{
         tagsList: [...otherRouters.children],
         messageCount: 0,
         dontCache: [],
-        noticeList:[{read:false,type:0,title:'第一条通知',description:'一天前'},{read:false,type:1},{read:false,type:0,title:'第二条通知',description:'一月前'}]
+        noticeList:[{read:false,type:0,title:'First notice',description:'One day ago'},{read:false,type:1},{read:false,type:0,title:'Second notice',description:'One month ago'}]
     };
     mutations= {
         logout(state:AppState){

diff --git a/vue/src/views/main.less b/vue/src/views/main.less
@@ -266,6 +266,13 @@
         display: inline-block;
         vertical-align: middle;
     }
+    i{
+        height: 64px;
+        width: auto;
+        display: inline-block;
+        vertical-align: middle;
+        padding: 16px 0px 16px 24px;
+    }
 }
 .page-body{
     margin: 8px;

diff --git a/vue/src/views/main.vue b/vue/src/views/main.vue
@@ -13,7 +13,7 @@
                 :menu-list="menuList">
                 <div slot="top" class="logo-con">
                   <a>
-                    <img src="../images/logo-min.jpg" key="min-logo" />
+                    <Icon type="cube" size="32"></Icon>
                     <h1 >{{L('AppName')}}</h1>
                   </a>
 
@@ -97,10 +97,10 @@
           return this.$store.state.app.menuList;
         }
         get pageTagsList () {
-          return this.$store.state.app.pageOpenedList as Array<any>;  // 打开的页面的页面对象
+          return this.$store.state.app.pageOpenedList as Array<any>;
         }
         get currentPath () {
-          return this.$store.state.app.currentPath;  // 当前面包屑数组
+          return this.$store.state.app.currentPath;
         }
         get lang(){
           return this.$store.state.app.lang;
@@ -150,7 +150,7 @@
               return false
             }
           });
-          if (!openpageHasTag) {  //  解决关闭当前标签后再点击回退按钮会退到当前页时没有标签的问题
+          if (!openpageHasTag) { 
             util.openNewPage(this, name as string, this.$route.params || {}, this.$route.query || {});
           }
         }

diff --git a/vue/src/views/setting/role/role.vue b/vue/src/views/setting/role/role.vue
@@ -163,9 +163,4 @@
             })
         }
     }
-</script>
-
-<style>
-
-</style>
-
+</script>
diff --git a/vue/src/views/setting/user/user.vue b/vue/src/views/setting/user/user.vue
@@ -190,9 +190,4 @@
             })
         }
     }
-</script>
-
-<style>
-
-</style>
-
+</script>