Skip to content

iBiz-Vue-R7
iBiz-Vue-R7
提交 170795da 编写于 作者: Mosher's avatar Mosher
浏览文件
操作

update：调整编辑视图上下关系、分页关系

上级 7fa9f6f8
显示空白字符变更
内嵌 并排
正在显示 包含 161 行增加 和 129 行删除
@CONTROL/@MACRO/HTML/DRTAB.html.ftl
浏览文件 @ 170795da
......@@ -7,7 +7,7 @@
:context="context"
<#if ctrl.getPSAppDataEntity()??>parentName = "${ctrl.getPSAppDataEntity().getCodeName()}"</#if>
<#if view.getViewType() == 'DEEDITVIEW4'>
:isShowSlot="false"
:selectDefault="true"
</#if>
<#if ctrl.getHookEventNames()??>
<#list ctrl.getHookEventNames() as eventName>
......@@ -15,7 +15,4 @@
</#list>
</#if>
@closeview='closeView($event)'>
<#if view.getViewType() != 'DEEDITVIEW4' && view.hasPSControl('form')>
${P.getCtrlCode('form', 'CONTROL.html').code}
</#if>
</view_${ctrl.getName()}>
\ No newline at end of file
@CONTROL/数据关系分页部件/CONTROL-BASE.vue.ftl
浏览文件 @ 170795da
......@@ -3,7 +3,15 @@
${ctrl.render.code}
<#else>
<div class="app-dr-tab<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>">
<div v-for="(item, index) in items" :class="{ 'app-dr-tab-item': true, 'dr-tab-item': true, 'is-disabled': item.disabled, 'is-active': selection.id === item.id }">
<div
v-for="(item, index) in items"
:class="{
'app-dr-tab-item': true,
'dr-tab-item': true,
'is-disabled': item.disabled,
'is-active': selection.id === item.id
}"
@click="handleDrTabChange(item)">
<span class="text">{{ item.text }}</span>
</div>
</div>
......@@ -17,14 +25,13 @@
<#ibizinclude>
../@MACRO/FUNC/MACRO.ftl
</#ibizinclude>
/**
* 是否显示插槽
* 是否默认加载数据
*
* @type {string}
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop({default:true}) public isShowSlot?: boolean;
@Prop({ default: false }) public selectDefault?: boolean;
/**
* 应用实体参数名称
......@@ -114,17 +121,6 @@
this.afterCreated();
}
/**
* 仿真选中第一项
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public selectFirst(){
if (this.items.length > 0){
this.isShowSlot?this.tabPanelClick(this.items[0].name):this.items.length>1?this.tabPanelClick(this.items[1].name):()=>{};
}
}
/**
* 执行created后的逻辑
*
......@@ -137,10 +133,10 @@
return;
}
if (Object.is('state', action)) {
const state = !this.context.${ctrl.getPSAppDataEntity().getCodeName()?lower_case} ? true : false;
this.setItemDisabled(state);
this.formData = data;
this.selectFirst();
this.handleFormDataChange(data);
}
if (Object.is('change', action)) {
this.selection = data;
}
});
}
......@@ -170,48 +166,10 @@
}
/**
* 获取关系项
*
* @public
* @param {*} [arg={}]
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public getDRTabItem(arg: any = {}): any {
let expmode = arg.nodetype.toUpperCase();
if (!expmode) {
expmode = '';
}
<#list ctrl.getPSAppViewRefs() as item>
<#if (item.getName()?index_of("DRITEM:")==0)>
<#assign refview = item.getRefPSAppView()>
if (Object.is(expmode, '${item.getName()?substring(7)}')) {
return {
viewname: '${srffilepath2(refview.codeName)}',
parentdatajo: <#if item.getParentDataJO()??>${item.getParentDataJO()}<#else>{},</#if>
};
}
</#if>
</#list>
return undefined;
}
/**
* 获取数据项
* 处理表单数据变化
*
* @public
* @param {string} id
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public getItem(id: string): any {
const arr: any[] = this.items.filter((_item: any) => Object.is(_item.id, id));
if (arr) {
return arr[0];
}
return null;
}
public handleFormDataChange(data: any) {
this.formData = data;
if (data && Object.is(data.srfuf, '1')) {
......@@ -223,37 +181,48 @@
item.disabled = true;
})
}
if (this.selectDefault && this.items.length > 0) {
this.handleDrTabChange(this.items[0]);
}
}
/**
* 选中节点
* 处理分页项变化
*
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public tabPanelClick($event: any): void {
// const item = this.getItem($event);
// if (Object.is(item.id, this.selection.id)) {
// return;
// }
// this.$emit('selectionchange', [item]);
// let localNavParam:any = this.initNavParam(item);
// const refview = this.getDRTabItem({ nodetype: item.id });
// this.selection = {};
// const _context: any = { ...JSON.parse(JSON.stringify(this.context)) };
// if(localNavParam && localNavParam.localContext){
// Object.assign(_context,localNavParam.localContext);
// }
// Object.assign(_context,{srfparentdename:this.parentName,srfparentkey:_context[this.parentName.toLowerCase()]});
// const _params: any = {};
// if(localNavParam && localNavParam.localViewParam){
// Object.assign(_params,localNavParam.localViewParam);
// }
// if (refview && refview.parentdatajo) {
// Object.assign(_context, refview.parentdatajo);
// Object.assign(this.selection, { view: { viewname: refview.viewname }, data: _context, param: _params });
// }
// Object.assign(this.selection, item);
public handleDrTabChange(item: any) {
if (this.selection && this.selection.id === item.id) {
return;
}
this.selection = item;
const tempContext = Util.deepCopy(this.context);
const tempViewParams = Util.deepCopy(this.viewparams);
if (item.localContext && Object.keys(item.localContext).length > 0) {
const _context: any = this.$util.computedNavData(this.formData, tempContext, tempViewParams, item.localContext);
Object.assign(tempContext, _context);
}
if (this.formData.srfparentkey) {
Object.assign(tempContext, { srfparentkey: this.formData.srfparentkey });
Object.assign(tempViewParams, { srfparentkey: this.formData.srfparentkey });
}
if (item.localViewParam && Object.keys(item.localViewParam).length > 0) {
const _params: any = this.$util.computedNavData(this.formData, tempContext, tempViewParams, item.localViewParam);
Object.assign(tempViewParams, _params);
}
if (this.formData.srfparentdename) {
Object.assign(tempContext, { srfparentdename: this.formData.srfparentdename });
Object.assign(tempViewParams, { srfparentdename: this.formData.srfparentdename });
}
const drItem = {
id: item.id,
navView: item.navView,
srfnavdata: {
context: tempContext,
viewparams: tempViewParams
}
}
this.$emit('selectionchange', drItem);
}
<#ibizinclude>
......
@CONTROL/数据关系分页部件/CONTROL.less.ftl
浏览文件 @ 170795da
.drtab{
height:100%;
overflow: auto;
.app-dr-tab {
height: 100%;
>.ivu-tabs-bar {
margin-bottom: 0px;
}
>.ivu-tabs-content {
height: calc(100% - 36px);
padding: 0px !important;
.ivu-tabs-tabpane {
height: 100%;
.main-data {
width: 100%;
height: 100%;
.app-dr-tab {
.dr-tab-item {
cursor: pointer;
padding: 0 16px;
&.is-active,
&:hover {
color: #2d8cf0;
}
&.is-active {
position: relative;
}
&.is-active::after {
content: '';
width: 100%;
height: 2px;
background: #2d8cf0;
position: absolute;
left: 0px;
bottom: 0px;
}
}
}
<#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/视图布局面板/@MACRO/EDIT3.vue.ftl
浏览文件 @ 170795da
......@@ -4,7 +4,7 @@
<#if view.hasPSControl('toolbar')>
<#assign selfToolbarRender>
<template v-if="Object.is(this.selection.id, 'form')">
<template v-if="drItem && drItem.id === 'form'">
${P.getCtrlCode('toolbar', 'CONTROL.html').code}
</template>
</#assign>
......@@ -29,7 +29,7 @@
<#-- END：视图内容区视图消息 -->
<div class="edit-view3">
<div class="edit-view3-drheader">
<span :class="{ 'dr-tab-item': true, 'is-active': drItem && drItem.id !== 'form' }" @click="handleDrTabChange"><#if view.getPSControl('drtab').getEditItemCaption?? && view.getPSControl('drtab').getEditItemCaption()??>${view.getPSControl('drtab').getEditItemCaption()}</#if></span>
<span :class="{ 'dr-tab-item': true, 'is-active': drItem && drItem.id === 'form' }" @click="handleDrTabChange"><#if view.getPSControl('drtab').getEditItemCaption?? && view.getPSControl('drtab').getEditItemCaption()??>${view.getPSControl('drtab').getEditItemCaption()}</#if></span>
<#if view.hasPSControl('drtab')>
<@ibizindent blank=8>
${P.getCtrlCode('drtab', 'CONTROL.html').code}
......
@CONTROL/视图布局面板/实体编辑视图（上下关系）/VIEW.less.ftl
浏览文件 @ 170795da
......@@ -2,6 +2,26 @@
../@MACRO/DEFAULT.less.ftl
</#ibizinclude>
.view-container.${srffilepath2(view.getCodeName())} > .view-card > .ivu-card-body > .content-container {
height: calc(100% - 30px);
.edit-view4 {
height: 100%;
display: flex;
flex-direction: column;
}
.edit-view4-content {
.app-dr-tab {
height: 40px;
line-height: 40px;
border-bottom: 1px solid rgb(220, 222, 226);
display: flex;
}
> .view-container2 {
height: calc(100% - 40px);
}
}
.edit-view4-form,
.edit-view4-content {
height: 50%;
}
.${srffilepath2(view.getCodeName())} {
height: 100%;
}
\ No newline at end of file
@CONTROL/视图布局面板/实体编辑视图（分页关系）/VIEW.less.ftl
浏览文件 @ 170795da
.view-card {
>.ivu-card-extra {
> .ivu-card-extra {
top: 5px;
right: 0px;
}
}
.edit-view3 {
height: 100%;
}
.edit-view3-drheader {
height: 40px;
line-height: 40px;
display: flex;
flex-direction: row;
align-items: center;
border-bottom: 1px solid rgb(220, 222, 226);
.dr-tab-item {
cursor: pointer;
padding: 0 16px;
&.is-active,
&:hover {
color: #2d8cf0;
}
&.is-active {
position: relative;
}
&.is-active::after {
content: '';
width: 100%;
height: 2px;
background: #2d8cf0;
position: absolute;
left: 0px;
bottom: 0px;
}
}
}
.edit-view3-content {
height: calc(100% - 40px);
.edit-view3-content__form,
> .view-container2 {
height: 100%;
}
}
.${srffilepath2(view.getCodeName())} {
height: 100%;
}
<#ibizinclude>
../@MACRO/DEFAULT.less.ftl
</#ibizinclude>
\ No newline at end of file
@VIEW/@MACRO/EDIT_VIEW3-BASE.vue.ftl
浏览文件 @ 170795da
......@@ -16,7 +16,7 @@
* @type {*}
* @memberof ${srfclassname('${view.name}')}Base
*/
public drItem: any = {};
public drItem: any = { id: 'form' };
/**
* 处理分页项变化
......@@ -24,7 +24,9 @@
* @memberof ${srfclassname('${view.name}')}Base
*/
public handleDrTabChange() {
if (this.engine) {
this.engine.drTabSelectionChange({ id: 'form' });
}
}
<#ibizinclude>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或