Merge pull request #378 from personball/master

Fix vue template when add more routers in appRouters

Author: ismcagdas

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-zh-Hans.xml

@@ -15,6 +15,10 @@
     <text name="UserNameOrEmail" value="用户名或邮箱地址" />
     <text name="Password" value="密码" />
     <text name="RememberMe" value="记住我" />
+    <text name="ForgetPassword" value="忘记密码"/>
+    <text name="NotSelected" value="未选"/>
+    <text name="ChangeTenant" value="更改租户"/>
+    <text name="LeaveEmptyToSwitchToHost" value="留空以切换到Host"/>
     <text name="LogIn" value="登录" />
     <text name="LoginFailed" value="登录失败!" />
     <text name="AppName" >AbpProjectName</text>

vue/src/lib/util.ts

@@ -1,5 +1,4 @@
 import Vue from 'vue';
-import {FieldType,CompareType,Filter} from '../store/entities/filter'
 import appconst from './appconst'
 class Util{
     abp:any=window.abp;

vue/src/router/router.ts

@@ -1,46 +1,59 @@
 declare global {
+    interface RouterMeta {
+        title: string;
+    }
+    interface Router {
+        path: string;
+        name: string;
+        icon?: string;
+        permission?: string;
+        meta?: RouterMeta;
+        component: any;
+        children?: Array<Router>;
+    }
     interface System {
-      import (request: string): Promise<any>
+        import(request: string): Promise<any>
     }
     var System: System
 }
 import login from '../views/login.vue'
 import home from '../views/home/home.vue'
 import main from '../views/main.vue'
+
 export const locking = {
     path: '/locking',
     name: 'locking',
     component: () => import('../components/lockscreen/components/locking-page.vue')
 };
-export const loginRouter = {
+export const loginRouter: Router = {
     path: '/',
     name: 'login',
     meta: {
         title: 'LogIn'
     },
-    component:()=>import('../views/login.vue')
+    component: () => import('../views/login.vue')
 };
-export const otherRouters={
-    path:'/main',
-    name:'main',
-    permission:'',
-    meta:{title:'ManageMenu'},
-    component:main,
-    children:[
-        {path: 'home', meta:{title:'HomePage'}, name: 'home', component:()=>import('../views/home/home.vue')}
+export const otherRouters: Router = {
+    path: '/main',
+    name: 'main',
+    permission: '',
+    meta: { title: 'ManageMenu' },
+    component: main,
+    children: [
+        { path: 'home', meta: { title: 'HomePage' }, name: 'home', component: () => import('../views/home/home.vue') }
     ]
 }
-export const appRouters=[{
-    path:'/setting',
-    name:'setting',
-    permission:'',
-    meta:{title:'ManageMenu'},
-    icon:'&#xe68a;',
-    component:main,
-    children:[
-        {path: 'user',permission:'Pages.Users', meta:{title:'Users'}, name: 'user', component:()=>import('../views/setting/user/user.vue')},
-        {path: 'role',permission:'Pages.Roles', meta:{title:'Roles'}, name: 'role', component:()=>import('../views/setting/role/role.vue')},
-        {path: 'tenant',permission:'Pages.Tenants', meta:{title:'Tenants'}, name: 'tenant', component:()=>import('../views/setting/tenant/tenant.vue')}
+export const appRouters: Array<Router> = [{
+    path: '/setting',
+    name: 'setting',
+    permission: '',
+    meta: { title: 'ManageMenu' },
+    icon: '&#xe68a;',
+    component: main,
+    children: [
+        { path: 'user', permission: 'Pages.Users', meta: { title: 'Users' }, name: 'user', component: () => import('../views/setting/user/user.vue') },
+        { path: 'role', permission: 'Pages.Roles', meta: { title: 'Roles' }, name: 'role', component: () => import('../views/setting/role/role.vue') },
+        { path: 'tenant', permission: 'Pages.Tenants', meta: { title: 'Tenants' }, name: 'tenant', component: () => import('../views/setting/tenant/tenant.vue') }
     ]
 }]
 export const routers = [

vue/src/store/entities/filter.ts

@@ -1,46 +1,46 @@
-import { appRouters,otherRouters} from '../../router/router'
+import { appRouters, otherRouters } from '../../router/router'
 import Util from '../../lib/util';
 import Vue from 'vue';
-import {Store,Module,ActionContext} from 'vuex'
+import { Store, Module, ActionContext } from 'vuex'
 import Vuex from 'vuex';
-import ajax from '../../lib/ajax' 
+import ajax from '../../lib/ajax'
 import appconst from '../../lib/appconst'
 Vue.use(Vuex);
-interface AppState{
-    cachePage:Array<any>;
-    lang:string;
+interface AppState {
+    cachePage: Array<any>;
+    lang: string;
     isFullScreen: boolean;
     openedSubmenuArr: Array<any>;
     menuTheme: string;
     themeColor: string,
-    pageOpenedList:Array<any>;
+    pageOpenedList: Array<any>;
     currentPageName: string;
-    currentPath:Array<any>;
+    currentPath: Array<any>;
     menuList: Array<any>;
-    routers:Array<any>;
+    routers: Array<any>;
     tagsList: Array<any>;
     messageCount: number;
-    dontCache:Array<any>;
-    noticeList:Array<any>;
+    dontCache: Array<any>;
+    noticeList: Array<any>;
 }
-class AppModule implements Module<AppState,any>{
-    namespaced=true;
-    state={
+class AppModule implements Module<AppState, any>{
+    namespaced = true;
+    state = {
         cachePage: [],
         lang: '',
         isFullScreen: false,
-        openedSubmenuArr: [], 
+        openedSubmenuArr: [],
         menuTheme: 'dark',
         themeColor: '',
         pageOpenedList: [{
-            meta:{title: 'HomePage'},
+            meta: { title: 'HomePage' },
             path: '',
             name: 'home'
         }],
         currentPageName: '',
         currentPath: [
             {
-                meta:{title: 'HomePage'},
+                meta: { title: 'HomePage' },
                 path: '',
                 name: 'home'
             }
@@ -53,35 +53,34 @@ class AppModule implements Module<AppState,any>{
         tagsList: [...otherRouters.children],
         messageCount: 0,
         dontCache: [],
-        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'}]
+        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){
+    mutations = {
+        logout(state: AppState) {
             localStorage.clear();
             sessionStorage.clear();
         },
-        setTagsList (state:AppState, list:Array<any>) {
+        setTagsList(state: AppState, list: Array<any>) {
             state.tagsList.push(...list);
         },
-        updateMenulist (state:AppState) {
-            let menuList:Array<any> = [];
+        updateMenulist(state: AppState) {
+            let menuList: Array<Router> = [];
             appRouters.forEach((item, index) => {
                 if (item.permission !== undefined) {
-                    let childrenArr = [];
-                    childrenArr = item.children.filter(child => {
-                        let childany=child as any;
-                        if (childany.permission !== undefined) {
-                            if(Util.abp.auth.hasPermission(childany.permission)){
+                    let hasPermissionMenuArr: Array<Router> = [];
+                    hasPermissionMenuArr = item.children.filter(child => {
+                        if (child.permission !== undefined) {
+                            if (Util.abp.auth.hasPermission(child.permission)) {
                                 return child;
-                            }                            
+                            }
                         } else {
                             return child;
                         }
                     });
-                    if(childrenArr.length>0){
-                        item.children=childrenArr;
+                    if (hasPermissionMenuArr.length > 0) {
+                        item.children = hasPermissionMenuArr;
                         menuList.push(item);
-                    }                   
+                    }
                 } else {
                     if (item.children.length === 1) {
                         menuList.push(item);
@@ -99,13 +98,13 @@ class AppModule implements Module<AppState,any>{
             });
             state.menuList = menuList;
         },
-        changeMenuTheme (state:AppState, theme:string) {
+        changeMenuTheme(state: AppState, theme: string) {
             state.menuTheme = theme;
         },
-        changeMainTheme (state:AppState, mainTheme:string) {
+        changeMainTheme(state: AppState, mainTheme: string) {
             state.themeColor = mainTheme;
         },
-        addOpenSubmenu (state:AppState, name:any) {
+        addOpenSubmenu(state: AppState, name: any) {
             let hasThisName = false;
             let isEmpty = false;
             if (name.length === 0) {
@@ -118,26 +117,26 @@ class AppModule implements Module<AppState,any>{
                 state.openedSubmenuArr.push(name);
             }
         },
-        closePage (state:AppState, name:any) {
+        closePage(state: AppState, name: any) {
             state.cachePage.forEach((item, index) => {
                 if (item === name) {
                     state.cachePage.splice(index, 1);
                 }
             });
         },
-        initCachepage (state:AppState) {
+        initCachepage(state: AppState) {
             if (localStorage.cachePage) {
                 state.cachePage = JSON.parse(localStorage.cachePage);
             }
         },
-        removeTag (state:AppState, name:string) {
+        removeTag(state: AppState, name: string) {
             state.pageOpenedList.map((item, index) => {
                 if (item.name === name) {
                     state.pageOpenedList.splice(index, 1);
                 }
             });
         },
-        pageOpenedList (state:AppState, get:any) {
+        pageOpenedList(state: AppState, get: any) {
             let openedPage = state.pageOpenedList[get.index];
             if (get.argu) {
                 openedPage.argu = get.argu;
@@ -148,12 +147,12 @@ class AppModule implements Module<AppState,any>{
             state.pageOpenedList.splice(get.index, 1, openedPage);
             localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
         },
-        clearAllTags (state:AppState) {
+        clearAllTags(state: AppState) {
             state.pageOpenedList.splice(1);
             state.cachePage.length = 0;
             localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
         },
-        clearOtherTags (state:AppState, vm:Vue) {
+        clearOtherTags(state: AppState, vm: Vue) {
             let currentName = vm.$route.name;
             let currentIndex = 0;
             state.pageOpenedList.forEach((item, index) => {
@@ -173,34 +172,34 @@ class AppModule implements Module<AppState,any>{
             state.cachePage = newCachepage;
             localStorage.pageOpenedList = JSON.stringify(state.pageOpenedList);
         },
-        setOpenedList (state:AppState) {
+        setOpenedList(state: AppState) {
             state.pageOpenedList = localStorage.pageOpenedList ? JSON.parse(localStorage.pageOpenedList) : [otherRouters.children[0]];
         },
-        setCurrentPath (state:AppState, pathArr:Array<any>) {
+        setCurrentPath(state: AppState, pathArr: Array<any>) {
             state.currentPath = pathArr;
         },
-        setCurrentPageName (state:AppState, name:string) {
+        setCurrentPageName(state: AppState, name: string) {
             state.currentPageName = name;
         },
-        clearOpenedSubmenu (state:AppState) {
+        clearOpenedSubmenu(state: AppState) {
             state.openedSubmenuArr.length = 0;
         },
-        increateTag (state:AppState, tagObj:any) {
+        increateTag(state: AppState, tagObj: any) {
             if (!Util.oneOf(tagObj.name, state.dontCache)) {
                 state.cachePage.push(tagObj.name);
                 localStorage.cachePage = JSON.stringify(state.cachePage);
             }
             state.pageOpenedList.push(tagObj);
         }
     }
-    actions={
-        async login(content:ActionContext<AppState,any>,payload:any){
-            let rep=await ajax.post("/api/TokenAuth/Authenticate",payload.data);
+    actions = {
+        async login(content: ActionContext<AppState, any>, payload: any) {
+            let rep = await ajax.post("/api/TokenAuth/Authenticate", payload.data);
             var tokenExpireDate = payload.data.rememberMe ? (new Date(new Date().getTime() + 1000 * rep.data.result.expireInSeconds)) : undefined;
-            Util.abp.auth.setToken(rep.data.result.accessToken,tokenExpireDate);
-            Util.abp.utils.setCookieValue(appconst.authorization.encrptedAuthTokenName,rep.data.result.encryptedAccessToken,tokenExpireDate,Util.abp.appPath)
+            Util.abp.auth.setToken(rep.data.result.accessToken, tokenExpireDate);
+            Util.abp.utils.setCookieValue(appconst.authorization.encrptedAuthTokenName, rep.data.result.encryptedAccessToken, tokenExpireDate, Util.abp.appPath)
         },
     }
 }
-const appModule=new AppModule();
+const appModule = new AppModule();
 export default appModule;

vue/src/store/modules/app.ts

@@ -38,10 +38,9 @@
 </template>
 <script lang="ts">
     import { Component, Vue,Inject, Prop,Watch } from 'vue-property-decorator';
-    import Util from '../../../lib/util'
-    import AbpBase from '../../../lib/abpbase'
-    import {FieldType,Filter,CompareType} from '../../../store/entities/filter'
-    import PageRequest from '../../../store/entities/page-request'
+    import Util from '@/lib/util'
+    import AbpBase from '@/lib/abpbase'
+    import PageRequest from '@/store/entities/page-request'
     import CreateRole from './create-role.vue'
     import EditRole from './edit-role.vue'
    

vue/src/views/setting/role/role.vue

@@ -43,10 +43,9 @@
 </template>
 <script lang="ts">
     import { Component, Vue,Inject, Prop,Watch } from 'vue-property-decorator';
-    import Util from '../../../lib/util'
-    import AbpBase from '../../../lib/abpbase'
-    import {FieldType,Filter,CompareType} from '../../../store/entities/filter'
-    import PageRequest from '../../../store/entities/page-request'
+    import Util from '@/lib/util'
+    import AbpBase from '@/lib/abpbase'
+    import PageRequest from '@/store/entities/page-request'
     import CreateTenant from './create-tenant.vue'
     import EditTenant from './edit-tenant.vue'
     

vue/src/views/setting/tenant/tenant.vue

@@ -48,10 +48,9 @@
 </template>
 <script lang="ts">
     import { Component, Vue,Inject, Prop,Watch } from 'vue-property-decorator';
-    import Util from '../../../lib/util'
-    import AbpBase from '../../../lib/abpbase'
-    import {FieldType,Filter,CompareType} from '../../../store/entities/filter'
-    import PageRequest from '../../../store/entities/page-request'
+    import Util from '@/lib/util'
+    import AbpBase from '@/lib/abpbase'
+    import PageRequest from '@/store/entities/page-request'
     import CreateUser from './create-user.vue'
     import EditUser from './edit-user.vue'
     class  PageUserRequest extends PageRequest{