tony001 发布系统代码 [后台服务，演示应用]

app_Web/src/widgets/ibizappeditor/default-searchform/default-searchform-base.vue

@@ -590,7 +590,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -626,7 +626,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list-base.vue

@@ -46,11 +46,11 @@
             <span class="quick-toolbar">
                             <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_quicktoolbarModels.deuiaction1.visabled" :disabled="listviewlist_quicktoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-file-text-o'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
             </div>
             </span>
@@ -61,18 +61,18 @@
         <span class="batch-toolbar">
                     <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction1.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction2.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction2.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.disabled" class='' v-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
         </span>
@@ -354,7 +354,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
          const _this: any = this;
@@ -374,7 +374,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -400,7 +400,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -575,9 +575,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_quicktoolbarModels: any = {
+    public usr4listview_layoutlist_quicktoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
     };
@@ -587,9 +587,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_batchtoolbarModels: any = {
+    public usr4listview_layoutlist_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -812,7 +812,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public load(opt: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -928,7 +928,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -1023,7 +1023,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1031,7 +1031,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue

@@ -291,7 +291,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZOrderSF1GridViewBase
+     * @memberof IBIZOrderPickupGridViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -413,20 +413,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -959,7 +945,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1054,7 +1040,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1160,7 +1146,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -2077,7 +2063,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2085,7 +2071,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){
@@ -2152,7 +2138,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts

@@ -104,21 +104,6 @@ export default class MainModel {
         prop: 'n_ibizordername_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_orderstate_eq',
-        prop: 'n_orderstate_eq',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_gt',
-        prop: 'n_ordertime_gt',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_ordertime_lt',
-        prop: 'n_ordertime_lt',
-        dataType: 'QUERYPARAM'
-      },
 
         {
           name:'size',

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPINDEXVIEWS/index.json

@@ -23,23 +23,6 @@
     "layoutMode" : "FLEX",
     "logicName" : "index",
     "name" : "layoutpanel",
-    "getPSAppViewLogics" : [ {
-      "logicTrigger" : "CUSTOM",
-      "logicType" : "APPVIEWUIACTION",
-      "name" : "layoutpanel_auth_logout1_click",
-      "getPSAppViewUIAction" : {
-        "modelref" : true,
-        "id" : "layoutpanel_auth_logout1"
-      }
-    } ],
-    "getPSAppViewUIActions" : [ {
-      "name" : "layoutpanel_auth_logout1",
-      "getPSUIAction" : {
-        "modelref" : true,
-        "id" : "panel_Usr1101864241_auth_logout1_click"
-      },
-      "xDataControlName" : "layoutpanel"
-    } ],
     "getPSControlParam" : { },
     "getPSLayout" : {
       "layout" : "FLEX"
@@ -154,7 +137,7 @@
         "showCaption" : true
       }, {
         "caption" : "面板容器",
-        "contentWidth" : 20.0,
+        "contentWidth" : 10.0,
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
         "name" : "container_scroll_left1",
@@ -164,7 +147,7 @@
         "getPSLayoutPos" : {
           "layout" : "BORDER",
           "layoutPos" : "WEST",
-          "width" : 20,
+          "width" : 10,
           "widthMode" : "PERCENTAGE"
         },
         "getPSPanelItems" : [ {
@@ -178,7 +161,7 @@
           },
           "showCaption" : true
         } ],
-        "width" : 20.0,
+        "width" : 10.0,
         "showCaption" : true
       }, {
         "caption" : "面板容器",
@@ -217,7 +200,7 @@
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : 3,
+              "grow" : 2,
               "layout" : "SIMPLEFLEX"
             },
             "getPSPanelItems" : [ {
@@ -248,7 +231,7 @@
               "layout" : "SIMPLEFLEX"
             },
             "getPSLayoutPos" : {
-              "grow" : 6,
+              "grow" : 7,
               "layout" : "SIMPLEFLEX"
             },
             "getPSPanelItems" : [ {
@@ -264,6 +247,7 @@
               },
               "getPSLayoutPos" : {
                 "grow" : -1,
+                "hAlignSelf" : "LEFT",
                 "layout" : "SIMPLEFLEX"
               },
               "getPSPanelItems" : [ {
@@ -313,36 +297,6 @@
                 "predefinedType" : "AUTH_USERINFO"
               },
               "showCaption" : true
-            }, {
-              "actionType" : "UIACTION",
-              "buttonStyle" : "DEFAULT",
-              "caption" : "登出",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "BUTTON",
-              "name" : "auth_logout1",
-              "getPSAppViewUIAction" : {
-                "modelref" : true,
-                "id" : "layoutpanel_auth_logout1"
-              },
-              "getPSLayoutPos" : {
-                "grow" : -1,
-                "hAlignSelf" : "RIGHT",
-                "layout" : "SIMPLEFLEX",
-                "vAlignSelf" : "MIDDLE"
-              },
-              "getPSUIAction" : {
-                "caption" : "登出",
-                "codeName" : "panel_Usr1101864241_auth_logout1_click",
-                "fullCodeName" : "panel_Usr1101864241_auth_logout1_click",
-                "name" : "登出",
-                "predefinedType" : "APP_LOGOUT",
-                "timeout" : 60000,
-                "uIActionMode" : "SYS",
-                "uIActionTag" : "panel_Usr1101864241_auth_logout1_click",
-                "uIActionType" : "DEUIACTION"
-              },
-              "tooltip" : "登出",
-              "showCaption" : true
             } ]
           } ]
         } ],

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json

@@ -1119,16 +1119,6 @@
     "uIActionTag" : "ToggleRowEdit",
     "uIActionType" : "DEUIACTION",
     "enableToggleMode" : true
-  }, {
-    "caption" : "登出",
-    "codeName" : "panel_Usr1101864241_auth_logout1_click",
-    "fullCodeName" : "panel_Usr1101864241_auth_logout1_click",
-    "name" : "登出",
-    "predefinedType" : "APP_LOGOUT",
-    "timeout" : 60000,
-    "uIActionMode" : "SYS",
-    "uIActionTag" : "panel_Usr1101864241_auth_logout1_click",
-    "uIActionType" : "DEUIACTION"
   }, {
     "caption" : "登陆",
     "codeName" : "panel_Usr1102196415_auth_loginbutton1_click",
@@ -14947,23 +14937,6 @@
         "layoutMode" : "FLEX",
         "logicName" : "index",
         "name" : "layoutpanel",
-        "getPSAppViewLogics" : [ {
-          "logicTrigger" : "CUSTOM",
-          "logicType" : "APPVIEWUIACTION",
-          "name" : "layoutpanel_auth_logout1_click",
-          "getPSAppViewUIAction" : {
-            "modelref" : true,
-            "id" : "layoutpanel_auth_logout1"
-          }
-        } ],
-        "getPSAppViewUIActions" : [ {
-          "name" : "layoutpanel_auth_logout1",
-          "getPSUIAction" : {
-            "modelref" : true,
-            "id" : "panel_Usr1101864241_auth_logout1_click"
-          },
-          "xDataControlName" : "layoutpanel"
-        } ],
         "getPSControlParam" : { },
         "getPSLayout" : {
           "layout" : "FLEX"
@@ -15078,7 +15051,7 @@
             "showCaption" : true
           }, {
             "caption" : "面板容器",
-            "contentWidth" : 20.0,
+            "contentWidth" : 10.0,
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
             "name" : "container_scroll_left1",
@@ -15088,7 +15061,7 @@
             "getPSLayoutPos" : {
               "layout" : "BORDER",
               "layoutPos" : "WEST",
-              "width" : 20,
+              "width" : 10,
               "widthMode" : "PERCENTAGE"
             },
             "getPSPanelItems" : [ {
@@ -15102,7 +15075,7 @@
               },
               "showCaption" : true
             } ],
-            "width" : 20.0,
+            "width" : 10.0,
             "showCaption" : true
           }, {
             "caption" : "面板容器",
@@ -15141,7 +15114,7 @@
                   "layout" : "SIMPLEFLEX"
                 },
                 "getPSLayoutPos" : {
-                  "grow" : 3,
+                  "grow" : 2,
                   "layout" : "SIMPLEFLEX"
                 },
                 "getPSPanelItems" : [ {
@@ -15172,7 +15145,7 @@
                   "layout" : "SIMPLEFLEX"
                 },
                 "getPSLayoutPos" : {
-                  "grow" : 6,
+                  "grow" : 7,
                   "layout" : "SIMPLEFLEX"
                 },
                 "getPSPanelItems" : [ {
@@ -15188,6 +15161,7 @@
                   },
                   "getPSLayoutPos" : {
                     "grow" : -1,
+                    "hAlignSelf" : "LEFT",
                     "layout" : "SIMPLEFLEX"
                   },
                   "getPSPanelItems" : [ {
@@ -15237,36 +15211,6 @@
                     "predefinedType" : "AUTH_USERINFO"
                   },
                   "showCaption" : true
-                }, {
-                  "actionType" : "UIACTION",
-                  "buttonStyle" : "DEFAULT",
-                  "caption" : "登出",
-                  "itemStyle" : "DEFAULT",
-                  "itemType" : "BUTTON",
-                  "name" : "auth_logout1",
-                  "getPSAppViewUIAction" : {
-                    "modelref" : true,
-                    "id" : "layoutpanel_auth_logout1"
-                  },
-                  "getPSLayoutPos" : {
-                    "grow" : -1,
-                    "hAlignSelf" : "RIGHT",
-                    "layout" : "SIMPLEFLEX",
-                    "vAlignSelf" : "MIDDLE"
-                  },
-                  "getPSUIAction" : {
-                    "caption" : "登出",
-                    "codeName" : "panel_Usr1101864241_auth_logout1_click",
-                    "fullCodeName" : "panel_Usr1101864241_auth_logout1_click",
-                    "name" : "登出",
-                    "predefinedType" : "APP_LOGOUT",
-                    "timeout" : 60000,
-                    "uIActionMode" : "SYS",
-                    "uIActionTag" : "panel_Usr1101864241_auth_logout1_click",
-                    "uIActionType" : "DEUIACTION"
-                  },
-                  "tooltip" : "登出",
-                  "showCaption" : true
                 } ]
               } ]
             } ],