Skip to content

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

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

上级 6ee35faa
显示空白字符变更
内嵌 并排
正在显示 包含 24 行增加 和 23 行删除
app_Web/src/components/layout-element/structure/app-scroll-container/app-scroll-container.vue
浏览文件 @ f6660758
......@@ -15,7 +15,7 @@
</div>
<div v-if="containerModel.CENTER" :style="containerModel.CENTER.style"
class="no-style overflow-auto app-scroll-container__center">
<div v-for="name of containerModel.CENTER.name" class="container-item__pos">
<div v-for="name of containerModel.CENTER.name" class="container-item__pos" :style="getItemPosStyle(name)">
<slot :name="name"></slot>
</div>
</div>
......@@ -166,6 +166,17 @@ export default class AppScrollContainer extends Vue {
this.containerModel.CENTER.style.width = minusWidth ? `calc(100%${minusWidth})` : '100%';
}
}
/**
* 获取项布局样式
*/
public getItemPosStyle(name: string) {
const itemName = this.index ? `${name}_${this.index}` : name;
let layoutModel = this.layoutModelDetails[itemName];
if (layoutModel) {
return layoutModel.getBoxLayOutStyle();
}
}
}
</script>
<style lang='less'>
......
app_Web/src/model/panel-detail/panel-detail.ts
浏览文件 @ f6660758
......@@ -450,9 +450,11 @@ export class PanelDetailModel {
Object.assign(boxStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, 'height': '100%' });
}
}
// 识别边缘布局
if (this.layout == 'BORDER') {
Object.assign(boxStyle, { 'display': 'flex' });
// 项如果设置宽高，布局应该对应设置宽高且不应该设置flex布局
const boxSize = this.getBoxSizeStyle();
if (boxSize && Object.keys(boxSize).length > 0) {
Object.assign(boxStyle, boxSize);
Object.assign(boxStyle, { 'flex': 'none' });
}
return boxStyle;
}
......
app_Web/src/pages/sample/index/index-base.vue
浏览文件 @ f6660758
......@@ -297,10 +297,10 @@ export default class IndexBase extends Vue {
* @memberof IndexBase
*/
public layoutItems:any = {
nav_pos1:{ name: 'nav_pos1', type: 'VIEWLAYOUT', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'INNERMEDIUM', spacingRight:'INNERMEDIUM', 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', 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:'INNERMEDIUM', spacingLeft:'INNERMEDIUM', spacingRight:'INNERMEDIUM', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll2', panel: this , details:['nav_pos1'] , dataRegionType: 'INHERIT' },
nav_pos1:{ name: 'nav_pos1', type: 'VIEWLAYOUT', caption: '导航区占位', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', 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', 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_scroll2', panel: this , details:['nav_pos1'] , dataRegionType: 'INHERIT' },
nav_tabs2:{ name: 'nav_tabs2', type: 'VIEWLAYOUT', caption: '标签页导航栏', isShowCaption: true, sysCss: '', itemType: 'RAWITEM', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', 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', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:56, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'INNERSMALL', spacingLeft:'INNERMEDIUM', spacingRight:'', spacingTop:'INNERSMALL', 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', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'NORTH', layoutHeight:56, heightMode:'PX', layoutWidth:0, widthMode:'', spacingBottom:'INNERSMALL', spacingLeft:'', spacingRight:'', spacingTop:'INNERSMALL', 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', type: 'VIEWLAYOUT', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:100, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', 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', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: 'gray-background', 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:['container_scroll2'] , dataRegionType: 'INHERIT' },
appmenu:{ name: 'appmenu', type: 'VIEWLAYOUT', caption: '首页菜单', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:100, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_left1', panel: this },
......
app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue
浏览文件 @ f6660758
......@@ -671,7 +671,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr3GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -707,7 +707,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr3GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return;
}
const arg: any = { ...opt } ;
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPINDEXVIEWS/index.json
浏览文件 @ f6660758
......@@ -77,10 +77,7 @@
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER",
"spacingBottom" : "INNERMEDIUM",
"spacingLeft" : "INNERMEDIUM",
"spacingRight" : "INNERMEDIUM"
"layoutPos" : "CENTER"
},
"getPSPanelItems" : [ {
"caption" : "导航区占位",
......@@ -91,8 +88,6 @@
"heightMode" : "FULL",
"layout" : "BORDER",
"layoutPos" : "CENTER",
"spacingLeft" : "INNERMEDIUM",
"spacingRight" : "INNERMEDIUM",
"widthMode" : "FULL"
},
"getPSRawItem" : {
......@@ -119,7 +114,6 @@
"layout" : "BORDER",
"layoutPos" : "NORTH",
"spacingBottom" : "INNERSMALL",
"spacingLeft" : "INNERMEDIUM",
"spacingTop" : "INNERSMALL",
"vAlignSelf" : "MIDDLE"
},
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ f6660758
......@@ -15029,10 +15029,7 @@
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER",
"spacingBottom" : "INNERMEDIUM",
"spacingLeft" : "INNERMEDIUM",
"spacingRight" : "INNERMEDIUM"
"layoutPos" : "CENTER"
},
"getPSPanelItems" : [ {
"caption" : "导航区占位",
......@@ -15043,8 +15040,6 @@
"heightMode" : "FULL",
"layout" : "BORDER",
"layoutPos" : "CENTER",
"spacingLeft" : "INNERMEDIUM",
"spacingRight" : "INNERMEDIUM",
"widthMode" : "FULL"
},
"getPSRawItem" : {
......@@ -15071,7 +15066,6 @@
"layout" : "BORDER",
"layoutPos" : "NORTH",
"spacingBottom" : "INNERSMALL",
"spacingLeft" : "INNERMEDIUM",
"spacingTop" : "INNERSMALL",
"vAlignSelf" : "MIDDLE"
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或