sd-data-grid 1.2.45 → 1.2.46

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -598,27 +598,15 @@ module.exports = function normalizeComponent (
598
598
  //分组统计
599
599
  if (_this.comModel.groupStat && _this.comModel.groupStatField && resp.group && _this.quickFilter) {
600
600
  try {
601
- // let groupStatFields = this.comModel.groupStatField.split('|')
602
- // console.log(groupStatFields)
603
- // console.log(this.quickFilter)
604
- // groupStatFields.forEach(field => {
605
- // this.quickFilter[0].forEach(qf => {
606
- // if(qf.groupStatField) {
607
- // if(qf.groupStatField == field && resp.group[field]) {
608
- // qf.groupNum = resp.group[field][qf.groupMatchValue] || 0
609
- // }
610
- // else{
611
- // qf.groupNum = 0
612
- // }
613
- // }
614
- // })
615
- // })
616
601
  _this.quickFilter[0].forEach(function (qf) {
617
- if (resp.group[qf.groupStatField]) {
618
- if (resp.group[qf.groupStatField][qf.groupMatchValue]) {
619
- qf.groupNum = resp.group[qf.groupStatField][qf.groupMatchValue];
620
- } else {
621
- qf.groupNum = 0;
602
+ var statFields = qf.groupStatField.split('|');
603
+ var statValues = qf.groupMatchValue.split('|');
604
+ qf.groupNum = 0;
605
+ for (var i = 0; i < statFields.length; i++) {
606
+ var statField = statFields[i];
607
+ var statValue = statValues[i];
608
+ if (resp.group[statField] && resp.group[statField][statValue]) {
609
+ qf.groupNum += resp.group[statField][statValue];
622
610
  }
623
611
  }
624
612
  });
@@ -4808,7 +4796,6 @@ runtime.o = o;
4808
4796
  window.open(url, '_blank');
4809
4797
  } else if (oper.openMode === '2') {
4810
4798
  window.open(url, '_self');
4811
- // window.location.href = url
4812
4799
  }
4813
4800
  },
4814
4801
  closeModal: function closeModal() {