快速报价app

陈鑫涛
1 parent a1a27ca1
Showing 10 changed files with 291245 additions and 128 deletions
src/components/Common/BoxDesignCompontent/svg.js
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/i.json
src/components/QuickQuote/index.jsx
src/mobile/components/SelectInput.jsx
src/mobile/quotation/detail.jsx
src/mobile/quotation/index.json
src/mobile/quotation/quotationDetail.css
src/mobile/quotation/quotationDetail.less
src/routes/mobile/IndexMobile.js
@@ -234,6 +234,7 @@ const SvgBox = props =&gt; {
         svgContainerRef.current.style.height = `${dSvgBoxHeight ? dSvgBoxHeight : 250}px`;
       }
     } else if (props.showNew === 1) {
+      console.log("🚀 ~ initSVG ~ props:", props)
       let ySvg = topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
       let leftSize = 0;
       let topSize = 0;
@@ -276,6 +277,7 @@ const SvgBox = props =&gt; {
       svgContainerRef.current.style.transform = `scale(${scaleX >= 1 ? 1 : scaleX}, ${scaleY >= 1 ? 1 : scaleY})`;
       svgContainerRef.current.style.transformOrigin = "top left";
       svgContainerRef.current.style.paddingTop = dSvgBoxWidth ? "0" : "25px";
+      svgContainerRef.current.style.backgroundColor = props.isMobile ? '#EDF4FF' : ''
     } else if (props.showNew === 2) {
       // g.setAttribute("transform", `rotate(${iFAngle, dSvgBoxWidth/2,dSvgBoxHeight*2})`);
       let ySvg = topOffect(boxList, boxLength, boxWidth, boxHeight) * scale;
@@ -12,13 +12,14 @@ const Typesetting = props =&gt; {
   const {
     radioValue, //
     app,
-    boxPicData,
     onSaveStates,
     boxModel,
     slaveRowData,
     state,
     onSaveDPartsLength,
   } = props;
+  console.log("🚀 ~ typesettingsss:", props)
+  if (!slaveRowData) return
   const {
     dSBLB, // 上边留白
     dXBLB, // 下边留白
@@ -33,7 +34,6 @@ const Typesetting = props =&gt; {
     sPackDetailPath,
     sColumnNameConfig,
   } = slaveRowData;
-
   const { masterData, selectedNode, slaveData } = state;
   // 生成盒子图片
   const [boxKey, setBoxKey] = useState(new Date().getTime());
@@ -213,25 +213,13 @@ const Typesetting = props =&gt; {
   // 每个盒子加上边距 和第二组偏移量 如果根据次盒再加上次盒偏移量
   let cols = Math.floor(outerWidth / (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset)));
   let rows = Math.floor(outerHeight / (innerHeightCombined + boxWidthOffset + (reference ? 0 : dSWidthOffset)));
-  //  判断最后得到的长宽是否大于排版尺寸
-  // let colsMaxLength =
-  //   cols * (innerWidthCombined + dYBJJ + dYBJJ + boxLengthOffset + (reference ? 0 : dSLengthOffset)) -
-  //   dYBJJ -
-  //   dYBJJ -
-  //   boxLengthOffset -
-  //   (reference ? 0 : dSLengthOffset);
+
   let colsMaxLength = (cols - 1) * (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset)) + innerWidthCombined;
   while (colsMaxLength >= outerWidth && cols > 0) {
     cols = cols - 1;
     colsMaxLength = (cols - 1) * (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset)) + innerWidthCombined;
   }
-  // let rowsMaxLength =
-  //   rows * (innerHeightCombined + dXBJJ + dXBJJ + boxWidthOffset + (reference ? 0 : dSWidthOffset)) -
-  //   dXBJJ -
-  //   dXBJJ -
-  //   boxWidthOffset -
-  //   (reference ? 0 : dSWidthOffset);
   let rowsMaxLength = (rows - 1) * (innerHeightCombined + boxWidthOffset + (reference ? 0 : dSWidthOffset)) + innerHeightCombined;
   while (rowsMaxLength >= outerHeight && rows > 0) {
     rows = rows - 1;
@@ -561,7 +549,8 @@ const Typesetting = props =&gt; {
   }
   const isMax = slaveDataDetail?.dMaxLength && Number(slaveDataDetail?.dMaxLength) >= Number(slaveRowData?.dMachineLength);
   const isShow = slaveRowData && slaveRowData.dMachineLength && slaveRowData.dMaxWidth && slaveRowData.dMaxLength && isMax && innerDivs.length;
-
+  console.log(innerDivs,'innerDivs');
+  
   const onClick = () => {
     setIsModalOpen(true);
     // setBoxKeys(new Date().getTime());