vg-print 1.1.301 → 1.1.302

package/README.md

@@ -7,7 +7,7 @@
 - npm搜索vg-print.
   ```vue
   ```
-- imageQuality联系我加 QQ: 984239686 或使用首页有微信加入群聊解决问题.
+- 联系我加 QQ: 984239686 或使用首页有微信加入群聊解决问题.
 
 > **Vue 2 版本**: 如果你使用的是 Vue2+webpack4.0以上，请查看 [vg-print-vue2](https://www.npmjs.com/package/vg-print-vue2)
 

package/dist/vg-print.es.js

@@ -68803,15 +68803,15 @@ ${i18n$1.__("转大小写")}
       });
     }, e.prototype._sgtRenderHtml = function(isDesignMode, rawData) {
       var grid = this._sgtEnsureGrid(), opt = this.options || {}, sgtEval = function(fnName, code) {
-        if (code) {
-          var fn = void 0;
+        if (code)
           try {
-            eval(fnName + "=" + code);
+            var src = String(code).trim();
+            src.charAt(src.length - 1) === ";" && (src = src.slice(0, -1));
+            var fn = eval("(" + src + ")");
+            if (typeof fn == "function") return fn;
           } catch (Be) {
             console.log(Be);
           }
-          return fn;
-        }
       }, toCssText = function(Be) {
         if (!Be) return "";
         if (typeof Be == "string") return Be;
@@ -68967,14 +68967,20 @@ ${i18n$1.__("转大小写")}
                 try {
                   var htmlTd = fnRenderFormatter(val, rawData || {}, c, opt, r, colObj);
                   if (htmlTd != null && htmlTd !== "") {
-                    var tmp = document.createElement("div");
-                    tmp.innerHTML = String(htmlTd);
-                    var tdNode = tmp.querySelector("td");
+                    var htmlStr = String(htmlTd), tdNode = null;
+                    if (htmlStr.indexOf("<td") !== -1 || htmlStr.indexOf("<TD") !== -1) {
+                      var tbl = document.createElement("table");
+                      tbl.innerHTML = "<tbody><tr>" + htmlStr + "</tr></tbody>", tdNode = tbl.querySelector("td");
+                    }
+                    if (!tdNode) {
+                      var tmp = document.createElement("div");
+                      tmp.innerHTML = htmlStr, tdNode = tmp.querySelector("td");
+                    }
                     if (tdNode) {
                       var sattr = tdNode.getAttribute("style");
                       sattr && (tdStyle += sattr), inner = tdNode.innerHTML || "";
                     } else
-                      inner = String(htmlTd);
+                      inner = htmlStr;
                   }
                 } catch (Be) {
                   console.log(Be);
@@ -82834,7 +82840,7 @@ const i18n = createI18n({
   fallbackLocale: "zh_CN",
   // 设置文本内容
   messages
-}), version = "1.1.301";
+}), version = "1.1.302";
 typeof window < "u" && window.hinnn && (window.hinnn.queue || (window.hinnn.queue = {
   list: [],
   running: !1,
@@ -83009,7 +83015,7 @@ hiprint$1.decryptAuthKey = async function(Be, Oe = {}, Ue = {}) {
     return null;
   }
 };
-const REQUIRED_AUTH_KEY = "gmc5760337", LICENSE_ALGO = "Ed25519", BUILTIN_LICENSE_PUBLIC_KEY_B64 = "2NFHW7F4mNGCFthseuqK7aWYpLv8ocex2knT8odisFI=", LEGACY_AUTH_COMPAT_EXPIRES_AT = Date.parse("2030-12-31T23:59:59+08:00");
+const REQUIRED_AUTH_KEY = "gmc5760337", LICENSE_ALGO = "Ed25519", BUILTIN_LICENSE_PUBLIC_KEY_B64 = "2NFHW7F4mNGCFthseuqK7aWYpLv8ocex2knT8odisFI=", LEGACY_AUTH_COMPAT_EXPIRES_AT = Date.parse("2028-12-31T23:59:59+08:00");
 function _normalizeB64(Be = "") {
   const Oe = String(Be || "").trim().replace(/-/g, "+").replace(/_/g, "/"), Ue = Oe.length % 4;
   return Ue === 2 ? Oe + "==" : Ue === 3 ? Oe + "=" : Ue === 1 ? Oe + "===" : Oe;
@@ -101543,9 +101549,10 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   mPhone: "13900000000",
   qrcode: "CHECK-202400056",
   barcode: "202400056",
-  address: "江苏省南京市玄武区XX路XX号",
-  desc1: "既往病史：无特殊。",
-  desc2: "现病史：腹痛2天。",
+  address: "江苏省南京市玄武区XX路XX号（formatter2 示例：追加说明）",
+  desc1: "既往病史：无特殊。<br><span style='color:red;'>（renderFormatter 富文本示例：红色强调）</span><br><span style='font-weight:bold;'>第二行加粗</span>",
+  desc2: `现病史：腹痛2天。
+（formatter2 示例：保留换行 + styler2 设置 pre-wrap）`,
   wtxm: "232323",
   wewm: "https://example.com/check/202400056",
   wimg: "https://picsum.photos/seed/hiprint/1200/800.jpg",
@@ -103357,6 +103364,62 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
                 ]
               ]
             },
+            styler: `function (value, options, columns, templateData, pageNo, data) {
+              return {
+                fontFamily: '微软雅黑'
+              };
+            }`,
+            rowStyler: `function (data, options, rowIndex, columns, templateData) {
+              if (rowIndex % 2 === 0) return { backgroundColor: '#fcfcfc' };
+              return;
+            }`,
+            formatter2: `function (value, rowData, colIndex, options, rowIndex, column) {
+              if (!column || !column.field) return value;
+              var f = String(column.field);
+              if (f === 'address') {
+                var v = value == null ? '' : String(value);
+                return '地址：' + v;
+              }
+              if (f === 'desc2') {
+                return value == null ? '' : String(value);
+              }
+              return value;
+            }`,
+            styler2: `function (value, rowData, colIndex, options, rowIndex, column) {
+              if (!column || !column.field) return;
+              var f = String(column.field);
+              if (f === 'address') {
+                return {
+                  whiteSpace: 'pre-wrap',
+                  wordBreak: 'break-word',
+                  backgroundColor: '#f6fbff'
+                };
+              }
+              if (f === 'desc1' || f === 'desc2') {
+                return {
+                  whiteSpace: 'pre-wrap',
+                  wordBreak: 'break-word'
+                };
+              }
+              return;
+            }`,
+            stylerHeader: `function (column, options, columns, templateData) {
+              return {
+                fontWeight: '700',
+                backgroundColor: '#f3f5f7'
+              };
+            }`,
+            renderFormatter: `function (value, rowData, colIndex, options, rowIndex, column) {
+              if (!column || column.field !== 'desc1') return '';
+              if (value == null) return '';
+              var s = String(value);
+              if (s.indexOf('<') === -1 || s.indexOf('>') === -1) return '';
+              return '<td style="white-space:pre-wrap;word-break:break-word;">' + s + '</td>';
+            }`,
+            rowsColumnsMerge: `function (rowData, col, colIndex, rowIndex, columns, templateData) {
+              if (rowIndex === 0 && colIndex === 0) return [1, 1];
+              return null;
+            }`,
             right: 564.75,
             bottom: 676.5,
             vCenter: 299.25,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vg-print",
-  "description": "vg-print Vue3.x 支持拖拽(分页(不分页)、表头表脚、样式设置、复制粘贴、缩放、撤销重做)生成打印模板、导出json模板数据、静默打印/获取MAC地址(借助客户端)",
-  "version": "1.1.301",
+  "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",
+  "version": "1.1.302",
   "author": "gmcSimple",
   "license": "MIT",
   "main": "dist/vg-print.es.js",