vg-print-vue2 1.0.511 → 1.0.513

package/dist/vg-print-vue2.es.js

@@ -84,6 +84,12 @@ const cn$1 = {
   "标签字号": "标签字号",
   "标签粗细": "标签粗细",
   "标签颜色": "标签颜色",
+  "标签左右对齐": "标签左右对齐",
+  "标签上下对齐": "标签上下对齐",
+  "标签左内边距": "标签左内边距",
+  "标签上内边距": "标签上内边距",
+  "标签右内边距": "标签右内边距",
+  "标签下内边距": "标签下内边距",
   "文本修饰": "文本修饰",
   "下划线": "下划线",
   "上划线": "上划线",
@@ -451,6 +457,12 @@ const en$1 = {
   "标签字号": "Title Font Size",
   "标签粗细": "Title Font Weight",
   "标签颜色": "Title Color",
+  "标签左右对齐": "Title Horizontal Align",
+  "标签上下对齐": "Title Vertical Align",
+  "标签左内边距": "Title Left Padding",
+  "标签上内边距": "Title Top Padding",
+  "标签右内边距": "Title Right Padding",
+  "标签下内边距": "Title Bottom Padding",
   "文本修饰": "Text Decoration",
   "下划线": "Underline",
   "上划线": "Overline",
@@ -48306,6 +48318,225 @@ const echartsElementTypes = [
   { tid: "echartsModule.radar", title: "雷达图", type: "echarts", options: { width: 200, height: 200, eChartsOption: radarOption } },
   { tid: "echartsModule.scatter", title: "散点图", type: "echarts", options: { width: 200, height: 200, eChartsOption: scatterOption } }
 ];
+const MIME_ALIASES = {
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  png: "image/png",
+  gif: "image/gif",
+  webp: "image/webp",
+  bmp: "image/bmp",
+  svg: "image/svg+xml",
+  tif: "image/tiff",
+  tiff: "image/tiff",
+  ico: "image/x-icon",
+  avif: "image/avif",
+  heic: "image/heic",
+  heif: "image/heif"
+};
+function normalizeMime(mime) {
+  if (!mime)
+    return "";
+  const value = String(mime).trim().toLowerCase().replace(/^\./, "").split(";")[0];
+  if (MIME_ALIASES[value])
+    return MIME_ALIASES[value];
+  if (value === "image/jpg" || value === "image/pjpeg")
+    return "image/jpeg";
+  return /^image\/[a-z0-9.+-]+$/.test(value) ? value : "";
+}
+function decodeBase64Prefix(value) {
+  try {
+    const sample = value.slice(0, 512);
+    const padded = sample + "=".repeat((4 - sample.length % 4) % 4);
+    let binary;
+    if (typeof atob === "function") {
+      binary = atob(padded);
+    } else if (typeof Buffer !== "undefined") {
+      binary = Buffer.from(padded, "base64").toString("binary");
+    } else {
+      return null;
+    }
+    const bytes = new Uint8Array(binary.length);
+    for (let i3 = 0; i3 < binary.length; i3++)
+      bytes[i3] = binary.charCodeAt(i3);
+    return bytes;
+  } catch (_2) {
+    return null;
+  }
+}
+function sniffImageMime(base642) {
+  if (/^iVBORw0KGgo/.test(base642))
+    return "image/png";
+  if (/^\/9j\//.test(base642))
+    return "image/jpeg";
+  if (/^R0lGOD/.test(base642))
+    return "image/gif";
+  if (/^UklGR/.test(base642))
+    return "image/webp";
+  if (/^Qk/.test(base642))
+    return "image/bmp";
+  if (/^(?:PHN2Zy|PD94bWwg|PCEtLS)/.test(base642))
+    return "image/svg+xml";
+  const bytes = decodeBase64Prefix(base642);
+  if (!bytes || bytes.length < 12)
+    return "";
+  const ascii = Array.from(bytes, (byte) => String.fromCharCode(byte)).join("");
+  if (bytes[0] === 137 && ascii.slice(1, 4) === "PNG")
+    return "image/png";
+  if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255)
+    return "image/jpeg";
+  if (ascii.slice(0, 6) === "GIF87a" || ascii.slice(0, 6) === "GIF89a")
+    return "image/gif";
+  if (ascii.slice(0, 4) === "RIFF" && ascii.slice(8, 12) === "WEBP")
+    return "image/webp";
+  if (ascii.slice(0, 2) === "BM")
+    return "image/bmp";
+  if (ascii.slice(0, 4) === "II*\0" || ascii.slice(0, 4) === "MM\0*")
+    return "image/tiff";
+  if (bytes[0] === 0 && bytes[1] === 0 && bytes[2] === 1 && bytes[3] === 0)
+    return "image/x-icon";
+  if (ascii.slice(4, 8) === "ftyp") {
+    const brand = ascii.slice(8, 12).toLowerCase();
+    if (brand === "avif" || brand === "avis")
+      return "image/avif";
+    if (/^(heic|heix|hevc|hevx)$/.test(brand))
+      return "image/heic";
+    if (brand === "mif1" || brand === "msf1")
+      return "image/heif";
+  }
+  const svgText = ascii.replace(/^\u00ef\u00bb\u00bf/, "").trimStart();
+  if (/^(?:<\?xml[\s\S]*?\?>\s*)?(?:<!--[^]*?-->\s*)*<svg\b/i.test(svgText))
+    return "image/svg+xml";
+  return "";
+}
+function cleanBase64(value) {
+  const cleaned = String(value).replace(/\\r\\n|\\n|\\r/g, "").replace(/\\\//g, "/").replace(/\s+/g, "").replace(/-/g, "+").replace(/_/g, "/");
+  if (!cleaned || !/^[A-Za-z0-9+/]*={0,2}$/.test(cleaned))
+    return "";
+  const unpadded = cleaned.replace(/=+$/, "");
+  if (unpadded.length % 4 === 1)
+    return "";
+  return unpadded + "=".repeat((4 - unpadded.length % 4) % 4);
+}
+function extractImageMarkupSource(value) {
+  const imgMatch = value.match(/^<img\b[^>]*\bsrc\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))[^>]*>$/i);
+  if (imgMatch)
+    return imgMatch[1] || imgMatch[2] || imgMatch[3] || value;
+  const cssMatch = value.match(/^url\(\s*(?:"([^"]*)"|'([^']*)'|([^)]*))\s*\)$/i);
+  if (cssMatch)
+    return (cssMatch[1] || cssMatch[2] || cssMatch[3] || "").trim();
+  return value;
+}
+function normalizeImageSrc(input, mimeHint) {
+  if (input == null)
+    return "";
+  let src2 = String(input).trim();
+  if (!src2)
+    return "";
+  if (src2[0] === '"' && src2[src2.length - 1] === '"' || src2[0] === "'" && src2[src2.length - 1] === "'") {
+    src2 = src2.slice(1, -1).trim();
+  }
+  src2 = extractImageMarkupSource(src2);
+  const dataUrlMatch = src2.match(/^data:([^,]*),(.*)$/is);
+  if (dataUrlMatch) {
+    const metadata = dataUrlMatch[1];
+    if (!/;base64(?:;|$)/i.test(metadata))
+      return src2;
+    const payload2 = cleanBase64(dataUrlMatch[2]);
+    if (!payload2)
+      return src2;
+    const parts = metadata.split(";");
+    const declaredMime = normalizeMime(parts[0]);
+    const detectedMime = sniffImageMime(payload2);
+    const mime = !declaredMime || declaredMime === "image/octet-stream" ? detectedMime || normalizeMime(mimeHint) || "image/png" : declaredMime;
+    const suffix2 = parts.slice(1).filter((part) => part.toLowerCase() !== "base64");
+    return "data:" + mime + (suffix2.length ? ";" + suffix2.join(";") : "") + ";base64," + payload2;
+  }
+  if (/^(?:https?:)?\/\//i.test(src2) || /^(?:blob|file):/i.test(src2) || src2.indexOf("./") === 0 || src2.indexOf("../") === 0) {
+    return src2;
+  }
+  let explicitMime = normalizeMime(mimeHint);
+  const prefixedBase64 = src2.match(/^(?:([a-z0-9.+-]+\/[a-z0-9.+-]+);)?base64\s*,/i);
+  if (prefixedBase64) {
+    explicitMime = normalizeMime(prefixedBase64[1]) || explicitMime;
+    src2 = src2.slice(prefixedBase64[0].length);
+  }
+  const payload = cleanBase64(src2);
+  if (payload && payload.length >= 20) {
+    const detectedMime = sniffImageMime(payload);
+    if (detectedMime || explicitMime || src2[0] !== "/") {
+      const mime = detectedMime || explicitMime || "image/png";
+      return "data:" + mime + ";base64," + payload;
+    }
+  }
+  if (src2[0] === "/")
+    return src2;
+  return src2;
+}
+function waitForImage(image2, timeoutMs) {
+  const timeout = Number.isFinite(Number(timeoutMs)) ? Math.max(0, Number(timeoutMs)) : 1e4;
+  return new Promise((resolve2) => {
+    if (!image2) {
+      resolve2(false);
+      return;
+    }
+    let settled = false;
+    let timer;
+    const cleanup = () => {
+      if (timer)
+        clearTimeout(timer);
+      image2.removeEventListener && image2.removeEventListener("load", onLoad);
+      image2.removeEventListener && image2.removeEventListener("error", onError);
+    };
+    const finish = (loaded) => {
+      if (settled)
+        return;
+      settled = true;
+      cleanup();
+      resolve2(!!loaded);
+    };
+    const hasPixels = () => typeof image2.naturalWidth !== "number" || image2.naturalWidth > 0;
+    const onLoad = () => {
+      if (typeof image2.decode === "function") {
+        try {
+          Promise.resolve(image2.decode()).then(() => finish(true)).catch(() => finish(hasPixels()));
+        } catch (_2) {
+          finish(hasPixels());
+        }
+      } else {
+        finish(hasPixels());
+      }
+    };
+    const onError = () => finish(false);
+    if (image2.complete) {
+      finish(hasPixels());
+      return;
+    }
+    image2.addEventListener && image2.addEventListener("load", onLoad);
+    image2.addEventListener && image2.addEventListener("error", onError);
+    timer = setTimeout(() => finish(false), timeout);
+    if (image2.complete)
+      hasPixels() ? onLoad() : onError();
+  });
+}
+function waitForImages(root2, timeoutMs) {
+  const element2 = root2 && root2.jquery ? root2[0] : root2;
+  if (!element2)
+    return Promise.resolve([]);
+  const images = [];
+  if (element2.tagName && String(element2.tagName).toLowerCase() === "img")
+    images.push(element2);
+  if (element2.querySelectorAll)
+    images.push(...Array.from(element2.querySelectorAll("img")));
+  return Promise.all(images.map((image2) => {
+    const rawSrc = image2.getAttribute("src") || "";
+    const normalized = normalizeImageSrc(rawSrc, image2.getAttribute("data-hiprint-mime") || image2.getAttribute("data-mime"));
+    if (normalized && normalized !== rawSrc)
+      image2.setAttribute("src", normalized);
+    if (!normalized || image2.src === window.location.href)
+      return Promise.resolve(false);
+    return waitForImage(image2, timeoutMs);
+  }));
+}
 const t$1 = (k2) => i18n$1 && i18n$1.global && typeof i18n$1.global.t === "function" ? i18n$1.global.t(k2) : k2;
 const MODULE_NAME = "taskProviderModule";
 const DEFAULT_CUSTOM_ELEMENT_TYPE_WHITELIST = [
@@ -48488,7 +48719,7 @@ function defaultTypeProvider(hiprint2) {
                   return "center";
                 }();
                 var makeItem = function(it2) {
-                  var src2 = it2 && (it2.src || it2.url || "");
+                  var src2 = normalizeImageSrc(it2 && (it2.src || it2.url || ""));
                   var name2 = it2 && (it2.name || it2.fileName) || "";
                   var desc = it2 && (it2.desc || it2.description) || "";
                   var descAlign = options3.descAlign || options3.textAlign || "center";
@@ -48673,6 +48904,7 @@ function defaultTypeProvider(hiprint2) {
                 height: 40,
                 field: "richText",
                 custom: true,
+                titleSeparator: "",
                 fontSize: 12,
                 lineHeight: 15
               }
@@ -48684,6 +48916,7 @@ function defaultTypeProvider(hiprint2) {
               options: {
                 field: "test",
                 width: 200,
+                titleSeparator: "",
                 testData: t$1("hiprint.item.longTextTest"),
                 fontSize: 12,
                 lineHeight: 15
@@ -48698,6 +48931,7 @@ function defaultTypeProvider(hiprint2) {
                 width: 150,
                 height: 40,
                 field: "richText",
+                titleSeparator: "",
                 textType: "html",
                 textAlign: "left",
                 fontSize: 12,
@@ -48768,225 +49002,6 @@ function defaultTypeProvider(hiprint2) {
   };
 }
 ;
-const MIME_ALIASES = {
-  jpg: "image/jpeg",
-  jpeg: "image/jpeg",
-  png: "image/png",
-  gif: "image/gif",
-  webp: "image/webp",
-  bmp: "image/bmp",
-  svg: "image/svg+xml",
-  tif: "image/tiff",
-  tiff: "image/tiff",
-  ico: "image/x-icon",
-  avif: "image/avif",
-  heic: "image/heic",
-  heif: "image/heif"
-};
-function normalizeMime(mime) {
-  if (!mime)
-    return "";
-  const value = String(mime).trim().toLowerCase().replace(/^\./, "").split(";")[0];
-  if (MIME_ALIASES[value])
-    return MIME_ALIASES[value];
-  if (value === "image/jpg" || value === "image/pjpeg")
-    return "image/jpeg";
-  return /^image\/[a-z0-9.+-]+$/.test(value) ? value : "";
-}
-function decodeBase64Prefix(value) {
-  try {
-    const sample = value.slice(0, 512);
-    const padded = sample + "=".repeat((4 - sample.length % 4) % 4);
-    let binary;
-    if (typeof atob === "function") {
-      binary = atob(padded);
-    } else if (typeof Buffer !== "undefined") {
-      binary = Buffer.from(padded, "base64").toString("binary");
-    } else {
-      return null;
-    }
-    const bytes = new Uint8Array(binary.length);
-    for (let i3 = 0; i3 < binary.length; i3++)
-      bytes[i3] = binary.charCodeAt(i3);
-    return bytes;
-  } catch (_2) {
-    return null;
-  }
-}
-function sniffImageMime(base642) {
-  if (/^iVBORw0KGgo/.test(base642))
-    return "image/png";
-  if (/^\/9j\//.test(base642))
-    return "image/jpeg";
-  if (/^R0lGOD/.test(base642))
-    return "image/gif";
-  if (/^UklGR/.test(base642))
-    return "image/webp";
-  if (/^Qk/.test(base642))
-    return "image/bmp";
-  if (/^(?:PHN2Zy|PD94bWwg|PCEtLS)/.test(base642))
-    return "image/svg+xml";
-  const bytes = decodeBase64Prefix(base642);
-  if (!bytes || bytes.length < 12)
-    return "";
-  const ascii = Array.from(bytes, (byte) => String.fromCharCode(byte)).join("");
-  if (bytes[0] === 137 && ascii.slice(1, 4) === "PNG")
-    return "image/png";
-  if (bytes[0] === 255 && bytes[1] === 216 && bytes[2] === 255)
-    return "image/jpeg";
-  if (ascii.slice(0, 6) === "GIF87a" || ascii.slice(0, 6) === "GIF89a")
-    return "image/gif";
-  if (ascii.slice(0, 4) === "RIFF" && ascii.slice(8, 12) === "WEBP")
-    return "image/webp";
-  if (ascii.slice(0, 2) === "BM")
-    return "image/bmp";
-  if (ascii.slice(0, 4) === "II*\0" || ascii.slice(0, 4) === "MM\0*")
-    return "image/tiff";
-  if (bytes[0] === 0 && bytes[1] === 0 && bytes[2] === 1 && bytes[3] === 0)
-    return "image/x-icon";
-  if (ascii.slice(4, 8) === "ftyp") {
-    const brand = ascii.slice(8, 12).toLowerCase();
-    if (brand === "avif" || brand === "avis")
-      return "image/avif";
-    if (/^(heic|heix|hevc|hevx)$/.test(brand))
-      return "image/heic";
-    if (brand === "mif1" || brand === "msf1")
-      return "image/heif";
-  }
-  const svgText = ascii.replace(/^\u00ef\u00bb\u00bf/, "").trimStart();
-  if (/^(?:<\?xml[\s\S]*?\?>\s*)?(?:<!--[^]*?-->\s*)*<svg\b/i.test(svgText))
-    return "image/svg+xml";
-  return "";
-}
-function cleanBase64(value) {
-  const cleaned = String(value).replace(/\\r\\n|\\n|\\r/g, "").replace(/\\\//g, "/").replace(/\s+/g, "").replace(/-/g, "+").replace(/_/g, "/");
-  if (!cleaned || !/^[A-Za-z0-9+/]*={0,2}$/.test(cleaned))
-    return "";
-  const unpadded = cleaned.replace(/=+$/, "");
-  if (unpadded.length % 4 === 1)
-    return "";
-  return unpadded + "=".repeat((4 - unpadded.length % 4) % 4);
-}
-function extractImageMarkupSource(value) {
-  const imgMatch = value.match(/^<img\b[^>]*\bsrc\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s>]+))[^>]*>$/i);
-  if (imgMatch)
-    return imgMatch[1] || imgMatch[2] || imgMatch[3] || value;
-  const cssMatch = value.match(/^url\(\s*(?:"([^"]*)"|'([^']*)'|([^)]*))\s*\)$/i);
-  if (cssMatch)
-    return (cssMatch[1] || cssMatch[2] || cssMatch[3] || "").trim();
-  return value;
-}
-function normalizeImageSrc(input, mimeHint) {
-  if (input == null)
-    return "";
-  let src2 = String(input).trim();
-  if (!src2)
-    return "";
-  if (src2[0] === '"' && src2[src2.length - 1] === '"' || src2[0] === "'" && src2[src2.length - 1] === "'") {
-    src2 = src2.slice(1, -1).trim();
-  }
-  src2 = extractImageMarkupSource(src2);
-  const dataUrlMatch = src2.match(/^data:([^,]*),(.*)$/is);
-  if (dataUrlMatch) {
-    const metadata = dataUrlMatch[1];
-    if (!/;base64(?:;|$)/i.test(metadata))
-      return src2;
-    const payload2 = cleanBase64(dataUrlMatch[2]);
-    if (!payload2)
-      return src2;
-    const parts = metadata.split(";");
-    const declaredMime = normalizeMime(parts[0]);
-    const detectedMime = sniffImageMime(payload2);
-    const mime = !declaredMime || declaredMime === "image/octet-stream" ? detectedMime || normalizeMime(mimeHint) || "image/png" : declaredMime;
-    const suffix2 = parts.slice(1).filter((part) => part.toLowerCase() !== "base64");
-    return "data:" + mime + (suffix2.length ? ";" + suffix2.join(";") : "") + ";base64," + payload2;
-  }
-  if (/^(?:https?:)?\/\//i.test(src2) || /^(?:blob|file):/i.test(src2) || src2.indexOf("./") === 0 || src2.indexOf("../") === 0) {
-    return src2;
-  }
-  let explicitMime = normalizeMime(mimeHint);
-  const prefixedBase64 = src2.match(/^(?:([a-z0-9.+-]+\/[a-z0-9.+-]+);)?base64\s*,/i);
-  if (prefixedBase64) {
-    explicitMime = normalizeMime(prefixedBase64[1]) || explicitMime;
-    src2 = src2.slice(prefixedBase64[0].length);
-  }
-  const payload = cleanBase64(src2);
-  if (payload && payload.length >= 20) {
-    const detectedMime = sniffImageMime(payload);
-    if (detectedMime || explicitMime || src2[0] !== "/") {
-      const mime = detectedMime || explicitMime || "image/png";
-      return "data:" + mime + ";base64," + payload;
-    }
-  }
-  if (src2[0] === "/")
-    return src2;
-  return src2;
-}
-function waitForImage(image2, timeoutMs) {
-  const timeout = Number.isFinite(Number(timeoutMs)) ? Math.max(0, Number(timeoutMs)) : 1e4;
-  return new Promise((resolve2) => {
-    if (!image2) {
-      resolve2(false);
-      return;
-    }
-    let settled = false;
-    let timer;
-    const cleanup = () => {
-      if (timer)
-        clearTimeout(timer);
-      image2.removeEventListener && image2.removeEventListener("load", onLoad);
-      image2.removeEventListener && image2.removeEventListener("error", onError);
-    };
-    const finish = (loaded) => {
-      if (settled)
-        return;
-      settled = true;
-      cleanup();
-      resolve2(!!loaded);
-    };
-    const hasPixels = () => typeof image2.naturalWidth !== "number" || image2.naturalWidth > 0;
-    const onLoad = () => {
-      if (typeof image2.decode === "function") {
-        try {
-          Promise.resolve(image2.decode()).then(() => finish(true)).catch(() => finish(hasPixels()));
-        } catch (_2) {
-          finish(hasPixels());
-        }
-      } else {
-        finish(hasPixels());
-      }
-    };
-    const onError = () => finish(false);
-    if (image2.complete) {
-      finish(hasPixels());
-      return;
-    }
-    image2.addEventListener && image2.addEventListener("load", onLoad);
-    image2.addEventListener && image2.addEventListener("error", onError);
-    timer = setTimeout(() => finish(false), timeout);
-    if (image2.complete)
-      hasPixels() ? onLoad() : onError();
-  });
-}
-function waitForImages(root2, timeoutMs) {
-  const element2 = root2 && root2.jquery ? root2[0] : root2;
-  if (!element2)
-    return Promise.resolve([]);
-  const images = [];
-  if (element2.tagName && String(element2.tagName).toLowerCase() === "img")
-    images.push(element2);
-  if (element2.querySelectorAll)
-    images.push(...Array.from(element2.querySelectorAll("img")));
-  return Promise.all(images.map((image2) => {
-    const rawSrc = image2.getAttribute("src") || "";
-    const normalized = normalizeImageSrc(rawSrc, image2.getAttribute("data-hiprint-mime") || image2.getAttribute("data-mime"));
-    if (normalized && normalized !== rawSrc)
-      image2.setAttribute("src", normalized);
-    if (!normalized || image2.src === window.location.href)
-      return Promise.resolve(false);
-    return waitForImage(image2, timeoutMs);
-  }));
-}
 const printLockCss = `@media print {
   /* App.vue fixes the designer viewport with overflow:hidden. The browser
      print iframe copies that rule, so explicitly restore printable overflow. */
@@ -51778,8 +51793,16 @@ var hiprint$3 = function(t4) {
         p2.target.css("height", nmh + "mm"), p2.target.attr("original-height", nmh);
       }
     }, BasePrintElement.prototype.getBeginPrintTopInPaperByReferenceElement = function(t4) {
-      var e2 = this.options.getTop();
-      return this.isHeaderOrFooter() || this.isFixed() ? e2 : t4.referenceElement.isPositionLeftOrRight(e2) ? t4.referenceElement.printTopInPaper + (e2 - t4.referenceElement.top) : t4.referenceElement.bottomInLastPaper + (e2 - (t4.referenceElement.top + t4.referenceElement.height));
+      var e2 = this.options.getTop(), n3 = this.options.getLeft(), i3 = this.options.getWidth(), r2 = t4.referenceElement;
+      if (Number.isFinite(this.__layoutTop))
+        return this.__layoutTop;
+      if (this.isHeaderOrFooter() || this.isFixed())
+        return e2;
+      var overlapsVertically = r2.top <= e2 && r2.top + r2.height > e2;
+      var overlapsHorizontally = r2.left < n3 + i3 && n3 < r2.left + r2.width;
+      if (overlapsVertically && !overlapsHorizontally)
+        return e2;
+      return r2.isPositionLeftOrRight(e2, n3, i3) ? r2.printTopInPaper + (e2 - r2.top) : r2.bottomInLastPaper + (e2 - (r2.top + r2.height));
     }, BasePrintElement.prototype.css = function(t4, e2) {
       var n3 = this, i3 = [], o2 = this.getConfigOptions();
       if (o2) {
@@ -53215,8 +53238,11 @@ var hiprint$3 = function(t4) {
     function t5(t6) {
       this.top = t6.top, this.left = t6.left, this.height = t6.height, this.width = t6.width, this.bottomInLastPaper = t6.bottomInLastPaper, this.beginPrintPaperIndex = t6.beginPrintPaperIndex, this.printTopInPaper = t6.printTopInPaper, this.endPrintPaperIndex = t6.endPrintPaperIndex;
     }
-    return t5.prototype.isPositionLeftOrRight = function(t6) {
-      return this.top <= t6 && this.top + this.height > t6;
+    return t5.prototype.isPositionLeftOrRight = function(t6, e3, n4) {
+      var i4 = this.top <= t6 && this.top + this.height > t6;
+      if (!i4 || null == e3 || null == n4 || null == this.left || null == this.width)
+        return i4;
+      return this.left < e3 + n4 && e3 < this.left + this.width;
     }, t5;
   }();
 }, function(t4, e2, n3) {
@@ -55968,7 +55994,160 @@ var hiprint$3 = function(t4) {
         this.target.remove();
       }, t5;
     };
-  }, titleFontFamilyOption = createTitleStyleOption("titleFontFamily", "标签字体", "fontFamily"), titleFontSizeOption = createTitleStyleOption("titleFontSize", "标签字号", "fontSize"), titleFontWeightOption = createTitleStyleOption("titleFontWeight", "标签粗细", "fontWeight"), titleColorOption = createTitleStyleOption("titleColor", "标签颜色", "color"), R2 = function() {
+  }, titleFontFamilyOption = createTitleStyleOption("titleFontFamily", "标签字体", "fontFamily"), titleFontSizeOption = createTitleStyleOption("titleFontSize", "标签字号", "fontSize"), titleFontWeightOption = createTitleStyleOption("titleFontWeight", "标签粗细", "fontWeight"), titleColorOption = createTitleStyleOption("titleColor", "标签颜色", "color"), createTitleLayoutOption = function(name2, label, kind) {
+    return function() {
+      function t5() {
+        this.name = name2;
+      }
+      return t5.prototype.createTarget = function() {
+        var field;
+        if (kind === "align") {
+          field = '<select class="auto-submit"><option value="" >' + i18n.__("默认") + '</option><option value="left" >' + i18n.__("居左") + '</option><option value="center" >' + i18n.__("居中") + '</option><option value="right" >' + i18n.__("居右") + '</option><option value="justify-left" >' + i18n.__("两端对齐（靠左）") + '</option><option value="justify-center" >' + i18n.__("两端对齐（居中）") + '</option><option value="justify-right" >' + i18n.__("两端对齐（靠右）") + '</option><option value="justify-distribute" >' + i18n.__("两端对齐（分散）") + "</option></select>";
+        } else if (kind === "valign") {
+          field = '<select class="auto-submit"><option value="" >' + i18n.__("默认") + '</option><option value="top" >' + i18n.__("居顶") + '</option><option value="middle" >' + i18n.__("垂直居中") + '</option><option value="bottom" >' + i18n.__("底部") + "</option></select>";
+        } else {
+          field = '<select class="auto-submit">' + buildPtOptionHtml(["0.75", "1.5", "2.25", "3", "3.75", "4.5", "5.25", "6", "6.75", "7.5", "8.25", "9", "9.75", "10.5", "11.25", "12", "12.75", "13.5", "14.25", "15", "15.75", "16.5", "17.25", "18", "18.75", "19.5", "20.25", "21", "21.75"]) + "</select>";
+        }
+        return this.target = $$i('<div class="hiprint-option-item"><div class="hiprint-option-item-label">' + i18n.__(label) + '</div><div class="hiprint-option-item-field">' + field + "</div></div>"), this.target;
+      }, t5.prototype.css = function(target, value) {
+        if (!target || !target.length)
+          return null;
+        var selector = ".hiprint-printElement-longText-title, .hiprint-printElement-html-title";
+        target.find(selector).each(function() {
+          var title = $$i(this);
+          if (kind === "align") {
+            var align = value === "justify" ? "justify-center" : value;
+            var alignKey = "hiprint-title-option-original-" + name2;
+            var isFlexTitle = title.css("display") === "flex" || title.css("display") === "inline-flex";
+            var getFlexAlign2 = function(alignValue) {
+              if (alignValue === "left" || alignValue === "justify-left")
+                return "flex-start";
+              if (alignValue === "center" || alignValue === "justify-center")
+                return "center";
+              if (alignValue === "right" || alignValue === "justify-right")
+                return "flex-end";
+              if (alignValue === "justify-distribute")
+                return "space-between";
+              var parentAlign = target.css("text-align");
+              var parentAlignLast = target.css("text-align-last");
+              if (parentAlign === "justify") {
+                if (parentAlignLast === "right")
+                  return "flex-end";
+                if (parentAlignLast === "center")
+                  return "center";
+                if (parentAlignLast === "justify")
+                  return "space-between";
+                return "flex-start";
+              }
+              if (parentAlign === "center")
+                return "center";
+              if (parentAlign === "right")
+                return "flex-end";
+              return "flex-start";
+            };
+            if (align) {
+              var originalAlign = title.data(alignKey);
+              if (!originalAlign) {
+                originalAlign = { display: this.style.display, textAlign: this.style.textAlign, textAlignLast: this.style.textAlignLast, textJustify: this.style.textJustify, justifyContent: this.style.justifyContent };
+                title.data(alignKey, originalAlign);
+              }
+              if (!isFlexTitle && this.style.display !== "none") {
+                this.style.display = title.css("position") === "absolute" ? "flex" : "inline-flex";
+                isFlexTitle = true;
+              }
+              this.style.textAlign = "";
+              this.style.textAlignLast = "";
+              this.style.textJustify = "";
+              if (align === "justify-left" || align === "justify-center" || align === "justify-right" || align === "justify-distribute") {
+                this.style.setProperty("text-align", "justify", "important");
+                if (align === "justify-distribute") {
+                  this.style.setProperty("text-align-last", "justify", "important");
+                  this.style.setProperty("text-justify", "distribute-all-lines", "important");
+                } else {
+                  this.style.setProperty("text-align-last", align === "justify-left" ? "left" : align === "justify-right" ? "right" : "center", "important");
+                }
+              } else {
+                this.style.setProperty("text-align", align, "important");
+              }
+              if (isFlexTitle)
+                this.style.setProperty("justify-content", getFlexAlign2(align), "important");
+            } else {
+              var previousAlign = title.data(alignKey);
+              if (previousAlign) {
+                var hasVerticalAlign = !!title.data("hiprint-title-vertical-original");
+                if (!hasVerticalAlign)
+                  this.style.display = previousAlign.display || "";
+                this.style.textAlign = previousAlign.textAlign || "";
+                this.style.textAlignLast = previousAlign.textAlignLast || "";
+                this.style.textJustify = previousAlign.textJustify || "";
+                if (!hasVerticalAlign)
+                  this.style.justifyContent = previousAlign.justifyContent || "";
+                title.removeData(alignKey);
+              }
+              if (isFlexTitle)
+                this.style.setProperty("justify-content", getFlexAlign2());
+            }
+          } else if (kind === "valign") {
+            if (value) {
+              var original = title.data("hiprint-title-vertical-original");
+              if (!original) {
+                original = {
+                  display: this.style.display,
+                  alignItems: this.style.alignItems,
+                  verticalAlign: this.style.verticalAlign,
+                  height: this.style.height
+                };
+                title.data("hiprint-title-vertical-original", original);
+              }
+              var isAbsoluteTitle = title.css("position") === "absolute";
+              title.css({
+                display: this.style.display === "none" ? "none" : isAbsoluteTitle ? "flex" : "inline-flex",
+                alignItems: value === "middle" ? "center" : value === "bottom" ? "flex-end" : "flex-start",
+                height: isAbsoluteTitle ? "100%" : "",
+                verticalAlign: value
+              });
+            } else {
+              var previous = title.data("hiprint-title-vertical-original");
+              if (previous) {
+                this.style.display = previous.display || "";
+                this.style.alignItems = previous.alignItems || "";
+                this.style.verticalAlign = previous.verticalAlign || "";
+                this.style.height = previous.height || "";
+                title.removeData("hiprint-title-vertical-original");
+              }
+            }
+          } else {
+            var property = kind === "paddingLeft" ? "padding-left" : kind === "paddingTop" ? "padding-top" : kind === "paddingRight" ? "padding-right" : "padding-bottom";
+            var propertyName = property.replace(/-([a-z])/g, function(_3, c3) {
+              return c3.toUpperCase();
+            });
+            var paddingKey = "hiprint-title-option-original-" + name2;
+            if (value != null && value !== "") {
+              if (!title.data(paddingKey))
+                title.data(paddingKey, this.style[propertyName]);
+              this.style[propertyName] = parseFloat(value) + "pt";
+            } else {
+              var previousPadding = title.data(paddingKey);
+              if (previousPadding !== void 0) {
+                this.style[propertyName] = previousPadding || "";
+                title.removeData(paddingKey);
+              }
+            }
+          }
+        });
+        return null;
+      }, t5.prototype.getValue = function() {
+        var value = this.target.find("select").val();
+        if (value == null || value === "")
+          return;
+        return kind === "paddingLeft" || kind === "paddingTop" || kind === "paddingRight" || kind === "paddingBottom" ? parseFloat(value.toString()) : value.toString();
+      }, t5.prototype.setValue = function(value) {
+        this.target.find("select").val(value == null ? "" : String(value));
+      }, t5.prototype.destroy = function() {
+        this.target.remove();
+      }, t5;
+    };
+  }, titleTextAlignOption = createTitleLayoutOption("titleTextAlign", "标签左右对齐", "align"), titleTextContentVerticalAlignOption = createTitleLayoutOption("titleTextContentVerticalAlign", "标签上下对齐", "valign"), titleContentPaddingLeftOption = createTitleLayoutOption("titleContentPaddingLeft", "标签左内边距", "paddingLeft"), titleContentPaddingTopOption = createTitleLayoutOption("titleContentPaddingTop", "标签上内边距", "paddingTop"), titleContentPaddingRightOption = createTitleLayoutOption("titleContentPaddingRight", "标签右内边距", "paddingRight"), titleContentPaddingBottomOption = createTitleLayoutOption("titleContentPaddingBottom", "标签下内边距", "paddingBottom"), R2 = function() {
     function t5() {
       this.name = "showInPage";
     }
@@ -60457,7 +60636,7 @@ ${i18n.__("转大小写")}
     return t5.init = function() {
       t5.printElementOptionItems || (t5.printElementOptionItems = {}, t5._printElementOptionItems.forEach(function(e3) {
         t5.printElementOptionItems[e3.name] = e3;
-      }), t5.printElementOptionItems.contentIndent || (t5.printElementOptionItems.contentIndent = new contentIndentOption()), t5.printElementOptionItems.titleFontFamily || (t5.printElementOptionItems.titleFontFamily = new (titleFontFamilyOption())()), t5.printElementOptionItems.titleFontSize || (t5.printElementOptionItems.titleFontSize = new (titleFontSizeOption())()), t5.printElementOptionItems.titleFontWeight || (t5.printElementOptionItems.titleFontWeight = new (titleFontWeightOption())()), t5.printElementOptionItems.titleColor || (t5.printElementOptionItems.titleColor = new (titleColorOption())()));
+      }), t5.printElementOptionItems.contentIndent || (t5.printElementOptionItems.contentIndent = new contentIndentOption()), t5.printElementOptionItems.titleFontFamily || (t5.printElementOptionItems.titleFontFamily = new (titleFontFamilyOption())()), t5.printElementOptionItems.titleFontSize || (t5.printElementOptionItems.titleFontSize = new (titleFontSizeOption())()), t5.printElementOptionItems.titleFontWeight || (t5.printElementOptionItems.titleFontWeight = new (titleFontWeightOption())()), t5.printElementOptionItems.titleColor || (t5.printElementOptionItems.titleColor = new (titleColorOption())()), t5.printElementOptionItems.titleTextAlign || (t5.printElementOptionItems.titleTextAlign = new (titleTextAlignOption())()), t5.printElementOptionItems.titleTextContentVerticalAlign || (t5.printElementOptionItems.titleTextContentVerticalAlign = new (titleTextContentVerticalAlignOption())()), t5.printElementOptionItems.titleContentPaddingLeft || (t5.printElementOptionItems.titleContentPaddingLeft = new (titleContentPaddingLeftOption())()), t5.printElementOptionItems.titleContentPaddingTop || (t5.printElementOptionItems.titleContentPaddingTop = new (titleContentPaddingTopOption())()), t5.printElementOptionItems.titleContentPaddingRight || (t5.printElementOptionItems.titleContentPaddingRight = new (titleContentPaddingRightOption())()), t5.printElementOptionItems.titleContentPaddingBottom || (t5.printElementOptionItems.titleContentPaddingBottom = new (titleContentPaddingBottomOption())()));
     }, t5.registerItem = function(e3) {
       if (!e3.name)
         throw new Error("styleItem must have name");
@@ -64358,7 +64537,25 @@ ${i18n.__("转大小写")}
     }, t.prototype.append = function(t4) {
       this.paperContentTarget.append(t4);
     }, t.prototype.updateReferenceElement = function(t4) {
-      t4 && (this.referenceElement = t4);
+      if (!t4)
+        return;
+      var current = this.referenceElement;
+      var sameRow = current && t4 && Math.abs(Number(current.top) - Number(t4.top)) <= 2.5 && current.beginPrintPaperIndex === t4.beginPrintPaperIndex && current.endPrintPaperIndex === t4.endPrintPaperIndex;
+      if (!sameRow) {
+        this.referenceElement = t4;
+        return;
+      }
+      var currentLeft = Number(current.left), nextLeft = Number(t4.left);
+      var currentRight = currentLeft + Number(current.width);
+      var nextRight = nextLeft + Number(t4.width);
+      var mergedLeft = Number.isFinite(currentLeft) && Number.isFinite(nextLeft) ? Math.min(currentLeft, nextLeft) : t4.left;
+      var mergedRight = Number.isFinite(currentRight) && Number.isFinite(nextRight) ? Math.max(currentRight, nextRight) : t4.left + t4.width;
+      current.left = mergedLeft;
+      current.width = Math.max(0, mergedRight - mergedLeft);
+      current.height = Math.max(Number(current.height) || 0, Number(t4.height) || 0);
+      current.bottomInLastPaper = Math.max(Number(current.bottomInLastPaper) || 0, Number(t4.bottomInLastPaper) || 0);
+      current.printTopInPaper = Math.min(Number(current.printTopInPaper) || 0, Number(t4.printTopInPaper) || 0);
+      current.endPrintPaperIndex = Math.max(current.endPrintPaperIndex, t4.endPrintPaperIndex);
     }, t.prototype.updatePrintLine = function(t4) {
       t4 >= this.printLine && (this.printLine = t4);
     }, t.prototype.design = function(t4) {
@@ -64550,7 +64747,7 @@ ${i18n.__("转大小写")}
       return Number.isFinite(n3) && n3 > 0 ? n3 : 0;
     }, e2.prototype.hasCustomTitleStyle = function() {
       var options2 = this.options || {};
-      return [options2.titleFontFamily, options2.titleFontSize, options2.titleFontWeight, options2.titleColor].some(function(value) {
+      return [options2.titleFontFamily, options2.titleFontSize, options2.titleFontWeight, options2.titleColor, options2.titleTextAlign, options2.titleTextContentVerticalAlign, options2.titleContentPaddingLeft, options2.titleContentPaddingTop, options2.titleContentPaddingRight, options2.titleContentPaddingBottom].some(function(value) {
         return value != null && value !== "";
       });
     }, e2.prototype.usesStructuredTitle = function() {
@@ -64561,7 +64758,7 @@ ${i18n.__("转大小写")}
       v2 = 0 != this.options.leftSpaceRemoved ? v2.toString().replace(/^\s*/, "") : v2;
       if (this.getField()) {
         return {
-          title: this.options.getHideTitle() ? "" : t5 ? t5 + "：" : "",
+          title: this.options.getHideTitle() ? "" : t5 ? t5 : "",
           body: n3 ? this._callFormatterSafely(n3, [t5, v2, this.options, this._currenttemplateData], v2) : v2
         };
       }
@@ -64591,11 +64788,13 @@ ${i18n.__("转大小写")}
       body.html(bodyText == null ? "" : bodyText);
       content2.css({ position: "relative", boxSizing: "border-box" });
       if (indent > 0) {
-        title.css({ position: "absolute", left: "0pt", top: "0pt", width: indent + "pt", display: titleText ? "block" : "none", boxSizing: "border-box" });
-        body.css({ display: "block", marginLeft: indent + "pt", width: "calc(100% - " + indent + "pt)", boxSizing: "border-box" });
+        content2.css({ display: "flex", alignItems: "flex-start" });
+        title.css({ position: "", left: "", top: "", width: indent + "pt", flex: "0 0 " + indent + "pt", display: titleText ? "flex" : "none", boxSizing: "border-box" });
+        body.css({ display: "block", marginLeft: "", width: "", flex: "1 1 auto", minWidth: 0, boxSizing: "border-box" });
       } else {
-        title.css({ position: "", left: "", top: "", width: "", display: titleText ? "inline" : "none", boxSizing: "" });
-        body.css({ display: "inline", marginLeft: "", width: "", boxSizing: "" });
+        content2.css({ display: "", alignItems: "" });
+        title.css({ position: "", left: "", top: "", width: "", flex: "", display: titleText ? "inline" : "none", boxSizing: "" });
+        body.css({ display: "inline", marginLeft: "", width: "", flex: "", minWidth: "", boxSizing: "" });
       }
     }, e2.prototype.setPagedBodyHtml = function(target, html2) {
       var body = target.find(".hiprint-printElement-longText-body");
@@ -64628,7 +64827,7 @@ ${i18n.__("转大小写")}
     }, e2.prototype.getText = function(t5, e3) {
       var n3 = this.getFormatter();
       e3 && (e3 = 0 != this.options.leftSpaceRemoved ? e3.toString().replace(/^\s*/, "") : e3);
-      return (this.getField() ? (this.options.getHideTitle() ? "" : t5 ? t5 + "：" : "") + (n3 ? this._callFormatterSafely(n3, [t5, e3, this.options, this._currenttemplateData], e3) : e3) : n3 ? this._callFormatterSafely(n3, [t5, t5, this.options, this._currenttemplateData], t5) : t5 || "") || "";
+      return (this.getField() ? (this.options.getHideTitle() ? "" : t5 ? t5 : "") + (n3 ? this._callFormatterSafely(n3, [t5, e3, this.options, this._currenttemplateData], e3) : e3) : n3 ? this._callFormatterSafely(n3, [t5, t5, this.options, this._currenttemplateData], t5) : t5 || "") || "";
     }, e2.prototype.getHtml = function(t5, e3) {
       this.setCurrenttemplateData(e3), this.createTempContainer();
       var n3 = this.getPaperHtmlResult(t5, e3);
@@ -64872,7 +65071,7 @@ ${i18n.__("转大小写")}
         hideTitle = true;
       if (hideTitle === "false")
         hideTitle = false;
-      var titleText = this.getField() && !hideTitle && e3 ? e3 + "：" : "";
+      var titleText = this.getField() && !hideTitle && e3 ? e3 : "";
       var bodyText;
       var useSeparateTitle = false;
       if (this.getField()) {
@@ -67535,21 +67734,9 @@ ${i18n.__("转大小写")}
         hideTitle = true;
       if (hideTitle === "false")
         hideTitle = false;
-      content2.css({ position: "relative", boxSizing: "border-box" });
-      title.css({
-        position: "absolute",
-        left: "0pt",
-        top: "0pt",
-        width: indent + "pt",
-        display: this.options.title && !hideTitle ? "block" : "none",
-        boxSizing: "border-box"
-      });
-      wrapper.css({
-        display: "block",
-        marginLeft: indent + "pt",
-        width: "calc(100% - " + indent + "pt)",
-        boxSizing: "border-box"
-      });
+      content2.css({ display: "flex", alignItems: "flex-start", boxSizing: "border-box" });
+      title.css({ width: indent + "pt", flex: "0 0 " + indent + "pt", display: this.options.title && !hideTitle ? "flex" : "none", boxSizing: "border-box" });
+      wrapper.css({ display: "block", flex: "1 1 auto", minWidth: 0, marginLeft: "", width: "", boxSizing: "border-box" });
     }, e.prototype.applyHtmlTitleStyle = function(title) {
       if (!title || !title.length)
         return;
@@ -67645,7 +67832,7 @@ ${i18n.__("转大小写")}
       if (hideTitle === "false")
         hideTitle = false;
       if (this.options.title && !hideTitle) {
-        title.text(this.options.title + "：");
+        title.text(this.options.title);
         if (this.isGalleryElement && this.isGalleryElement()) {
           title.css({ width: "100%", display: "block", "text-align": "left" });
           contentWrapper2.css({ width: "100%", display: "block" });
@@ -68493,7 +68680,6 @@ ${i18n.__("转大小写")}
                   }
                   allElements[j] = restEl;
                   pageHeight = Math.max(pageElement[0].scrollHeight, pageElement.outerHeight(true));
-                  elementsToRemove.push(j);
                 } else {
                   var singleChild = children.length === 1 ? children[0] : null;
                   var isTextChild = singleChild && singleChild.nodeType === 3;
@@ -68524,7 +68710,6 @@ ${i18n.__("转大小写")}
                       restEl2.append($$i("<span></span>").text(restText));
                       allElements[j] = restEl2;
                       pageHeight = Math.max(pageElement[0].scrollHeight, pageElement.outerHeight(true));
-                      elementsToRemove.push(j);
                     } else {
                       if (partialEl && partialEl.remove) {
                         partialEl.remove();
@@ -68579,7 +68764,6 @@ ${i18n.__("转大小写")}
                           }
                           allElements[j] = restEl3;
                           pageHeight = Math.max(pageElement[0].scrollHeight, pageElement.outerHeight(true));
-                          elementsToRemove.push(j);
                         } else {
                           if (partialEl && partialEl.remove) {
                             partialEl.remove();
@@ -68639,7 +68823,6 @@ ${i18n.__("转大小写")}
                           }
                           allElements[j] = restEl4;
                           pageHeight = Math.max(pageElement[0].scrollHeight, pageElement.outerHeight(true));
-                          elementsToRemove.push(j);
                         } else {
                           if (partialEl && partialEl.remove) {
                             partialEl.remove();
@@ -71020,6 +71203,12 @@ ${i18n.__("转大小写")}
         this.index = t4.index, this.name = t4.name, this.nameField = t4.nameField, this.width = t4.width, this.height = t4.height, this.paperType = t4.paperType, this.paperHeader = t4.paperHeader, this.paperFooter = t4.paperFooter;
         this.designPaper.width = o.a.mm.toPt(t4.width), this.designPaper.height = o.a.mm.toPt(this.height), this.designPaper.paperType = this.paperType, this.designPaper.paperHeader = this.paperHeader, this.designPaper.paperFooter = this.paperFooter;
         this.designPaper.mmheight = t4.height, this.designPaper.mmwidth = t4.width;
+        if (this.designPaper.target && this.designPaper.target.length) {
+          this.designPaper.target.css("width", t4.width + "mm");
+          this.designPaper.target.css("height", t4.height - p.a.instance.paperHeightTrim + "mm");
+          this.designPaper.target.attr("original-height", t4.height);
+        }
+        this.designPaper.contentHeight = this.designPaper.paperFooter - this.designPaper.paperHeader;
         this.designPaper.headerLinetarget.css("top", (this.paperHeader || -1) + "pt"), 0 == this.paperHeader ? this.designPaper.headerLinetarget.addClass("hideheaderLinetarget") : this.designPaper.headerLinetarget.removeClass("hideheaderLinetarget");
         this.designPaper.footerLinetarget.css("top", parseInt(this.paperFooter.toString()) + "pt"), this.paperFooter >= this.designPaper.height ? (this.designPaper.footerLinetarget.css("top", t4.height - p.a.instance.paperHeightTrim + "mm"), this.designPaper.footerLinetarget.addClass("hidefooterLinetarget")) : this.designPaper.footerLinetarget.removeClass("hidefooterLinetarget");
         this.watermarkOptions = t4.watermarkOptions || {};
@@ -71323,10 +71512,17 @@ ${i18n.__("转大小写")}
               if (!Number.isFinite(dx))
                 dx = 0;
               var imgLeft = contentLeftPt + dx;
+              if (typeof img.setCurrenttemplateData === "function")
+                img.setCurrenttemplateData(printData4);
               var imgData = img.getData(printData4) || "";
+              var emptyDisplayMode = typeof img.getEmptyDataDisplayMode === "function" ? img.getEmptyDataDisplayMode(imgData) : "";
+              if (emptyDisplayMode === "collapse")
+                return;
               var target = img.createTarget(img.getTitle(), imgData, paper.index);
               img.updateTargetSize(target);
               img.css(target, imgData);
+              if (emptyDisplayMode === "placeholder")
+                target.css("visibility", "hidden");
               var imgH = 0;
               try {
                 imgH = Number(img.options.getHeight ? img.options.getHeight() : img.options.height) || 0;
@@ -71356,6 +71552,94 @@ ${i18n.__("转大小写")}
         } catch (_2) {
         }
       };
+      var __layoutGroups = {};
+      var __layoutGroupList = [];
+      (this.printElements || []).forEach(function(element2) {
+        var options2 = element2 && element2.options;
+        var groupValue = options2 && options2.layoutGroup;
+        if (groupValue == null || String(groupValue).trim() === "")
+          return;
+        var key = String(groupValue);
+        var top = Number(options2.getTop ? options2.getTop() : options2.top);
+        var left = Number(options2.getLeft ? options2.getLeft() : options2.left);
+        var width2 = Number(options2.getWidth ? options2.getWidth() : options2.width);
+        var height = Number(options2.getHeight ? options2.getHeight() : options2.height);
+        if (!Number.isFinite(top) || !Number.isFinite(left) || !Number.isFinite(width2) || !Number.isFinite(height))
+          return;
+        var info = __layoutGroups[key];
+        if (!info) {
+          info = __layoutGroups[key] = {
+            key,
+            rawTop: top,
+            baseHeight: height,
+            left,
+            right: left + width2,
+            memberCount: 0,
+            processedCount: 0,
+            effectiveTop: null,
+            actualTop: null,
+            actualBottom: null,
+            extra: 0,
+            hasPaging: false,
+            firstPageIndex: null
+          };
+          __layoutGroupList.push(info);
+        } else {
+          info.rawTop = Math.min(info.rawTop, top);
+          info.baseHeight = Math.max(info.baseHeight, height);
+          info.left = Math.min(info.left, left);
+          info.right = Math.max(info.right, left + width2);
+        }
+        info.memberCount++;
+      });
+      __layoutGroupList.sort(function(a2, b3) {
+        return a2.rawTop - b3.rawTop || a2.left - b3.left;
+      });
+      var __layoutGroupsOverlap = function(a2, b3) {
+        return a2.left < b3.right && b3.left < a2.right;
+      };
+      var __getLayoutGroupTop = function(info) {
+        if (!info)
+          return null;
+        if (Number.isFinite(info.effectiveTop))
+          return info.effectiveTop;
+        var shift = 0;
+        __layoutGroupList.forEach(function(previous) {
+          if (previous === info || previous.rawTop >= info.rawTop)
+            return;
+          var previousBottom = previous.rawTop + previous.baseHeight;
+          if (previousBottom <= info.rawTop + 2.5 && __layoutGroupsOverlap(previous, info)) {
+            shift += Number(previous.extra) || 0;
+          }
+        });
+        info.effectiveTop = info.rawTop + shift;
+        return info.effectiveTop;
+      };
+      var __recordLayoutGroupResult = function(info, results, startPageIndex) {
+        if (!info || !results || !results.length)
+          return;
+        var firstRef = results[0] && results[0].referenceElement;
+        if (info.firstPageIndex == null && firstRef && typeof startPageIndex === "number") {
+          info.firstPageIndex = startPageIndex;
+        }
+        if (results.length > 1) {
+          info.hasPaging = true;
+          return;
+        }
+        var ref = results[0] && results[0].referenceElement;
+        if (!ref || typeof startPageIndex === "number" && ref.beginPrintPaperIndex !== startPageIndex)
+          return;
+        var top = Number(ref.printTopInPaper), bottom = Number(ref.bottomInLastPaper);
+        if (!Number.isFinite(top) || !Number.isFinite(bottom))
+          return;
+        info.actualTop = info.actualTop == null ? top : Math.min(info.actualTop, top);
+        info.actualBottom = info.actualBottom == null ? bottom : Math.max(info.actualBottom, bottom);
+        info.processedCount++;
+        if (info.processedCount >= info.memberCount && !info.hasPaging && info.actualBottom != null) {
+          var baseBottom = (info.actualTop == null ? info.effectiveTop : info.actualTop) + info.baseHeight;
+          info.extra = Math.max(0, info.actualBottom - baseBottom);
+        }
+      };
       this.printElements.filter(function(t4) {
         if (!t4 || t4.isFixed() || t4.isHeaderOrFooter())
           return false;
@@ -71364,15 +71648,20 @@ ${i18n.__("转大小写")}
         return true;
       }).forEach(function(e2) {
         var n3 = [], i3 = p[p.length - 1];
-        var __sameRowBefore = !!(i3 && i3.referenceElement && i3.referenceElement.isPositionLeftOrRight(e2.options.getTop()));
-        var __rowBottomBefore = __sameRowBefore && Number.isFinite(Number(i3.referenceElement.bottomInLastPaper)) ? Number(i3.referenceElement.bottomInLastPaper) : null;
+        var __layoutGroupValue = e2 && e2.options && e2.options.layoutGroup;
+        var __layoutGroupInfo = __layoutGroupValue == null ? null : __layoutGroups[String(__layoutGroupValue)];
+        if (__layoutGroupInfo) {
+          e2.__layoutTop = __getLayoutGroupTop(__layoutGroupInfo);
+        }
         var getSafePage = function(pageIdx, fallbackPage) {
           var idx2 = typeof pageIdx === "number" && pageIdx >= 0 ? pageIdx : fallbackPage && typeof fallbackPage.index === "number" ? fallbackPage.index : p.length - 1;
           if (!p[idx2])
             idx2 = p.length - 1;
           return p[idx2] || fallbackPage || p[p.length - 1];
         };
-        if (i3.referenceElement && i3.referenceElement.isPositionLeftOrRight(e2.options.getTop())) {
+        if (__layoutGroupInfo && Number.isInteger(__layoutGroupInfo.firstPageIndex)) {
+          l = getSafePage(__layoutGroupInfo.firstPageIndex, i3);
+        } else if (i3.referenceElement && i3.referenceElement.isPositionLeftOrRight(e2.options.getTop(), e2.options.getLeft(), e2.options.getWidth())) {
           l = getSafePage(i3.referenceElement.beginPrintPaperIndex, i3);
         } else {
           l = getSafePage(i3 && i3.referenceElement ? i3.referenceElement.endPrintPaperIndex : void 0, i3);
@@ -71383,6 +71672,10 @@ ${i18n.__("转大小写")}
           a.append(l.getTarget());
         }
         n3 = e2.getHtml(l, __printData) || [];
+        if (__layoutGroupInfo) {
+          __recordLayoutGroupResult(__layoutGroupInfo, n3, l && typeof l.index === "number" ? l.index : void 0);
+          e2.__layoutTop = void 0;
+        }
         n3.forEach(function(t4, i4) {
           if (t4.referenceElement) {
             if (typeof t4.referenceElement.beginPrintPaperIndex !== "number") {
@@ -71403,12 +71696,6 @@ ${i18n.__("转大小写")}
           var __visibleByPage = e2.showInPage ? e2.showInPage(l.index, p.length) : "none" != e2.options.showInPage;
           t4.target && (__visibleByPage && (l.append(t4.target), l.updatePrintLine(t4.printLine), e2.onRendered(l, t4.target)));
           if (i4 == n3.length - 1 && t4.referenceElement) {
-            if (__sameRowBefore && __rowBottomBefore != null) {
-              var __currentBottom = Number(t4.referenceElement.bottomInLastPaper);
-              if (!Number.isFinite(__currentBottom) || __rowBottomBefore > __currentBottom) {
-                t4.referenceElement.bottomInLastPaper = __rowBottomBefore;
-              }
-            }
             l.updateReferenceElement(t4.referenceElement);
           }
           if (t4.target && __visibleByPage && e2.printElementType && e2.printElementType.type === "table") {
@@ -74613,8 +74900,35 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
   }
 })($$i);
 (function() {
+  function translate(key, fallback) {
+    try {
+      var value = i18n$1 && i18n$1.global && i18n$1.global.t ? i18n$1.global.t(key) : "";
+      return value && value !== key ? value : fallback;
+    } catch (_2) {
+      return fallback;
+    }
+  }
+  function layoutGroupOption() {
+    this.name = "layoutGroup";
+  }
+  layoutGroupOption.prototype.createTarget = function() {
+    this.target = $('<div class="hiprint-option-item">\n        <div class="hiprint-option-item-label">\n        ' + translate("hiprint.layoutGroup.label", "同一行组件") + '\n        </div>\n        <div class="hiprint-option-item-field">\n        <input type="text" class="auto-submit" placeholder="' + translate("hiprint.layoutGroup.placeholder", "相同名称表示同一行") + '" />\n        </div>\n    </div>');
+    return this.target;
+  };
+  layoutGroupOption.prototype.getValue = function() {
+    var value = this.target.find("input").val();
+    value = value == null ? "" : value.toString().trim();
+    return value || void 0;
+  };
+  layoutGroupOption.prototype.setValue = function(value) {
+    this.target.find("input").val(value == null ? "" : value);
+  };
+  layoutGroupOption.prototype.destroy = function() {
+    this.target.remove();
+  };
   window.HIPRINT_CONFIG = {
     //optionItems: [hiprintCustomOptionItem],//自定义选项
+    optionItems: [layoutGroupOption],
     movingDistance: 1.5,
     //鼠标拖动一次移动的距离,默认1.5pt
     paperHeightTrim: 1,
@@ -74931,6 +75245,10 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
               name: "widthHeight",
               hidden: false
             },
+            {
+              name: "layoutGroup",
+              hidden: false
+            },
             {
               name: "hideTitle",
               hidden: false
@@ -75162,6 +75480,10 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
           name: "widthHeight",
           hidden: false
         },
+        {
+          name: "layoutGroup",
+          hidden: false
+        },
         {
           name: "dataType",
           hidden: false
@@ -75455,15 +75777,272 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
           hidden: false
         },
         {
-          name: "src",
-          hidden: false
-        },
-        {
-          name: "fit",
-          hidden: false
-        },
-        {
-          name: "borderRadius",
+          name: "src",
+          hidden: false
+        },
+        {
+          name: "fit",
+          hidden: false
+        },
+        {
+          name: "borderRadius",
+          hidden: false
+        },
+        {
+          name: "coordinate",
+          hidden: false
+        },
+        {
+          name: "widthHeight",
+          hidden: false
+        },
+        {
+          name: "hideTitle",
+          hidden: false
+        },
+        {
+          name: "showInPage",
+          hidden: false
+        },
+        {
+          name: "unShowInPage",
+          hidden: false
+        },
+        {
+          name: "fixed",
+          hidden: false
+        },
+        {
+          name: "pageBreak",
+          hidden: false
+        },
+        {
+          name: "axis",
+          hidden: false
+        },
+        {
+          name: "transform",
+          hidden: false
+        },
+        {
+          name: "zIndex",
+          hidden: false
+        },
+        {
+          name: "formatter",
+          hidden: false
+        },
+        {
+          name: "styler",
+          hidden: false
+        },
+        {
+          name: "followTableMode",
+          hidden: false
+        },
+        {
+          name: "followTableAnchor",
+          hidden: false
+        },
+        {
+          name: "followOffsetX",
+          hidden: false
+        },
+        {
+          name: "followOffsetY",
+          hidden: false
+        },
+        {
+          name: "followOffsetYFromBottom",
+          hidden: false
+        },
+        {
+          name: "followTableMinOverlapPt",
+          hidden: false
+        }
+      ],
+      default: {
+        title: "",
+        hideTitle: null
+      }
+    },
+    longText: {
+      tabs: [
+        {
+          name: "基础",
+          options: [
+            {
+              name: "title",
+              hidden: false
+            },
+            {
+              name: "field",
+              hidden: false
+            },
+            {
+              name: "testData",
+              hidden: false
+            },
+            {
+              name: "coordinate",
+              hidden: false
+            },
+            {
+              name: "widthHeight",
+              hidden: false
+            },
+            {
+              name: "layoutGroup",
+              hidden: false
+            },
+            {
+              name: "hideTitle",
+              hidden: false
+            },
+            {
+              name: "fixed",
+              hidden: false
+            }
+          ]
+        },
+        {
+          name: "样式",
+          options: [
+            {
+              name: "fontFamily",
+              hidden: false
+            },
+            {
+              name: "fontSize",
+              hidden: false
+            },
+            {
+              name: "fontWeight",
+              hidden: false
+            },
+            {
+              name: "letterSpacing",
+              hidden: false
+            },
+            {
+              name: "textAlign",
+              hidden: false
+            },
+            {
+              name: "lineHeight",
+              hidden: false
+            },
+            {
+              name: "color",
+              hidden: false
+            },
+            {
+              name: "titleFontFamily",
+              hidden: false
+            },
+            {
+              name: "titleFontSize",
+              hidden: false
+            },
+            {
+              name: "titleFontWeight",
+              hidden: false
+            },
+            {
+              name: "titleColor",
+              hidden: false
+            },
+            {
+              name: "titleTextContentVerticalAlign",
+              hidden: false
+            },
+            {
+              name: "titleTextAlign",
+              hidden: false
+            },
+            {
+              name: "titleContentPaddingLeft",
+              hidden: false
+            },
+            {
+              name: "titleContentPaddingTop",
+              hidden: false
+            },
+            {
+              name: "titleContentPaddingRight",
+              hidden: false
+            },
+            {
+              name: "titleContentPaddingBottom",
+              hidden: false
+            },
+            {
+              name: "longTextIndent",
+              hidden: false
+            },
+            {
+              name: "contentIndent",
+              hidden: false
+            },
+            {
+              name: "leftSpaceRemoved",
+              hidden: false
+            },
+            {
+              name: "lHeight",
+              hidden: false
+            },
+            {
+              name: "transform",
+              hidden: false
+            },
+            {
+              name: "zIndex",
+              hidden: false
+            }
+          ]
+        },
+        {
+          name: "高级",
+          options: [
+            {
+              name: "pageBreak",
+              hidden: false
+            },
+            {
+              name: "showInPage",
+              hidden: false
+            },
+            {
+              name: "unShowInPage",
+              hidden: false
+            },
+            {
+              name: "axis",
+              hidden: false
+            },
+            {
+              name: "formatter",
+              hidden: false
+            },
+            {
+              name: "styler",
+              hidden: false
+            }
+          ]
+        }
+      ],
+      supportOptions: [
+        {
+          name: "title",
+          hidden: false
+        },
+        {
+          name: "field",
+          hidden: false
+        },
+        {
+          name: "testData",
           hidden: false
         },
         {
@@ -75475,276 +76054,75 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
           hidden: false
         },
         {
-          name: "hideTitle",
-          hidden: false
-        },
-        {
-          name: "showInPage",
-          hidden: false
-        },
-        {
-          name: "unShowInPage",
-          hidden: false
-        },
-        {
-          name: "fixed",
-          hidden: false
-        },
-        {
-          name: "pageBreak",
-          hidden: false
-        },
-        {
-          name: "axis",
-          hidden: false
-        },
-        {
-          name: "transform",
-          hidden: false
-        },
-        {
-          name: "zIndex",
-          hidden: false
-        },
-        {
-          name: "formatter",
-          hidden: false
-        },
-        {
-          name: "styler",
-          hidden: false
-        },
-        {
-          name: "followTableMode",
-          hidden: false
-        },
-        {
-          name: "followTableAnchor",
-          hidden: false
-        },
-        {
-          name: "followOffsetX",
-          hidden: false
-        },
-        {
-          name: "followOffsetY",
-          hidden: false
-        },
-        {
-          name: "followOffsetYFromBottom",
+          name: "layoutGroup",
           hidden: false
         },
         {
-          name: "followTableMinOverlapPt",
+          name: "fontFamily",
           hidden: false
-        }
-      ],
-      default: {
-        title: "",
-        hideTitle: null
-      }
-    },
-    longText: {
-      tabs: [
-        {
-          name: "基础",
-          options: [
-            {
-              name: "title",
-              hidden: false
-            },
-            {
-              name: "field",
-              hidden: false
-            },
-            {
-              name: "testData",
-              hidden: false
-            },
-            {
-              name: "coordinate",
-              hidden: false
-            },
-            {
-              name: "widthHeight",
-              hidden: false
-            },
-            {
-              name: "hideTitle",
-              hidden: false
-            },
-            {
-              name: "fixed",
-              hidden: false
-            }
-          ]
-        },
-        {
-          name: "样式",
-          options: [
-            {
-              name: "fontFamily",
-              hidden: false
-            },
-            {
-              name: "fontSize",
-              hidden: false
-            },
-            {
-              name: "fontWeight",
-              hidden: false
-            },
-            {
-              name: "letterSpacing",
-              hidden: false
-            },
-            {
-              name: "textAlign",
-              hidden: false
-            },
-            {
-              name: "lineHeight",
-              hidden: false
-            },
-            {
-              name: "color",
-              hidden: false
-            },
-            {
-              name: "titleFontFamily",
-              hidden: false
-            },
-            {
-              name: "titleFontSize",
-              hidden: false
-            },
-            {
-              name: "titleFontWeight",
-              hidden: false
-            },
-            {
-              name: "titleColor",
-              hidden: false
-            },
-            {
-              name: "longTextIndent",
-              hidden: false
-            },
-            {
-              name: "contentIndent",
-              hidden: false
-            },
-            {
-              name: "leftSpaceRemoved",
-              hidden: false
-            },
-            {
-              name: "lHeight",
-              hidden: false
-            },
-            {
-              name: "transform",
-              hidden: false
-            },
-            {
-              name: "zIndex",
-              hidden: false
-            }
-          ]
         },
         {
-          name: "高级",
-          options: [
-            {
-              name: "pageBreak",
-              hidden: false
-            },
-            {
-              name: "showInPage",
-              hidden: false
-            },
-            {
-              name: "unShowInPage",
-              hidden: false
-            },
-            {
-              name: "axis",
-              hidden: false
-            },
-            {
-              name: "formatter",
-              hidden: false
-            },
-            {
-              name: "styler",
-              hidden: false
-            }
-          ]
-        }
-      ],
-      supportOptions: [
-        {
-          name: "title",
+          name: "fontSize",
           hidden: false
         },
         {
-          name: "field",
+          name: "fontWeight",
           hidden: false
         },
         {
-          name: "testData",
+          name: "letterSpacing",
           hidden: false
         },
         {
-          name: "coordinate",
+          name: "textAlign",
           hidden: false
         },
         {
-          name: "widthHeight",
+          name: "lineHeight",
           hidden: false
         },
         {
-          name: "fontFamily",
+          name: "color",
           hidden: false
         },
         {
-          name: "fontSize",
+          name: "titleFontFamily",
           hidden: false
         },
         {
-          name: "fontWeight",
+          name: "titleFontSize",
           hidden: false
         },
         {
-          name: "letterSpacing",
+          name: "titleFontWeight",
           hidden: false
         },
         {
-          name: "textAlign",
+          name: "titleColor",
           hidden: false
         },
         {
-          name: "lineHeight",
+          name: "titleTextAlign",
           hidden: false
         },
         {
-          name: "color",
+          name: "titleTextContentVerticalAlign",
           hidden: false
         },
         {
-          name: "titleFontFamily",
+          name: "titleContentPaddingLeft",
           hidden: false
         },
         {
-          name: "titleFontSize",
+          name: "titleContentPaddingTop",
           hidden: false
         },
         {
-          name: "titleFontWeight",
+          name: "titleContentPaddingRight",
           hidden: false
         },
         {
-          name: "titleColor",
+          name: "titleContentPaddingBottom",
           hidden: false
         },
         {
@@ -77267,6 +77645,10 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
               name: "widthHeight",
               hidden: false
             },
+            {
+              name: "layoutGroup",
+              hidden: false
+            },
             {
               name: "fixed",
               hidden: false
@@ -77336,6 +77718,24 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
           }, {
             name: "textAlign",
             hidden: false
+          }, {
+            name: "titleTextContentVerticalAlign",
+            hidden: false
+          }, {
+            name: "titleTextAlign",
+            hidden: false
+          }, {
+            name: "titleContentPaddingLeft",
+            hidden: false
+          }, {
+            name: "titleContentPaddingTop",
+            hidden: false
+          }, {
+            name: "titleContentPaddingRight",
+            hidden: false
+          }, {
+            name: "titleContentPaddingBottom",
+            hidden: false
           }, {
             name: "contentIndent",
             hidden: false
@@ -77394,6 +77794,10 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
           name: "widthHeight",
           hidden: false
         },
+        {
+          name: "layoutGroup",
+          hidden: false
+        },
         {
           name: "fixed",
           hidden: false
@@ -77458,6 +77862,30 @@ var defaultElementTypeProvider$1 = defaultTypeProvider(hiprint$3);
           name: "titleColor",
           hidden: false
         },
+        {
+          name: "titleTextAlign",
+          hidden: false
+        },
+        {
+          name: "titleTextContentVerticalAlign",
+          hidden: false
+        },
+        {
+          name: "titleContentPaddingLeft",
+          hidden: false
+        },
+        {
+          name: "titleContentPaddingTop",
+          hidden: false
+        },
+        {
+          name: "titleContentPaddingRight",
+          hidden: false
+        },
+        {
+          name: "titleContentPaddingBottom",
+          hidden: false
+        },
         {
           name: "backgroundColor",
           hidden: false
@@ -77887,7 +78315,7 @@ async function ensureHttpClient() {
 }
 const name = "vg-print-vue2";
 const description = "vg-print supports visual drag and drop design templates, with functions such as previewing and exporting PDFs/images. Silent printing can be achieved in conjunction with a dedicated client";
-const version = "1.0.511";
+const version = "1.0.513";
 const author = "gmcSimple";
 const license = "MIT";
 const main = "dist/vg-print-vue2.cjs.js";
@@ -81235,6 +81663,7 @@ const template1 = {
     {
       "index": 0,
       "name": "销售单",
+      "nameField": "",
       "height": 210,
       "width": 297,
       "paperHeader": 70.5,
@@ -81526,6 +81955,7 @@ const template1 = {
             "tableHeaderBackground": "",
             "tableBodyRowHeight": 15.75,
             "tablePaginationTolerancePx": 16,
+            "gridFillDirection": "",
             "columns": [
               [
                 {
@@ -81830,17 +82260,25 @@ const template1 = {
           }
         }
       ],
-      "paperNumberLeft": 750,
-      "paperNumberTop": 570,
+      "paperNumberLeft": -30,
+      "paperNumberTop": 37,
       "paperNumberContinue": true,
       "orient": 2,
-      "watermarkOptions": {},
+      "watermarkOptions": {
+        "content": "",
+        "fillStyle": "rgba(184, 184, 184, 0.3)",
+        "fontSize": "14px",
+        "rotate": 25,
+        "width": 200,
+        "height": 200,
+        "timestamp": false,
+        "format": "YYYY-MM-DD HH:mm"
+      },
       "panelLayoutOptions": {
         "layoutType": "column",
         "layoutRowGap": 0,
         "layoutColumnGap": 0
       },
-      "backgroundColor": "#fff",
       "expandCss": ".products {\n    display: flex;\n    flex-wrap: wrap;\n    position: relative;\n    box-sizing: border-box;\n    border: 1px solid #c8c9cc;\n    padding: 5pt;\n    margin-bottom: 5pt;\n}\n.products .mg-row {display: flex;margin-bottom: 5pt;}\n\n.col-25{max-width:25%;flex:0 0 25%}\n.col-75{max-width:75%;flex:0 0 75%}\n.col-100{width:100%;flex:0 0 100%}\n.w-9{width:9%}\n.w-10{width:10%}\n.w-20{width:20%}\n.w-40{width:40%}\n.center{text-align:center}\n\n.custom-table {\n   width: 100%;\n}\n.custom-table .custom-th div, .custom-table .custom-tr div {\n    font-size: 6pt;\n    display: inline-block;\n    padding: 2pt 0;\n    border-left: 1pt solid #000000;\n    border-bottom: 1pt solid #000000;\n    vertical-align: top;\n  }\n.custom-table .custom-th div:last-child, .custom-table .custom-tr div:last-child {\n    border-right: 1px solid #000000;\n  }\n.custom-table .custom-th, .custom-table .custom-tr {\n    display: block;\n    font-size: 0;\n  }\n.custom-table .custom-th div span, .custom-table .custom-tr div span {\n    margin: 0 5pt;\n  }\n.custom-table .custom-th div {\n    border-top: 1pt solid #000000;\n  }"
     }
   ]
@@ -81984,7 +82422,7 @@ const template2 = {
             "top": 118.5,
             "height": 19,
             "width": 105,
-            "title": "姓 名",
+            "title": "姓 名：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82016,7 +82454,7 @@ const template2 = {
             "top": 118.5,
             "height": 19,
             "width": 105,
-            "title": "年 龄",
+            "title": "年 龄：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82053,7 +82491,7 @@ const template2 = {
             "custom": true,
             "fontSize": 12,
             "lineHeight": 15,
-            "title": "检查日期",
+            "title": "检查日期：",
             "eid": "38a34dfb-db12-433b-abf7-75a860b4da79",
             "testData": "",
             "coordinateSync": false,
@@ -82081,7 +82519,7 @@ const template2 = {
             "top": 118.5,
             "height": 19,
             "width": 84,
-            "title": "性 别",
+            "title": "性 别：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82114,7 +82552,7 @@ const template2 = {
             "top": 154.5,
             "height": 19,
             "width": 136.5,
-            "title": "科 别",
+            "title": "科 别：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82147,7 +82585,7 @@ const template2 = {
             "top": 187.5,
             "height": 19,
             "width": 210,
-            "title": "送检医院",
+            "title": "送检医院：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82180,7 +82618,7 @@ const template2 = {
             "top": 189,
             "height": 19,
             "width": 120,
-            "title": "住院号",
+            "title": "住院号：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82813,7 +83251,7 @@ const template2 = {
             "top": 805.5,
             "height": 19,
             "width": 112.5,
-            "title": "初诊医生",
+            "title": "初诊医生：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82828,7 +83266,10 @@ const template2 = {
             "vCenter": 88.5,
             "hCenter": 814.25,
             "qid": "p_7",
-            "eid": "fb99eacb-daa1-40d6-b6a4-1e0949154df6"
+            "eid": "fb99eacb-daa1-40d6-b6a4-1e0949154df6",
+            "autoSizeMin": "",
+            "color": "",
+            "backgroundColor": ""
           },
           "printElementType": {
             "title": "自定义文本",
@@ -82846,7 +83287,7 @@ const template2 = {
             "fontSize": 12,
             "textAlign": "left",
             "textContentVerticalAlign": "middle",
-            "title": "报告日期",
+            "title": "报告日期：",
             "qid": "date",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -82857,7 +83298,10 @@ const template2 = {
             "bottom": 823.5,
             "vCenter": 462.75,
             "hCenter": 815.25,
-            "eid": "db4fee36-389d-49f4-a6fd-129f4ee2edff"
+            "eid": "db4fee36-389d-49f4-a6fd-129f4ee2edff",
+            "autoSizeMin": "",
+            "color": "",
+            "backgroundColor": ""
           },
           "printElementType": {
             "title": "业务日期",
@@ -82870,7 +83314,7 @@ const template2 = {
             "top": 805.5,
             "height": 19,
             "width": 112.5,
-            "title": "复诊医生",
+            "title": "复诊医生：",
             "fontFamily": "微软雅黑",
             "textAlign": "left",
             "lineHeight": 18,
@@ -82885,7 +83329,10 @@ const template2 = {
             "vCenter": 261.75,
             "hCenter": 815,
             "qid": "p_8",
-            "eid": "2633622d-13e2-4029-a35d-a78eac6183cc"
+            "eid": "2633622d-13e2-4029-a35d-a78eac6183cc",
+            "autoSizeMin": "",
+            "color": "",
+            "backgroundColor": ""
           },
           "printElementType": {
             "title": "自定义文本",
@@ -82934,7 +83381,7 @@ const template2 = {
         "layoutRowGap": 0,
         "layoutColumnGap": 0
       },
-      "expandCss": ""
+      "expandCss": ".products {\n    display: flex;\n    flex-wrap: wrap;\n    position: relative;\n    box-sizing: border-box;\n    border: 1px solid #c8c9cc;\n    padding: 5pt;\n    margin-bottom: 5pt;\n}\n.products .mg-row {display: flex;margin-bottom: 5pt;}\n\n.col-25{max-width:25%;flex:0 0 25%}\n.col-75{max-width:75%;flex:0 0 75%}\n.col-100{width:100%;flex:0 0 100%}\n.w-9{width:9%}\n.w-10{width:10%}\n.w-20{width:20%}\n.w-40{width:40%}\n.center{text-align:center}\n\n.custom-table {\n   width: 100%;\n}\n.custom-table .custom-th div, .custom-table .custom-tr div {\n    font-size: 6pt;\n    display: inline-block;\n    padding: 2pt 0;\n    border-left: 1pt solid #000000;\n    border-bottom: 1pt solid #000000;\n    vertical-align: top;\n  }\n.custom-table .custom-th div:last-child, .custom-table .custom-tr div:last-child {\n    border-right: 1px solid #000000;\n  }\n.custom-table .custom-th, .custom-table .custom-tr {\n    display: block;\n    font-size: 0;\n  }\n.custom-table .custom-th div span, .custom-table .custom-tr div span {\n    margin: 0 5pt;\n  }\n.custom-table .custom-th div {\n    border-top: 1pt solid #000000;\n  }"
     }
   ]
 };
@@ -82957,7 +83404,8 @@ const template3 = {
             "right": 316.5,
             "bottom": 186.75,
             "vCenter": 166.5,
-            "hCenter": 99
+            "hCenter": 99,
+            "eid": "f544570f-e36d-4579-b002-773d21094aa4"
           },
           "printElementType": {
             "title": "矩形",
@@ -82983,7 +83431,8 @@ const template3 = {
             "bottom": 39,
             "vCenter": 118.5,
             "hCenter": 29.25,
-            "textContentVerticalAlign": "middle"
+            "textContentVerticalAlign": "middle",
+            "eid": "9866621b-0e9e-49ed-9c8b-67fdb5ec5a7f"
           },
           "printElementType": {
             "title": "平台名称",
@@ -83000,7 +83449,8 @@ const template3 = {
             "right": 291,
             "bottom": 54,
             "vCenter": 149.25,
-            "hCenter": 49.5
+            "hCenter": 49.5,
+            "eid": "3d1cd374-e3dc-41cf-9786-71edb0bb78c6"
           },
           "printElementType": {
             "title": "横线",
@@ -83018,7 +83468,8 @@ const template3 = {
             "vCenter": 57,
             "hCenter": 100.5,
             "coordinateSync": false,
-            "widthHeightSync": false
+            "widthHeightSync": false,
+            "eid": "b86d8fc1-5847-4feb-b9b0-42cbf18f2aa3"
           },
           "printElementType": {
             "title": "竖线",
@@ -83044,7 +83495,8 @@ const template3 = {
             "coordinateSync": false,
             "widthHeightSync": false,
             "hideTitle": true,
-            "qrCodeLevel": 0
+            "qrCodeLevel": 0,
+            "eid": "8ff4eb82-10f5-471d-887d-74afc677017c"
           },
           "printElementType": {
             "title": "二维码",
@@ -83080,7 +83532,7 @@ const template3 = {
               }
             ],
             "testData": "214124123123",
-            "title": "编码",
+            "title": "编码：",
             "right": 56.25,
             "bottom": 74.25,
             "vCenter": 41.25,
@@ -83089,7 +83541,11 @@ const template3 = {
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 12,
-            "qrCodeLevel": 0
+            "qrCodeLevel": 0,
+            "eid": "b2857fa1-88d8-4ab9-8d88-9ba3200c631c",
+            "autoSizeMin": "",
+            "color": "",
+            "backgroundColor": ""
           },
           "printElementType": {
             "title": "文本",
@@ -83105,7 +83561,7 @@ const template3 = {
             "field": "p_patient_name",
             "custom": true,
             "fontSize": 12,
-            "title": "姓名",
+            "title": "姓名：",
             "testData": "张三",
             "coordinateSync": false,
             "widthHeightSync": false,
@@ -83113,7 +83569,11 @@ const template3 = {
             "right": 156,
             "bottom": 96,
             "vCenter": 87.75,
-            "hCenter": 87.75
+            "hCenter": 87.75,
+            "eid": "97028ca0-85b7-4401-ae27-3d7bc6c81cde",
+            "autoSizeMin": "",
+            "color": "",
+            "backgroundColor": ""
           },
           "printElementType": {
             "title": "文本",
@@ -83129,7 +83589,7 @@ const template3 = {
             "field": "p_patient_sex",
             "custom": true,
             "fontSize": 12,
-            "title": "性别",
+            "title": "性别：",
             "right": 178.5,
             "bottom": 145.5,
             "vCenter": 103.5,
@@ -83137,7 +83597,11 @@ const template3 = {
             "testData": "男",
             "coordinateSync": false,
             "widthHeightSync": false,
-            "qrCodeLevel": 0
+            "qrCodeLevel": 0,
+            "eid": "b318b05a-4563-450d-92d1-72900807c755",
+            "autoSizeMin": "",
+            "color": "",
+            "backgroundColor": ""
           },
           "printElementType": {
             "title": "文本",
@@ -83154,7 +83618,8 @@ const template3 = {
             "right": 268.5,
             "bottom": 140.25,
             "vCenter": 138,
-            "hCenter": 135.75
+            "hCenter": 135.75,
+            "eid": "dab062ca-13c4-4435-8551-681c5dd0583c"
           },
           "printElementType": {
             "title": "横线",
@@ -83180,7 +83645,8 @@ const template3 = {
             "right": 171,
             "bottom": 245.75,
             "vCenter": 96.75,
-            "hCenter": 229.75
+            "hCenter": 229.75,
+            "eid": "29e5aca5-0d81-46c9-b6e5-424fe4c4b552"
           },
           "printElementType": {
             "title": "条形码",
@@ -83208,8 +83674,7 @@ const template3 = {
         "layoutRowGap": 0,
         "layoutColumnGap": 1
       },
-      "backgroundColor": "#fff",
-      "expandCss": ""
+      "expandCss": ".products {\n    display: flex;\n    flex-wrap: wrap;\n    position: relative;\n    box-sizing: border-box;\n    border: 1px solid #c8c9cc;\n    padding: 5pt;\n    margin-bottom: 5pt;\n}\n.products .mg-row {display: flex;margin-bottom: 5pt;}\n\n.col-25{max-width:25%;flex:0 0 25%}\n.col-75{max-width:75%;flex:0 0 75%}\n.col-100{width:100%;flex:0 0 100%}\n.w-9{width:9%}\n.w-10{width:10%}\n.w-20{width:20%}\n.w-40{width:40%}\n.center{text-align:center}\n\n.custom-table {\n   width: 100%;\n}\n.custom-table .custom-th div, .custom-table .custom-tr div {\n    font-size: 6pt;\n    display: inline-block;\n    padding: 2pt 0;\n    border-left: 1pt solid #000000;\n    border-bottom: 1pt solid #000000;\n    vertical-align: top;\n  }\n.custom-table .custom-th div:last-child, .custom-table .custom-tr div:last-child {\n    border-right: 1px solid #000000;\n  }\n.custom-table .custom-th, .custom-table .custom-tr {\n    display: block;\n    font-size: 0;\n  }\n.custom-table .custom-th div span, .custom-table .custom-tr div span {\n    margin: 0 5pt;\n  }\n.custom-table .custom-th div {\n    border-top: 1pt solid #000000;\n  }"
     }
   ]
 };