提交 147742b8 编写于 作者: Shine-zwj's avatar Shine-zwj

update:更新

上级 feb86829
...@@ -543,7 +543,7 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code} ...@@ -543,7 +543,7 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code}
let dataArea = null; let dataArea = null;
let parentLayoutModel = null; let parentLayoutModel = null;
Object.values(this.layoutModelDetails).forEach((pLayoutModel: any) => { Object.values(this.layoutModelDetails).forEach((pLayoutModel: any) => {
if (pLayoutModel.name == cLayoutModel.name) { if (pLayoutModel.name == cLayoutModel.parentName) {
parentLayoutModel = pLayoutModel; parentLayoutModel = pLayoutModel;
if (parentLayoutModel.dataRegionType == 'SINGLEDATA' || parentLayoutModel.dataRegionType == 'MULTIDATA') { if (parentLayoutModel.dataRegionType == 'SINGLEDATA' || parentLayoutModel.dataRegionType == 'MULTIDATA') {
dataArea = parentLayoutModel; dataArea = parentLayoutModel;
...@@ -556,26 +556,20 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code} ...@@ -556,26 +556,20 @@ ${P.getCtrlCode('toolbar', 'CONTROL.vue').code}
return dataArea; return dataArea;
} }
xData = getDataArea(curLayoutModel); xData = getDataArea(curLayoutModel);
<#if view.getXDataControlName?? && view.getXDataControlName() != ''>
// 获取激活部件 // 获取激活部件
if (!xData && this.layoutCtrls.length > 0) { if (!xData) {
const getActionCtrl = (cLayoutModel: any): any => { const xDataControlName = "${view.getXDataControlName()}";
let actionCtrl = null; let xDataControl = null;
let parentLayoutModel = null; Object.values(this.layoutModelDetails).forEach((layoutModel: any) => {
Object.values(this.layoutModelDetails).forEach((pLayoutModel: any) => { if (layoutModel.name.toLowerCase() == xDataControlName.toLowerCase()) {
if (pLayoutModel.name == cLayoutModel.name) { xDataControl = layoutModel;
parentLayoutModel = pLayoutModel; return
actionCtrl= parentLayoutModel.details.find((ctrlName: string) => {
return this.layoutCtrls.indexOf(ctrlName) !== -1;
})
}
})
if (!actionCtrl && parentLayoutModel) {
actionCtrl = getActionCtrl(parentLayoutModel);
} }
return actionCtrl; })
} xData = xDataControl;
xData = getActionCtrl(curLayoutModel);
} }
</#if>
} }
// 获取当前视图 // 获取当前视图
if (!xData) { if (!xData) {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册