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

陈鑫涛
2 parents 4412932f 85efeead
Showing 2 changed files with 12 additions and 2 deletions
src/components/Common/commonFunc.js
src/components/QuickQuote/index.jsx
@@ -229,6 +229,13 @@ export function getDefaultData(config, allTableData = {}, extraData = {}) {
               }
             });
             returnData[sName] = oldTableFieldName.substring(0, 1) === '&' ? sFormula.split('+').join('') : commonUtils.convertFixNum(eval(sFormula), 6);
+          } else if (sDefault.split(',').length > 1 && sDefault.split(':').length > 1) {
+            sDefault.split(',').forEach(item => {
+              const oldFieldName = item.split(':')[1];
+              const [tableName, oldTableFieldName] = oldFieldName.split('.'); 
+              const newFieldName = item.split(':')[0];
+              returnData[newFieldName] = allTableData[tableName][oldTableFieldName];
+            });
           } else {
             returnData[sName] = allTableData[tableName][oldTableFieldName];
           }
@@ -282,6 +282,7 @@ const QuickQuoteEvent = props =&gt; {
             handleType: "add",
             sBoxModel: boxModel,
             sTreeNodeName,
+            ...commonFunc.getDefaultData(slaveConfig, { tree: selectedNode }),
           });
         } else {
           slaveData[iIndex] = {
@@ -290,7 +291,7 @@ const QuickQuoteEvent = props =&gt; {
                   sId: slaveData[iIndex].sId,
                   sBoxModel: boxModel,
                   sTreeNodeName,
-                  ...commonFunc.getDefaultData(slaveConfig),
+                  ...commonFunc.getDefaultData(slaveConfig, { tree: selectedNode }),
                 }
               : slaveData[iIndex]),
             ...changeValue,
@@ -1092,7 +1093,7 @@ const TreeComponent = props =&gt; {
       props.setState(pre => {
         const { slaveData = [], slaveConfig } = pre;
         const addState = {};
-        const defaultData = commonFunc.getDefaultData(slaveConfig);
+        const defaultData = commonFunc.getDefaultData(slaveConfig, { tree: selectedNode });
         const slaveDataNew = slaveData.filter(item => item.sTreeNodeName === selectedNode.showName);
         if (!slaveDataNew.length) {
           const sAllPartsName = selectedNode.sAllPartsName || selectedNode.showName;
@@ -2166,9 +2167,11 @@ const PrintParamsComponent = props =&gt; {
             type="primary"
             icon={<PlusOutlined />}
             onClick={() => {
+              const defaultData = commonFunc.getDefaultData({ ...slaveConfig, gdsconfigformslave: printParamsConfig }, { tree: selectedNode });
               sBackProcessData.push({
                 sId: commonUtils.createSid(),
                 bPrintParams: true,
+                ...defaultData,
               });
               slaveData[slaveRowDataIndex] = { ...slaveRowData, sBackProcessData };
               setState(pre => {