From 06e3687ba1bdf90e4eb90a4847d50d50b2214a94 Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Mon, 30 Jun 2025 16:32:36 +0800
Subject: [PATCH] 排版

---
 src/components/Common/Typesetting/typesetting.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js
index fc7bf45..98305b3 100644
--- a/src/components/Common/Typesetting/typesetting.js
+++ b/src/components/Common/Typesetting/typesetting.js
@@ -277,6 +277,16 @@ const Typesetting = props => {
 
   let remaining = isVertical ? commonHeightCheck : commonWidthCheck;
   // const remaining = false;
+  console.log(innerWidth, '盒长');
+  console.log(innerHeight, '盒高');
+  console.log(dFWidthOffset, '首盒纵向偏移');
+  console.log(dFLengthOffset, '首盒横向偏移');
+  console.log(dSWidthOffset,radioValue?.sSWidthOffset, '次盒纵向偏移');
+  console.log(dSLengthOffset,radioValue?.sSLengthOffset, '次盒横向偏移');
+  console.log(boxLengthOffset, '第二列横向偏移');
+  console.log(boxWidthOffset, '第二列纵向偏移');
+  console.log(variabless,'variabless');
+  
 
   const isOdd = num => {
     return num % 2 !== 0;
@@ -336,7 +346,7 @@ const Typesetting = props => {
       }}
     >
       <div style={{ transform: `rotateZ(${offsetZ}deg)` }}>
-        {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
+        {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width={jInnerWidth} height={jInnerHeight} />}
         {/* <DynamicSVG {...svgProps} /> */}
       </div>
     </div>
@@ -371,11 +381,11 @@ const Typesetting = props => {
           alignItems: "center",
           position: "absolute",
           left: `${dFLengthOffset + dYBJJ}px`,
-          top: `${iFAngle === 90 || iFAngle === 270 ? 0 : dFWidthOffset + dXBJJ}px`,
+          top: `${iFAngle === 90 || iFAngle === 270 ? dFLengthOffset : dFWidthOffset + dXBJJ}px`,
         }}
       >
         <div style={{ transform: `rotateZ(${iFAngle}deg)` }}>
-          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
+          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width={ `${iSAngle === 90 || iSAngle === 270 ? jInnerWidth : innerWidth}px`} height={ `${iFAngle === 90 || iFAngle === 270 ? jInnerHeight : innerHeight}px`} />}
         </div>
       </div>
       <div
@@ -387,14 +397,14 @@ const Typesetting = props => {
           justifyContent: "center",
           alignItems: "center",
           position: "absolute",
-          left: `${isVertical ? dSLengthOffset + dYBJJ : jInnerWidth + dFLengthOffset + dSLengthOffset + dYBJJ}px`,
+          left: `${isVertical ? dSLengthOffset  : innerWidth + dFLengthOffset + dSLengthOffset + dYBJJ}px`,
           top: `${
             isVertical ? jInnerHeight + dXBJJ + dFWidthOffset + dSWidthOffset : iSAngle === 90 || iSAngle === 270 ? dSWidthOffset : dSWidthOffset + dXBJJ
           }px`,
         }}
       >
         <div style={{ transform: `rotateZ(${iSAngle}deg)` }}>
-          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
+          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width={ `${iSAngle === 90 || iSAngle === 270 ? jInnerWidth : innerWidth}px`} height={`${iSAngle === 90 || iSAngle === 270 ? jInnerHeight : innerHeight}px`} />}
         </div>
       </div>
     </div>
@@ -434,7 +444,7 @@ const Typesetting = props => {
         {/* <img src={icon} width="100%" height="100%" /> */}
         {/* {isSvg ? <DynamicSVG {...props} /> : <img src={icon} width="100%" height="100%" />} */}
         <div style={{ transform: `rotateZ(${iFAngle}deg)` }}>
-          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width="100%" height="100%" />}
+          {!sSvgPath ? <DynamicSVG {...svgProps} /> : <img src={sSvgPath} width={`${innerWidth}px`} height={`${innerHeight}px`} />}
         </div>
       </div>
     </div>
--
libgit2 0.22.2