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

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

上级 48166b4b
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
**.iml **.iml
*.jar *.jar
*.log *.log
.DS_Store .DS_Store
\ No newline at end of file
...@@ -351,7 +351,7 @@ export default class IBIZBOOKInterFuncEditView_layoutBase extends Vue { ...@@ -351,7 +351,7 @@ export default class IBIZBOOKInterFuncEditView_layoutBase extends Vue {
container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['form'] , dataRegionType: 'INHERIT' }, container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['form'] , dataRegionType: 'INHERIT' },
view_pagecaption:{ name: 'view_pagecaption', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'LEFT', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', dataItemName:'', }, view_pagecaption:{ name: 'view_pagecaption', type: 'VIEWLAYOUT', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'LEFT', vAlignSelf:'', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', dataItemName:'', },
container1:{ name: 'container1', type: 'VIEWLAYOUT', 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:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' }, container1:{ name: 'container1', type: 'VIEWLAYOUT', 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:3, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['view_pagecaption'] , dataRegionType: 'INHERIT' },
toolbar:{ name: 'toolbar', type: 'VIEWLAYOUT', caption: 'TOOLBAR', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_2', panel: this }, toolbar:{ name: 'toolbar', type: 'VIEWLAYOUT', caption: 'TOOLBAR', 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: 'container_2', panel: this },
container_2:{ name: 'container_2', type: 'VIEWLAYOUT', 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:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' }, container_2:{ name: 'container_2', type: 'VIEWLAYOUT', 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:9, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['toolbar'] , dataRegionType: 'INHERIT' },
container_grid1:{ name: 'container_grid1', type: 'VIEWLAYOUT', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', 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 , details:['container1','container_2'] , dataRegionType: 'INHERIT' }, container_grid1:{ name: 'container_grid1', type: 'VIEWLAYOUT', caption: '栅格容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'SIMPLEFLEX', 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 , details:['container1','container_2'] , dataRegionType: 'INHERIT' },
container_scroll_header1:{ name: 'container_scroll_header1', type: 'VIEWLAYOUT', 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:['container_grid1'] , dataRegionType: 'INHERIT' }, container_scroll_header1:{ name: 'container_scroll_header1', type: 'VIEWLAYOUT', 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:['container_grid1'] , 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: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; 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: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKGroupByCodelistListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
...@@ -649,7 +649,7 @@ export default class Usr4Base extends Vue implements ControlInterface { ...@@ -649,7 +649,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}, isReset: boolean = false): void { public load(opt: any = {}, isReset: boolean = false): void {
if(!this.fetchAction){ if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
return; return;
} }
const arg: any = {...opt}; const arg: any = {...opt};
...@@ -728,7 +728,7 @@ export default class Usr4Base extends Vue implements ControlInterface { ...@@ -728,7 +728,7 @@ export default class Usr4Base 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: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
return; return;
} }
let _datas:any[] = []; let _datas:any[] = [];
...@@ -837,7 +837,7 @@ export default class Usr4Base extends Vue implements ControlInterface { ...@@ -837,7 +837,7 @@ export default class Usr4Base 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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (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);
...@@ -845,7 +845,7 @@ export default class Usr4Base extends Vue implements ControlInterface { ...@@ -845,7 +845,7 @@ export default class Usr4Base 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: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.ibizbook){ if(item.ibizbook){
......
...@@ -69,6 +69,11 @@ export default class Usr4Model { ...@@ -69,6 +69,11 @@ export default class Usr4Model {
prop: 'n_ibizbookname_like', prop: 'n_ibizbookname_like',
dataType: 'QUERYPARAM' dataType: 'QUERYPARAM'
}, },
{
name: 'n_price_gtandeq',
prop: 'n_price_gtandeq',
dataType: 'QUERYPARAM'
},
{ {
......
...@@ -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 52000 EXPOSE 8081
ADD demo-boot.jar /demo-boot.jar ADD demo-boot.jar /demo-boot.jar
...@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
@EnableFeignClients(basePackages = {"cn.ibizlab.util","cn.ibizlab"}) @EnableFeignClients(basePackages = {"cn.ibizlab.util","cn.ibizlab"})
@SpringBootApplication(exclude = { @SpringBootApplication(exclude = {
org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class, org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration.class,
com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure.class com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure.class
}) })
@ComponentScan(basePackages = {"cn.ibizlab.util","cn.ibizlab"} @ComponentScan(basePackages = {"cn.ibizlab.util","cn.ibizlab"}
...@@ -51,4 +50,4 @@ public class BootApplication extends WebMvcConfigurerAdapter { ...@@ -51,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
...@@ -154,7 +154,6 @@ ...@@ -154,7 +154,6 @@
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "grow" : -1,
"hAlignSelf" : "RIGHT", "hAlignSelf" : "RIGHT",
"heightMode" : "FULL",
"layout" : "SIMPLEFLEX", "layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE" "vAlignSelf" : "MIDDLE"
}, },
......
...@@ -1245,186 +1245,172 @@ ...@@ -1245,186 +1245,172 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"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" : "container_scroll2",
"getPSLayout" : { "getPSLayout" : {
"layout" : "FLEX" "layout" : "BORDER"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"height" : 100, "layout" : "TABLE_24COL"
"heightMode" : "PERCENTAGE",
"layout" : "TABLE_24COL",
"width" : 100,
"widthMode" : "PERCENTAGE"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "栅格容器", "caption" : "面板容器",
"contentHeight" : 50.0,
"height" : 50.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_grid1", "name" : "container_scroll_main2",
"getPSLayout" : { "getPSLayout" : {
"layout" : "SIMPLEFLEX" "layout" : "BORDER"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "layout" : "BORDER",
"height" : 50, "layoutPos" : "CENTER"
"heightMode" : "PX",
"layout" : "FLEX"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "面板容器", "caption" : "栅格容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container1", "name" : "container_grid2",
"getPSLayout" : { "getPSLayout" : {
"layout" : "SIMPLEFLEX" "layout" : "SIMPLEFLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : 3, "heightMode" : "FULL",
"layout" : "SIMPLEFLEX" "layout" : "BORDER",
"layoutPos" : "CENTER",
"widthMode" : "FULL"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "页面标题", "caption" : "面板容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "FIELD", "itemType" : "CONTAINER",
"name" : "view_pagecaption", "name" : "container3",
"getPSEditor" : { "getPSLayout" : {
"editorType" : "SPAN",
"name" : "view_pagecaption",
"predefinedType" : "VIEW_PAGECAPTION",
"renderMode" : "HEADING1",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "SIMPLEFLEX" "layout" : "SIMPLEFLEX"
}, },
"hidden" : false,
"showCaption" : false
} ]
}, {
"caption" : "面板容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container2",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : 9,
"hAlignSelf" : "RIGHT",
"layout" : "SIMPLEFLEX"
},
"getPSPanelItems" : [ {
"caption" : "工具栏",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "toolbar",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "grow" : 12,
"hAlignSelf" : "RIGHT", "layout" : "SIMPLEFLEX"
"layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE"
}, },
"showCaption" : true "getPSPanelItems" : [ {
"caption" : "DRTAB部件",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "drtab",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "SIMPLEFLEX"
},
"showCaption" : true
}, {
"caption" : "导航区占位",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "nav_pos1",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "SIMPLEFLEX"
},
"getPSRawItem" : {
"name" : "nav_pos1",
"predefinedType" : "NAV_POS"
},
"showCaption" : true
} ]
} ] } ]
} ] } ],
"showCaption" : true
}, { }, {
"caption" : "容器", "caption" : "面板容器",
"contentHeight" : 80.0,
"height" : 80.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container3", "name" : "container_scroll_header2",
"getPSLayout" : { "getPSLayout" : {
"dir" : "column", "layout" : "BORDER"
"layout" : "FLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "height" : 80,
"layout" : "FLEX" "heightMode" : "PX",
"layout" : "BORDER",
"layoutPos" : "NORTH"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "滚动条容器", "caption" : "栅格容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_scroll1", "name" : "container_grid1",
"getPSLayout" : { "getPSLayout" : {
"layout" : "BORDER" "layout" : "SIMPLEFLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "layout" : "BORDER",
"layout" : "FLEX" "layoutPos" : "CENTER"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "面板容器", "caption" : "面板容器",
"contentWidth" : 100.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_scroll_main1", "name" : "container1",
"getPSLayout" : { "getPSLayout" : {
"layout" : "BORDER" "layout" : "SIMPLEFLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"layout" : "BORDER", "grow" : 3,
"layoutPos" : "CENTER", "layout" : "SIMPLEFLEX"
"width" : 100,
"widthMode" : "PX"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "导航区占位", "caption" : "页面标题",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "RAWITEM", "itemType" : "FIELD",
"name" : "nav_pos1", "name" : "view_pagecaption",
"getPSLayoutPos" : { "getPSEditor" : {
"layout" : "BORDER", "editorType" : "SPAN",
"layoutPos" : "CENTER" "name" : "view_pagecaption",
"predefinedType" : "VIEW_PAGECAPTION",
"renderMode" : "HEADING1",
"enableLinkView" : false
}, },
"getPSRawItem" : { "getPSLayoutPos" : {
"name" : "nav_pos1", "grow" : -1,
"predefinedType" : "NAV_POS" "layout" : "SIMPLEFLEX"
}, },
"showCaption" : true "hidden" : false,
} ], "showCaption" : false
"showCaption" : true } ]
}, { }, {
"caption" : "面板容器", "caption" : "面板容器",
"contentHeight" : 80.0,
"height" : 80.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_scroll_header1", "name" : "container2",
"getPSLayout" : { "getPSLayout" : {
"layout" : "BORDER" "layout" : "SIMPLEFLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"height" : 80, "grow" : 9,
"heightMode" : "PX", "hAlignSelf" : "RIGHT",
"layout" : "BORDER", "layout" : "SIMPLEFLEX"
"layoutPos" : "NORTH"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "DRTAB部件", "caption" : "工具栏",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS", "itemType" : "CTRLPOS",
"name" : "drtab", "name" : "toolbar",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"layout" : "BORDER", "grow" : -1,
"layoutPos" : "CENTER" "hAlignSelf" : "RIGHT",
"layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE"
}, },
"showCaption" : true "showCaption" : true
} ], } ]
"showCaption" : true
} ] } ]
} ] } ],
} ], "showCaption" : true
"width" : 100.0 } ]
} ], } ],
"layoutBodyOnly" : true, "layoutBodyOnly" : true,
"layoutPanel" : true, "layoutPanel" : true,
......
...@@ -1243,180 +1243,204 @@ ...@@ -1243,180 +1243,204 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"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" : "container_scroll2",
"getPSLayout" : { "getPSLayout" : {
"layout" : "FLEX" "layout" : "BORDER"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"colMD" : 24, "colMD" : 24,
"height" : 100, "layout" : "TABLE_24COL"
"heightMode" : "PERCENTAGE",
"layout" : "TABLE_24COL",
"width" : 100,
"widthMode" : "PERCENTAGE"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "栅格容器", "caption" : "面板容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_grid1", "name" : "container_scroll_main2",
"getPSLayout" : { "getPSLayout" : {
"layout" : "SIMPLEFLEX" "layout" : "BORDER"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "layout" : "BORDER",
"layout" : "FLEX" "layoutPos" : "CENTER"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "面板容器", "caption" : "栅格容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container1", "name" : "container_grid2",
"getPSLayout" : { "getPSLayout" : {
"layout" : "SIMPLEFLEX" "layout" : "SIMPLEFLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : 3, "layout" : "BORDER",
"layout" : "SIMPLEFLEX", "layoutPos" : "CENTER"
"vAlignSelf" : "MIDDLE"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "页面标题", "caption" : "面板容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "FIELD", "itemType" : "CONTAINER",
"name" : "view_pagecaption", "name" : "container3",
"getPSEditor" : { "getPSLayout" : {
"editorType" : "SPAN", "layout" : "SIMPLEFLEX"
"name" : "view_pagecaption",
"predefinedType" : "VIEW_PAGECAPTION",
"renderMode" : "HEADING1",
"enableLinkView" : false
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "grow" : 12,
"layout" : "SIMPLEFLEX" "layout" : "SIMPLEFLEX"
}, },
"hidden" : false, "getPSPanelItems" : [ {
"showCaption" : false "caption" : "表单",
"contentHeight" : 50.0,
"height" : 50.0,
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "form",
"getPSLayoutPos" : {
"grow" : -1,
"height" : 50,
"heightMode" : "PERCENTAGE",
"layout" : "SIMPLEFLEX"
},
"showCaption" : true
} ]
} ] } ]
}, { }, {
"caption" : "面板容器", "caption" : "容器",
"contentHeight" : 50.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container2", "name" : "container4",
"getPSLayout" : { "getPSLayout" : {
"layout" : "SIMPLEFLEX" "layout" : "FLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : 9, "height" : 50,
"hAlignSelf" : "RIGHT", "heightMode" : "PERCENTAGE",
"layout" : "SIMPLEFLEX", "layout" : "BORDER",
"vAlignSelf" : "MIDDLE" "layoutPos" : "CENTER"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "工具栏", "caption" : "DRTAB部件",
"contentHeight" : 50.0,
"height" : 50.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS", "itemType" : "CTRLPOS",
"name" : "toolbar", "name" : "drtab",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "grow" : -1,
"hAlignSelf" : "RIGHT", "height" : 50,
"layout" : "SIMPLEFLEX", "heightMode" : "PX",
"vAlignSelf" : "MIDDLE" "layout" : "FLEX"
},
"showCaption" : true
}, {
"caption" : "导航区占位",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "nav_pos1",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"name" : "nav_pos1",
"predefinedType" : "NAV_POS"
}, },
"showCaption" : true "showCaption" : true
} ] } ]
} ] } ],
"showCaption" : true
}, { }, {
"caption" : "滚动条容器", "caption" : "面板容器",
"contentHeight" : 80.0,
"height" : 80.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_scroll1", "name" : "container_scroll_header1",
"getPSLayout" : { "getPSLayout" : {
"layout" : "BORDER" "layout" : "BORDER"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "height" : 80,
"layout" : "FLEX" "heightMode" : "PX",
"layout" : "BORDER",
"layoutPos" : "NORTH"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "面板容器", "caption" : "栅格容器",
"contentHeight" : 50.0,
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CONTAINER", "itemType" : "CONTAINER",
"name" : "container_scroll_main1", "name" : "container_grid1",
"getPSLayout" : { "getPSLayout" : {
"layout" : "BORDER" "layout" : "SIMPLEFLEX"
}, },
"getPSLayoutPos" : { "getPSLayoutPos" : {
"height" : 50,
"heightMode" : "PERCENTAGE",
"layout" : "BORDER", "layout" : "BORDER",
"layoutPos" : "CENTER" "layoutPos" : "CENTER"
}, },
"getPSPanelItems" : [ { "getPSPanelItems" : [ {
"caption" : "表单", "caption" : "面板容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS", "itemType" : "CONTAINER",
"name" : "form", "name" : "container1",
"getPSLayoutPos" : { "getPSLayout" : {
"layout" : "BORDER", "layout" : "SIMPLEFLEX"
"layoutPos" : "CENTER"
}, },
"showCaption" : true
} ],
"showCaption" : true
}, {
"caption" : "面板容器",
"contentHeight" : 50.0,
"height" : 50.0,
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_bottom1",
"getPSLayout" : {
"layout" : "BORDER"
},
"getPSLayoutPos" : {
"height" : 50,
"heightMode" : "PERCENTAGE",
"layout" : "BORDER",
"layoutPos" : "SOUTH"
},
"getPSPanelItems" : [ {
"caption" : "DRTAB部件",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "drtab",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"layout" : "BORDER", "grow" : 3,
"layoutPos" : "CENTER" "layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE"
}, },
"showCaption" : true "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,
"layout" : "SIMPLEFLEX"
},
"hidden" : false,
"showCaption" : false
} ]
}, { }, {
"caption" : "导航区占位", "caption" : "面板容器",
"itemStyle" : "DEFAULT", "itemStyle" : "DEFAULT",
"itemType" : "RAWITEM", "itemType" : "CONTAINER",
"name" : "nav_pos1", "name" : "container2",
"getPSLayoutPos" : { "getPSLayout" : {
"layout" : "BORDER", "layout" : "SIMPLEFLEX"
"layoutPos" : "CENTER"
}, },
"getPSRawItem" : { "getPSLayoutPos" : {
"name" : "nav_pos1", "grow" : 9,
"predefinedType" : "NAV_POS" "hAlignSelf" : "RIGHT",
"layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE"
}, },
"showCaption" : true "getPSPanelItems" : [ {
} ], "caption" : "工具栏",
"showCaption" : true "itemStyle" : "DEFAULT",
} ] "itemType" : "CTRLPOS",
} ], "name" : "toolbar",
"width" : 100.0 "getPSLayoutPos" : {
"grow" : -1,
"layout" : "SIMPLEFLEX"
},
"showCaption" : true
} ]
} ]
} ],
"showCaption" : true
} ]
} ], } ],
"layoutBodyOnly" : true, "layoutBodyOnly" : true,
"layoutPanel" : true, "layoutPanel" : true,
......
...@@ -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
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<!--输出实体[IBIZBOOK]数据结构 --> <!--输出实体[IBIZBOOK]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-243-7"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizbook-247-7">
<createTable tableName="T_IBIZBOOK"> <createTable tableName="T_IBIZBOOK">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)"> <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column> </column>
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
<!--输出实体[IBIZORDER]数据结构 --> <!--输出实体[IBIZORDER]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-388-14"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-396-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-388-8" runOnChange="true"> <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-396-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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册