From 7f8864ea732e5efeae5d69acc96fce9d89cb99ad Mon Sep 17 00:00:00 2001
From: 陈鑫涛 <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Tue, 8 Jul 2025 13:41:59 +0800
Subject: [PATCH] 拼版

---
 src/components/Common/Typesetting/typesetting.js | 15 +++++----------
 src/components/Common/commonFunc.js              |  3 +++
 src/components/QuickQuote/index.jsx              |  1 -
 src/routes/mobile/IndexMobile.js                 |  1 -
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/Common/Typesetting/typesetting.js b/src/components/Common/Typesetting/typesetting.js
index a978681..2b2ace9 100644
--- a/src/components/Common/Typesetting/typesetting.js
+++ b/src/components/Common/Typesetting/typesetting.js
@@ -40,8 +40,6 @@ const Typesetting = props => {
     dL = 0,
     dW = 0
   } = slaveRowData;
-  console.log("🚀 ~ slaveRowData:", slaveRowData)
-
   const { masterData, selectedNode, slaveData } = state;
   if (!masterData) return;
   // 如果是卷筒类 那么上下左右留白等于左留白
@@ -194,8 +192,6 @@ const Typesetting = props => {
       variabless[key] = 0;
     }
   });
-    console.log("🚀 ~ Object.keys ~ variabless:", variabless)
-
   let DisableMateriallIcon = L ? sPackDetailPath : null;
   // 盒子展长展开公式计算
   const innerWidth = slaveRowData.sTypes === "6" ? evaluateFormula(sWidthFormula, variabless) : evaluateFormula(sLengthFormula, variabless);
@@ -258,13 +254,10 @@ const Typesetting = props => {
     rows = rows - 1;
     rowsMaxLength = rows * (innerHeightCombined + boxWidthOffset + (reference ? 0 : dSWidthOffset) + dXBJJ);
   }
-
-  // console.log(cols, rows, outerWidth, outerHeight, colsMaxLength,rowsMaxLength,"cols rows outerWidth outerHeight");
-
   // 最大上机长 上机宽 开料尺寸
   // 计算剩余空间 每组都算上偏移量 那么剩余需要加上后面偏移的总量
-  const remainingWidth = outerWidth - colsMaxLength;
-  const remainingHeight = outerHeight - rowsMaxLength;
+  const remainingWidth = outerWidth - colsMaxLength  - (boxLengthOffset + (reference ? 0 : dSLengthOffset) + dYBJJ);
+  const remainingHeight = outerHeight - rowsMaxLength - (boxWidthOffset + (reference ? 0 : dSWidthOffset) + dXBJJ);
   //   const remainingWidth =
   //   outerWidth -
   //   (cols * (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset)) - boxLengthOffset - (reference ? 0 : dSLengthOffset));
@@ -277,7 +270,9 @@ const Typesetting = props => {
   const isCustomized = bAdvancedSetting;
 
   let remaining = isVertical ? commonHeightCheck : commonWidthCheck;
-
+  console.log(commonWidthCheck,commonHeightCheck,remainingWidth,remainingHeight,remaining,'remaining');
+  
+  // 判断
   // const remaining = false;
   const isOdd = num => {
     return num % 2 !== 0;
diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js
index 3e83f27..28c4f4c 100644
--- a/src/components/Common/commonFunc.js
+++ b/src/components/Common/commonFunc.js
@@ -579,6 +579,9 @@ export function showLocalMessage(props, sName, sChineseName) {
   } else {
     sTitle = sChineseName;
   }
+  if (sTitle === '') {
+    sTitle = sChineseName
+  }
   return sTitle;
 }
 /** 获取常量数据 */
diff --git a/src/components/QuickQuote/index.jsx b/src/components/QuickQuote/index.jsx
index 50582a9..e04ec25 100644
--- a/src/components/QuickQuote/index.jsx
+++ b/src/components/QuickQuote/index.jsx
@@ -2221,7 +2221,6 @@ const BoxComponent = props => {
     { src: slaveRowData.sPackDetailPathUpLoad, alt: "展开图" },
     { src: slaveRowData.sPackPath, alt: "立体图" },
   ];
-  console.log(state, "activeKey");
   const { activeKey = 0 } = state;
   return (
     <Tabs
diff --git a/src/routes/mobile/IndexMobile.js b/src/routes/mobile/IndexMobile.js
index 0c7d0c1..646fc5d 100644
--- a/src/routes/mobile/IndexMobile.js
+++ b/src/routes/mobile/IndexMobile.js
@@ -116,7 +116,6 @@ class IndexMobile extends React.Component {
     }
   };
   renderContent(pageText) {
-    console.log(this.props, "pageText");
 
     if (pageText === "message") {
       if (location.pathname === "/indexMobile/examine") {
--
libgit2 0.22.2