| | |
| | | dels.forEach(del=>{ |
| | | for(let b=0;b<a.template.length;b++){ |
| | | if(a.template[b].r === del.r){ |
| | | if(a.template[b].v.mc!=undefined){ |
| | | if(a.template[b].v.mc.rs!=undefined&&a.template[b].v.mc.rs>1){ |
| | | if(a.template[b].r === a.template[b].v.mc.r){ |
| | | a.template[b].r += 1 |
| | | a.template[b].v.mc.r += 1 |
| | | a.template[b].v.mc.rs -= 1 |
| | | continue |
| | | } |
| | | } |
| | | } |
| | | a.template.splice(b, 1) |
| | | b-=1 |
| | | } |
| | |
| | | } |
| | | }) |
| | | }) |
| | | console.log(this.tableList); |
| | | // return |
| | | this.tableList.map(item=>{ |
| | | const mySet0 = new Set(); |
| | | let arr = []; |
| | | let arrItem = []; |
| | | item.template.forEach((m,i)=>{ |
| | | let num0 = mySet0.size; |
| | | mySet0.add(m.r) |
| | | let num1 = mySet0.size; |
| | | if(num0<num1){ |
| | | if(arrItem.length>0){ |
| | | arr.push(arrItem) |
| | | arrItem = [] |
| | | } |
| | | if(m.v.mc){ |
| | | if(m.v.mc.rs||m.v.mc.cs){ |
| | | arrItem.push(m) |
| | | } |
| | | }else{ |
| | | arrItem.push(m) |
| | | } |
| | | }else{ |
| | | if(m.v.mc){ |
| | | if(m.v.mc.rs||m.v.mc.cs){ |
| | | arrItem.push(m) |
| | | } |
| | | }else{ |
| | | arrItem.push(m) |
| | | } |
| | | } |
| | | }) |
| | | arr.push(arrItem) |
| | | item.arr = arr; |
| | | return item |
| | | }) |
| | | console.log(this.tableList); |
| | | this.tableList.forEach(a=>{ |
| | | let arrs = [] |
| | | let set = new Set() |
| | | a.template.forEach(b=>{ |
| | | set.add(b.r) |
| | | }) |
| | | set = Array.sort(set) |
| | | set.forEach(b=>{ |
| | | let arr = [] |
| | | a.template.forEach(c=>{ |
| | | if(c.r === b){ |
| | | if(arr.length===0){ |
| | | if(c.v.mc==undefined||Object.keys(c.v.mc).length==4) arr.push(c) |
| | | }else{ |
| | | for(let d=0;d<arr.length;d++){ |
| | | if(c.c<arr[d].c){ |
| | | if(c.v.mc==undefined||Object.keys(c.v.mc).length==4) arr.splice(d, 0, c) |
| | | break |
| | | } |
| | | if(d === arr.length-1){ |
| | | if(c.v.mc==undefined||Object.keys(c.v.mc).length==4) arr.push(c) |
| | | break |
| | | } |
| | | } |
| | | } |
| | | } |
| | | }) |
| | | arrs.push(arr) |
| | | }) |
| | | a.arr = arrs |
| | | }) |
| | | } |
| | | } |
| | | } |