Commit 86f77d1af78907cbe7f5222916fd9aee53cd3fdb
1 parent
c0d9a47f
优化后道参数额外参数处理;
Showing
1 changed file
with
5 additions
and
3 deletions
src/components/QuickQuote/index.jsx
| ... | ... | @@ -215,8 +215,8 @@ const QuickQuoteEvent = props => { |
| 215 | 215 | upAbleConfigsExtra: sColumnNameConfig, |
| 216 | 216 | }; |
| 217 | 217 | } else { |
| 218 | - if(!slaveData[0]) return | |
| 219 | - const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[0].sColumnNameConfig, []).map(item => ({ | |
| 218 | + if (!slaveData[0]) return; | |
| 219 | + const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[0].sColumnNameConfig, []).map(item => ({ | |
| 220 | 220 | ...item, |
| 221 | 221 | iColValue: item.iColValue || 6, |
| 222 | 222 | })); |
| ... | ... | @@ -279,6 +279,8 @@ const QuickQuoteEvent = props => { |
| 279 | 279 | sParam: sParam, |
| 280 | 280 | [`sParam${iOrder}`]: sParamDefault, |
| 281 | 281 | ...(sFieldName ? { [sFieldName]: sParamDefault } : {}), |
| 282 | + sParamKey: `sParam${iOrder}`, | |
| 283 | + sParamKeyNew: sFieldName || `sParam${iOrder}`, | |
| 282 | 284 | }; |
| 283 | 285 | }) |
| 284 | 286 | .filter(item => item !== ""); |
| ... | ... | @@ -2005,7 +2007,7 @@ const BoxComponent = props => { |
| 2005 | 2007 | slaveNewData.forEach(x => { |
| 2006 | 2008 | let key = 0; |
| 2007 | 2009 | if (x.sAssignFormula) { |
| 2008 | - key = parseFloat(evaluateFormula(x.sAssignFormula, variables)).toFixed(2); | |
| 2010 | + key = parseFloat(evaluateFormula(x.sAssignFormula, variables)).toFixed(2); | |
| 2009 | 2011 | slaveRowData[x.sName] = key; |
| 2010 | 2012 | } else { |
| 2011 | 2013 | key = slaveRowData[x.sName]; | ... | ... |