esvn-react-barcode-print 1.0.3 → 1.0.5

package/dist/index.d.mts

@@ -51,7 +51,7 @@ interface IExtraFieldOption {
 
 declare const getOrganizationName: () => string;
 declare const generateBarcodeHtml: (value: string, printType: number, height?: number) => string;
-declare const renderSingleLabelHtml: (item: IBarcodePrintItem, settings: ISettingPrint, companyNameDefault?: string, barcodeHeight?: number) => string;
+declare const renderSingleLabelHtml: (item: IBarcodePrintItem, settings: ISettingPrint, companyNameDefault?: string, barcodeHeight?: number, dynamicFontSize?: string, isTest?: boolean) => string;
 declare const getPaperSizeLabel: (paperSize?: number, stampNumber?: number) => string;
 declare const generatePrintDocument: (settings: ISettingPrint, items: IBarcodePrintItem[], isTest?: boolean, isPreview?: boolean) => {
     html: string;

package/dist/index.d.ts

@@ -51,7 +51,7 @@ interface IExtraFieldOption {
 
 declare const getOrganizationName: () => string;
 declare const generateBarcodeHtml: (value: string, printType: number, height?: number) => string;
-declare const renderSingleLabelHtml: (item: IBarcodePrintItem, settings: ISettingPrint, companyNameDefault?: string, barcodeHeight?: number) => string;
+declare const renderSingleLabelHtml: (item: IBarcodePrintItem, settings: ISettingPrint, companyNameDefault?: string, barcodeHeight?: number, dynamicFontSize?: string, isTest?: boolean) => string;
 declare const getPaperSizeLabel: (paperSize?: number, stampNumber?: number) => string;
 declare const generatePrintDocument: (settings: ISettingPrint, items: IBarcodePrintItem[], isTest?: boolean, isPreview?: boolean) => {
     html: string;

package/dist/index.js

@@ -102,7 +102,7 @@ var generateBarcodeHtml = (value, printType, height = 24) => {
     return `<div style="font-size: 10px; text-align: center; word-break: break-word;">${value}</div>`;
   }
 };
-var renderSingleLabelHtml = (item, settings, companyNameDefault, barcodeHeight = 22) => {
+var renderSingleLabelHtml = (item, settings, companyNameDefault, barcodeHeight = 22, dynamicFontSize, isTest = false) => {
   const {
     printType = 0,
     hinge = false,
@@ -139,7 +139,15 @@ var renderSingleLabelHtml = (item, settings, companyNameDefault, barcodeHeight =
       const isItalic = !!field.italic;
       const isUnderline = !!field.underline;
       const textColor = field.color || "#000000";
-      const customFontSize = field.fontSize ? `${field.fontSize}px` : void 0;
+      let customFontSize = void 0;
+      if (field.fontSize) {
+        if (isTest) {
+          customFontSize = `${field.fontSize}px`;
+        } else {
+          const baseScale = parseFloat(dynamicFontSize || "7.5");
+          customFontSize = `${(field.fontSize / 13 * baseScale).toFixed(1)}px`;
+        }
+      }
       const offsetLeft = field.offsetX && field.offsetX > 0 ? `${field.offsetX}px` : void 0;
       const styleRules = [
         `font-weight: ${isBold ? 700 : 400} !important`,
@@ -184,7 +192,10 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
     labelList = [sampleItem];
   } else {
     items.forEach((item) => {
-      const qty = Math.max(1, Number(item.printQuantity || item.quantity || 1));
+      var _a2, _b;
+      const rawQty = (_b = (_a2 = item.printQuantity) != null ? _a2 : item.quantity) != null ? _b : 1;
+      const parsedQty = typeof rawQty === "number" ? rawQty : parseInt(String(rawQty), 10);
+      const qty = Math.max(1, isNaN(parsedQty) ? 1 : parsedQty);
       for (let i = 0; i < qty; i++) {
         labelList.push({ ...item, companyName: orgName });
       }
@@ -196,6 +207,7 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
   if (labelList.length === 0) {
     return { html: "", totalStamps: 0, paperLabel, uniqueProducts: items.length };
   }
+  const enabledFieldsCount = (settings.fields || []).filter((f) => f.enabled).length || 4;
   let cols = 3;
   let pageSizeCss = "105mm auto";
   let pageMargin = "0";
@@ -203,9 +215,9 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
   let labelHeight = "22mm";
   let labelGap = "1.5mm";
   let bodyPadding = "1mm";
-  let stampPadding = "2px 4px";
-  let dynamicFontSize = "8px";
-  let barcodeHeight = 16;
+  let stampPadding = enabledFieldsCount >= 5 ? "1px 2px" : "1.5px 3px";
+  let dynamicFontSize = enabledFieldsCount >= 5 ? "6.8px" : enabledFieldsCount >= 4 ? "7.2px" : "7.8px";
+  let barcodeHeight = enabledFieldsCount >= 5 ? 12 : enabledFieldsCount >= 4 ? 14 : 16;
   let sheetWidth = "105mm";
   let sheetMinHeight = "60mm";
   let sheetPadding = "2mm 1mm";
@@ -235,9 +247,9 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
         labelHeight = "22mm";
         labelGap = "2mm";
         bodyPadding = "1mm";
-        stampPadding = "2px 4px";
-        dynamicFontSize = "8px";
-        barcodeHeight = 18;
+        stampPadding = enabledFieldsCount >= 5 ? "1px 2px" : "1.5px 3px";
+        dynamicFontSize = enabledFieldsCount >= 5 ? "7px" : enabledFieldsCount >= 4 ? "7.5px" : "8px";
+        barcodeHeight = enabledFieldsCount >= 5 ? 13 : enabledFieldsCount >= 4 ? 15 : 18;
         sheetWidth = "80mm";
         sheetMinHeight = "60mm";
         sheetPadding = "2mm 1mm";
@@ -251,9 +263,9 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
         labelHeight = "22mm";
         labelGap = "1.5mm";
         bodyPadding = "1mm";
-        stampPadding = "1px 3px";
-        dynamicFontSize = "7.5px";
-        barcodeHeight = 16;
+        stampPadding = enabledFieldsCount >= 5 ? "1px 2px" : "1px 3px";
+        dynamicFontSize = enabledFieldsCount >= 5 ? "6.8px" : enabledFieldsCount >= 4 ? "7.2px" : "7.6px";
+        barcodeHeight = enabledFieldsCount >= 5 ? 12 : enabledFieldsCount >= 4 ? 14 : 16;
         sheetWidth = "105mm";
         sheetMinHeight = "60mm";
         sheetPadding = "2mm 1mm";
@@ -324,7 +336,7 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
       pages.push({ items: labelList, emptyCount: 0 });
     }
     const pagesHtml = pages.map((page, pageIndex) => {
-      const pageLabelsHtml = page.items.map((item) => renderSingleLabelHtml(item, settings, orgName, barcodeHeight)).join("");
+      const pageLabelsHtml = page.items.map((item) => renderSingleLabelHtml(item, settings, orgName, barcodeHeight, dynamicFontSize, isTest)).join("");
       let emptySlotsHtml = "";
       if (page.emptyCount > 0) {
         emptySlotsHtml = Array(page.emptyCount).fill(0).map(() => '<div class="empty-slot" title="V\u1ECB tr\xED tem tr\u1ED1ng tr\xEAn decal"></div>').join("");
@@ -404,6 +416,7 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
               width: 100%;
               min-height: ${isTest ? "48mm" : labelHeight === "auto" ? "22mm" : labelHeight};
               height: ${labelHeight === "auto" ? "auto" : labelHeight};
+              max-height: ${isTest ? "none" : labelHeight === "auto" ? "none" : labelHeight};
               padding: ${stampPadding};
               display: flex;
               flex-direction: column;
@@ -433,17 +446,21 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
             }
             .lbl-dynamic, .lbl-company, .lbl-code, .lbl-name, .lbl-price {
               font-size: ${dynamicFontSize};
-              line-height: 1.2;
+              line-height: 1.15;
               word-break: break-word;
-              white-space: normal;
-              margin-bottom: 2px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: ${enabledFieldsCount >= 5 ? 1 : 2};
+              margin-bottom: ${enabledFieldsCount >= 5 ? "1px" : "1.5px"};
             }
             .code-wrapper {
               display: flex;
               flex-direction: column;
               justify-content: center;
               align-items: center;
-              margin: 2px 0;
+              margin: ${enabledFieldsCount >= 5 ? "1px 0" : "1.5px 0"};
               width: 100%;
             }
             .barcode-svg-box {
@@ -470,7 +487,7 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
       </html>
     `;
   } else {
-    const labelsHtml = labelList.map((item) => renderSingleLabelHtml(item, settings, orgName, barcodeHeight)).join("");
+    const labelsHtml = labelList.map((item) => renderSingleLabelHtml(item, settings, orgName, barcodeHeight, dynamicFontSize, isTest)).join("");
     printDocument = `
       <!DOCTYPE html>
       <html>
@@ -507,6 +524,8 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
             .stamp-item {
               width: 100%;
               min-height: ${isTest ? "48mm" : labelHeight === "auto" ? "22mm" : labelHeight};
+              height: ${isTest ? "auto" : labelHeight === "auto" ? "auto" : labelHeight};
+              max-height: ${isTest ? "none" : labelHeight === "auto" ? "none" : labelHeight};
               padding: ${stampPadding};
               display: flex;
               flex-direction: column;
@@ -517,6 +536,7 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
               border: 1px solid #d8d6de;
               border-radius: 4px;
               background: #fff;
+              box-sizing: border-box;
             }
             .text-left {
               text-align: left;
@@ -528,17 +548,21 @@ var generatePrintDocument = (settings, items, isTest = false, isPreview = false)
             }
             .lbl-dynamic, .lbl-company, .lbl-code, .lbl-name, .lbl-price {
               font-size: ${dynamicFontSize};
-              line-height: 1.2;
+              line-height: 1.15;
               word-break: break-word;
-              white-space: normal;
-              margin-bottom: 2px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: ${enabledFieldsCount >= 5 ? 1 : 2};
+              margin-bottom: ${enabledFieldsCount >= 5 ? "1px" : "1.5px"};
             }
             .code-wrapper {
               display: flex;
               flex-direction: column;
               justify-content: center;
               align-items: center;
-              margin: 2px 0;
+              margin: ${enabledFieldsCount >= 5 ? "1px 0" : "1.5px 0"};
               width: 100%;
             }
             .barcode-svg-box {
@@ -860,10 +884,14 @@ var styles = {
   dynamicText: {
     fontSize: 13,
     color: "#111",
-    lineHeight: 1.25,
+    lineHeight: 1.2,
     marginBottom: 2,
     wordBreak: "break-word",
-    whiteSpace: "normal"
+    overflow: "hidden",
+    textOverflow: "ellipsis",
+    display: "-webkit-box",
+    WebkitBoxOrient: "vertical",
+    WebkitLineClamp: 2
   }
 };
 var preview_print_default = PreviewPrint;
@@ -945,7 +973,7 @@ var SettingPrint = (props) => {
       italic: false,
       underline: false,
       color: "#000000",
-      fontSize: 13,
+      fontSize: void 0,
       offsetX: 0,
       prefix: fieldTemplate.prefix,
       customValue: fieldTemplate.customValue || "N\u1ED9i dung t\xF9y ch\u1EC9nh"