拼版图弹窗大小修改

陈鑫涛
1 parent 88753631
Showing 2 changed files with 13 additions and 7 deletions
src/components/Common/Typesetting/typesetting.js
src/components/QuickQuote/index.jsx
@@ -52,8 +52,8 @@ const Typesetting = props =&gt; {
   const [boxKey, setBoxKey] = useState(new Date().getTime());
   const [boxKeys, setBoxKeys] = useState(new Date().getTime());
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const [modalWidth, setModalWidth] = useState(700);
-  const [modalHeight, setModalHeight] = useState(500);
+  const [modalWidth, setModalWidth] = useState(1000);
+  const [modalHeight, setModalHeight] = useState(800);
   const [modalBoxWidth, setModalBoxWidth] = useState(1200);
   const [scale, setScale] = useState(1);
   const [materialLength, setMaterialLength] = useState(0);
@@ -712,9 +712,9 @@ const Typesetting = props =&gt; {
     setIsModalOpen(true);
     // setBoxKeys(new Date().getTime());
     setTimeout(() => {
-      const scaleX = 1200 / outerWidth;
-      const scaleY = 500 / outerHeight;
-      const scales = Math.min(scaleX, scaleY) - 0.2;
+      const scaleX = 900 / outerWidth;
+      const scaleY = 600 / outerHeight;
+      const scales = Math.min(scaleX, scaleY);
       if (boxsRef.current) {
         boxsRef.current.style.transform = `scale(${scales}) translateX(-50%)`;
         boxsRef.current.style.transformOrigin = "top left";
@@ -1084,10 +1084,11 @@ const Typesetting = props =&gt; {
         footer={null}
         bodyStyle={{
           overflowY: "hide",
-          minHeight: "500px",
+          minHeight: `${700}px`,
           width: `${modalWidth}`,
           padding: "1px",
         }}
+        style={{top: 0}}
         onCancel={handleCancel}
       >
         <div
@@ -2258,10 +2258,15 @@ const BoxComponent = props =&gt; {
  
   const noImage = commonFunc.showLocalMessage(props, "ImpositionInformation", "暂无图片");
  
-  const imagesData = [
+  let imagesData = [
     { src: slaveRowData.sPackDetailPathUpLoad, alt: "展开图" },
     { src: slaveRowData.sPackPath, alt: "立体图" },
   ];
+  if (!slaveRowData.sPackDetailPathUpLoad) {
+    imagesData = [{ src: slaveRowData.sPackPath, alt: "立体图" }]
+  } else if (!slaveRowData.sPackPath) {
+    imagesData = [{ src: slaveRowData.sPackPath, alt: "立体图" }]
+  }
   const { activeKey = 0 } = state;
   useEffect(() => {
     props.setState(pre => {