Merge pull request #366 from personball/master

fix errors in vue template when run yarn serve

Author: ismcagdas

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

@@ -61,5 +61,21 @@
     <text name="PasswordRequireNonAlphanumeric">密码至少需要包含一个特殊字符（非字母或数字的字符）.</text>
     <text name="PasswordRequireUppercase">密码至少需要一位是A到Z的大写字母.</text>
     <text name="PasswordTooShort">密码长度太短</text>
+
+     <text name="UserName">用户名</text>
+    <text name="Name">名称</text>
+    <text name="IsActive">是否启用</text>
+    <text name="LastLoginTime">最近登陆时间</text>
+    <text name="RoleName">角色名</text>
+    <text name="DisplayName">显示名</text>
+    <text name="Description">描述</text>
+    <text name="IsStatic">是否内置</text>
+
+    <text name="All">全部</text>
+    <text name="Actived">启用</text>
+    <text name="NoActive">未启用</text>
+    
+    <text name="Yes">是</text>
+    <text name="No">否</text>
   </texts>
 </localizationDictionary>

vue/README.md

@@ -0,0 +1,35 @@
+# ASP.NET Boilerplate VueJS Template
+
+The Vue.js integration for ABP Boilerplate framework. This template is built on Vue+iview+Typescript.
+
+![](_screenshots/roles.png)
+
+## Getting Started
+
+### Installing
+
+
+```sh
+cd vue
+yarn install 
+```
+
+And then start
+
+```
+yarn serve
+```
+
+## Deployment
+
+```sh
+yarn build
+```
+
+## Built With
+
+* [Vue](https://vuejs.org/) - The Progressive JavaScript Framework
+* [Typescript](https://www.typescriptlang.org/) - Used for static typing
+* [Vuex](https://vuex.vuejs.org/) - Vuex is a state management pattern + library for Vue.js applications. 
+* [iView](https://www.iviewui.com/) - A High quality and rich functions, friendly APIs, free and flexible UI Toolkit based on Vue.js.
+

vue/_screenshots/roles.png

@@ -11,7 +11,7 @@
     "abp-web-resources": "^3.8.2",
     "axios": "^0.18.0",
     "famfamfam-flags": "^1.0.0",
-    "iview": "^3.0.0",
+    "iview": "~3.0.0",
     "js-cookie": "^2.2.0",
     "register-service-worker": "^1.0.0",
     "vue": "^2.5.17",

vue/package.json

@@ -107,7 +107,7 @@
         },{
             title:this.L('IsStatic'),
             render:(h:any,params:any)=>{
-                return h('span',params.row.isStatic?'是':'否')
+                return h('span',params.row.isStatic?this.L('Yes'):this.L('No'))
             }
         },{
             title:this.L('Actions'),

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

@@ -10,7 +10,7 @@
                             </FormItem>
                         </Col>
                         <Col span="8">
-                            <FormItem :label="L('TenantName')+':'" style="width:100%">
+                            <FormItem :label="L('Name')+':'" style="width:100%">
                                 <Input v-model="filters[0].Value"></Input>
                             </FormItem>
                         </Col>                        
@@ -112,7 +112,7 @@
             title:this.L('TenancyName'),
             key:'tenancyName'
         },{
-            title:this.L('TenantName'),
+            title:this.L('Name'),
             key:'name'
         },{
             title:this.L('IsActive'),

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

@@ -3706,9 +3706,9 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "http://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-iview@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/iview/-/iview-3.1.3.tgz#c99ca1d5dad48fb4df17d75b95554d16bd05ab77"
+iview@~3.0.0:
+  version "3.0.1"
+  resolved "http://registry.npm.taobao.org/iview/download/iview-3.0.1.tgz#705128658d102ff4f85b0015e49477c23b1967bf"
   dependencies:
     async-validator "^1.8.2"
     deepmerge "^2.1.0"
@@ -6612,10 +6612,14 @@ [email protected]:
   dependencies:
     indexof "0.0.1"
 
-vue-class-component@^6.0.0, vue-class-component@^6.2.0:
+vue-class-component@^6.0.0:
   version "6.2.0"
   resolved "http://registry.npm.taobao.org/vue-class-component/download/vue-class-component-6.2.0.tgz#7adb1daa9a868c75f30f97f33f4f1b94aee62089"
 
+vue-class-component@^6.2.0:
+  version "6.3.2"
+  resolved "http://registry.npm.taobao.org/vue-class-component/download/vue-class-component-6.3.2.tgz#e6037e84d1df2af3bde4f455e50ca1b9eec02be6"
+
 vue-hot-reload-api@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
@@ -6632,7 +6636,7 @@ vue-loader@^15.4.2:
 
 vue-property-decorator@^7.0.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-7.2.0.tgz#8e6b0f4dcc630c357135f76366ba7bd91f1db015"
+  resolved "http://registry.npm.taobao.org/vue-property-decorator/download/vue-property-decorator-7.2.0.tgz#8e6b0f4dcc630c357135f76366ba7bd91f1db015"
   dependencies:
     vue-class-component "^6.2.0"