fix vue template for issue#379

Author: personball

angular/src/shared/paged-listing-component-base.ts

@@ -13,7 +13,6 @@ export class EntityDto {
 export class PagedRequestDto {
     skipCount: number;
     maxResultCount: number;
-    keyword: string;
 }
 
 export abstract class PagedListingComponentBase<EntityDto> extends AppComponentBase implements OnInit {

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

@@ -5,18 +5,8 @@
                 <Form ref="queryForm" :label-width="90" label-position="left" inline>
                     <Row :gutter="16">
                         <Col span="8">
-                            <FormItem :label="L('RoleName')+':'" style="width:100%">
-                                <Input v-model="pagerequest.roleName"></Input>
-                            </FormItem>
-                        </Col>
-                        <Col span="8">
-                            <FormItem :label="L('DisplayName')+':'" style="width:100%">
-                                <Input v-model="pagerequest.displayName"></Input>
-                            </FormItem>
-                        </Col>
-                        <Col span="8">
-                            <FormItem :label="L('Description')+':'" style="width:100%">
-                                <Input v-model="pagerequest.description"></Input>
+                            <FormItem :label="L('Keyword')+':'" style="width:100%">
+                                <Input v-model="pagerequest.keyword" :placeholder="L('RoleName')+'/'+L('DisplayName')+'/'+L('Description')"></Input>
                             </FormItem>
                         </Col>
                     </Row>
@@ -45,9 +35,7 @@
     import EditRole from './edit-role.vue'
    
     class PageRoleRequest extends PageRequest{
-        roleName:string='';
-        displayName:string='';
-        description:string='';
+        keyword:string='';
     }
     
     @Component({

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

@@ -5,15 +5,10 @@
                 <Form ref="queryForm" :label-width="100" label-position="left" inline>
                     <Row :gutter="16">
                         <Col span="8">
-                            <FormItem :label="L('TenancyName')+':'" style="width:100%">
-                                <Input v-model="pagerequest.tenancyName"></Input>
+                            <FormItem :label="L('Keyword')+':'" style="width:100%">
+                                <Input v-model="pagerequest.keyword" :placeholder="L('TenancyName')+'/'+L('Name')"></Input>
                             </FormItem>
-                        </Col>
-                        <Col span="8">
-                            <FormItem :label="L('Name')+':'" style="width:100%">
-                                <Input v-model="pagerequest.name"></Input>
-                            </FormItem>
-                        </Col>                        
+                        </Col>                 
                         <Col span="8">
                             <FormItem :label="L('IsActive')+':'" style="width:100%">
                                 <!--Select should not set :value="'All'" it may not trigger on-change when first select 'NoActive'(or 'Actived') then select 'All'-->
@@ -50,9 +45,8 @@
     import EditTenant from './edit-tenant.vue'
     
     class PageTenantRequest extends PageRequest{
-        tenancyName:string=''
-        name:string=''
-        isActive:boolean=null
+        keyword:string='';
+        isActive:boolean=null;
     }
     
     @Component({

vue/src/views/setting/user/user.vue

@@ -5,13 +5,8 @@
                 <Form ref="queryForm" :label-width="80" label-position="left" inline>
                     <Row :gutter="16">
                         <Col span="6">
-                            <FormItem :label="L('UserName')+':'" style="width:100%">
-                                <Input v-model="pagerequest.userName"></Input>
-                            </FormItem>
-                        </Col>
-                        <Col span="6">
-                            <FormItem :label="L('Name')+':'" style="width:100%">
-                                <Input v-model="pagerequest.name"></Input>
+                            <FormItem :label="L('Keyword')+':'" style="width:100%">
+                                <Input v-model="pagerequest.keyword" :placeholder="L('UserName')+'/'+L('Name')"></Input>
                             </FormItem>
                         </Col>
                         <Col span="6">
@@ -54,8 +49,7 @@
     import CreateUser from './create-user.vue'
     import EditUser from './edit-user.vue'
     class  PageUserRequest extends PageRequest{
-        userName:string;
-        name:string;
+        keyword:string;
         isActive:boolean=null;//nullable
         from:Date;
         to:Date;