Commit 4836dfd5a60aeb62afd29e8a957736c28a4aacd5
1 parent
c0d9a47f
格式化
Showing
3 changed files
with
4 additions
and
3 deletions
src/components/Common/BoxDesignCompontent/svg.js
| @@ -85,6 +85,7 @@ const SvgBox = props => { | @@ -85,6 +85,7 @@ const SvgBox = props => { | ||
| 85 | const boxLength = Number(boxList.find(x => x.sName === "盒长")?.value) || 0; | 85 | const boxLength = Number(boxList.find(x => x.sName === "盒长")?.value) || 0; |
| 86 | const boxWidth = Number(boxList.find(x => x.sName === "盒宽")?.value) || 0; | 86 | const boxWidth = Number(boxList.find(x => x.sName === "盒宽")?.value) || 0; |
| 87 | const boxHeight = Number(boxList.find(x => x.sName === "盒高")?.value) || 0; | 87 | const boxHeight = Number(boxList.find(x => x.sName === "盒高")?.value) || 0; |
| 88 | + | ||
| 88 | setWidth(boxLength); | 89 | setWidth(boxLength); |
| 89 | setHeight(boxWidth); | 90 | setHeight(boxWidth); |
| 90 | setDeep(boxHeight); | 91 | setDeep(boxHeight); |
src/components/Common/Typesetting/typesetting.js
| @@ -468,7 +468,7 @@ const Typesetting = props => { | @@ -468,7 +468,7 @@ const Typesetting = props => { | ||
| 468 | useEffect(() => { | 468 | useEffect(() => { |
| 469 | // 计算缩放比例 | 469 | // 计算缩放比例 |
| 470 | // setBoxKey(new Date().getTime()); | 470 | // setBoxKey(new Date().getTime()); |
| 471 | - setTimeout(() => { | 471 | + // setTimeout(() => { |
| 472 | const scaleX = (clientWidth - 50) / (outerWidth + 110); | 472 | const scaleX = (clientWidth - 50) / (outerWidth + 110); |
| 473 | const scaleY = (clientHeight - 5) / (outerHeight + 90); | 473 | const scaleY = (clientHeight - 5) / (outerHeight + 90); |
| 474 | const newScale = Math.min(scaleX, scaleY); | 474 | const newScale = Math.min(scaleX, scaleY); |
| @@ -477,7 +477,7 @@ const Typesetting = props => { | @@ -477,7 +477,7 @@ const Typesetting = props => { | ||
| 477 | boxRef.current.style.transform = `scale(${scaleX}, ${scaleY})`; | 477 | boxRef.current.style.transform = `scale(${scaleX}, ${scaleY})`; |
| 478 | boxRef.current.style.transformOrigin = "top left"; | 478 | boxRef.current.style.transformOrigin = "top left"; |
| 479 | } | 479 | } |
| 480 | - }, 0); | 480 | + // }, 0); |
| 481 | }, [radioValue, slaveRowData, masterData, selectedNode, slaveData]); | 481 | }, [radioValue, slaveRowData, masterData, selectedNode, slaveData]); |
| 482 | // 生成里层 div 的数组 | 482 | // 生成里层 div 的数组 |
| 483 | const innerDivs = []; | 483 | const innerDivs = []; |
src/components/QuickQuote/index.jsx
| @@ -179,7 +179,6 @@ const QuickQuoteEvent = props => { | @@ -179,7 +179,6 @@ const QuickQuoteEvent = props => { | ||
| 179 | 179 | ||
| 180 | addState.onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => { | 180 | addState.onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => { |
| 181 | const { masterData = {}, slaveData = [], selectedNode = {}, manyData = [] } = state; | 181 | const { masterData = {}, slaveData = [], selectedNode = {}, manyData = [] } = state; |
| 182 | - | ||
| 183 | const extraState = { | 182 | const extraState = { |
| 184 | calcPriceFinished: false, | 183 | calcPriceFinished: false, |
| 185 | }; | 184 | }; |
| @@ -2956,6 +2955,7 @@ const BackendParamsExtraComponent = props => { | @@ -2956,6 +2955,7 @@ const BackendParamsExtraComponent = props => { | ||
| 2956 | return props.getSqlDropDownData(...args); | 2955 | return props.getSqlDropDownData(...args); |
| 2957 | }, | 2956 | }, |
| 2958 | onDataChange: (name, sFieldName, changeValue, sId, dropDownData, isWait) => { | 2957 | onDataChange: (name, sFieldName, changeValue, sId, dropDownData, isWait) => { |
| 2958 | + | ||
| 2959 | const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId); | 2959 | const iIndex = slaveData.findIndex(item => item.sId === slaveRowData.sId); |
| 2960 | const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[sParentFieldsName]); | 2960 | const iIndex1 = slaveData[iIndex].sBackProcessData.findIndex(item => item[sParentFieldsName]); |
| 2961 | const showConfig = viewConfigs.find(item => item.sName === sFieldName); | 2961 | const showConfig = viewConfigs.find(item => item.sName === sFieldName); |