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

分组表格---fix4

上级 9f8fdce8
......@@ -1467,13 +1467,36 @@ ${gridColumn.getName()}
let children:Array<any> = [];
this.items.forEach((item: any,j: number)=>{
if(Object.is(group.label,item[this.groupAppField])){
item.groupById = Number((i+1) * 10 + (i+1) * 1);
item.groupById = Number((i+1) * 100 + (i+1) * 1);
item.group = '';
children.push(item);
}
});
if(children && children.length === 0){
children = [
{
groupById: Number((i+1)*100+(i+1) * 1),
group: '',
<#if ctrl.getPSDEGridColumns()??>
<#list ctrl.getPSDEGridColumns() as singleColumn>
<#if singleColumn.getColumnType()?? && singleColumn.getColumnType() == "UAGRIDCOLUMN">
<#if singleColumn.getPSDEUIActionGroup()?? && singleColumn.getPSDEUIActionGroup().getPSUIActions()??>
<#list singleColumn.getPSDEUIActionGroup().getPSUIActions() as singleUIAction>
${singleUIAction.getCodeName()}:{
visabled: false
},
</#list>
</#if>
<#else>
${singleColumn.getCodeName()}:'',
</#if>
</#list>
</#if>
}
]
}
const tree: any ={
groupById: Number((i+1)*10),
groupById: Number((i+1)*100),
group: group.label,
<#if ctrl.getPSDEGridColumns()??>
<#list ctrl.getPSDEGridColumns() as singleColumn>
......@@ -1498,13 +1521,13 @@ ${gridColumn.getName()}
this.items.forEach((item: any,index: number)=>{
let i = allGroup.findIndex((group: any)=>Object.is(group.label,item[this.groupAppField]));
if(i < 0){
item.groupById = Number((allGroup.length+1) * 10 + (index+1) * 1);
item.groupById = Number((allGroup.length+1) * 100 + (index+1) * 1);
item.group = '';
child.push(item);
}
})
const Tree: any = {
groupById: Number((allGroup.length+1)*10),
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
<#if ctrl.getPSDEGridColumns()??>
<#list ctrl.getPSDEGridColumns() as singleColumn>
......@@ -1558,14 +1581,14 @@ ${gridColumn.getName()}
let children:Array<any> = [];
this.items.forEach((item: any,itemIndex: number)=>{
if(Object.is(group,item[this.groupAppField])){
item.groupById = Number((groupIndex+1) * 10 + (itemIndex+1) * 1);
item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
item.group = '';
children.push(item);
}
});
group = group ? group : this.$t('app.gridpage.other');
const tree: any ={
groupById: Number((groupIndex+1)*10),
groupById: Number((groupIndex+1)*100),
group: group,
<#if ctrl.getPSDEGridColumns()??>
<#list ctrl.getPSDEGridColumns() as singleColumn>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册