Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents 4836dfd5 86f77d1a
Showing 1 changed file with 5 additions and 3 deletions
src/components/QuickQuote/index.jsx
@@ -214,8 +214,8 @@ const QuickQuoteEvent = props =&gt; {
             upAbleConfigsExtra: sColumnNameConfig,
           };
         } else {
-          if(!slaveData[0]) return
-           const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[0].sColumnNameConfig, []).map(item => ({
+          if (!slaveData[0]) return;
+          const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[0].sColumnNameConfig, []).map(item => ({
             ...item,
             iColValue: item.iColValue || 6,
           }));
@@ -278,6 +278,8 @@ const QuickQuoteEvent = props =&gt; {
                     sParam: sParam,
                     [`sParam${iOrder}`]: sParamDefault,
                     ...(sFieldName ? { [sFieldName]: sParamDefault } : {}),
+                    sParamKey: `sParam${iOrder}`,
+                    sParamKeyNew: sFieldName || `sParam${iOrder}`,
                   };
             })
             .filter(item => item !== "");
@@ -2004,7 +2006,7 @@ const BoxComponent = props =&gt; {
     slaveNewData.forEach(x => {
       let key = 0;
       if (x.sAssignFormula) {
-        key =  parseFloat(evaluateFormula(x.sAssignFormula, variables)).toFixed(2);
+        key = parseFloat(evaluateFormula(x.sAssignFormula, variables)).toFixed(2);
         slaveRowData[x.sName] = key;
       } else {
         key = slaveRowData[x.sName];