|
@@ -309,7 +309,7 @@ class ScaleItem extends Component {
|
|
|
}
|
|
|
for( let i in scaleItems){
|
|
|
it = this.getScaleContent(scaleItems[i]);
|
|
|
- if(!it) return '';
|
|
|
+ if(!it) continue;
|
|
|
let scaleRes=formulaResult&&formulaResult[it.id]&&formulaResult[it.id].calcalculate;
|
|
|
temp =<span className={style['scale']} onClick={()=>this.handleShowScale(it)}>
|
|
|
{scaleRes&&scaleRes.result?(' 【'+it.name+'】 结果:'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.name+'】'}
|
|
@@ -324,7 +324,7 @@ class ScaleItem extends Component {
|
|
|
<img className={style["deleteIcon"]} src={deleteIcon} />
|
|
|
</div>
|
|
|
</li>;
|
|
|
- return li;
|
|
|
+ arr.push(li);
|
|
|
};
|
|
|
return arr;
|
|
|
}
|