vg-print 1.1.510 → 1.1.511

package/dist/vg-print.es.js

@@ -37564,7 +37564,7 @@ var i18n = {
         designTarget: We,
         onDrag: function(En, Mn, Fn) {
           var Rn = We.panel.printElements.filter(function(Ca) {
-            return Ca.designTarget.children().last().css("display") == "block" && Ca.designTarget.children().last().hasClass("selected") && !Ca.printElementType.type.includes("table");
+            return !!(Ca && Ca.designTarget && Ca.designTarget.length && Ca.designTarget.children && Ca.printElementType) && Ca.designTarget.children().last().css("display") == "block" && Ca.designTarget.children().last().hasClass("selected") && !(Ca.printElementType.type || "").includes("table");
           }), kn = Rn.length > 1, Aa = !We.designTarget.children().last().hasClass("selected");
           if (kn) {
             var ia = Mn - We.options.left, $n = Fn - We.options.top;
@@ -37595,7 +37595,7 @@ var i18n = {
         onStopDrag: function(En) {
           _HiPrintlib__WEBPACK_IMPORTED_MODULE_6__.a.instance.changed && hinnn.event.trigger("hiprintTemplateDataChanged_" + We.templateId, "移动"), _HiPrintlib__WEBPACK_IMPORTED_MODULE_6__.a.instance.draging = !1, _HiPrintlib__WEBPACK_IMPORTED_MODULE_6__.a.instance.changed = !1;
           var Mn = We.panel.printElements.filter(function(Fn) {
-            return Fn.designTarget.children().last().css("display") == "block" && !Fn.printElementType.type.includes("table");
+            return !!(Fn && Fn.designTarget && Fn.designTarget.length && Fn.designTarget.children && Fn.printElementType) && Fn.designTarget.children().last().css("display") == "block" && !(Fn.printElementType.type || "").includes("table");
           });
           Mn.length > 1 ? Mn.forEach(function(Fn) {
             Fn.removeLineOfPosition();
@@ -37851,7 +37851,7 @@ var i18n = {
       var We = this.getField(), St = De ? We ? getValueByPath(De, We) : "" : this.printElementType.getData();
       St == null && (St = "");
       var An = this.getFormatter();
-      return An && St !== "" && (St = An(St, this.options, De, _e)), St;
+      return An && St !== "" && (St = this._callFormatterSafely(An, [St, this.options, De, _e], St)), St;
     }, BasePrintElement.prototype.copyFromType = function() {
       var De = this.options, _e = this.printElementType, We = this.getConfigOptions(), St = [];
       return We && We.tabs && We.tabs.length ? We.tabs.forEach(function(An) {
@@ -38038,6 +38038,20 @@ var i18n = {
         console.log(De);
       }
       return formatter;
+    }, BasePrintElement.prototype._callFormatterSafely = function(De, _e, We) {
+      try {
+        return De.apply(null, _e || []);
+      } catch (An) {
+        var St = An && An.message ? An.message : String(An);
+        if (this._formatterErrorsLogged = this._formatterErrorsLogged || {}, !this._formatterErrorsLogged[St]) {
+          this._formatterErrorsLogged[St] = !0;
+          try {
+            console.warn("[vg-print] formatter 执行失败，已回退为原始字段值：", An);
+          } catch {
+          }
+        }
+        return We;
+      }
     }, BasePrintElement.prototype.getStyler = function() {
       var fnstyler = void 0;
       if (this.printElementType.styler && (fnstyler = this.printElementType.styler), this.options.styler) try {
@@ -38061,7 +38075,7 @@ var i18n = {
           }
           if (!(We._editing && !Cn.altKey) && We.options.draggable !== !1) {
             var Mn = We.panel.printElements.filter(function(Aa) {
-              return Aa.designTarget.children().last().css("display") == "block" && !Aa.printElementType.type.includes("table");
+              return !!(Aa && Aa.designTarget && Aa.designTarget.length && Aa.designTarget.children && Aa.printElementType) && Aa.designTarget.children().last().css("display") == "block" && !(Aa.printElementType.type || "").includes("table");
             }), Fn = Mn.length > 1, Rn = _HiPrintConfig__WEBPACK_IMPORTED_MODULE_1__.a.instance.movingDistance;
             switch (Cn.keyCode) {
               case 8:
@@ -46822,7 +46836,7 @@ ${i18n.__("转大小写")}
       if (St(ia), !(ia.ctrlKey || ia.metaKey) && (ia.data.target.className.startsWith("resize-panel") || ia.data.target.style.zIndex == "2" || ia.data.target.className.startsWith("hiprint-printElement"))) {
         var Ca = ia.data;
         if (We(".mouseRect").length == 0 && $n.options.designTarget && $n.options.designTarget.panel.printElements.filter(function(ka) {
-          return ka.designTarget.children().last().css("display") == "block" && !ka.printElementType.type.includes("table");
+          return !!(ka && ka.designTarget && ka.designTarget.length && ka.designTarget.children && ka.printElementType) && ka.designTarget.children().last().css("display") == "block" && !(ka.printElementType.type || "").includes("table");
         }).length <= 1) {
           let ka = window.hinnn.px.toPt(Ca.left), za = window.hinnn.px.toPt(Ca.top), Ha = $n.options.designTarget.options;
           Ha.left = ka, Ha.top = za, Ha.right = ka + Ha.width, Ha.bottom = za + Ha.height, Ha.vCenter = ka + Ha.width / 2, Ha.hCenter = za + Ha.height / 2, (() => {
@@ -48070,7 +48084,7 @@ ${i18n.__("转大小写")}
       var St = "", An = this.getField();
       We ? St = An ? getValueByPath(We, An) : this.options.src || this.printElementType.getData() : St = this.options.src || this.printElementType.getData(), St == null && (St = "");
       var Cn = this.getFormatter();
-      return Cn && (St = Cn(St, this.options, this._currenttemplateData)), St ?? "";
+      return Cn && (St = this._callFormatterSafely(Cn, [St, this.options, this._currenttemplateData], St)), St ?? "";
     }, _e.prototype.createTarget = function(We, St) {
       var An = $$h('<div class="hiprint-printElement hiprint-printElement-image" style="position: absolute;display:flex;flex-direction:column;"><div class="hiprint-printElement-image-title" style="text-align:left;flex:0 0 auto;display:none;"></div><div class="hiprint-printElement-image-content" style="flex:1 1 auto;min-height:0;width:100%"></div></div>');
       return this.updateTargetImage(An, We, St), An;
@@ -48382,8 +48396,8 @@ ${i18n.__("转大小写")}
       var An = this.getFormatter(), Cn = St ?? "";
       return Cn = this.options.leftSpaceRemoved != 0 ? Cn.toString().replace(/^\s*/, "") : Cn, this.getField() ? {
         title: this.options.getHideTitle() ? "" : We ? We + "：" : "",
-        body: An ? An(We, Cn, this.options, this._currenttemplateData) : Cn
-      } : { title: "", body: An ? An(We, We, this.options, this._currenttemplateData) : Cn || We || "" };
+        body: An ? this._callFormatterSafely(An, [We, Cn, this.options, this._currenttemplateData], Cn) : Cn
+      } : { title: "", body: An ? this._callFormatterSafely(An, [We, We, this.options, this._currenttemplateData], We) : Cn || We || "" };
     }, _e.prototype.getStructuredContentParts = function(We, St) {
       var An = this.getContentParts(We, St);
       return this.getContentIndent() === 0 && !this.getField() && (An.body = this.getText(We, St)), An;
@@ -48418,7 +48432,7 @@ ${i18n.__("转大小写")}
       return this.updateTargetText(An, We, St), An;
     }, _e.prototype.getText = function(We, St) {
       var An = this.getFormatter();
-      return St && (St = this.options.leftSpaceRemoved != 0 ? St.toString().replace(/^\s*/, "") : St), (this.getField() ? (this.options.getHideTitle() ? "" : We ? We + "：" : "") + (An ? An(We, St, this.options, this._currenttemplateData) : St) : An ? An(We, We, this.options, this._currenttemplateData) : We || "") || "";
+      return St && (St = this.options.leftSpaceRemoved != 0 ? St.toString().replace(/^\s*/, "") : St), (this.getField() ? (this.options.getHideTitle() ? "" : We ? We + "：" : "") + (An ? this._callFormatterSafely(An, [We, St, this.options, this._currenttemplateData], St) : St) : An ? this._callFormatterSafely(An, [We, We, this.options, this._currenttemplateData], We) : We || "") || "";
     }, _e.prototype.getHtml = function(We, St) {
       this.setCurrenttemplateData(St), this.createTempContainer();
       var An = this.getPaperHtmlResult(We, St);
@@ -48638,7 +48652,7 @@ ${i18n.__("转大小写")}
       var Mn = this.getFormatter(), Fn = We.find(".hiprint-printElement-text-content"), Rn = "", kn = this.options.getTextType(), Aa = this.options.getHideTitle();
       Aa === "true" && (Aa = !0), Aa === "false" && (Aa = !1);
       var ia = this.getField() && !Aa && St ? St + "：" : "", $n, Ca = !1;
-      if (this.getField() ? ($n = hinnn.toUpperCase(this.options.upperCase, Mn ? Mn(St, An, this.options, this._currenttemplateData, We, Cn) : An), Rn = ia + $n, Ca = kn == "text" && this.hasCustomTitleStyle() && !!ia) : (An = hinnn.toUpperCase(this.options.upperCase, Mn ? Mn(St, St, this.options, this._currenttemplateData, We, Cn) : St), Rn = An), !this.getField() && Aa && kn == "text" && (Rn = ""), kn == "text")
+      if (this.getField() ? ($n = hinnn.toUpperCase(this.options.upperCase, Mn ? this._callFormatterSafely(Mn, [St, An, this.options, this._currenttemplateData, We, Cn], An) : An), Rn = ia + $n, Ca = kn == "text" && this.hasCustomTitleStyle() && !!ia) : (An = hinnn.toUpperCase(this.options.upperCase, Mn ? this._callFormatterSafely(Mn, [St, St, this.options, this._currenttemplateData, We, Cn], St) : St), Rn = An), !this.getField() && Aa && kn == "text" && (Rn = ""), kn == "text")
         if (Ca) {
           Fn.empty();
           var Ma = $$h('<span class="hiprint-printElement-text-title"></span>').text(ia), Na = $$h('<span class="hiprint-printElement-text-body"></span>').html($n ?? String($n));
@@ -58162,7 +58176,7 @@ async function ensureHttpClient() {
   }
   return null;
 }
-const version = "1.1.510";
+const version = "1.1.511";
 typeof window < "u" && window.hinnn && (window.hinnn.queue || (window.hinnn.queue = {
   list: [],
   running: !1,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vg-print",
   "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.510",
+  "version": "1.1.511",
   "author": "gmcSimple",
   "license": "MIT",
   "main": "dist/vg-print.es.js",