Skip to content

功
功能演示系统
提交 c87d0f9e 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 9d9baf24
隐藏空白字符变更
内嵌 并排
正在显示 包含 460 行增加 和 57 行删除
.gitignore
浏览文件 @ c87d0f9e
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
**.iml **.iml
*.jar *.jar
*.log *.log
.DS_Store .DS_Store
\ No newline at end of file
app_Web/src/pages/sample/ibizorder-sedit-view4-layout/ibizorder-sedit-view4-layout-base.vue
浏览文件 @ c87d0f9e
<template> <template>
<div v-show="!isLayoutLoadding" class="app-view-layout ibizorder-sedit-view4-layout" :style="{height: '100%', width: '100%','display': 'flex', 'flex-direction': 'column'}"> <div v-show="!isLayoutLoadding" class="app-view-layout ibizorder-sedit-view4-layout" :style="{height: '100%', width: '100%', overflow: 'auto'}">
<app-standard-container name="page_container" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
<template #container_grid1>
<app-simpleflex-container name="container_grid1" :layoutModelDetails="layoutModelDetails">
<template #container1>
<app-simpleflex-container name="container1" :layoutModelDetails="layoutModelDetails">
<template #view_pagecaption>
<app-preset-caption name="view_pagecaption" :layoutModelDetails="layoutModelDetails"> 实体编辑视图（上下关系） </app-preset-caption>
</template>
</app-simpleflex-container>
</template>
<template #container2>
<app-simpleflex-container name="container2" :layoutModelDetails="layoutModelDetails">
<template #toolbar>
<app-ctrl-pos name="toolbar" :layoutModelDetails="layoutModelDetails">
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
<i class='fa fa-file-text-o'></i>
<span class='caption'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.deuiaction1.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.deuiaction1.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class=' deepskyblueToolBar' v-loading:i-button @click="toolbar_click({ tag: 'tbitem3' }, $event)">
<i class='fa fa-save'></i>
<span class='caption'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem3.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem3.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
<i class='sx-tb-saveandclose'></i>
<span class='caption'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem5.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem5.tip')}}</div>
</tooltip>
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem9_saveandstart.visabled" :disabled="toolBarModels.tbitem9_saveandstart.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem9_saveandstart' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem9_saveandstart.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem9_saveandstart.tip')}}</div>
</tooltip>
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem15.visabled" :disabled="toolBarModels.tbitem15.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem15' }, $event)">
<i class='fa fa-print'></i>
<span class='caption'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem15.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.ibizorder.seditview4_layouttoolbar_toolbar.tbitem15.tip')}}</div>
</tooltip>
</div>
</app-ctrl-pos>
</template>
</app-simpleflex-container>
</template>
</app-simpleflex-container>
</template>
<template #container3>
<app-standard-container name="container3" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
<template #form>
<app-ctrl-pos name="form" :layoutModelDetails="layoutModelDetails">
<view_form
:viewState="viewState"
:viewparams="viewparams"
:context="context"
:autosave="false"
:viewtag="viewtag"
:showBusyIndicator="true"
updateAction="Update"
removeAction="Remove"
loaddraftAction="GetDraft"
loadAction="Get"
createAction="Create"
WFSubmitAction=""
WFStartAction=""
style=''
name="form"
ref='form'
@load="form_load($event)"
@save="form_save($event)"
@remove="form_remove($event)"
@closeview="closeView($event)">
</view_form>
</app-ctrl-pos>
</template>
<template #container4>
<app-standard-container name="container4" :isMultiContainer="false" :layoutModelDetails="layoutModelDetails">
<template #drtab>
<app-ctrl-pos name="drtab" :layoutModelDetails="layoutModelDetails">
<view_drtab
:viewState="viewState"
name='drtab'
ref='drtab'
:viewparams="viewparams"
:context="context"
parentName = "IBIZOrder"
:selectDefault="true"
@selectionchange='drtab_selectionchange($event)'
@closeview='closeView($event)'>
</view_drtab>
</app-ctrl-pos>
</template>
<template #nav_pos1>
<app-nav-pos name="nav_pos1" :layoutModelDetails="layoutModelDetails" :navData="layoutModelDetails['nav_pos1'].navData"/>
</template>
</app-standard-container>
</template>
</app-standard-container>
</template>
</app-standard-container>
</div> </div>
</template> </template>
...@@ -270,7 +382,7 @@ export default class IBIZOrderSEditView4_layoutBase extends Vue { ...@@ -270,7 +382,7 @@ export default class IBIZOrderSEditView4_layoutBase extends Vue {
* @public * @public
* @memberof IBIZOrderSEditView4_layoutBase * @memberof IBIZOrderSEditView4_layoutBase
*/ */
public rootLayoutDetailNames: string[] = [ ]; public rootLayoutDetailNames: string[] = [ 'page_container' ];
/** /**
* 视图布局面板项模型对象 * 视图布局面板项模型对象
...@@ -279,6 +391,17 @@ export default class IBIZOrderSEditView4_layoutBase extends Vue { ...@@ -279,6 +391,17 @@ export default class IBIZOrderSEditView4_layoutBase extends Vue {
* @memberof IBIZOrderSEditView4_layoutBase * @memberof IBIZOrderSEditView4_layoutBase
*/ */
public layoutItems:any = { public layoutItems:any = {
view_pagecaption:{ name: 'view_pagecaption', caption: '页面标题', isShowCaption: false, sysCss: '', itemType: 'FIELD', 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: 'container1', panel: this , fieldState: '0', predefinedType: 'VIEW_PAGECAPTION', dataItemName:'', },
container1:{ name: 'container1', 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', 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: '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' },
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 },
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 },
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: '', },
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' },
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' },
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' }
}; };
/** /**
......
app_Web/src/pages/sample/index/index-base.vue
浏览文件 @ c87d0f9e
...@@ -300,7 +300,7 @@ export default class IndexBase extends Vue { ...@@ -300,7 +300,7 @@ export default class IndexBase extends Vue {
public layoutItems:any = { public layoutItems:any = {
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_main2', panel: this , viewType: 'APPINDEXVIEW', 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_main2', panel: this , viewType: 'APPINDEXVIEW', predefinedType: 'NAV_POS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
container_scroll_main2:{ name: 'container_scroll_main2', 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:'OUTERSMALL', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll2', panel: this , details:['nav_pos1'] , dataRegionType: 'INHERIT' }, container_scroll_main2:{ name: 'container_scroll_main2', 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:'OUTERSMALL', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll2', panel: this , details:['nav_pos1'] , dataRegionType: 'INHERIT' },
nav_tabs2:{ name: 'nav_tabs2', caption: '标签页导航栏', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:40, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_header2', panel: this , viewType: 'APPINDEXVIEW', predefinedType: 'NAV_TABS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }, nav_tabs2:{ name: 'nav_tabs2', caption: '标签页导航栏', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:55, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_header2', panel: this , viewType: 'APPINDEXVIEW', predefinedType: 'NAV_TABS', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
container_scroll_header2:{ name: 'container_scroll_header2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:55, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'LEFT', vAlignSelf:'MIDDLE', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll2', panel: this , details:['nav_tabs2'] , dataRegionType: 'INHERIT' }, container_scroll_header2:{ name: 'container_scroll_header2', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:55, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'LEFT', vAlignSelf:'MIDDLE', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll2', panel: this , details:['nav_tabs2'] , dataRegionType: 'INHERIT' },
container_scroll2:{ name: 'container_scroll2', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , details:['container_scroll_main2','container_scroll_header2'] , dataRegionType: 'INHERIT' }, container_scroll2:{ name: 'container_scroll2', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:100, heightMode:'PERCENTAGE', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this , details:['container_scroll_main2','container_scroll_header2'] , dataRegionType: 'INHERIT' },
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:80, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['container_scroll2'] , dataRegionType: 'INHERIT' }, 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:80, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['container_scroll2'] , dataRegionType: 'INHERIT' },
......
app_Web/src/widgets/ibizbook/main-form/main-form-base.vue
浏览文件 @ c87d0f9e
...@@ -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];
......
app_Web/src/widgets/ibizorder/default-searchform/default-searchform-base.vue
浏览文件 @ c87d0f9e
...@@ -626,7 +626,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -626,7 +626,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: 'IBIZOrderPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderBarChartView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -662,7 +662,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -662,7 +662,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: 'IBIZOrderPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderBarChartView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
config.xml
浏览文件 @ c87d0f9e
...@@ -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>
......
demo-boot/src/main/docker/Dockerfile
浏览文件 @ c87d0f9e
...@@ -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
demo-boot/src/main/java/cn/ibizlab/BootApplication.java
浏览文件 @ c87d0f9e
...@@ -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
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZOrderSEditView4_layout.json
浏览文件 @ c87d0f9e
...@@ -1225,18 +1225,171 @@ ...@@ -1225,18 +1225,171 @@
"getPSDEViewCodeName" : "SEditView4_layout", "getPSDEViewCodeName" : "SEditView4_layout",
"getPSDEViewId" : "1340DA40-8B5C-4371-9FF0-55FE75766F22", "getPSDEViewId" : "1340DA40-8B5C-4371-9FF0-55FE75766F22",
"getPSViewLayoutPanel" : { "getPSViewLayoutPanel" : {
"getAllPSPanelFields" : [ {
"id" : "view_pagecaption"
} ],
"codeName" : "Layoutpanel", "codeName" : "Layoutpanel",
"controlStyle" : "APPDEEDITVIEW4",
"controlType" : "VIEWLAYOUTPANEL", "controlType" : "VIEWLAYOUTPANEL",
"layoutMode" : "TABLE_24COL",
"logicName" : "编辑视图4",
"name" : "layoutpanel", "name" : "layoutpanel",
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZOrder.json"
}, },
"getPSControlParam" : { }, "getPSControlParam" : { },
"getPSLayout" : {
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getRootPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "page_container",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"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,
"layout" : "SIMPLEFLEX"
},
"hidden" : false,
"showCaption" : false
} ]
}, {
"caption" : "面板容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container2",
"getPSLayout" : {
"layout" : "SIMPLEFLEX"
},
"getPSLayoutPos" : {
"grow" : 9,
"hAlignSelf" : "RIGHT",
"layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE"
},
"getPSPanelItems" : [ {
"caption" : "工具栏",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "toolbar",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "SIMPLEFLEX"
},
"showCaption" : true
} ]
} ]
}, {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container3",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "表单",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "form",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"showCaption" : true
}, {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container4",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "DRTAB部件",
"itemStyle" : "DEFAULT",
"itemType" : "CTRLPOS",
"name" : "drtab",
"getPSLayoutPos" : {
"grow" : -1,
"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
} ]
} ]
} ]
} ],
"layoutBodyOnly" : true, "layoutBodyOnly" : true,
"layoutPanel" : true, "layoutPanel" : true,
"useDefaultLayout" : true "useDefaultLayout" : false,
"modelid" : "567DAB86-F0B0-4452-8CB7-5BF2E2875201",
"modeltype" : "PSSYSVIEWLAYOUTPANEL"
}, },
"title" : "实体编辑视图（上下关系）", "title" : "实体编辑视图（上下关系）",
"getTitlePSLanguageRes" : { "getTitlePSLanguageRes" : {
......
demo-core/pom.xml
浏览文件 @ c87d0f9e
...@@ -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
demo-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ c87d0f9e
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
<!--输出实体[IBIZORDER]数据结构 --> <!--输出实体[IBIZORDER]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-326-14"> <changeSet author="a_LAB01_df847bdfd" id="tab-ibizorder-340-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>
......
demo-core/src/main/resources/liquibase/view.xml
浏览文件 @ c87d0f9e
...@@ -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-326-8" runOnChange="true"> <changeSet author="a_LAB01_df847bdfd" id="view-ibizorder-340-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>
......
demo-core/src/main/resources/sysmodel/RuntimeDict.json
浏览文件 @ c87d0f9e
[ [
{
"name": "年度",
"code": "Years",
"group": "",
"memo": "",
}
]
\ No newline at end of file
{
"name":"年度",
"code":"Years",
"group":"",
"memo":"",
"enable":"",
}
]
pom.xml
浏览文件 @ c87d0f9e
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或