提交 d1217a87 编写于 作者: ibizdev's avatar ibizdev

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

上级 7274b36f
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
**.iml **.iml
*.jar *.jar
*.log *.log
.DS_Store .DS_Store
\ No newline at end of file
...@@ -59,11 +59,19 @@ ...@@ -59,11 +59,19 @@
</template> </template>
</app-simpleflex-container> </app-simpleflex-container>
</template> </template>
<template #container3>
<app-standard-container name="container3" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
<template #container_scroll1>
<app-scroll-container name="container_scroll1" :layoutModelDetails="layoutModelDetails">
<template #container_scroll_main1>
<app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
<template #nav_pos1> <template #nav_pos1>
<app-nav-pos name="nav_pos1" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['nav_pos1'].navData"/> <app-nav-pos name="nav_pos1" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['nav_pos1'].navData"/>
</template> </template>
<template #container3> </app-scroll-container>
<app-standard-container name="container3" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails"> </template>
<template #container_scroll_header1>
<app-scroll-container name="container_scroll_header1" :layoutModelDetails="layoutModelDetails">
<template #drtab> <template #drtab>
<app-ctrl-pos name="drtab" :layoutModelDetails="layoutModelDetails"> <app-ctrl-pos name="drtab" :layoutModelDetails="layoutModelDetails">
<view_drtab <view_drtab
...@@ -78,6 +86,10 @@ ...@@ -78,6 +86,10 @@
</view_drtab> </view_drtab>
</app-ctrl-pos> </app-ctrl-pos>
</template> </template>
</app-scroll-container>
</template>
</app-scroll-container>
</template>
</app-standard-container> </app-standard-container>
</template> </template>
</app-standard-container> </app-standard-container>
...@@ -364,10 +376,13 @@ export default class IBIZOrderSEditView3_layoutBase extends Vue { ...@@ -364,10 +376,13 @@ export default class IBIZOrderSEditView3_layoutBase extends Vue {
toolbar:{ name: 'toolbar', caption: '工具栏', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this }, toolbar:{ name: 'toolbar', caption: '工具栏', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this },
container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' }, container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' },
container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:50, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container2'] , dataRegionType: 'INHERIT' }, container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:50, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container2'] , dataRegionType: 'INHERIT' },
nav_pos1:{ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , viewType: 'DEEDITVIEW3', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }, nav_pos1:{ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , viewType: 'DEEDITVIEW3', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
drtab:{ name: 'drtab', caption: 'DRTAB部件', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this }, container_scroll_main1:{ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:100, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['nav_pos1'] , dataRegionType: 'INHERIT' },
container3:{ name: 'container3', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'column',vAlign:''}, parentName: 'page_container', panel: this , details:['drtab'] , dataRegionType: 'INHERIT' }, drtab:{ name: 'drtab', caption: 'DRTAB部件', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_header1', panel: this },
page_container:{ name: 'page_container', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:100, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_grid1','nav_pos1','container3'] , dataRegionType: 'INHERIT' } container_scroll_header1:{ name: 'container_scroll_header1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:80, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['drtab'] , dataRegionType: 'INHERIT' },
container_scroll1:{ name: 'container_scroll1', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , details:['container_scroll_main1','container_scroll_header1'] , dataRegionType: 'INHERIT' },
container3:{ name: 'container3', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'column',vAlign:''}, parentName: 'page_container', panel: this , details:['container_scroll1'] , dataRegionType: 'INHERIT' },
page_container:{ name: 'page_container', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:100, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_grid1','container3'] , dataRegionType: 'INHERIT' }
}; };
/** /**
......
...@@ -60,8 +60,10 @@ ...@@ -60,8 +60,10 @@
</template> </template>
</app-simpleflex-container> </app-simpleflex-container>
</template> </template>
<template #container3> <template #container_scroll1>
<app-standard-container name="container3" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails"> <app-scroll-container name="container_scroll1" :layoutModelDetails="layoutModelDetails">
<template #container_scroll_main1>
<app-scroll-container name="container_scroll_main1" :layoutModelDetails="layoutModelDetails">
<template #form> <template #form>
<app-ctrl-pos name="form" :layoutModelDetails="layoutModelDetails"> <app-ctrl-pos name="form" :layoutModelDetails="layoutModelDetails">
<view_form <view_form
...@@ -88,8 +90,10 @@ ...@@ -88,8 +90,10 @@
</view_form> </view_form>
</app-ctrl-pos> </app-ctrl-pos>
</template> </template>
<template #container4> </app-scroll-container>
<app-standard-container name="container4" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails"> </template>
<template #container_scroll_bottom1>
<app-scroll-container name="container_scroll_bottom1" :layoutModelDetails="layoutModelDetails">
<template #drtab> <template #drtab>
<app-ctrl-pos name="drtab" :layoutModelDetails="layoutModelDetails"> <app-ctrl-pos name="drtab" :layoutModelDetails="layoutModelDetails">
<view_drtab <view_drtab
...@@ -108,9 +112,9 @@ ...@@ -108,9 +112,9 @@
<template #nav_pos1> <template #nav_pos1>
<app-nav-pos name="nav_pos1" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['nav_pos1'].navData"/> <app-nav-pos name="nav_pos1" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['nav_pos1'].navData"/>
</template> </template>
</app-standard-container> </app-scroll-container>
</template> </template>
</app-standard-container> </app-scroll-container>
</template> </template>
</app-standard-container> </app-standard-container>
</div> </div>
...@@ -396,12 +400,13 @@ export default class IBIZOrderSEditView4_layoutBase extends Vue { ...@@ -396,12 +400,13 @@ export default class IBIZOrderSEditView4_layoutBase extends Vue {
toolbar:{ name: 'toolbar', caption: '工具栏', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this }, toolbar:{ name: 'toolbar', caption: '工具栏', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this },
container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' }, container2:{ name: 'container2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' },
container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container2'] , dataRegionType: 'INHERIT' }, container_grid1:{ name: 'container_grid1', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container1','container2'] , dataRegionType: 'INHERIT' },
form:{ name: 'form', caption: '表单', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this }, form:{ name: 'form', caption: '表单', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this },
drtab:{ name: 'drtab', caption: 'DRTAB部件', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container4', panel: this }, container_scroll_main1:{ name: 'container_scroll_main1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:50, heightMode:'PERCENTAGE', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['form'] , dataRegionType: 'INHERIT' },
nav_pos1:{ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container4', panel: this , viewType: 'DEEDITVIEW4', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }, drtab:{ name: 'drtab', caption: 'DRTAB部件', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_bottom1', panel: this },
container4:{ name: 'container4', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , details:['drtab','nav_pos1'] , dataRegionType: 'INHERIT' }, nav_pos1:{ name: 'nav_pos1', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_bottom1', panel: this , viewType: 'DEEDITVIEW4', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
container3:{ name: 'container3', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['form','container4'] , dataRegionType: 'INHERIT' }, container_scroll_bottom1:{ name: 'container_scroll_bottom1', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'SOUTH', layoutHeight:50, heightMode:'PERCENTAGE', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['drtab','nav_pos1'] , dataRegionType: 'INHERIT' },
page_container:{ name: 'page_container', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_grid1','container3'] , dataRegionType: 'INHERIT' } container_scroll1:{ name: 'container_scroll1', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'page_container', panel: this , details:['container_scroll_main1','container_scroll_bottom1'] , dataRegionType: 'INHERIT' },
page_container:{ name: 'page_container', caption: '容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'FLEX', layoutPos:'', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:100, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_grid1','container_scroll1'] , dataRegionType: 'INHERIT' }
}; };
/** /**
......
...@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ 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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public loadDraft(opt: any = {},mode?:string): void { public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){ 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: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
...@@ -1800,7 +1800,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1800,7 +1800,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -1835,7 +1835,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1835,7 +1835,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public loadDraft(opt: any = {}): void { public loadDraft(opt: any = {}): void {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
...@@ -1897,7 +1897,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1897,7 +1897,7 @@ export default class MainBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -2005,7 +2005,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2005,7 +2005,7 @@ export default class MainBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction; const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){ if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction"; let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -2082,7 +2082,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2082,7 +2082,7 @@ export default class MainBase extends Vue implements ControlInterface {
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> { public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){ if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return; return;
} }
const arg: any = opt[0]; const arg: any = opt[0];
......
...@@ -522,7 +522,7 @@ export default class ListExpBase extends Vue implements ControlInterface { ...@@ -522,7 +522,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
return; return;
} }
const arg: any = {...opt}; const arg: any = {...opt};
...@@ -638,7 +638,7 @@ export default class ListExpBase extends Vue implements ControlInterface { ...@@ -638,7 +638,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
*/ */
public async remove(datas: any[]): Promise<any> { public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){ if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.removeAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.removeAction') as string) });
return; return;
} }
if (datas.length === 0) { if (datas.length === 0) {
...@@ -733,7 +733,7 @@ export default class ListExpBase extends Vue implements ControlInterface { ...@@ -733,7 +733,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
try { try {
if(Object.is(item.rowDataState, 'create')){ if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){ if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.createAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator); let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
...@@ -741,7 +741,7 @@ export default class ListExpBase extends Vue implements ControlInterface { ...@@ -741,7 +741,7 @@ export default class ListExpBase extends Vue implements ControlInterface {
} }
}else if(Object.is(item.rowDataState, 'update')){ }else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){ if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView_layout' + (this.$t('app.list.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZOrderListExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.ibizorder){ if(item.ibizorder){
......
...@@ -291,7 +291,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -291,7 +291,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [$event] 事件源 * @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件 * @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文 * @param {*} [actionContext] 执行行为上下文
* @memberof IBIZOrderSF1GridViewBase * @memberof IBIZOrderPickupGridViewBase
*/ */
public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) { if (args.length === 0) {
...@@ -413,20 +413,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -413,20 +413,6 @@ export default class MainBase extends Vue implements ControlInterface {
return this.selections[0]; 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 { ...@@ -959,7 +945,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}, pageReset: boolean = false): void { public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){ 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; return;
} }
if(pageReset){ if(pageReset){
...@@ -1054,7 +1040,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1054,7 +1040,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public async remove(datas: any[]): Promise<any> { public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){ 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; return;
} }
let _datas:any[] = []; let _datas:any[] = [];
...@@ -1160,7 +1146,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1160,7 +1146,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public addBatch(arg: any = {}): void { public addBatch(arg: any = {}): void {
if(!this.fetchAction){ 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; return;
} }
if(!arg){ if(!arg){
...@@ -2077,7 +2063,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2077,7 +2063,7 @@ export default class MainBase extends Vue implements ControlInterface {
try { try {
if(Object.is(item.rowDataState, 'create')){ if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){ 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{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator); 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 { ...@@ -2085,7 +2071,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
}else if(Object.is(item.rowDataState, 'update')){ }else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){ 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{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.ibizorder){ if(item.ibizorder){
...@@ -2152,7 +2138,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2152,7 +2138,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public newRow(args: any[], params?: any, $event?: any, xData?: any): void { public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){ 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; return;
} }
let _this = this; let _this = this;
......
...@@ -104,21 +104,6 @@ export default class MainModel { ...@@ -104,21 +104,6 @@ export default class MainModel {
prop: 'n_ibizordername_like', prop: 'n_ibizordername_like',
dataType: 'QUERYPARAM' 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', name:'size',
......
...@@ -55,23 +55,6 @@ ...@@ -55,23 +55,6 @@
git clone -b master $para2 demosys/ git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/ cd demosys/
cd demo-boot
mvn ibizlabcli:code
cd ..
set +e
git config user.name "ibizdev"
git add .
git commit -m "generator before deploy $para5"
git push origin master
git config user.name "root"
set -e
mvn package -Pboot
cd demo-boot
sed -i "s#dstimage#$para5#g" pom.xml
sed -i "s#dstimage#$para5#g" src/main/docker/demo-boot-demoapi.yaml
mvn -Pboot docker:build
mvn -Pboot docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-boot-demoapi.yaml iBizDemo --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar
EXPOSE 51000 EXPOSE 8081
ADD demo-boot.jar /demo-boot.jar ADD demo-boot.jar /demo-boot.jar
...@@ -50,4 +50,4 @@ public class BootApplication extends WebMvcConfigurerAdapter { ...@@ -50,4 +50,4 @@ public class BootApplication extends WebMvcConfigurerAdapter {
super.addArgumentResolvers(argumentResolvers); super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(resolver); argumentResolvers.add(resolver);
} }
} }
\ No newline at end of file
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
"getPSDEViewCodeName" : "SEditView2_layout", "getPSDEViewCodeName" : "SEditView2_layout",
"getPSDEViewId" : "DADA07CE-4DD9-41BD-BD5F-97DD5D150266", "getPSDEViewId" : "DADA07CE-4DD9-41BD-BD5F-97DD5D150266",
"getPSViewLayoutPanel" : { "getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ {
"id" : "view_pagecaption"
} ],
"codeName" : "Usr1103525384", "codeName" : "Usr1103525384",
"controlType" : "VIEWLAYOUTPANEL", "controlType" : "VIEWLAYOUTPANEL",
"layoutMode" : "FLEX", "layoutMode" : "FLEX",
...@@ -40,211 +37,6 @@ ...@@ -40,211 +37,6 @@
"getPSLayout" : { "getPSLayout" : {
"layout" : "FLEX" "layout" : "FLEX"
}, },
"getRootPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container2",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "栅格容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_grid1",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "面板容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container1",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : 3,
"layout" : "SIMPLEFLEX"
},
"getPSPanelItems" : [ {
"caption" : "页面标题",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "view_pagecaption",
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "view_pagecaption",
"predefinedType" : "VIEW_PAGECAPTION",
"renderMode" : "HEADING1",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"grow" : -1,
"hAlignSelf" : "LEFT",
"heightMode" : "FULL",
"layout" : "SIMPLEFLEX",
"widthMode" : "FULL"
},
"hidden" : false,
"showCaption" : false
} ]
}, {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_2",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "SIMPLEFLEX"
},
"getPSPanelItems" : [ {
"caption" : "TOOLBAR",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "toolbar",
"getPSLayoutPos" : {
"grow" : -1,
"hAlignSelf" : "RIGHT",
"heightMode" : "FULL",
"layout" : "SIMPLEFLEX"
},
"showCaption" : true
} ]
} ]
}, {
"caption" : "滚动条容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "面板容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_main1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"getPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container2",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"getPSPanelItems" : [ {
"caption" : "FORM",
"contentHeight" : 300.0,
"contentWidth" : 100.0,
"height" : 300.0,
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "form",
"getPSLayoutPos" : {
"grow" : -1,
"height" : 300,
"heightMode" : "PX",
"layout" : "FLEX",
"width" : 100,
"widthMode" : "PERCENTAGE"
},
"width" : 100.0,
"showCaption" : true
}, {
"caption" : "导航区占位",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "nav_pos1",
"getPSLayoutPos" : {
"grow" : -1,
"heightMode" : "FULL",
"layout" : "FLEX"
},
"getPSRawItem" : {
"name" : "nav_pos1",
"predefinedType" : "NAV_POS"
},
"showCaption" : true
} ]
} ],
"showCaption" : true
}, {
"caption" : "面板容器",
"contentWidth" : 240.0,
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_left1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "WEST",
"width" : 240,
"widthMode" : "PX"
},
"getPSPanelItems" : [ {
"caption" : "DRBAR",
"contentHeight" : 100.0,
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "drbar",
"getPSLayoutPos" : {
"height" : 100,
"heightMode" : "PERCENTAGE",
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"showCaption" : true
} ],
"width" : 240.0,
"showCaption" : true
} ]
} ]
} ]
} ],
"layoutBodyOnly" : false, "layoutBodyOnly" : false,
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : false, "useDefaultLayout" : false,
......
...@@ -1337,20 +1337,6 @@ ...@@ -1337,20 +1337,6 @@
"showCaption" : true "showCaption" : true
} ] } ]
} ] } ]
}, {
"caption" : "导航区占位",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "nav_pos1",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"name" : "nav_pos1",
"predefinedType" : "NAV_POS"
},
"showCaption" : true
}, { }, {
"caption" : "容器", "caption" : "容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
...@@ -1365,15 +1351,77 @@ ...@@ -1365,15 +1351,77 @@
"layout" : "FLEX" "layout" : "FLEX"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "DRTAB部件", "caption" : "滚动条容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS", "itemType" : "CONTAINER",
"name" : "drtab", "name" : "container_scroll1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "grow" : -1,
"layout" : "FLEX" "layout" : "FLEX"
}, },
"showCaption" : true "getPSPanelItems" : [ {
"caption" : "面板容器",
"contentWidth" : 100.0,
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_main1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER",
"width" : 100,
"widthMode" : "PX"
},
"getPSPanelItems" : [ {
"caption" : "导航区占位",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "nav_pos1",
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"getPSRawItem" : {
"name" : "nav_pos1",
"predefinedType" : "NAV_POS"
},
"showCaption" : true
} ],
"showCaption" : true
}, {
"caption" : "面板容器",
"contentHeight" : 80.0,
"height" : 80.0,
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_header1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"height" : 80,
"heightMode" : "PX",
"layout" : "BORDER",
"layoutPos" : "NORTH"
},
"getPSPanelItems" : [ {
"caption" : "DRTAB部件",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "drtab",
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"showCaption" : true
} ],
"showCaption" : true
} ]
} ] } ]
} ], } ],
"width" : 100.0 "width" : 100.0
......
...@@ -1244,6 +1244,9 @@ ...@@ -1244,6 +1244,9 @@
}, },
"getRootPSPanelItems" : [ { "getRootPSPanelItems" : [ {
"caption" : "容器", "caption" : "容器",
"contentHeight" : 100.0,
"contentWidth" : 100.0,
"height" : 100.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "page_container", "name" : "page_container",
...@@ -1252,7 +1255,11 @@ ...@@ -1252,7 +1255,11 @@
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"layout" : "TABLE_24COL" "height" : 100,
"heightMode" : "PERCENTAGE",
"layout" : "TABLE_24COL",
"width" : 100,
"widthMode" : "PERCENTAGE"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "栅格容器", "caption" : "栅格容器",
...@@ -1340,6 +1347,7 @@ ...@@ -1340,6 +1347,7 @@
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "面板容器", "caption" : "面板容器",
"contentHeight" : 50.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_scroll_main1", "name" : "container_scroll_main1",
...@@ -1347,6 +1355,8 @@ ...@@ -1347,6 +1355,8 @@
"layout" : "BORDER" "layout" : "BORDER"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"height" : 50,
"heightMode" : "PERCENTAGE",
"layout" : "BORDER", "layout" : "BORDER",
"layoutPos" : "CENTER" "layoutPos" : "CENTER"
}, },
...@@ -1364,8 +1374,8 @@ ...@@ -1364,8 +1374,8 @@
"showCaption" : true "showCaption" : true
}, { }, {
"caption" : "面板容器", "caption" : "面板容器",
"contentHeight" : 80.0, "contentHeight" : 50.0,
"height" : 80.0, "height" : 50.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_scroll_bottom1", "name" : "container_scroll_bottom1",
...@@ -1373,8 +1383,8 @@ ...@@ -1373,8 +1383,8 @@
"layout" : "BORDER" "layout" : "BORDER"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"height" : 80, "height" : 50,
"heightMode" : "PX", "heightMode" : "PERCENTAGE",
"layout" : "BORDER", "layout" : "BORDER",
"layoutPos" : "SOUTH" "layoutPos" : "SOUTH"
}, },
...@@ -1405,7 +1415,8 @@ ...@@ -1405,7 +1415,8 @@
} ], } ],
"showCaption" : true "showCaption" : true
} ] } ]
} ] } ],
"width" : 100.0
} ], } ],
"layoutBodyOnly" : true, "layoutBodyOnly" : true,
"layoutPanel" : true, "layoutPanel" : true,
......
...@@ -14,9 +14,6 @@ ...@@ -14,9 +14,6 @@
"getPSDEViewCodeName" : "TestCLEditView2", "getPSDEViewCodeName" : "TestCLEditView2",
"getPSDEViewId" : "62675704-E8C8-4E8E-91B5-732932BDD956", "getPSDEViewId" : "62675704-E8C8-4E8E-91B5-732932BDD956",
"getPSViewLayoutPanel" : { "getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ {
"id" : "view_pagecaption"
} ],
"codeName" : "Usr1103525384", "codeName" : "Usr1103525384",
"controlType" : "VIEWLAYOUTPANEL", "controlType" : "VIEWLAYOUTPANEL",
"layoutMode" : "FLEX", "layoutMode" : "FLEX",
...@@ -30,211 +27,6 @@ ...@@ -30,211 +27,6 @@
"getPSLayout" : { "getPSLayout" : {
"layout" : "FLEX" "layout" : "FLEX"
}, },
"getRootPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container2",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "栅格容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_grid1",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "面板容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container1",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : 3,
"layout" : "SIMPLEFLEX"
},
"getPSPanelItems" : [ {
"caption" : "页面标题",
"itemStyle" : "DEFAULT",
"itemType" : "FIELD",
"name" : "view_pagecaption",
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "view_pagecaption",
"predefinedType" : "VIEW_PAGECAPTION",
"renderMode" : "HEADING1",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"grow" : -1,
"hAlignSelf" : "LEFT",
"heightMode" : "FULL",
"layout" : "SIMPLEFLEX",
"widthMode" : "FULL"
},
"hidden" : false,
"showCaption" : false
} ]
}, {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_2",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "SIMPLEFLEX"
},
"getPSPanelItems" : [ {
"caption" : "TOOLBAR",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "toolbar",
"getPSLayoutPos" : {
"grow" : -1,
"hAlignSelf" : "RIGHT",
"heightMode" : "FULL",
"layout" : "SIMPLEFLEX"
},
"showCaption" : true
} ]
} ]
}, {
"caption" : "滚动条容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "面板容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_main1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"getPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container2",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"getPSPanelItems" : [ {
"caption" : "FORM",
"contentHeight" : 300.0,
"contentWidth" : 100.0,
"height" : 300.0,
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "form",
"getPSLayoutPos" : {
"grow" : -1,
"height" : 300,
"heightMode" : "PX",
"layout" : "FLEX",
"width" : 100,
"widthMode" : "PERCENTAGE"
},
"width" : 100.0,
"showCaption" : true
}, {
"caption" : "导航区占位",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "nav_pos1",
"getPSLayoutPos" : {
"grow" : -1,
"heightMode" : "FULL",
"layout" : "FLEX"
},
"getPSRawItem" : {
"name" : "nav_pos1",
"predefinedType" : "NAV_POS"
},
"showCaption" : true
} ]
} ],
"showCaption" : true
}, {
"caption" : "面板容器",
"contentWidth" : 240.0,
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_left1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "WEST",
"width" : 240,
"widthMode" : "PX"
},
"getPSPanelItems" : [ {
"caption" : "DRBAR",
"contentHeight" : 100.0,
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "drbar",
"getPSLayoutPos" : {
"height" : 100,
"heightMode" : "PERCENTAGE",
"layout" : "BORDER",
"layoutPos" : "CENTER"
},
"showCaption" : true
} ],
"width" : 240.0,
"showCaption" : true
} ]
} ]
} ]
} ],
"layoutBodyOnly" : false, "layoutBodyOnly" : false,
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : false, "useDefaultLayout" : false,
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
</parent> </parent>
<artifactId>demo-core</artifactId> <artifactId>demo-core</artifactId>
<name>Demo Core</name> <name>后台服务 Core</name>
<description>后台服务 Core,模板生成代码,再次发布会覆盖,建议不要直接修改,修改请在demo-boot项目中继承或覆盖重写</description> <description>后台服务 Core</description>
<dependencies> <dependencies>
...@@ -20,14 +20,6 @@ ...@@ -20,14 +20,6 @@
<artifactId>ibizlab-boot-starter-data</artifactId> <artifactId>ibizlab-boot-starter-data</artifactId>
<version>2.4.0-SNAPSHOT</version> <version>2.4.0-SNAPSHOT</version>
</dependency> </dependency>
<!-- MySQL驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies> </dependencies>
<properties> <properties>
...@@ -101,4 +93,4 @@ ...@@ -101,4 +93,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>
\ No newline at end of file
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
<!--输出实体[IBIZORDER]数据结构 --> <!--输出实体[IBIZORDER]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-346-14"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-366-14">
<createTable tableName="T_IBIZORDER"> <createTable tableName="T_IBIZORDER">
<column name="TP" remarks="" type="TEXT(1048576)"> <column name="TP" remarks="" type="TEXT(1048576)">
</column> </column>
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</createView> </createView>
</changeSet> </changeSet>
<!--输出实体[IBIZORDER]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步--> <!--输出实体[IBIZORDER]视图结构信息 runOnChange="true" 当视图发生变更时,通过liquibase强刷prod的视图,实现视图的同步-->
<changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-346-8" runOnChange="true"> <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-366-8" runOnChange="true">
<createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER"> <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZORDER">
<![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1 LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID ]]> <![CDATA[ SELECT t1.[AMOUNT], t1.[CREATEDATE], t1.[CREATEMAN], t1.[DETAILNUM], t1.[IBIZCUSTOMERID], t11.[IBIZCUSTOMERNAME], t1.[IBIZORDERID], t1.[IBIZORDERNAME], t1.[MEMO], t1.[ORDERSTATE], t1.[ORDERTIME], t1.[ORDERTYPE], t1.[ORDERUID], t1.[UPDATEDATE], t1.[UPDATEMAN], t1.[WFINSTANCEID], t1.[WFSTATE], t1.[WFSTEP] FROM [T_IBIZORDER] t1 LEFT JOIN T_IBIZCUSTOMER t11 ON t1.IBIZCUSTOMERID = t11.IBIZCUSTOMERID ]]>
</createView> </createView>
......
[ [
{
"name": "年度",
"code": "Years",
"group": "",
"memo": "",
}
]
\ No newline at end of file
{
"name":"年度",
"code":"Years",
"group":"",
"memo":"",
"enable":"",
}
]
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<artifactId>demo</artifactId> <artifactId>demo</artifactId>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<version>1.0.0.0</version> <version>1.0.0.0</version>
<name>Demo</name> <name>后台服务</name>
<description>后台服务</description> <description></description>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<generateBackupPoms>false</generateBackupPoms> <generateBackupPoms>false</generateBackupPoms>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>cn.ibizlab</groupId> <groupId>cn.ibizlab</groupId>
<artifactId>ibizlab-generator-plugin</artifactId> <artifactId>ibizlab-generator-plugin</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
...@@ -137,4 +137,4 @@ ...@@ -137,4 +137,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册