diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js index d48be0c..3e83f27 100644 --- a/src/components/Common/commonFunc.js +++ b/src/components/Common/commonFunc.js @@ -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]; } diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx index 12ce554..302b8df 100644 --- a/src/components/QuickQuote/index.jsx +++ b/src/components/QuickQuote/index.jsx @@ -282,6 +282,7 @@ const QuickQuoteEvent = props => { handleType: "add", sBoxModel: boxModel, sTreeNodeName, + ...commonFunc.getDefaultData(slaveConfig, { tree: selectedNode }), }); } else { slaveData[iIndex] = { @@ -290,7 +291,7 @@ const QuickQuoteEvent = props => { 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 => { 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 => { type="primary" icon={} onClick={() => { + const defaultData = commonFunc.getDefaultData({ ...slaveConfig, gdsconfigformslave: printParamsConfig }, { tree: selectedNode }); sBackProcessData.push({ sId: commonUtils.createSid(), bPrintParams: true, + ...defaultData, }); slaveData[slaveRowDataIndex] = { ...slaveRowData, sBackProcessData }; setState(pre => {