Commit 86f77d1af78907cbe7f5222916fd9aee53cd3fdb

Authored by zhangzzzz
1 parent c0d9a47f

优化后道参数额外参数处理;

src/components/QuickQuote/index.jsx
@@ -215,8 +215,8 @@ const QuickQuoteEvent = props => { @@ -215,8 +215,8 @@ const QuickQuoteEvent = props => {
215 upAbleConfigsExtra: sColumnNameConfig, 215 upAbleConfigsExtra: sColumnNameConfig,
216 }; 216 };
217 } else { 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 ...item, 220 ...item,
221 iColValue: item.iColValue || 6, 221 iColValue: item.iColValue || 6,
222 })); 222 }));
@@ -279,6 +279,8 @@ const QuickQuoteEvent = props => { @@ -279,6 +279,8 @@ const QuickQuoteEvent = props => {
279 sParam: sParam, 279 sParam: sParam,
280 [`sParam${iOrder}`]: sParamDefault, 280 [`sParam${iOrder}`]: sParamDefault,
281 ...(sFieldName ? { [sFieldName]: sParamDefault } : {}), 281 ...(sFieldName ? { [sFieldName]: sParamDefault } : {}),
  282 + sParamKey: `sParam${iOrder}`,
  283 + sParamKeyNew: sFieldName || `sParam${iOrder}`,
282 }; 284 };
283 }) 285 })
284 .filter(item => item !== ""); 286 .filter(item => item !== "");
@@ -2005,7 +2007,7 @@ const BoxComponent = props => { @@ -2005,7 +2007,7 @@ const BoxComponent = props => {
2005 slaveNewData.forEach(x => { 2007 slaveNewData.forEach(x => {
2006 let key = 0; 2008 let key = 0;
2007 if (x.sAssignFormula) { 2009 if (x.sAssignFormula) {
2008 - key = parseFloat(evaluateFormula(x.sAssignFormula, variables)).toFixed(2); 2010 + key = parseFloat(evaluateFormula(x.sAssignFormula, variables)).toFixed(2);
2009 slaveRowData[x.sName] = key; 2011 slaveRowData[x.sName] = key;
2010 } else { 2012 } else {
2011 key = slaveRowData[x.sName]; 2013 key = slaveRowData[x.sName];