Commit c999b859b26054a8fe0156de2294625bf3a71790
1 parent
39863751
不默认使用卡牌
Showing
1 changed file
with
2 additions
and
3 deletions
src/components/Common/Typesetting/typesetting.js
| @@ -92,9 +92,8 @@ const Typesetting = props => { | @@ -92,9 +92,8 @@ const Typesetting = props => { | ||
| 92 | // dHorizontal = 1; | 92 | // dHorizontal = 1; |
| 93 | // 如果需要自定义排版数 | 93 | // 如果需要自定义排版数 |
| 94 | // 确认是竖向排列还是横向排列 | 94 | // 确认是竖向排列还是横向排列 |
| 95 | - const isKapai = slaveRowData.svgType === '6' | ||
| 96 | - const L = isKapai? Number(dL) : Number(masterData?.dLength) || 0; | ||
| 97 | - const W = isKapai? Number(dW) : masterData?.dWidth || 0; | 95 | + const L = slaveRowData.dL? Number(dL) : Number(masterData?.dLength) || 0; |
| 96 | + const W = slaveRowData.dW? Number(dW) : masterData?.dWidth || 0; | ||
| 98 | const H = masterData?.dWidth || 0; | 97 | const H = masterData?.dWidth || 0; |
| 99 | const D = masterData?.dHeight || 0; | 98 | const D = masterData?.dHeight || 0; |
| 100 | // 动态计算公式值 | 99 | // 动态计算公式值 |