Ver a proveniência

修复在做取消行类型操作时某些情况下出现不准确的情况,修复存在多总结行出现倒排序的问题

master
youseries há 6 anos
ascendente
cometimento
a479c2aa77
  1. 2
      ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js
  2. 4
      ureport2-core/src/main/java/com/bstek/ureport/build/paging/BasePagination.java
  3. 5
      ureport2-js/src/Context.js

2
ureport2-console/src/main/resources/ureport-asserts/js/designer.bundle.js

A apresentação das diferenças entre ficheiros foi suprimida porque há linhas demasiado longas

4
ureport2-core/src/main/java/com/bstek/ureport/build/paging/BasePagination.java

@ -35,9 +35,7 @@ public abstract class BasePagination {
protected void buildSummaryRows(List<Row> summaryRows,List<Page> pages){
Page lastPage=pages.get(pages.size()-1);
List<Row> lastPageRows=lastPage.getRows();
int summaryRowSize=summaryRows.size()-1;
for(int i=summaryRowSize;i>-1;i--){
Row row=summaryRows.get(i);
for(Row row:summaryRows){
row.setPageIndex(pages.size());
lastPageRows.add(row);
}

5
ureport2-js/src/Context.js

@ -36,10 +36,9 @@ export default class Context{
adjustDelRowHeaders(row){
let targetHeader=null;
for(let header of this.rowHeaders){
if(header.rowNumber>row){
header.rowNumber-=1;
}else if(header.rowNumber===row){
if(header.rowNumber===row){
targetHeader=header;
break;
}
}
if(targetHeader){

Carregando…
Cancelar
Guardar