Skip to content

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

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

上级 3149c991
隐藏空白字符变更
内嵌 并排
正在显示 包含 80 行增加 和 108 行删除
app_Web/src/components/layout-element/structure/app-scroll-container/app-scroll-container.less
浏览文件 @ bd2c9528
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
.app-scroll-container__header, .app-scroll-container__header,
.app-scroll-container__bottom { .app-scroll-container__bottom {
display: flex;
flex-direction: column;
width: 100%; width: 100%;
} }
...@@ -13,6 +15,8 @@ ...@@ -13,6 +15,8 @@
.app-scroll-container__left, .app-scroll-container__left,
.app-scroll-container__center, .app-scroll-container__center,
.app-scroll-container__right { .app-scroll-container__right {
display: flex;
flex-direction: column;
height: 100%; height: 100%;
} }
} }
......
app_Web/src/components/layout-element/structure/app-scroll-container/app-scroll-container.vue
浏览文件 @ bd2c9528
...@@ -2,33 +2,33 @@ ...@@ -2,33 +2,33 @@
<div :class="curClassName" :style="curStyle"> <div :class="curClassName" :style="curStyle">
<div v-if="containerModel.NORTH" :style="containerModel.NORTH.style" <div v-if="containerModel.NORTH" :style="containerModel.NORTH.style"
class="no-style overflow-auto app-scroll-container__header"> class="no-style overflow-auto app-scroll-container__header">
<div v-for="name of containerModel.NORTH.name" class="scroll-item__pos" :style="getItemPosStyle(name)"> <div v-for="name of containerModel.NORTH.name" class="container-item__pos">
<slot :name="name"></slot> <slot :name="name"></slot>
</div> </div>
</div> </div>
<div class="app-scroll-container__middle" :style="middleContainerStyle"> <div class="app-scroll-container__middle" :style="middleContainerStyle">
<div v-if="containerModel.WEST" :style="containerModel.WEST.style" <div v-if="containerModel.WEST" :style="containerModel.WEST.style"
class="no-style overflow-auto app-scroll-container__left"> class="no-style overflow-auto app-scroll-container__left">
<div v-for="name of containerModel.WEST.name" class="scroll-item__pos" :style="getItemPosStyle(name)"> <div v-for="name of containerModel.WEST.name" class="container-item__pos">
<slot :name="name"></slot> <slot :name="name"></slot>
</div> </div>
</div> </div>
<div v-if="containerModel.CENTER" :style="containerModel.CENTER.style" <div v-if="containerModel.CENTER" :style="containerModel.CENTER.style"
class="no-style overflow-auto app-scroll-container__center"> class="no-style overflow-auto app-scroll-container__center">
<div v-for="name of containerModel.CENTER.name" class="scroll-item__pos" :style="getItemPosStyle(name)"> <div v-for="name of containerModel.CENTER.name" class="container-item__pos">
<slot :name="name"></slot> <slot :name="name"></slot>
</div> </div>
</div> </div>
<div v-if="containerModel.EAST" :style="containerModel.EAST.style" <div v-if="containerModel.EAST" :style="containerModel.EAST.style"
class="no-style overflow-auto app-scroll-container__right"> class="no-style overflow-auto app-scroll-container__right">
<div v-for="name of containerModel.EAST.name" class="scroll-item__pos" :style="getItemPosStyle(name)"> <div v-for="name of containerModel.EAST.name" class="container-item__pos">
<slot :name="name"></slot> <slot :name="name"></slot>
</div> </div>
</div> </div>
</div> </div>
<div v-if="containerModel.SOUTH" :style="containerModel.SOUTH.style" <div v-if="containerModel.SOUTH" :style="containerModel.SOUTH.style"
class="no-style overflow-auto app-scroll-container__bottom"> class="no-style overflow-auto app-scroll-container__bottom">
<div v-for="name of containerModel.SOUTH.name" class="scroll-item__pos" :style="getItemPosStyle(name)"> <div v-for="name of containerModel.SOUTH.name" class="container-item__pos">
<slot :name="name"></slot> <slot :name="name"></slot>
</div> </div>
</div> </div>
...@@ -119,16 +119,6 @@ export default class AppScrollContainer extends Vue { ...@@ -119,16 +119,6 @@ export default class AppScrollContainer extends Vue {
} }
} }
/**
* 获取项布局样式
*/
public getItemPosStyle(name: string) {
const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) {
return layoutModel.getBorderLayoutStyle();
}
}
/** /**
* 初始化滚动容器 * 初始化滚动容器
* *
......
app_Web/src/components/layout-element/structure/app-simpleflex-container/app-simpleflex-container.less
浏览文件 @ bd2c9528
...@@ -2,8 +2,4 @@ ...@@ -2,8 +2,4 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
.simpleflex-item__pos{
height: 100%;
width: 100%;
}
} }
\ No newline at end of file
app_Web/src/components/layout-element/structure/app-simpleflex-container/app-simpleflex-container.vue
浏览文件 @ bd2c9528
<template> <template>
<div :class="curClassName" :style="curStyle"> <div :class="curClassName" :style="curStyle">
<template v-if="containerModel.length > 0"> <template v-if="containerModel.length > 0">
<div v-for="name of containerModel" class="simpleflex-item__pos" :style="getItemPosStyle(name)"> <div v-for="name of containerModel" class="container-item__pos" :style="getItemPosStyle(name)">
<slot :name="name"></slot> <slot :name="name"></slot>
</div> </div>
</template> </template>
......
app_Web/src/components/layout-element/structure/app-standard-container/app-standard-container.less
浏览文件 @ bd2c9528
// 标准容器大小靠内容撑 // 标准容器大小靠内容撑
.app-standard-container{ .app-standard-container{
display: block; display: flex;
.container-item__pos{ flex-direction: column;
width: 100%; flex-wrap: nowrap;
height: 100%;
}
} }
\ No newline at end of file
app_Web/src/model/panel-detail/panel-container.ts
浏览文件 @ bd2c9528
...@@ -96,6 +96,7 @@ export class PanelContainerModel extends PanelDetailModel { ...@@ -96,6 +96,7 @@ export class PanelContainerModel extends PanelDetailModel {
} }
Object.assign(containerStyle, this.getBoxSpacingStyle()); Object.assign(containerStyle, this.getBoxSpacingStyle());
Object.assign(containerStyle, this.getSpecificStyle()); Object.assign(containerStyle, this.getSpecificStyle());
Object.assign(containerStyle, this.getBoxSelfAlignStyle());
return containerStyle; return containerStyle;
} }
......
app_Web/src/model/panel-detail/panel-detail.ts
浏览文件 @ bd2c9528
...@@ -318,6 +318,7 @@ export class PanelDetailModel { ...@@ -318,6 +318,7 @@ export class PanelDetailModel {
Object.assign(elementStyle, this.getBoxSizeStyle()); Object.assign(elementStyle, this.getBoxSizeStyle());
Object.assign(elementStyle, this.getBoxSpacingStyle()); Object.assign(elementStyle, this.getBoxSpacingStyle());
Object.assign(elementStyle, this.getBoxContentStyle()); Object.assign(elementStyle, this.getBoxContentStyle());
Object.assign(elementStyle, this.getBoxSelfAlignStyle());
return elementStyle; return elementStyle;
} }
...@@ -387,54 +388,7 @@ export class PanelDetailModel { ...@@ -387,54 +388,7 @@ export class PanelDetailModel {
} }
/** /**
* 获取盒子内容样式（元素，包含内容换行模式，内容水平对齐，内容垂直对齐） * 获取自身对齐模式(元素)
*
* @memberof PanelDetailModel
*/
protected getBoxContentStyle() {
const boxStyle = {};
return boxStyle;
}
/**
* 获取盒子边框样式（元素）
*
* @memberof PanelDetailModel
*/
protected getBoxBorderStyle() {
const boxStyle = {};
return boxStyle;
}
/**
* 获取通用布局样式(SAMPLEFLEX/FLEX)（布局，包含约束内容区布局的样式，包含内容区的对齐方式）
*
* @return {*}
* @memberof PanelDetailModel
*/
public getCommonLayoutStyle() {
const layoutStyle = {};
Object.assign(layoutStyle, this.getBoxSelfAlignStyle());
Object.assign(layoutStyle, this.getBoxLayOutStyle());
return layoutStyle;
}
/**
* 获取边缘布局样式
*
* @memberof PanelDetailModel
*/
public getBorderLayoutStyle() {
const borderLayoutStyle: any = { width: '100%', height: '100%' };
if (this.layoutHeight) {
Object.assign(borderLayoutStyle, Util.getBoxSize("HEIGHT", this.heightMode, this.layoutHeight));
}
// TODO 合入样式代码
return borderLayoutStyle;
}
/**
* 获取自身对齐模式(布局)
* *
* @memberof PanelDetailModel * @memberof PanelDetailModel
*/ */
...@@ -442,17 +396,16 @@ export class PanelDetailModel { ...@@ -442,17 +396,16 @@ export class PanelDetailModel {
const boxStyle = {}; const boxStyle = {};
// 自身对齐方式 // 自身对齐方式
if (this.vAlignSelf || this.hAlignSelf) { if (this.vAlignSelf || this.hAlignSelf) {
Object.assign(boxStyle, { 'display': 'flex' });
// 自身垂直对齐模式 // 自身垂直对齐模式
switch (this.vAlignSelf) { switch (this.vAlignSelf) {
case 'TOP': case 'TOP':
Object.assign(boxStyle, { 'align-items': 'flex-start' }); // 默认样式
break; break;
case 'MIDDLE': case 'MIDDLE':
Object.assign(boxStyle, { 'align-items': 'center' }); Object.assign(boxStyle, { 'margin': 'auto 0px' });
break; break;
case 'BOTTOM': case 'BOTTOM':
Object.assign(boxStyle, { 'align-items': 'flex-end' }); Object.assign(boxStyle, { 'margin-top': 'auto' });
break; break;
default: default:
break; break;
...@@ -460,16 +413,16 @@ export class PanelDetailModel { ...@@ -460,16 +413,16 @@ export class PanelDetailModel {
// 自身水平对齐模式 // 自身水平对齐模式
switch (this.hAlignSelf) { switch (this.hAlignSelf) {
case 'LEFT': case 'LEFT':
Object.assign(boxStyle, { 'justify-content': 'flex-start' }); Object.assign(boxStyle, { 'align-self': 'flex-start' });
break; break;
case 'CENTER': case 'CENTER':
Object.assign(boxStyle, { 'justify-content': 'center' }); Object.assign(boxStyle, { 'align-self': 'center' });
break; break;
case 'RIGHT': case 'RIGHT':
Object.assign(boxStyle, { 'justify-content': 'flex-end' }); Object.assign(boxStyle, { 'align-self': 'flex-end' });
break; break;
case 'JUSTIFY': case 'JUSTIFY':
Object.assign(boxStyle, { 'justify-content': 'space-between' }); // 默认样式
break; break;
default: default:
break; break;
...@@ -478,6 +431,38 @@ export class PanelDetailModel { ...@@ -478,6 +431,38 @@ export class PanelDetailModel {
return boxStyle; return boxStyle;
} }
/**
* 获取盒子内容样式（元素，包含内容换行模式，内容水平对齐，内容垂直对齐）
*
* @memberof PanelDetailModel
*/
protected getBoxContentStyle() {
const boxStyle = {};
return boxStyle;
}
/**
* 获取盒子边框样式（元素）
*
* @memberof PanelDetailModel
*/
protected getBoxBorderStyle() {
const boxStyle = {};
return boxStyle;
}
/**
* 获取通用布局样式(SAMPLEFLEX/FLEX)（布局，包含约束内容区布局的样式，包含内容区的对齐方式）
*
* @return {*}
* @memberof PanelDetailModel
*/
public getCommonLayoutStyle() {
const layoutStyle = {};
Object.assign(layoutStyle, this.getBoxLayOutStyle());
return layoutStyle;
}
/** /**
* 获取盒子布局样式(布局) * 获取盒子布局样式(布局)
* *
...@@ -487,7 +472,7 @@ export class PanelDetailModel { ...@@ -487,7 +472,7 @@ export class PanelDetailModel {
const boxStyle = {}; const boxStyle = {};
// 识别FLEX // 识别FLEX
if (this.layout == 'FLEX') { if (this.layout == 'FLEX') {
Object.assign(boxStyle, { 'display': 'flex', 'flex-grow': this.flexGrow ? this.flexGrow : 0 }); Object.assign(boxStyle, { 'flex-grow': this.flexGrow ? this.flexGrow : 0 });
} }
// 识别SIMPLEFLEX // 识别SIMPLEFLEX
if (this.layout == 'SIMPLEFLEX') { if (this.layout == 'SIMPLEFLEX') {
......
app_Web/src/pages/sample/index/index-base.vue
浏览文件 @ bd2c9528
...@@ -307,7 +307,7 @@ export default class IndexBase extends Vue { ...@@ -307,7 +307,7 @@ export default class IndexBase extends Vue {
container_scroll_left1:{ name: 'container_scroll_left1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'WEST', layoutHeight:0, heightMode:'', layoutWidth:15, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['appmenu'] , dataRegionType: 'INHERIT' }, container_scroll_left1:{ name: 'container_scroll_left1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'WEST', layoutHeight:0, heightMode:'', layoutWidth:15, widthMode:'PERCENTAGE', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['appmenu'] , dataRegionType: 'INHERIT' },
app_apptitle:{ name: 'app_apptitle', type: 'VIEWLAYOUT', 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:'CENTER', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , fieldState: '0', predefinedType: 'APP_APPTITLE', dataItemName:'', }, app_apptitle:{ name: 'app_apptitle', type: 'VIEWLAYOUT', 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:'CENTER', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container1', panel: this , fieldState: '0', predefinedType: 'APP_APPTITLE', 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:2, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['app_apptitle'] , 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:2, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['app_apptitle'] , dataRegionType: 'INHERIT' },
nav_breadcrumb1:{ name: 'nav_breadcrumb1', type: 'VIEWLAYOUT', 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:'CENTER', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this , viewType: 'APPINDEXVIEW', predefinedType: 'NAV_BREADCRUMB', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }, nav_breadcrumb1:{ name: 'nav_breadcrumb1', type: 'VIEWLAYOUT', 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:'LEFT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container2', panel: this , viewType: 'APPINDEXVIEW', predefinedType: 'NAV_BREADCRUMB', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
container2:{ name: 'container2', 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:7, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['nav_breadcrumb1'] , dataRegionType: 'INHERIT' }, container2:{ name: 'container2', 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:7, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_grid1', panel: this , details:['nav_breadcrumb1'] , dataRegionType: 'INHERIT' },
auth_userinfo1:{ name: 'auth_userinfo1', type: 'VIEWLAYOUT', 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:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , viewType: 'APPINDEXVIEW', predefinedType: 'AUTH_USERINFO', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', }, auth_userinfo1:{ name: 'auth_userinfo1', type: 'VIEWLAYOUT', 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:'RIGHT', vAlignSelf:'MIDDLE', flexGrow:-1, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container3', panel: this , viewType: 'APPINDEXVIEW', predefinedType: 'AUTH_USERINFO', contentType: '', contentStyle: '', rawContent: '', htmlContent: '', },
container3:{ name: 'container3', 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:['auth_userinfo1'] , dataRegionType: 'INHERIT' }, container3:{ name: 'container3', 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:['auth_userinfo1'] , dataRegionType: 'INHERIT' },
......
app_Web/src/styles/default.less
浏览文件 @ bd2c9528
...@@ -293,6 +293,12 @@ ...@@ -293,6 +293,12 @@
.app-view-layout{ .app-view-layout{
width: 100%; width: 100%;
height: 100%; height: 100%;
.container-item__pos{
display: flex;
flex-direction: column;
flex-wrap: nowrap;
flex-grow: 1;
}
} }
// 看板视图，卡片模式 // 看板视图，卡片模式
......
app_Web/src/widgets/ibizbook/main-form/main-form-base.vue
浏览文件 @ bd2c9528
...@@ -1808,7 +1808,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1808,7 +1808,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' + (this.$t('app.formpage.notconfig.loadaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -1843,7 +1843,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1843,7 +1843,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' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
...@@ -1905,7 +1905,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1905,7 +1905,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' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -2013,7 +2013,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2013,7 +2013,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' + (this.$t('app.formpage.notconfig.actionname') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
...@@ -2090,7 +2090,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2090,7 +2090,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' + (this.$t('app.formpage.notconfig.removeaction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKOptionView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return; return;
} }
const arg: any = opt[0]; const arg: any = opt[0];
...@@ -2507,5 +2507,4 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2507,5 +2507,4 @@ export default class MainBase extends Vue implements ControlInterface {
<style lang='less'> <style lang='less'>
@import './main-form.less'; @import './main-form.less';
</style>import './main-form.less';
</style> </style>
\ No newline at end of file
app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue
浏览文件 @ bd2c9528
...@@ -629,7 +629,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface ...@@ -629,7 +629,7 @@ export default class QUICKSEARCHFORMBase 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: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -665,7 +665,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface ...@@ -665,7 +665,7 @@ export default class QUICKSEARCHFORMBase 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: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_Web/src/widgets/ibizsample0021/default-searchform/default-searchform-base.vue
浏览文件 @ bd2c9528
...@@ -598,7 +598,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -598,7 +598,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: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -634,7 +634,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -634,7 +634,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: 'IBIZSample0021GridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_Web/src/widgets/ibizsample0021/main-grid/main-grid-base.vue
浏览文件 @ bd2c9528
...@@ -353,13 +353,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -353,13 +353,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;
/** /**
* 打开编辑数据视图 * 打开编辑数据视图
* *
...@@ -890,7 +883,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -890,7 +883,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(pageReset){ if(pageReset){
...@@ -985,7 +978,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -985,7 +978,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.removeAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return; return;
} }
let _datas:any[] = []; let _datas:any[] = [];
...@@ -1091,7 +1084,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1091,7 +1084,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return; return;
} }
if(!arg){ if(!arg){
...@@ -1984,7 +1977,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1984,7 +1977,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.createAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(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);
...@@ -1992,7 +1985,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1992,7 +1985,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{ }else{
Object.assign(item,{viewparams:this.viewparams}); Object.assign(item,{viewparams:this.viewparams});
if(item.ibizsample0021){ if(item.ibizsample0021){
...@@ -2059,7 +2052,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -2059,7 +2052,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: 'IBIZSample0021GridView_layout'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZSample0021WFDynaExpGridView_layout'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return; return;
} }
let _this = this; let _this = this;
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPINDEXVIEWS/index.json
浏览文件 @ bd2c9528
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
"name" : "nav_breadcrumb1", "name" : "nav_breadcrumb1",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "grow" : -1,
"hAlignSelf" : "CENTER", "hAlignSelf" : "LEFT",
"layout" : "SIMPLEFLEX", "layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE" "vAlignSelf" : "MIDDLE"
}, },
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ bd2c9528
...@@ -15166,7 +15166,7 @@ ...@@ -15166,7 +15166,7 @@
"name" : "nav_breadcrumb1", "name" : "nav_breadcrumb1",
"getPSLayoutPos" : { "getPSLayoutPos" : {
"grow" : -1, "grow" : -1,
"hAlignSelf" : "CENTER", "hAlignSelf" : "LEFT",
"layout" : "SIMPLEFLEX", "layout" : "SIMPLEFLEX",
"vAlignSelf" : "MIDDLE" "vAlignSelf" : "MIDDLE"
}, },
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或