ibizdev提交

app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue

@@ -1089,9 +1089,11 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
     protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         const batchAddPSAppViews=[
             {view:{viewname:'sys-permissionmpickup-view',height: 0,width: 0,title: '权限表数据多项选择视图'},
-            res:['SYS_PERMISSION'],'resAppKey':'sys_permissionid'},
+            res:['SYS_PERMISSION'],
+            'resAppKey':'permissionid'},
             {view:{viewname:'sys-rolempickup-view',height: 0,width: 0,title: '角色数据多项选择视图'},
-            res:['SYS_ROLE'],'resAppKey':'sys_roleid'}
+            res:['SYS_ROLE'],
+            'resAppKey':'roleid'}
         ];
         if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
             this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue

@@ -1089,9 +1089,11 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
     protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         const batchAddPSAppViews=[
             {view:{viewname:'sys-rolempickup-view',height: 0,width: 0,title: '角色数据多项选择视图'},
-            res:['SYS_ROLE'],'resAppKey':'sys_roleid'},
+            res:['SYS_ROLE'],
+            'resAppKey':'roleid'},
             {view:{viewname:'sys-usermpickup-view',height: 0,width: 0,title: '用户表数据多项选择视图'},
-            res:['SYS_USER'],'resAppKey':'userid'}
+            res:['SYS_USER'],
+            'resAppKey':'userid'}
         ];
         if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
             this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });

app_web/src/widgets/sys-permission/default-searchform/default-searchform-base.vue

@@ -2,7 +2,7 @@
     <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
   <row>
-    <i-col span="20">
+    <i-col span="20" class="form-content">
       <row>
                     <i-col v-show="detailsModel.n_sys_permissionname_like.visible" :style="{}"  :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
               <app-form-item name='n_sys_permissionname_like' :itemRules="this.rules.n_sys_permissionname_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_sys_permissionname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_permissionname_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
@@ -30,7 +30,7 @@
           </i-col>
       </row>
     </i-col>
-    <i-col span="4">
+    <i-col span="4" class="search-button">
       <row v-show="Object.keys(data).length>0">
         <i-button class='search_reset'  size="default" type="primary"  @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
         <i-button class='search_reset'  size="default"  @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>

app_web/src/widgets/sys-permission/default-searchform/default-searchform.less

@@ -13,6 +13,9 @@
       margin-right: 12px;
       margin-bottom: 8px;
   }
+  .search-button{
+      text-align: right;
+  }
 }
 .app-search-form-flex {
     height: 100%;

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -486,7 +486,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @type {number}
     * @memberof AppIndex
     */
-    protected checkboxColWidth: number = 80;
+    protected checkboxColWidth: number = 50;
 
     /**
      * 是否允许拖动列宽

app_web/src/widgets/sys-role-permission/default-searchform/default-searchform-base.vue

@@ -2,11 +2,11 @@
     <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
   <row>
-    <i-col span="20">
+    <i-col span="20" class="form-content">
       <row>
                 </row>
     </i-col>
-    <i-col span="4">
+    <i-col span="4" class="search-button">
       <row v-show="Object.keys(data).length>0">
         <i-button class='search_reset'  size="default" type="primary"  @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
         <i-button class='search_reset'  size="default"  @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>

app_web/src/widgets/sys-role-permission/default-searchform/default-searchform.less

@@ -13,6 +13,9 @@
       margin-right: 12px;
       margin-bottom: 8px;
   }
+  .search-button{
+      text-align: right;
+  }
 }
 .app-search-form-flex {
     height: 100%;

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -491,7 +491,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @type {number}
     * @memberof AppIndex
     */
-    protected checkboxColWidth: number = 80;
+    protected checkboxColWidth: number = 50;
 
     /**
      * 是否允许拖动列宽

app_web/src/widgets/sys-role/default-searchform/default-searchform-base.vue

@@ -2,7 +2,7 @@
     <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
   <row>
-    <i-col span="20">
+    <i-col span="20" class="form-content">
       <row>
                     <i-col v-show="detailsModel.n_sys_rolename_like.visible" :style="{}"  :lg="{ span: 8, offset: 0 }">
               <app-form-item name='n_sys_rolename_like' :itemRules="this.rules.n_sys_rolename_like" class='' :caption="$t('entities.sys_role.default_searchform.details.n_sys_rolename_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_rolename_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
@@ -24,7 +24,7 @@
           </i-col>
       </row>
     </i-col>
-    <i-col span="4">
+    <i-col span="4" class="search-button">
       <row v-show="Object.keys(data).length>0">
         <i-button class='search_reset'  size="default" type="primary"  @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
         <i-button class='search_reset'  size="default"  @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>

app_web/src/widgets/sys-role/default-searchform/default-searchform.less

@@ -13,6 +13,9 @@
       margin-right: 12px;
       margin-bottom: 8px;
   }
+  .search-button{
+      text-align: right;
+  }
 }
 .app-search-form-flex {
     height: 100%;

app_web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -498,7 +498,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @type {number}
     * @memberof AppIndex
     */
-    protected checkboxColWidth: number = 80;
+    protected checkboxColWidth: number = 50;
 
     /**
      * 是否允许拖动列宽

app_web/src/widgets/sys-user-role/default-searchform/default-searchform-base.vue

@@ -2,11 +2,11 @@
     <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
   <row>
-    <i-col span="20">
+    <i-col span="20" class="form-content">
       <row>
                 </row>
     </i-col>
-    <i-col span="4">
+    <i-col span="4" class="search-button">
       <row v-show="Object.keys(data).length>0">
         <i-button class='search_reset'  size="default" type="primary"  @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
         <i-button class='search_reset'  size="default"  @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>

app_web/src/widgets/sys-user-role/default-searchform/default-searchform.less

@@ -13,6 +13,9 @@
       margin-right: 12px;
       margin-bottom: 8px;
   }
+  .search-button{
+      text-align: right;
+  }
 }
 .app-search-form-flex {
     height: 100%;

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -505,7 +505,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @type {number}
     * @memberof AppIndex
     */
-    protected checkboxColWidth: number = 80;
+    protected checkboxColWidth: number = 50;
 
     /**
      * 是否允许拖动列宽

app_web/src/widgets/sys-user/default-searchform/default-searchform-base.vue

@@ -2,11 +2,11 @@
     <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
   <row>
-    <i-col span="20">
+    <i-col span="20" class="form-content">
       <row>
                 </row>
     </i-col>
-    <i-col span="4">
+    <i-col span="4" class="search-button">
       <row v-show="Object.keys(data).length>0">
         <i-button class='search_reset'  size="default" type="primary"  @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
         <i-button class='search_reset'  size="default"  @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>

app_web/src/widgets/sys-user/default-searchform/default-searchform.less

@@ -13,6 +13,9 @@
       margin-right: 12px;
       margin-bottom: 8px;
   }
+  .search-button{
+      text-align: right;
+  }
 }
 .app-search-form-flex {
     height: 100%;

app_web/src/widgets/sys-user/main-grid/main-grid-base.vue

@@ -491,7 +491,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @type {number}
     * @memberof AppIndex
     */
-    protected checkboxColWidth: number = 80;
+    protected checkboxColWidth: number = 50;
 
     /**
      * 是否允许拖动列宽