盒型设计贴边修改

陈鑫涛
1 parent 31e5e6bb
Showing 3 changed files with 21 additions and 18 deletions
src/components/Common/BoxDesign/createAirplaneBox.js
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
@@ -917,23 +917,26 @@ export const createWelt1 = (height, size, offsetX, offsetY) =&gt; {
 };
 // 贴边2
 export const createWelt2 = (height, size, offsetX, offsetY) => {
-  const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size * 0.5} ${size} 0 0 1 ${offsetX + size * 0.5} ${offsetY + size} A  ${
-    size * 0.5
-  } ${size} 0 0 1 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 1 ${offsetX + size * 0.5} ${
-    offsetY + height + Math.abs(size)
-  } A ${size * 0.5} ${size} 0 0 1 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${
-    offsetY + height
-  } L ${offsetX} ${offsetY + height}`;
+  const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size *0.3} ${size * 0.3} 0 0 1 ${offsetX } ${offsetY } L ${offsetX} ${offsetY + height} L 
+  ${offsetX + size} ${offsetY + height} A  ${size *0.3} ${size * 0.3} 0 0 0 ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} 
+    `
+  // A  ${ size * 0.5 } ${size} 0 0 1 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 1 ${offsetX + size * 0.5} ${
+  //   offsetY + height + Math.abs(size)
+  // } A ${size * 0.5} ${size} 0 0 1 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${
+  //   offsetY + height
+  // } L ${offsetX} ${offsetY + height}`;
   return createSvg(d);
 };
 export const createWelt2Right = (height, size, offsetX, offsetY) => {
-  const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size * 0.5} ${size} 0 0 0 ${offsetX + size * 0.5} ${offsetY - size} A ${
-    size * 0.5
-  } ${size} 0 0 0 ${offsetX} ${offsetY}  L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 0 ${offsetX + size * 0.5} ${
-    offsetY + height + Math.abs(size)
-  } A ${size * 0.5} ${size} 0 0 0 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${
-    offsetY + height
-  } L ${offsetX} ${offsetY + height}`;
+  const d = `M ${offsetX} ${offsetY} L ${offsetX + size} ${offsetY} A ${size * 0.3} ${size * 0.3} 0 0 0 ${offsetX} ${offsetY} L ${offsetX} ${offsetY + height}
+  L ${offsetX + size} ${offsetY + height} A  ${size *0.3} ${size * 0.3} 0 0 1 ${offsetX} ${offsetY + height} L ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} `
+  //  A ${
+  //   size * 0.5
+  // } ${size} 0 0 0 ${offsetX} ${offsetY}  L ${offsetX} ${offsetY + height} A ${size * 0.5} ${size} 0 0 0 ${offsetX + size * 0.5} ${
+  //   offsetY + height + Math.abs(size)
+  // } A ${size * 0.5} ${size} 0 0 0 ${offsetX + size} ${offsetY + height} L ${offsetX + size} ${offsetY} L ${offsetX + size} ${
+  //   offsetY + height
+  // } L ${offsetX} ${offsetY + height}`;
   return createSvg(d);
 };
 export const createWelt3 = (height, size, offsetX, offsetY) => {
@@ -229,7 +229,8 @@ const Typesetting = props =&gt; {
   };
   // 加上间距后的最大盒子长宽 计算每列可以放多少个组合 需要计算间距
   // 每个盒子加上边距 和第二组偏移量 如果根据次盒再加上次盒偏移量
-  let cols = Math.floor(outerWidth / (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset)));
+  const dSWidthOffsetCombined = (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset))
+  let cols =  dSWidthOffsetCombined === 0 ? 0 : Math.floor(outerWidth / dSWidthOffsetCombined);
   let rows = Math.floor(outerHeight / (innerHeightCombined + boxWidthOffset + (reference ? 0 : dSWidthOffset)));
   let colsMaxLength = (cols - 1) * (innerWidthCombined + boxLengthOffset + (reference ? 0 : dSLengthOffset)) + innerWidthCombined;
   while (colsMaxLength >= outerWidth && cols > 0) {
@@ -481,7 +482,6 @@ const Typesetting = props =&gt; {
   }, [radioValue, slaveRowData, masterData, selectedNode, slaveData]);
   // 生成里层 div 的数组
   const innerDivs = [];
-      console.log("🚀 ~ typeSetting:",cols, rows,dZBLB,dSBLB)
   for (let col = 0; col < cols; col++) {
     for (let row = 0; row < rows; row++) {
@@ -268,7 +268,7 @@ const QuickQuoteEvent = props =&gt; {
           extraState.backendParamsConfig = sParamConfig;
           extraState.backendConfig = { sParentFieldsName: sFieldName, sBoxModel: boxModel };
           const sBackendParams = sParamConfig
-            .map(item => {
+            .map((item) => {
               const { sParamDefault, sParam, sFieldName, iOrder } = item;
               return !sParamDefault
                 ? ""
@@ -1460,7 +1460,7 @@ const BoxComponent = props =&gt; {
       };
       getSqlDropDownData({ sId: "17428091410008594700322758474000" }, dropDownData => {
-        const boxTypeList = Array.from(new Set(dropDownData.map(item => item.sBoxType || "其它")));
+        const boxTypeList = Array.from(new Set(dropDownData?.map(item => item.sBoxType || "其它")));
         setBoxTypeList(boxTypeList);
         setBoxData(
           dropDownData.map((item, index) => ({