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

app_Web/src/locale/lang/BO-CN-base.ts

@@ -210,6 +210,7 @@ function getAppLocale(){
                 },
                 mainmenu: {
                     menuitem1: commonLogic.appcommonhandle("工作台",null),
+                    menuitem201: commonLogic.appcommonhandle("测试界面逻辑",null),
                     menuitem3: commonLogic.appcommonhandle("控件",null),
                     menuitem6: commonLogic.appcommonhandle("默认数据类型",null),
                     menuitem7: commonLogic.appcommonhandle("默认编辑器类型",null),
@@ -411,8 +412,6 @@ function getAppLocale(){
                     menuitem226: commonLogic.appcommonhandle("工作流动态操作视图",null),
                     menuitem227: commonLogic.appcommonhandle("其他视图",null),
                     menuitem230: commonLogic.appcommonhandle("自定义视图",null),
-                    menuitem201: commonLogic.appcommonhandle("测试界面逻辑",null),
-                    menuitem131: commonLogic.appcommonhandle("界面逻辑",null),
                 },
             },
             formpage:{

app_Web/src/locale/lang/en-US-base.ts

@@ -210,6 +210,7 @@ function getAppLocale(){
                 },
                 mainmenu: {
                     menuitem1: commonLogic.appcommonhandle("Work bench",null),
+                    menuitem201: commonLogic.appcommonhandle("测试界面逻辑",null),
                     menuitem3: commonLogic.appcommonhandle("Control",null),
                     menuitem6: commonLogic.appcommonhandle("Default Data Type",null),
                     menuitem7: commonLogic.appcommonhandle("Default Editor Type",null),
@@ -411,8 +412,6 @@ function getAppLocale(){
                     menuitem226: commonLogic.appcommonhandle("工作流动态操作视图",null),
                     menuitem227: commonLogic.appcommonhandle("其他视图",null),
                     menuitem230: commonLogic.appcommonhandle("自定义视图",null),
-                    menuitem201: commonLogic.appcommonhandle("测试界面逻辑",null),
-                    menuitem131: commonLogic.appcommonhandle("界面逻辑",null),
                 },
             },
             formpage:{

app_Web/src/locale/lang/zh-CN-base.ts

@@ -210,6 +210,7 @@ function getAppLocale(){
                 },
                 mainmenu: {
                     menuitem1: commonLogic.appcommonhandle("工作台",null),
+                    menuitem201: commonLogic.appcommonhandle("测试界面逻辑",null),
                     menuitem3: commonLogic.appcommonhandle("控件",null),
                     menuitem6: commonLogic.appcommonhandle("默认数据类型",null),
                     menuitem7: commonLogic.appcommonhandle("默认编辑器类型",null),
@@ -411,8 +412,6 @@ function getAppLocale(){
                     menuitem226: commonLogic.appcommonhandle("工作流动态操作视图",null),
                     menuitem227: commonLogic.appcommonhandle("其他视图",null),
                     menuitem230: commonLogic.appcommonhandle("自定义视图",null),
-                    menuitem201: commonLogic.appcommonhandle("测试界面逻辑",null),
-                    menuitem131: commonLogic.appcommonhandle("界面逻辑",null),
                 },
             },
             formpage:{

app_Web/src/pages/sample/index/page-register.ts

 export const PageComponents = {
     install(Vue: any, opt: any) {
                 Vue.component('app-portal-view', () => import('@pages/ungroup/app-portal-view/app-portal-view.vue'));
+        Vue.component('ibizbooktest-logic-custom-view', () => import('@pages/sample/ibizbooktest-logic-custom-view/ibizbooktest-logic-custom-view.vue'));
         Vue.component('ibizsample0001-sf4-edit-view', () => import('@pages/sample/ibizsample0001-sf4-edit-view/ibizsample0001-sf4-edit-view.vue'));
         Vue.component('ibizsample0001-sf5-edit-view', () => import('@pages/sample/ibizsample0001-sf5-edit-view/ibizsample0001-sf5-edit-view.vue'));
         Vue.component('ibizsample0001-sf6-edit-view', () => import('@pages/sample/ibizsample0001-sf6-edit-view/ibizsample0001-sf6-edit-view.vue'));
@@ -139,7 +140,6 @@ export const PageComponents = {
         Vue.component('ibizsample0021-grid-view-layout', () => import('@pages/sample/ibizsample0021-grid-view-layout/ibizsample0021-grid-view-layout.vue'));
         Vue.component('ibizsample0021-wfdyna-action-view-layout', () => import('@pages/sample/ibizsample0021-wfdyna-action-view-layout/ibizsample0021-wfdyna-action-view-layout.vue'));
         Vue.component('ibizbookcustom-view-layout', () => import('@pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.vue'));
-        Vue.component('ibizbooktest-logic-custom-view', () => import('@pages/sample/ibizbooktest-logic-custom-view/ibizbooktest-logic-custom-view.vue'));
         Vue.component('ibizappviewgrid-view', () => import('@pages/sample/ibizappviewgrid-view/ibizappviewgrid-view.vue'));
         Vue.component('ibizappviewlist-view', () => import('@pages/sample/ibizappviewlist-view/ibizappviewlist-view.vue'));
         Vue.component('ibizappctrlgrid-view', () => import('@pages/sample/ibizappctrlgrid-view/ibizappctrlgrid-view.vue'));

app_Web/src/pages/sample/index/router.ts

@@ -48,6 +48,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/ungroup/app-portal-view/app-portal-view.vue'),
                 },
+                {
+                    path: 'ibizbooks/:ibizbook?/testlogiccustomview/:testlogiccustomview?',
+                    meta: {
+                        caption: 'entities.ibizbook.views.testlogiccustomview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+                            { pathName: 'testlogiccustomview', parameterName: 'testlogiccustomview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/sample/ibizbooktest-logic-custom-view/ibizbooktest-logic-custom-view.vue'),
+                },
                 {
                     path: 'ibizsample0002s/:ibizsample0002?/ibizsample0001s/:ibizsample0001?/sf4editview/:sf4editview?',
                     meta: {
@@ -2112,20 +2126,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizbookcustom-view-layout/ibizbookcustom-view-layout.vue'),
                 },
-                {
-                    path: 'ibizbooks/:ibizbook?/testlogiccustomview/:testlogiccustomview?',
-                    meta: {
-                        caption: 'entities.ibizbook.views.testlogiccustomview.caption',
-                        info:'',
-                        parameters: [
-                            { pathName: 'index', parameterName: 'index' },
-                            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
-                            { pathName: 'testlogiccustomview', parameterName: 'testlogiccustomview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/sample/ibizbooktest-logic-custom-view/ibizbooktest-logic-custom-view.vue'),
-                },
                 {
                     path: 'ibizappviews/:ibizappview?/gridview/:gridview?',
                     meta: {

app_Web/src/store/modules/view-action/state.ts

@@ -811,6 +811,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '96bc1e4d0d5d6b66d639f401966b375b',
+                'E74D4E6C-CFF5-4CBA-8195-FD943B3B910F',
                 'bb609fe4b67afe2ec2d2e29112101036',
                 'cbfcd74d365d562cbfa3ba6deef39e86',
                 '8c29a026990571a81823c5d28a7a65be',
@@ -950,7 +951,6 @@ export const viewstate: any = {
                 'ef0aa2f297f599cdbc14fc8393b78a1d',
                 'a6d2ee3618dcfb23c3db981c9dbc4340',
                 'fa2731c1873f3c86aa065e73cff4667b',
-                'E74D4E6C-CFF5-4CBA-8195-FD943B3B910F',
             ],
         },
         {

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-base.vue

@@ -626,6 +626,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'AppFunc66': 
                     this.clickAppFunc66(item);
                     return;
+                case 'UsrAppFunc1108357066': 
+                    this.clickUsrAppFunc1108357066(item);
+                    return;
                 case 'Auto338': 
                     this.clickAuto338(item);
                     return;
@@ -1049,9 +1052,6 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                 case 'AppFunc124': 
                     this.clickAppFunc124(item);
                     return;
-                case 'UsrAppFunc1108357066': 
-                    this.clickUsrAppFunc1108357066(item);
-                    return;
                 default:
                     console.warn('未指定应用功能');
             }
@@ -1081,6 +1081,29 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         })
     }
     
+    /**
+     * 测试界面逻辑（表单加载）
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickUsrAppFunc1108357066(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
+            { pathName: 'testlogiccustomview', parameterName: 'testlogiccustomview' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
+    
     /**
      * 属性类型
      *
@@ -4300,29 +4323,6 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         })
     }
 
-    /**
-     * 测试界面逻辑（表单加载）
-     *
-     * @param {*} [item={}]
-     * @memberof MainMenu
-     */
-    public clickUsrAppFunc1108357066(item: any = {}) {
-        const viewparam: any = {};
-        Object.assign(viewparam, {});
-        const deResParameters: any[] = [];
-        const parameters: any[] = [
-            { pathName: 'ibizbooks', parameterName: 'ibizbook' },
-            { pathName: 'testlogiccustomview', parameterName: 'testlogiccustomview' },
-        ];
-        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
-        if(Object.is(this.$route.fullPath,path)){
-            return;
-        }
-        this.$nextTick(function(){
-            this.$router.push(path);
-        })
-    }
-
     /**
      * 数据加载
      *

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

@@ -618,7 +618,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: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -654,7 +654,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: 'IBIZAPPEDITORListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZAPPEDITORGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/listpanel-list/listpanel-list-model.ts

@@ -14,6 +14,11 @@ export default class ListpanelModel {
 	 */
 	public getDataItems(): any[] {
 		return [
+			{
+				name: 'booknumber',
+				prop: 'booknumber',
+				dataType: 'INT',
+			},
 			{
 				name: 'ibizbookid',
 				prop: 'ibizbookid',
@@ -24,11 +29,6 @@ export default class ListpanelModel {
 				prop: 'author',
 				dataType: 'TEXT',
 			},
-			{
-				name: 'booknumber',
-				prop: 'booknumber',
-				dataType: 'INT',
-			},
 			{
 				name: 'srfkey',
 				prop: 'ibizbookid',

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -677,7 +677,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -756,7 +756,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -865,7 +865,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (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);
@@ -873,7 +873,7 @@ export default class Usr4Base 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: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizorder/card-navigation-dataview/card-navigation-dataview-base.vue

@@ -713,7 +713,7 @@ export default class CardNavigationBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -792,7 +792,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -901,7 +901,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (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);
@@ -909,7 +909,7 @@ export default class CardNavigationBase 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: 'IBIZOrderDataViewExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizorder){

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

@@ -299,7 +299,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) {
@@ -441,20 +441,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;
     
     /**
     * 是否嵌入关系界面
@@ -989,7 +975,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.fetchAction) {
             this.$Notice.error({
                 title: this.$t("app.commonWords.wrong") as string,
-                desc: "IBIZOrderSF1GridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
+                desc: "IBIZOrderPickupGridView" + (this.$t("app.gridpage.notConfig.fetchAction") as string),
             });
             return;
         }
@@ -1118,7 +1104,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!this.removeAction) {
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.removeAction') as string)
             });
             return;
         }
@@ -1225,7 +1211,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){
@@ -2148,7 +2134,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);
@@ -2156,7 +2142,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){
@@ -2225,7 +2211,7 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.loaddraftAction){
             this.$Notice.error({
                 title: (this.$t('app.commonWords.wrong') as string),
-                desc: 'IBIZOrderSF1GridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
+                desc: 'IBIZOrderPickupGridView' + (this.$t('app.gridpage.notConfig.loaddraftAction') as string)
             });
             return;
         }

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/PSAPPDATAENTITIES/IBIZBOOK/PSLISTS/Listpanel.json

@@ -81,17 +81,29 @@
       "layout" : "TABLE_24COL"
     },
     "getRootPSPanelItems" : [ {
-      "caption" : "容器",
+      "caption" : "滚动条容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "container1",
+      "name" : "container_scroll1",
       "getPSLayout" : {
-        "layout" : "FLEX"
+        "layout" : "BORDER"
       },
       "getPSLayoutPos" : {
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
+      "getPSPanelItems" : [ {
+        "caption" : "面板容器",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "CONTAINER",
+        "name" : "container_scroll_main1",
+        "getPSLayout" : {
+          "layout" : "BORDER"
+        },
+        "getPSLayoutPos" : {
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
+        },
         "getPSPanelItems" : [ {
           "caption" : "标签",
           "contentType" : "RAW",
@@ -99,8 +111,8 @@
           "itemType" : "RAWITEM",
           "name" : "static_label1",
           "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "getPSRawItem" : {
             "caption" : "标签",
@@ -118,8 +130,8 @@
           "itemType" : "RAWITEM",
           "name" : "static_text1",
           "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "getPSRawItem" : {
             "caption" : "文本内容",
@@ -143,8 +155,8 @@
             "enableLinkView" : false
           },
           "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "viewFieldName" : "author",
           "hidden" : false,
@@ -160,8 +172,8 @@
             "predefinedType" : "FIELD_TEXTBOX"
           },
           "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "viewFieldName" : "booknumber",
           "hidden" : false,
@@ -178,8 +190,8 @@
             "id" : "list_itempanel_button_link1"
           },
           "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEDATA",
@@ -214,8 +226,8 @@
             "id" : "list_itempanel_button_calluilogic1"
           },
           "getPSLayoutPos" : {
-          "grow" : -1,
-          "layout" : "FLEX"
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
           },
           "getPSUIAction" : {
             "actionTarget" : "SINGLEKEY",
@@ -243,6 +255,8 @@
           },
           "tooltip" : "按钮",
           "showCaption" : true
+        } ],
+        "showCaption" : true
       } ]
     } ],
     "name" : "list_itempanel",
@@ -269,6 +283,13 @@
     "id" : "DataImport"
   },
   "getPSDEListDataItems" : [ {
+    "dataType" : 9,
+    "name" : "booknumber",
+    "getPSAppDEField" : {
+      "name" : "BOOKNUMBER",
+      "codeName" : "Booknumber"
+    }
+  }, {
     "dataType" : 25,
     "name" : "ibizbookid",
     "getPSAppDEField" : {
@@ -282,13 +303,6 @@
       "name" : "AUTHOR",
       "codeName" : "Author"
     }
-  }, {
-    "dataType" : 9,
-    "name" : "booknumber",
-    "getPSAppDEField" : {
-      "name" : "BOOKNUMBER",
-      "codeName" : "Booknumber"
-    }
   }, {
     "dataType" : 25,
     "name" : "srfkey",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSPANELS/Listpanel.json

@@ -62,17 +62,29 @@
     "layout" : "TABLE_24COL"
   },
   "getRootPSPanelItems" : [ {
-    "caption" : "容器",
+    "caption" : "滚动条容器",
     "itemStyle" : "DEFAULT",
     "itemType" : "CONTAINER",
-    "name" : "container1",
+    "name" : "container_scroll1",
     "getPSLayout" : {
-      "layout" : "FLEX"
+      "layout" : "BORDER"
     },
     "getPSLayoutPos" : {
       "colMD" : 24,
       "layout" : "TABLE_24COL"
     },
+    "getPSPanelItems" : [ {
+      "caption" : "面板容器",
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container_scroll_main1",
+      "getPSLayout" : {
+        "layout" : "BORDER"
+      },
+      "getPSLayoutPos" : {
+        "layout" : "BORDER",
+        "layoutPos" : "CENTER"
+      },
       "getPSPanelItems" : [ {
         "caption" : "标签",
         "contentType" : "RAW",
@@ -80,8 +92,8 @@
         "itemType" : "RAWITEM",
         "name" : "static_label1",
         "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "getPSRawItem" : {
           "caption" : "标签",
@@ -99,8 +111,8 @@
         "itemType" : "RAWITEM",
         "name" : "static_text1",
         "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "getPSRawItem" : {
           "caption" : "文本内容",
@@ -124,8 +136,8 @@
           "enableLinkView" : false
         },
         "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "viewFieldName" : "author",
         "hidden" : false,
@@ -141,8 +153,8 @@
           "predefinedType" : "FIELD_TEXTBOX"
         },
         "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "viewFieldName" : "booknumber",
         "hidden" : false,
@@ -159,8 +171,8 @@
           "id" : "list_itempanel_button_link1"
         },
         "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "getPSUIAction" : {
           "actionTarget" : "SINGLEDATA",
@@ -195,8 +207,8 @@
           "id" : "list_itempanel_button_calluilogic1"
         },
         "getPSLayoutPos" : {
-        "grow" : -1,
-        "layout" : "FLEX"
+          "layout" : "BORDER",
+          "layoutPos" : "CENTER"
         },
         "getPSUIAction" : {
           "actionTarget" : "SINGLEKEY",
@@ -224,6 +236,8 @@
         },
         "tooltip" : "按钮",
         "showCaption" : true
+      } ],
+      "showCaption" : true
     } ]
   } ],
   "modelid" : "D7D06AA3-7298-433A-BBD9-5A4105BD915F",

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

@@ -201,17 +201,29 @@
         "layout" : "TABLE_24COL"
       },
       "getRootPSPanelItems" : [ {
-        "caption" : "容器",
+        "caption" : "滚动条容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container1",
+        "name" : "container_scroll1",
         "getPSLayout" : {
-          "layout" : "FLEX"
+          "layout" : "BORDER"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
+        "getPSPanelItems" : [ {
+          "caption" : "面板容器",
+          "itemStyle" : "DEFAULT",
+          "itemType" : "CONTAINER",
+          "name" : "container_scroll_main1",
+          "getPSLayout" : {
+            "layout" : "BORDER"
+          },
+          "getPSLayoutPos" : {
+            "layout" : "BORDER",
+            "layoutPos" : "CENTER"
+          },
           "getPSPanelItems" : [ {
             "caption" : "标签",
             "contentType" : "RAW",
@@ -219,8 +231,8 @@
             "itemType" : "RAWITEM",
             "name" : "static_label1",
             "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
             },
             "getPSRawItem" : {
               "caption" : "标签",
@@ -238,8 +250,8 @@
             "itemType" : "RAWITEM",
             "name" : "static_text1",
             "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
             },
             "getPSRawItem" : {
               "caption" : "文本内容",
@@ -263,8 +275,8 @@
               "enableLinkView" : false
             },
             "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
             },
             "viewFieldName" : "author",
             "hidden" : false,
@@ -280,8 +292,8 @@
               "predefinedType" : "FIELD_TEXTBOX"
             },
             "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
             },
             "viewFieldName" : "booknumber",
             "hidden" : false,
@@ -298,8 +310,8 @@
               "id" : "list_itempanel_button_link1"
             },
             "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
             },
             "getPSUIAction" : {
               "actionTarget" : "SINGLEDATA",
@@ -334,8 +346,8 @@
               "id" : "list_itempanel_button_calluilogic1"
             },
             "getPSLayoutPos" : {
-            "grow" : -1,
-            "layout" : "FLEX"
+              "layout" : "BORDER",
+              "layoutPos" : "CENTER"
             },
             "getPSUIAction" : {
               "actionTarget" : "SINGLEKEY",
@@ -363,6 +375,8 @@
             },
             "tooltip" : "按钮",
             "showCaption" : true
+          } ],
+          "showCaption" : true
         } ]
       } ],
       "name" : "list_itempanel",
@@ -463,6 +477,13 @@
       "id" : "DataImport"
     },
     "getPSDEListDataItems" : [ {
+      "dataType" : 9,
+      "name" : "booknumber",
+      "getPSAppDEField" : {
+        "name" : "BOOKNUMBER",
+        "codeName" : "Booknumber"
+      }
+    }, {
       "dataType" : 25,
       "name" : "ibizbookid",
       "getPSAppDEField" : {
@@ -476,13 +497,6 @@
         "name" : "AUTHOR",
         "codeName" : "Author"
       }
-    }, {
-      "dataType" : 9,
-      "name" : "booknumber",
-      "getPSAppDEField" : {
-        "name" : "BOOKNUMBER",
-        "codeName" : "Booknumber"
-      }
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -334,6 +334,24 @@
         },
         "tooltip" : "工作台",
         "openDefault" : true
+      }, {
+        "accUserMode" : 2,
+        "caption" : "测试界面逻辑",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem201",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc1108357066"
+        },
+        "getPSLayout" : {
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "测试界面逻辑"
       }, {
         "accUserMode" : 0,
         "getCapPSLanguageRes" : {
@@ -4320,24 +4338,6 @@
             "layout" : "TABLE_24COL"
           },
           "tooltip" : "视图"
-        }, {
-          "accUserMode" : 2,
-          "caption" : "测试界面逻辑",
-          "itemType" : "MENUITEM",
-          "name" : "menuitem201",
-          "getPSAppFunc" : {
-            "modelref" : true,
-            "id" : "UsrAppFunc1108357066"
-          },
-          "getPSLayout" : {
-            "columnCount" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "tooltip" : "测试界面逻辑"
         } ],
         "getPSLayout" : {
           "columnCount" : 24,
@@ -4348,20 +4348,6 @@
           "layout" : "TABLE_24COL"
         },
         "tooltip" : "视图布局面板测试"
-      }, {
-        "accUserMode" : 0,
-        "caption" : "界面逻辑",
-        "itemType" : "MENUITEM",
-        "name" : "menuitem131",
-        "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "tooltip" : "界面逻辑"
       } ],
       "getPSControlHandler" : {
         "enableDEFieldPrivilege" : false,

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

@@ -20,6 +20,16 @@
     },
     "tooltip" : "工作台",
     "openDefault" : true
+  }, {
+    "accUserMode" : 2,
+    "caption" : "测试界面逻辑",
+    "itemType" : "MENUITEM",
+    "name" : "menuitem201",
+    "getPSAppFunc" : {
+      "modelref" : true,
+      "id" : "UsrAppFunc1108357066"
+    },
+    "tooltip" : "测试界面逻辑"
   }, {
     "accUserMode" : 0,
     "getCapPSLanguageRes" : {
@@ -2406,24 +2416,8 @@
         "tooltip" : "其他视图"
       } ],
       "tooltip" : "视图"
-    }, {
-      "accUserMode" : 2,
-      "caption" : "测试界面逻辑",
-      "itemType" : "MENUITEM",
-      "name" : "menuitem201",
-      "getPSAppFunc" : {
-        "modelref" : true,
-        "id" : "UsrAppFunc1108357066"
-      },
-      "tooltip" : "测试界面逻辑"
     } ],
     "tooltip" : "视图布局面板测试"
-  }, {
-    "accUserMode" : 0,
-    "caption" : "界面逻辑",
-    "itemType" : "MENUITEM",
-    "name" : "menuitem131",
-    "tooltip" : "界面逻辑"
   } ],
   "enableCustomize" : false,
   "name" : "mainmenu",

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -172,7 +172,7 @@
 
 
     <!--输出实体[IBIZBOOK]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-654-7">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-660-7">
         <createTable tableName="T_IBIZBOOK">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>