Merge pull request #326 from zorc/master

Update iView to 3.x

Author: alirizaadiyahsi

vue/package.json

@@ -11,25 +11,26 @@
     "abp-web-resources": "^3.8.2",
     "axios": "^0.18.0",
     "famfamfam-flags": "^1.0.0",
-    "iview": "^2.13.1",
+    "iview": "^3.0.0",
     "js-cookie": "^2.2.0",
     "register-service-worker": "^1.0.0",
-    "vue": "^2.5.16",
+    "vue": "^2.5.17",
     "vue-class-component": "^6.0.0",
-    "vue-property-decorator": "^6.0.0",
+    "vue-property-decorator": "^7.0.0",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
     "@types/axios": "^0.14.0",
     "@types/js-cookie": "^2.1.0",
-    "@vue/cli-plugin-babel": "^3.0.0-beta.9",
-    "@vue/cli-plugin-pwa": "^3.0.0-beta.9",
-    "@vue/cli-plugin-typescript": "^3.0.0-beta.9",
-    "@vue/cli-service": "^3.0.0-beta.9",
+    "@vue/cli-plugin-babel": "^3.0.4",
+    "@vue/cli-plugin-pwa": "^3.0.4",
+    "@vue/cli-plugin-typescript": "^3.0.4",
+    "@vue/cli-service": "^3.0.4",
     "less": "^2.7.3",
     "less-loader": "^4.0.5",
-    "vue-template-compiler": "^2.5.13"
+    "vue-template-compiler": "^2.5.17",
+    "typescript": "^3.0.0"
   },
   "babel": {
     "presets": [

vue/src/iview.d.ts

@@ -1,5 +1,4 @@
 import axios from 'axios'
-import Util from './util'
 import appconst from './appconst'
 import Vue from 'vue'
 const ajax = axios.create({

vue/src/lib/ajax.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import Vue from 'vue';
 import {FieldType,CompareType,Filter} from '../store/entities/filter'
 import appconst from './appconst'

vue/src/lib/util.ts

@@ -1,19 +1,16 @@
-import Vue from 'vue'
-import App from './app.vue'
-import iView from 'iview'
+import Vue from 'vue';
+import App from './app.vue';
+import iView from 'iview';
 import {router} from './router/index';
-//import 'iview/dist/styles/iview.css';
 import 'famfamfam-flags/dist/sprite/famfamfam-flags.css';
 import './theme.less';
-import Vuex from 'vuex';
 import Ajax from './lib/ajax';
-import Util from './lib/util'
-import SignalRAspNetCoreHelper from './lib/SignalRAspNetCoreHelper'
+import Util from './lib/util';
+import SignalRAspNetCoreHelper from './lib/SignalRAspNetCoreHelper';
 Vue.use(iView);
-//Vue.use(Vuex)
 import store from './store/index';
-Vue.config.productionTip = false
-import { appRouters,otherRouters} from './router/router'
+Vue.config.productionTip = false;
+import { appRouters,otherRouters} from './router/router';
 if(!abp.utils.getCookieValue('Abp.Localization.CultureName')){
   let language=navigator.language;
   abp.utils.setCookieValue('Abp.Localization.CultureName',language,new Date(new Date().getTime() + 5 * 365 * 86400000),abp.appPath);

vue/src/main.ts

@@ -10,15 +10,15 @@ import main from '../views/main.vue'
 export const locking = {
     path: '/locking',
     name: 'locking',
-    component: () => System.import('../components/lockscreen/components/locking-page.vue')
+    component: () => import('../components/lockscreen/components/locking-page.vue')
 };
 export const loginRouter = {
     path: '/',
     name: 'login',
     meta: {
         title: 'LogIn'
     },
-    component:()=>System.import('../views/login.vue')
+    component:()=>import('../views/login.vue')
 };
 export const otherRouters={
     path:'/main',
@@ -27,7 +27,7 @@ export const otherRouters={
     meta:{title:'ManageMenu'},
     component:main,
     children:[
-        {path: 'home', meta:{title:'HomePage'}, name: 'home', component:()=>System.import('../views/home/home.vue')}
+        {path: 'home', meta:{title:'HomePage'}, name: 'home', component:()=>import('../views/home/home.vue')}
     ]
 }
 export const appRouters=[{
@@ -38,9 +38,9 @@ export const appRouters=[{
     icon:'',
     component:main,
     children:[
-        {path: 'user',permission:'Pages.Users', meta:{title:'Users'}, name: 'user', component:()=>System.import('../views/setting/user/user.vue')},
-        {path: 'role',permission:'Pages.Roles', meta:{title:'Roles'}, name: 'role', component:()=>System.import('../views/setting/role/role.vue')},
-        {path: 'tenant',permission:'Pages.Tenants', meta:{title:'Tenants'}, name: 'tenant', component:()=>System.import('../views/setting/tenant/tenant.vue')}
+        {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/router/router.ts

@@ -4,8 +4,7 @@ import ListState from './list-state'
 import Role from '../entities/role'
 import Ajax from '../../lib/ajax'
 import PageResult from '@/store/entities/page-result';
-import ListMutations from './list-mutations'
-import { stat } from 'fs';
+
 interface RoleState extends ListState<Role>{
     editRole:Role;
     permissions:Array<string>

vue/src/store/modules/role.ts

@@ -6,7 +6,7 @@ import Role from '../entities/role'
 import Ajax from '../../lib/ajax'
 import PageResult from '@/store/entities/page-result';
 import ListMutations from './list-mutations'
-import { stat } from 'fs';
+
 interface UserState extends ListState<User>{
     editUser:User,
     roles:Role[]