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

分组表格--update

上级 6f9a0ee3
...@@ -1411,7 +1411,7 @@ ${gridColumn.getName()} ...@@ -1411,7 +1411,7 @@ ${gridColumn.getName()}
*/ */
public rowDBLClick($event: any): void { public rowDBLClick($event: any): void {
// 分组行跳过 // 分组行跳过
if($event && $event.children && $event.children.length >0){ if($event && $event.children){
return; return;
} }
if (!$event || this.actualIsOpenEdit || Object.is(this.gridRowActiveMode,0)) { if (!$event || this.actualIsOpenEdit || Object.is(this.gridRowActiveMode,0)) {
...@@ -1503,12 +1503,12 @@ ${gridColumn.getName()} ...@@ -1503,12 +1503,12 @@ ${gridColumn.getName()}
if(allGroupField && allGroupField.length > 0){ if(allGroupField && allGroupField.length > 0){
const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]}); const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
if(Object.is(group.label,arr[0].label)){ if(Object.is(group.label,arr[0].label)){
item.groupById = Number((i+1) * 100 + (i+1) * 1); item.groupById = Number((i+1) * 100 + (j+1) * 1);
item.group = ''; item.group = '';
children.push(item); children.push(item);
} }
}else if(Object.is(group.label,item[this.groupAppField])){ }else if(Object.is(group.label,item[this.groupAppField])){
item.groupById = Number((i+1) * 100 + (i+1) * 1); item.groupById = Number((i+1) * 100 + (j+1) * 1);
item.group = ''; item.group = '';
children.push(item); children.push(item);
} }
...@@ -1633,12 +1633,12 @@ ${gridColumn.getName()} ...@@ -1633,12 +1633,12 @@ ${gridColumn.getName()}
if(allGroupField && allGroupField.length > 0){ if(allGroupField && allGroupField.length > 0){
const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]}); const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
if(Object.is(group,arr[0].label)){ if(Object.is(group,arr[0].label)){
item.groupById = Number((groupIndex+1) * 100 + (groupIndex+1) * 1); item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
item.group = ''; item.group = '';
children.push(item); children.push(item);
} }
}else if(Object.is(group,item[this.groupAppField])){ }else if(Object.is(group,item[this.groupAppField])){
item.groupById = Number((groupIndex+1) * 100 + (groupIndex+1) * 1); item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
item.group = ''; item.group = '';
children.push(item); children.push(item);
} }
...@@ -1788,7 +1788,7 @@ ${gridColumn.getName()} ...@@ -1788,7 +1788,7 @@ ${gridColumn.getName()}
let flag: boolean = true; let flag: boolean = true;
if(selection && selection.length === this.items.length) { if(selection && selection.length === this.items.length) {
selection.forEach((element: any) => { selection.forEach((element: any) => {
if(element.children && element.children.length > 0) { if(element.children) {
this.toggleSelection(element.children, flag); this.toggleSelection(element.children, flag);
element.children.forEach((children: any) => { element.children.forEach((children: any) => {
this.selections.push(children); this.selections.push(children);
...@@ -1822,7 +1822,7 @@ ${gridColumn.getName()} ...@@ -1822,7 +1822,7 @@ ${gridColumn.getName()}
*/ */
public rowClick($event: any, ifAlways: boolean = false): void { public rowClick($event: any, ifAlways: boolean = false): void {
// 分组行跳过 // 分组行跳过
if($event && $event.children && $event.children.length >0){ if($event && $event.children){
return; return;
} }
if (!ifAlways && (!$event || this.actualIsOpenEdit)) { if (!ifAlways && (!$event || this.actualIsOpenEdit)) {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册