Merge remote-tracking branch 'origin/master'

app_web/src/components/app-form-group/app-form-group.less

 .app-form-group {
+
     >.ivu-card-head {
         >p {
             >i {
@@ -7,9 +8,12 @@
             }
         }
     }
+
     >.ivu-card-extra {
+
         .item-extract-mode {
             display: flex;
+
             .item {
                 margin-left: 12px;
             }
@@ -18,6 +22,7 @@
 }
 
 .app-form-group.app-group-collapse-contant {
+
     .ivu-card-body {
         display: none;
     }
@@ -25,9 +30,12 @@
 
 .app-group-flex {
     height: 100%;
-    overflow: auto;
-    > .ivu-card-body {
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    >.ivu-card-body {
         height: calc(100% - 51px);
-        overflow: auto;
+        overflow-y: auto;
+        overflow-x: hidden;
     }
 }
\ No newline at end of file

app_web/src/components/app-form-group/app-form-group.vue

 <template>
-    <div class="app-form-group">
-        <div v-if="uiStyle=='STYLE2'">
+    <div :class="classes">
+        <template v-if="uiStyle=='STYLE2'">
             <app-form-group2
                 :caption="caption"
                 :uiStyle="uiStyle"
@@ -10,8 +10,8 @@
                 :titleBarCloseMode="titleBarCloseMode">
                    <slot></slot>
                 </app-form-group2>
-        </div>
-        <div v-else>
+        </template>
+        <template v-else>
             <card v-if="isShowCaption === true" :bordered="false" :dis-hover="true" :class="classes">
                 <p class='' slot='title'>
                      <icon v-if="titleBarCloseMode !== 0" :type="collapseContant ? 'ios-arrow-dropright-circle' : 'ios-arrow-dropdown-circle'"
@@ -87,17 +87,17 @@
                         </template>
                     </a >
                 </template>
-                <div v-if="Object.is(layoutType, 'FLEX')">
+                <template v-if="Object.is(layoutType, 'FLEX')">
                     <slot></slot>
-                </div>
-                <div v-if="!Object.is(layoutType, 'FLEX')">
+                </template>
+                <template v-if="!Object.is(layoutType, 'FLEX')">
                     <row :gutter="10"><slot></slot></row>
-                </div>
+                </template>
             </card>
-            <row v-if="isShowCaption === false" :class="classes">
-               <slot></slot>
-            </row>
-        </div>
+            <template v-if="isShowCaption === false">
+                <slot></slot>
+            </template>
+        </template>
     </div>
 </template>
 

app_web/src/components/app-form-item/app-form-item.less

 .app-form-item {
-    // margin-bottom: 16px;
-    >.ivu-form-item-label {
-        text-decoration: none;
-        display: block;
-        overflow: hidden;
-        white-space: nowrap;
-    }
-    >.ivu-form-item-content {
-        min-height: 36px;
-    }
+  height: 100%;
+  .editor {
+      height: 100%;
+      .ivu-form-item-content {
+          height: 100%;
+          min-height: 36px;
+      }
+  }
+  .app-form-item-label {
+      padding: 6px 12px 6px 0px;
+  }
 }
-.app-form-item-label-top {
-    >.ivu-form-item-label {
-        float: none;
-        display: inline-block;
-        padding: 0 0 10px;
-    }
+
+.app-form-item.label-top, .app-form-item.label-bottom {
+  .app-form-item-label {
+      display: block;
+  }
 }
 
-.app-form-item-label-left{
-  .app-form-item-label{
-    float: left;
-    text-align: right;
-    padding-right: 12px;
+.app-form-item.label-left, .app-form-item.label-right {
+  .app-form-item-label, .editor {
+      height: 100%;
   }
 }
-.app-form-item-label-right{
-  .app-form-item-label{
-    float: right;
-    text-align: left;
-    padding-left: 12px;
+
+.app-form-item.label-left {
+  .app-form-item-label {
+      float: left;
   }
 }
-.app-form-item-label-top{
-  .app-form-item-label{
-    display: block;
-    padding-bottom: 10px;
+
+.app-form-item.label-right {
+  .app-form-item-label {
+      float: right;
+      padding-left: 12px;
   }
 }
-.app-form-item-label-bottom{
-  .app-form-item-label{
-    display: block;
-    padding-top: 10px;
+
+.app-form-item.label-none {
+  .app-form-item-label {
+      display: none !important;
   }
 }
\ No newline at end of file

app_web/src/utils/interceptor/interceptor.ts

@@ -132,13 +132,16 @@ export class Interceptors {
      * @memberof Interceptors
      */
     private doNoLogin(data: any = {}): void {
-        // 清除user和token
+        // 清除user、token和cookie
         if(localStorage.getItem('user')){
             localStorage.removeItem('user');
         }
         if(localStorage.getItem('token')){
             localStorage.removeItem('token');
         }
+        let leftTime = new Date();
+        leftTime.setTime(leftTime.getSeconds() - 1);
+        document.cookie = "ibzuaa-token=;expires=" + leftTime.toUTCString();
         if (data.loginurl && !Object.is(data.loginurl, '') && data.originurl && !Object.is(data.originurl, '')) {
             let _url = encodeURIComponent(encodeURIComponent(window.location.href));
             let loginurl: string = data.loginurl;

app_web/src/widgets/sys-app/main-grid/main-grid-service.ts

@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
                     response.data.id = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
         });
     }
 
-    /**
-     * 合并配置的默认值
-     * @param {*} 
-     * @memberof MainService
-     */
-    public mergeDefaults(response:any = {}){ 
-        if(response.data){                    
-        }
-    }
-
 
     /**
      * 前台逻辑

app_web/src/widgets/sys-auth-log/main-grid/main-grid-service.ts

@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
                     response.data.logid = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
         });
     }
 
-    /**
-     * 合并配置的默认值
-     * @param {*} 
-     * @memberof MainService
-     */
-    public mergeDefaults(response:any = {}){ 
-        if(response.data){                    
-        }
-    }
-
 
     /**
      * 前台逻辑

app_web/src/widgets/sys-permission/main-grid/main-grid-service.ts

@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
                     response.data.permissionid = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
         });
     }
 
-    /**
-     * 合并配置的默认值
-     * @param {*} 
-     * @memberof MainService
-     */
-    public mergeDefaults(response:any = {}){ 
-        if(response.data){                    
-        }
-    }
-
 
     /**
      * 前台逻辑

app_web/src/widgets/sys-role-permission/main-grid/main-grid-service.ts

@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
                     response.data.rolepermissionid = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
         });
     }
 
-    /**
-     * 合并配置的默认值
-     * @param {*} 
-     * @memberof MainService
-     */
-    public mergeDefaults(response:any = {}){ 
-        if(response.data){                    
-        }
-    }
-
 
     /**
      * 前台逻辑

app_web/src/widgets/sys-role/main-grid/main-grid-service.ts

@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
                     response.data.roleid = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
         });
     }
 
-    /**
-     * 合并配置的默认值
-     * @param {*} 
-     * @memberof MainService
-     */
-    public mergeDefaults(response:any = {}){ 
-        if(response.data){                    
-        }
-    }
-
 
     /**
      * 前台逻辑

app_web/src/widgets/sys-user-role/main-grid/main-grid-service.ts

@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
                     response.data.userroleid = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
         });
     }
 
-    /**
-     * 合并配置的默认值
-     * @param {*} 
-     * @memberof MainService
-     */
-    public mergeDefaults(response:any = {}){ 
-        if(response.data){                    
-        }
-    }
-
 
     /**
      * 前台逻辑

app_web/src/widgets/sys-user/main-grid/main-grid-service.ts

@@ -267,7 +267,6 @@ export default class MainService extends ControlService {
                     response.data.userid = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
-                this.mergeDefaults(response);
                 resolve(response);
             }).catch(response => {
                 reject(response);
@@ -275,16 +274,6 @@ export default class MainService extends ControlService {
         });
     }
 
-    /**
-     * 合并配置的默认值
-     * @param {*} 
-     * @memberof MainService
-     */
-    public mergeDefaults(response:any = {}){ 
-        if(response.data){                    
-        }
-    }
-
 
     /**
      * 前台逻辑

ibzuaa-app/ibzuaa-app-web/src/main/resources/keypair/ibzrt_rsa

+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKaTz4pgOR/p0RjlczM0dErf4ZUNziE/HJcfKDLPu77Gs2EJdDK0uGfPI3GX/eRwX9L9bTZJtz9sX2fkRqRt3gWnsMypT2P/cO/2GgtRCPHRFD7BI+Df32isEJZ6M4kD9tyKLw8Y9KuP0C20ZMMDeCrrbjMagMMrwTOM4/4eFjzVAgMBAAECgYEAnH3mj2hgolOmhg4hkOxpiGIV6lMi4OcKtAqoWDwCdHL12GbqTCytxZC7Cp+w/Wh5DZ3aeRL93c6xPsgdeaJh3kYa4ooo6b5tFHPU63VU5MBgwGzi26/6GB4GCXxGMB+SxmdigDmmPIYbXD+jO2oj1s8hj+DOE4U2fIjeZ//DumECQQDlA74KHNZlKxoWl0FoHCgcIHFBZcQWKO3puhrH7VsRYI7CVVguE57NBT6QvAmU9r32PDt64tS0Qd1sCrk4uEqtAkEAujSj/cwF4ctQZCbUoMMzK/mw8ZxW3M6VK3urbq8fyFJ2iT2aLV3jE3+tnDdpezcfnbs/9SVXeFmJpdg/L7hnyQJAQyxo1qCExmHxIgU1uyrfHPjrH2qRLIrO1gqvhkr5tkwjM59C4SkCIFLUejGdgeMp7wrVy4KzLzhOkT1H/PoZdQJAEbKxJ409veFKKcq7CPCkq3hXBg/a/a+w4+okOCfy+GJGG/M79TXoQFExWhi2MNzjZ2WFxbIf5zNzbszn7Iw1aQJBAIXpKrQ0sLxr0rFzsoHBrobPcnQeutzypQNTPkoItILVP9pWz+aUfIKnOHEC5GAdD2LPZZ/pF7ixdRd9nBab+pk=
\ No newline at end of file

ibzuaa-app/ibzuaa-app-web/src/main/resources/keypair/ibzrt_rsa.pub

+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmk8+KYDkf6dEY5XMzNHRK3+GVDc4hPxyXHygyz7u+xrNhCXQytLhnzyNxl/3kcF/S/W02Sbc/bF9n5Eakbd4Fp7DMqU9j/3Dv9hoLUQjx0RQ+wSPg399orBCWejOJA/bcii8PGPSrj9AttGTDA3gq624zGoDDK8EzjOP+HhY81QIDAQAB
\ No newline at end of file