datastake-daf 0.6.412 → 0.6.414

package/dist/components/index.js

@@ -13276,15 +13276,9 @@ DAFFooter.propTypes = {
 };
 
 const PAGE_HEIGHT = 1587;
+// margin-top: 20, bottom: 20;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
-const SECTION_SPACING = 24; // Space between sections
-const FIRST_PAGE_TOP_PADDING = 30; // Padding after header on first page
-const NEW_PAGE_TOP_PADDING = 30; // Padding after header on new pages
-const LAST_SECTION_BOTTOM_PADDING = 30; // Padding after last section
-
-// Available content height per page (excluding header and footer)
-const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT;
 const Row = _ref => {
   let {
     widgets,
@@ -13309,7 +13303,7 @@ const Row = _ref => {
         ref
       });
     }
-  }, [height, i, onChangeHeight]);
+  }, [height]);
   return /*#__PURE__*/jsxRuntime.jsx("section", {
     ref: ref,
     style: widgets.style,
@@ -13331,73 +13325,51 @@ function PdfView(_ref2) {
   const [pages, setPages] = React.useState([1]);
   const doSizing = React.useCallback(() => {
     const keys = Object.keys(sectionsConfig);
-
-    // Wait until all sections have been measured
-    if (keys.length !== config.length) return;
     let _pages = [1];
-    let currentPage = 1;
-    let currentPageContentHeight = 0; // Tracks content height on current page (excluding header)
-
-    // Reset all styles first
-    keys.forEach(k => {
-      const {
-        ref
-      } = sectionsConfig[k];
-      ref.current.style.marginTop = '0px';
-      ref.current.style.marginBottom = '0px';
-      ref.current.style.paddingBottom = '0px';
-    });
-    keys.forEach((k, i) => {
-      const {
-        height,
-        ref
-      } = sectionsConfig[k];
-      const isFirstSection = i === 0;
-      const isLastSection = i === keys.length - 1;
-      const isFirstSectionOnPage = currentPageContentHeight === 0;
-
-      // For first section of entire document
-      if (isFirstSection) {
-        ref.current.style.marginTop = "".concat(HEADER_HEIGHT + FIRST_PAGE_TOP_PADDING, "px");
-        currentPageContentHeight = height + FIRST_PAGE_TOP_PADDING;
-        if (isLastSection) {
-          ref.current.style.paddingBottom = "".concat(LAST_SECTION_BOTTOM_PADDING, "px");
+    let _page = 1;
+    if (keys.length === config.length) {
+      let incrHeight = 0;
+      keys.forEach(k => {
+        const {
+          ref
+        } = sectionsConfig[k];
+        ref.current.style.marginBottom = '0px';
+        // ref.current.style.marginTop = '15px';
+      });
+      keys.forEach((k, i) => {
+        const {
+          height,
+          ref
+        } = sectionsConfig[k];
+        if (i === 0) {
+          ref.current.style.marginTop = "".concat(HEADER_HEIGHT, "px");
+          incrHeight += HEADER_HEIGHT;
+        }
+        const newHeight = incrHeight + height;
+        if (i === keys.length - 1) {
+          ref.current.style.paddingBottom = '30px';
+        }
+        if (newHeight > PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT) {
+          const dif = Math.abs(PAGE_HEIGHT - incrHeight);
+          ref.current.style.marginTop = '30px';
+          _page += 1;
+          _pages.push(_page);
+          if (sectionsConfig[keys[i - 1]]) {
+            const {
+              ref: topRef
+            } = sectionsConfig[keys[i - 1]];
+            topRef.current.style.marginBottom = "".concat(dif + HEADER_HEIGHT - 24, "px");
+            incrHeight = height + 24 + HEADER_HEIGHT;
+            // console.log('margin', dif);
+          }
+        } else {
+          incrHeight = newHeight + 24;
         }
-        return;
-      }
-
-      // Calculate space needed for this section including spacing before it
-      const spacingBefore = isFirstSectionOnPage ? NEW_PAGE_TOP_PADDING : SECTION_SPACING;
-      const totalSpaceNeeded = spacingBefore + height;
-
-      // Check if we need to move to next page
-      if (currentPageContentHeight + totalSpaceNeeded > AVAILABLE_HEIGHT) {
-        // Move to new page
-        currentPage += 1;
-        _pages.push(currentPage);
-
-        // Calculate and apply bottom margin to fill previous page
-        const usedSpace = currentPageContentHeight;
-        const remainingSpace = AVAILABLE_HEIGHT - usedSpace;
-        const previousKey = keys[i - 1];
-        sectionsConfig[previousKey].ref.current.style.marginBottom = "".concat(remainingSpace, "px");
-
-        // This section starts the new page
-        ref.current.style.marginTop = "".concat(HEADER_HEIGHT + NEW_PAGE_TOP_PADDING, "px");
-        currentPageContentHeight = height + NEW_PAGE_TOP_PADDING;
-      } else {
-        // Section fits on current page
-        ref.current.style.marginTop = "".concat(spacingBefore, "px");
-        currentPageContentHeight += totalSpaceNeeded;
-      }
-
-      // Add bottom padding to last section
-      if (isLastSection) {
-        ref.current.style.paddingBottom = "".concat(LAST_SECTION_BOTTOM_PADDING, "px");
-      }
-    });
-    setPages(_pages);
-  }, [sectionsConfig, config.length]);
+        // console.groupEnd();
+      });
+      setPages(_pages);
+    }
+  }, [sectionsConfig]);
   React.useEffect(() => {
     doSizing();
   }, [doSizing]);
@@ -13418,22 +13390,32 @@ function PdfView(_ref2) {
             widgets: widgets,
             i: i,
             onChangeHeight: onChangeHeight
-          }, "dashboard-sections-".concat(i + 1)))
+          }, "dashboard-sections=".concat(i + 1)))
         })
       })
     });
   }, [config, onChangeHeight]);
+
+  // <div className="daf-analysis">
+  // <Header title={t('Dashboard Title')} />
+
+  // <div className="content">
+  //   <div className="view-content">
+  //     <div className="daf-analysis-layout">
+  //       <div className='sections-cont w-pt'>
+  //         <section>
+
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: contClassName,
     style: {
       position: 'relative'
     },
-    children: [renderDashboard(), pages.map(page => /*#__PURE__*/jsxRuntime.jsxs("div", {
+    children: [renderDashboard(), pages.map(page => /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
           top: (page - 1) * PAGE_HEIGHT,
           width: '100%',
-          height: HEADER_HEIGHT,
+          height: HEADER_HEIGHT - 24,
           position: 'absolute',
           left: 0,
           zIndex: 1000000
@@ -13451,7 +13433,7 @@ function PdfView(_ref2) {
             alt: "logo"
           })
         })]
-      }), /*#__PURE__*/jsxRuntime.jsxs("div", {
+      }, "headers-".concat(page)), /*#__PURE__*/jsxRuntime.jsxs("div", {
         style: {
           top: page * PAGE_HEIGHT - FOOTER_HEIGHT,
           width: '100%',
@@ -13494,8 +13476,8 @@ function PdfView(_ref2) {
             children: page
           })
         })]
-      })]
-    }, "page-".concat(page)))]
+      }, "footers-".concat(page))]
+    }))]
   });
 }
 PdfView.propTypes = {
@@ -13505,8 +13487,7 @@ PdfView.propTypes = {
   imgSrc: PropTypes__default["default"].string,
   userId: PropTypes__default["default"].string,
   accountId: PropTypes__default["default"].string,
-  documentId: PropTypes__default["default"].string,
-  downloadId: PropTypes__default["default"].string
+  documentId: PropTypes__default["default"].string
 };
 
 const ajaxSelectFieldData = async (value, config, getApiBaseUrl = () => {}, getAppHeader = () => {}, app, formValues = {}) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.412",
+	"version": "0.6.414",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Dashboard/PdfView/index.jsx

@@ -4,15 +4,9 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { formatClassname } from "../../../../../helpers/ClassesHelper";
 
 const PAGE_HEIGHT = 1587;
+// margin-top: 20, bottom: 20;
 const FOOTER_HEIGHT = 70;
 const HEADER_HEIGHT = 100;
-const SECTION_SPACING = 24; // Space between sections
-const FIRST_PAGE_TOP_PADDING = 30; // Padding after header on first page
-const NEW_PAGE_TOP_PADDING = 30; // Padding after header on new pages
-const LAST_SECTION_BOTTOM_PADDING = 30; // Padding after last section
-
-// Available content height per page (excluding header and footer)
-const AVAILABLE_HEIGHT = PAGE_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT;
 
 const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
   const ref = useRef();
@@ -34,7 +28,7 @@ const Row = ({ widgets, i, onChangeHeight = () => { } }) => {
     if (height) {
       onChangeHeight(i, { height, ref });
     }
-  }, [height, i, onChangeHeight])
+  }, [height])
 
   return (
     <section ref={ref} style={widgets.style}>
@@ -58,72 +52,52 @@ export default function PdfView({
 
   const doSizing = useCallback(() => {
     const keys = Object.keys(sectionsConfig);
-    
-    // Wait until all sections have been measured
-    if (keys.length !== config.length) return;
-
     let _pages = [1];
-    let currentPage = 1;
-    let currentPageContentHeight = 0; // Tracks content height on current page (excluding header)
-
-    // Reset all styles first
-    keys.forEach(k => {
-      const { ref } = sectionsConfig[k];
-      ref.current.style.marginTop = '0px';
-      ref.current.style.marginBottom = '0px';
-      ref.current.style.paddingBottom = '0px';
-    });
+    let _page = 1;
+
+    if (keys.length === config.length) {
+      let incrHeight = 0;
+
+      keys.forEach(k => {
+        const { ref } = sectionsConfig[k];
+        ref.current.style.marginBottom = '0px';
+        // ref.current.style.marginTop = '15px';
+      })
 
-    keys.forEach((k, i) => {
-      const { height, ref } = sectionsConfig[k];
-      const isFirstSection = i === 0;
-      const isLastSection = i === keys.length - 1;
-      const isFirstSectionOnPage = currentPageContentHeight === 0;
-
-      // For first section of entire document
-      if (isFirstSection) {
-        ref.current.style.marginTop = `${HEADER_HEIGHT + FIRST_PAGE_TOP_PADDING}px`;
-        currentPageContentHeight = height + FIRST_PAGE_TOP_PADDING;
-        
-        if (isLastSection) {
-          ref.current.style.paddingBottom = `${LAST_SECTION_BOTTOM_PADDING}px`;
+      keys.forEach((k, i) => {
+        const { height, ref } = sectionsConfig[k];
+
+        if (i === 0) {
+          ref.current.style.marginTop = `${HEADER_HEIGHT}px`;
+          incrHeight += HEADER_HEIGHT;
         }
-        return;
-      }
 
-      // Calculate space needed for this section including spacing before it
-      const spacingBefore = isFirstSectionOnPage ? NEW_PAGE_TOP_PADDING : SECTION_SPACING;
-      const totalSpaceNeeded = spacingBefore + height;
-
-      // Check if we need to move to next page
-      if (currentPageContentHeight + totalSpaceNeeded > AVAILABLE_HEIGHT) {
-        // Move to new page
-        currentPage += 1;
-        _pages.push(currentPage);
-        
-        // Calculate and apply bottom margin to fill previous page
-        const usedSpace = currentPageContentHeight;
-        const remainingSpace = AVAILABLE_HEIGHT - usedSpace;
-        const previousKey = keys[i - 1];
-        sectionsConfig[previousKey].ref.current.style.marginBottom = `${remainingSpace}px`;
-        
-        // This section starts the new page
-        ref.current.style.marginTop = `${HEADER_HEIGHT + NEW_PAGE_TOP_PADDING}px`;
-        currentPageContentHeight = height + NEW_PAGE_TOP_PADDING;
-      } else {
-        // Section fits on current page
-        ref.current.style.marginTop = `${spacingBefore}px`;
-        currentPageContentHeight += totalSpaceNeeded;
-      }
+        const newHeight = incrHeight + height;
 
-      // Add bottom padding to last section
-      if (isLastSection) {
-        ref.current.style.paddingBottom = `${LAST_SECTION_BOTTOM_PADDING}px`;
-      }
-    });
+        if (i === keys.length - 1) {
+          ref.current.style.paddingBottom = '30px';
+        }
 
-    setPages(_pages);
-  }, [sectionsConfig, config.length]);
+        if (newHeight > PAGE_HEIGHT - 30 - FOOTER_HEIGHT - HEADER_HEIGHT) {
+          const dif = Math.abs(PAGE_HEIGHT - incrHeight);
+          ref.current.style.marginTop = '30px';
+          _page += 1;
+          _pages.push(_page);
+
+          if (sectionsConfig[keys[i - 1]]) {
+            const { ref: topRef } = sectionsConfig[keys[i - 1]];
+            topRef.current.style.marginBottom = `${dif + HEADER_HEIGHT - 24}px`;
+            incrHeight = height + 24 + HEADER_HEIGHT;
+            // console.log('margin', dif);
+          }
+        } else {
+          incrHeight = newHeight + 24;
+        }
+        // console.groupEnd();
+      })
+      setPages(_pages);
+    }
+  }, [sectionsConfig]);
 
   useEffect(() => {
     doSizing();
@@ -143,7 +117,7 @@ export default function PdfView({
             {config.map((widgets, i) => (
               <Row
                 widgets={widgets}
-                key={`dashboard-sections-${i + 1}`}
+                key={`dashboard-sections=${i + 1}`}
                 i={i}
                 onChangeHeight={onChangeHeight}
               />
@@ -154,20 +128,23 @@ export default function PdfView({
     );
   }, [config, onChangeHeight]);
 
+  // <div className="daf-analysis">
+  // <Header title={t('Dashboard Title')} />
+
+  // <div className="content">
+  //   <div className="view-content">
+  //     <div className="daf-analysis-layout">
+  //       <div className='sections-cont w-pt'>
+  //         <section>
+
   return (
     <div className={contClassName} style={{ position: 'relative' }}>
       {renderDashboard()}
       {pages.map((page) => (
-        <div key={`page-${page}`}>
+        <>
           <div
-            style={{ 
-              top: ((page - 1) * PAGE_HEIGHT), 
-              width: '100%', 
-              height: HEADER_HEIGHT, 
-              position: 'absolute', 
-              left: 0, 
-              zIndex: 1000000 
-            }}
+            style={{ top: ((page - 1) * PAGE_HEIGHT), width: '100%', height: HEADER_HEIGHT - 24, position: 'absolute', left: 0, zIndex: 1000000 }}
+            key={`headers-${page}`}
             className="flex-row dashboard-header"
           >
             <div className="flex flex-column justify-center flex-1">
@@ -178,14 +155,8 @@ export default function PdfView({
             </div>
           </div>
           <div
-            style={{ 
-              top: (page * PAGE_HEIGHT) - FOOTER_HEIGHT, 
-              width: '100%', 
-              height: FOOTER_HEIGHT, 
-              position: 'absolute', 
-              left: 0, 
-              zIndex: 1000000 
-            }}
+            style={{ top: (page * PAGE_HEIGHT) - FOOTER_HEIGHT, width: '100%', height: FOOTER_HEIGHT, position: 'absolute', left: 0, zIndex: 1000000 }}
+            key={`footers-${page}`}
             className="dashboard-footer flex-row"
           >
             <div className="flex flex-column justify-center">
@@ -219,7 +190,7 @@ export default function PdfView({
               <h5>{page}</h5>
             </div>
           </div>
-        </div>
+        </>
       ))}
     </div>
   );
@@ -233,5 +204,4 @@ PdfView.propTypes = {
   userId: PropTypes.string,
   accountId: PropTypes.string,
   documentId: PropTypes.string,
-  downloadId: PropTypes.string,
-}
+}