vg-print 1.0.304 → 1.0.311

package/README.md

@@ -182,13 +182,13 @@ tpl.toPdf({ name: '示例' }, '打印预览pdf', { paperWidth: 210, paperHeight:
 tpl.toImage({ name: '示例' }, { isDownload: true, name: '图片', limit: 1, type: 'image/jpeg', pixelRatio: 2 })
 ```
 
-水印与授权行为说明：设计态与运行态分离。设计态始终显示默认水印；运行态由授权控制。
+水印与授权行为说明：设计态与运行态分离。设计态不自动显示默认水印（由面板设置项决定）；运行态由授权控制。
 
 ### 授权密钥（authKey）与默认水印
 
 - 行为说明：
-  - 设计态（FullDesigner 设计界面）：始终显示默认水印 `{ content: 'vg-print', timestamp: true }`，不受 `authKey` 控制。
-  - 运行态（预览、浏览器打印、导出 PDF/图片、直连打印）：未注册 `authKey` 时显示默认水印；注册有效 `authKey` 后默认水印移除。
+  - 设计态（FullDesigner 设计界面）：不自动注入默认水印；是否显示水印由面板中的“水印功能”设置项决定，与 `authKey` 无关。
+  - 运行态（预览、浏览器打印、导出 PDF/图片、直连打印）：未注册 `authKey` 时显示默认水印 `{ content: 'vg-print', timestamp: true }`；注册有效 `authKey` 后默认水印移除。
   - 适用于所有入口：完整设计器组件、直接 `new hiprint.PrintTemplate(...)`、以及轻量运行时 API（`createTemplate`）。
 
 - 全局注册授权密钥：
@@ -199,7 +199,7 @@ import { hiprint } from 'vg-print'
 // 注册授权 key（建议在应用启动时调用）
 hiprint.register({ authKey: '你的key' })
 
-// 有授权 key → 运行态默认水印移除（设计态仍显示）
+// 有授权 key → 运行态默认水印移除（设计态由面板设置项决定）
 const tpl = new hiprint.PrintTemplate({ template: {} })
 ```
 
@@ -227,7 +227,7 @@ const tpl2 = createTemplate(tmplJson, {
   watermarkOptions: { content: 'your-brand', timestamp: true }
 })
 
-// 设计态不可关闭默认水印。
+// 设计态由面板设置项决定水印，不受 authKey 控制。
 // 运行态的默认水印由授权控制，不建议通过传入空对象取消；如需取消，请注册有效 authKey。
 const tpl3 = new hiprint.PrintTemplate({ template: {}, watermarkOptions: { content: 'your-brand', timestamp: true } })
 ```

package/dist/vg-print.es.js

@@ -60346,9 +60346,12 @@ ${i18n$1.__("转大小写")}
         watch: Ie,
         container: Be.target[0]
       });
-      Ee.container && (Ee.content || (Ie || typeof window < "u" && window.hiprint && !window.hiprint._authKey) && (Ee.content = "vg-print", Ee.timestamp = Ee.timestamp == null ? !0 : Ee.timestamp), Ee.content ? (Ie && watermark.destroyWatermark(Object.assign({}, Ee, {
-        id: `${Be.templateId}_${Be.panelIdx}_${Ae || 1}_${Be.index}`
-      })), watermark.createWatermark(Ee)) : watermark.destroyWatermark(Ee));
+      if (Ee.container) {
+        var Se = !!(Be && Be.target && Be.target.hasClass && Be.target.hasClass("design"));
+        Ee.content || !Ie && !Se && typeof window < "u" && window.hiprint && !window.hiprint._authKey && (Ee.content = "vg-print", Ee.timestamp = Ee.timestamp == null ? !0 : Ee.timestamp), Ee.content ? (Ie && watermark.destroyWatermark(Object.assign({}, Ee, {
+          id: `${Be.templateId}_${Be.panelIdx}_${Ae || 1}_${Be.index}`
+        })), watermark.createWatermark(Ee)) : watermark.destroyWatermark(Ee);
+      }
     }, t.prototype.displayHeight = function() {
       return this.mmheight - p.a.instance.paperHeightTrim + "mm";
     }, t.prototype.displayWidth = function() {
@@ -65480,7 +65483,7 @@ ${i18n$1.__("转大小写")}
     }
   };
 })();
-const version = "1.0.304";
+const version = "1.0.311";
 let autoConnect = function(Ie) {
   console.log("autoConnect"), window.autoConnect = !0, window.hiwebSocket && window.hiwebSocket.hasIo() && window.hiwebSocket.start(Ie);
 }, disAutoConnect = function() {
@@ -79201,120 +79204,117 @@ b`.split(/\n/).length != 3 ? function(Fe) {
     });
   }(codemirror)), codemirror.exports;
 }
-var hasRequiredFoldcode;
-function requireFoldcode() {
-  return hasRequiredFoldcode || (hasRequiredFoldcode = 1, function(Ie, Ae) {
-    (function(je) {
-      je(requireCodemirror());
-    })(function(je) {
-      function Be(Pe, De, Ue, He) {
-        if (Ue && Ue.call) {
-          var Ge = Ue;
-          Ue = null;
-        } else
-          var Ge = Te(Pe, Ue, "rangeFinder");
-        typeof De == "number" && (De = je.Pos(De, 0));
-        var Oe = Te(Pe, Ue, "minFoldSize");
-        function Qe(Ke) {
-          var rr = Ge(Pe, De);
-          if (!rr || rr.to.line - rr.from.line < Oe) return null;
-          if (He === "fold") return rr;
-          for (var or = Pe.findMarksAt(rr.from), er = 0; er < or.length; ++er)
-            if (or[er].__isFold) {
-              if (!Ke) return null;
-              rr.cleared = !0, or[er].clear();
-            }
-          return rr;
-        }
-        var Ye = Qe(!0);
-        if (Te(Pe, Ue, "scanUp")) for (; !Ye && De.line > Pe.firstLine(); )
-          De = je.Pos(De.line - 1, 0), Ye = Qe(!1);
-        if (!(!Ye || Ye.cleared || He === "unfold")) {
-          var Je = Ee(Pe, Ue, Ye);
-          je.on(Je, "mousedown", function(Ke) {
-            St.clear(), je.e_preventDefault(Ke);
-          });
-          var St = Pe.markText(Ye.from, Ye.to, {
-            replacedWith: Je,
-            clearOnEnter: Te(Pe, Ue, "clearOnEnter"),
-            __isFold: !0
-          });
-          St.on("clear", function(Ke, rr) {
-            je.signal(Pe, "unfold", Pe, Ke, rr);
-          }), je.signal(Pe, "fold", Pe, Ye.from, Ye.to);
-        }
-      }
-      function Ee(Pe, De, Ue) {
-        var He = Te(Pe, De, "widget");
-        if (typeof He == "function" && (He = He(Ue.from, Ue.to)), typeof He == "string") {
-          var Ge = document.createTextNode(He);
-          He = document.createElement("span"), He.appendChild(Ge), He.className = "CodeMirror-foldmarker";
-        } else He && (He = He.cloneNode(!0));
-        return He;
-      }
-      je.newFoldFunction = function(Pe, De) {
-        return function(Ue, He) {
-          Be(Ue, He, { rangeFinder: Pe, widget: De });
-        };
-      }, je.defineExtension("foldCode", function(Pe, De, Ue) {
-        Be(this, Pe, De, Ue);
-      }), je.defineExtension("isFolded", function(Pe) {
-        for (var De = this.findMarksAt(Pe), Ue = 0; Ue < De.length; ++Ue)
-          if (De[Ue].__isFold) return !0;
-      }), je.commands.toggleFold = function(Pe) {
-        Pe.foldCode(Pe.getCursor());
-      }, je.commands.fold = function(Pe) {
-        Pe.foldCode(Pe.getCursor(), null, "fold");
-      }, je.commands.unfold = function(Pe) {
-        Pe.foldCode(Pe.getCursor(), { scanUp: !1 }, "unfold");
-      }, je.commands.foldAll = function(Pe) {
-        Pe.operation(function() {
-          for (var De = Pe.firstLine(), Ue = Pe.lastLine(); De <= Ue; De++)
-            Pe.foldCode(je.Pos(De, 0), { scanUp: !1 }, "fold");
+(function(Ie, Ae) {
+  (function(je) {
+    je(requireCodemirror());
+  })(function(je) {
+    function Be(Pe, De, Ue, He) {
+      if (Ue && Ue.call) {
+        var Ge = Ue;
+        Ue = null;
+      } else
+        var Ge = Te(Pe, Ue, "rangeFinder");
+      typeof De == "number" && (De = je.Pos(De, 0));
+      var Oe = Te(Pe, Ue, "minFoldSize");
+      function Qe(Ke) {
+        var rr = Ge(Pe, De);
+        if (!rr || rr.to.line - rr.from.line < Oe) return null;
+        if (He === "fold") return rr;
+        for (var or = Pe.findMarksAt(rr.from), er = 0; er < or.length; ++er)
+          if (or[er].__isFold) {
+            if (!Ke) return null;
+            rr.cleared = !0, or[er].clear();
+          }
+        return rr;
+      }
+      var Ye = Qe(!0);
+      if (Te(Pe, Ue, "scanUp")) for (; !Ye && De.line > Pe.firstLine(); )
+        De = je.Pos(De.line - 1, 0), Ye = Qe(!1);
+      if (!(!Ye || Ye.cleared || He === "unfold")) {
+        var Je = Ee(Pe, Ue, Ye);
+        je.on(Je, "mousedown", function(Ke) {
+          St.clear(), je.e_preventDefault(Ke);
         });
-      }, je.commands.unfoldAll = function(Pe) {
-        Pe.operation(function() {
-          for (var De = Pe.firstLine(), Ue = Pe.lastLine(); De <= Ue; De++)
-            Pe.foldCode(je.Pos(De, 0), { scanUp: !1 }, "unfold");
+        var St = Pe.markText(Ye.from, Ye.to, {
+          replacedWith: Je,
+          clearOnEnter: Te(Pe, Ue, "clearOnEnter"),
+          __isFold: !0
         });
-      }, je.registerHelper("fold", "combine", function() {
-        var Pe = Array.prototype.slice.call(arguments, 0);
-        return function(De, Ue) {
-          for (var He = 0; He < Pe.length; ++He) {
-            var Ge = Pe[He](De, Ue);
-            if (Ge) return Ge;
-          }
-        };
-      }), je.registerHelper("fold", "auto", function(Pe, De) {
-        for (var Ue = Pe.getHelpers(De, "fold"), He = 0; He < Ue.length; He++) {
-          var Ge = Ue[He](Pe, De);
+        St.on("clear", function(Ke, rr) {
+          je.signal(Pe, "unfold", Pe, Ke, rr);
+        }), je.signal(Pe, "fold", Pe, Ye.from, Ye.to);
+      }
+    }
+    function Ee(Pe, De, Ue) {
+      var He = Te(Pe, De, "widget");
+      if (typeof He == "function" && (He = He(Ue.from, Ue.to)), typeof He == "string") {
+        var Ge = document.createTextNode(He);
+        He = document.createElement("span"), He.appendChild(Ge), He.className = "CodeMirror-foldmarker";
+      } else He && (He = He.cloneNode(!0));
+      return He;
+    }
+    je.newFoldFunction = function(Pe, De) {
+      return function(Ue, He) {
+        Be(Ue, He, { rangeFinder: Pe, widget: De });
+      };
+    }, je.defineExtension("foldCode", function(Pe, De, Ue) {
+      Be(this, Pe, De, Ue);
+    }), je.defineExtension("isFolded", function(Pe) {
+      for (var De = this.findMarksAt(Pe), Ue = 0; Ue < De.length; ++Ue)
+        if (De[Ue].__isFold) return !0;
+    }), je.commands.toggleFold = function(Pe) {
+      Pe.foldCode(Pe.getCursor());
+    }, je.commands.fold = function(Pe) {
+      Pe.foldCode(Pe.getCursor(), null, "fold");
+    }, je.commands.unfold = function(Pe) {
+      Pe.foldCode(Pe.getCursor(), { scanUp: !1 }, "unfold");
+    }, je.commands.foldAll = function(Pe) {
+      Pe.operation(function() {
+        for (var De = Pe.firstLine(), Ue = Pe.lastLine(); De <= Ue; De++)
+          Pe.foldCode(je.Pos(De, 0), { scanUp: !1 }, "fold");
+      });
+    }, je.commands.unfoldAll = function(Pe) {
+      Pe.operation(function() {
+        for (var De = Pe.firstLine(), Ue = Pe.lastLine(); De <= Ue; De++)
+          Pe.foldCode(je.Pos(De, 0), { scanUp: !1 }, "unfold");
+      });
+    }, je.registerHelper("fold", "combine", function() {
+      var Pe = Array.prototype.slice.call(arguments, 0);
+      return function(De, Ue) {
+        for (var He = 0; He < Pe.length; ++He) {
+          var Ge = Pe[He](De, Ue);
           if (Ge) return Ge;
         }
-      });
-      var Se = {
-        rangeFinder: je.fold.auto,
-        widget: "↔",
-        minFoldSize: 0,
-        scanUp: !1,
-        clearOnEnter: !0
       };
-      je.defineOption("foldOptions", null);
-      function Te(Pe, De, Ue) {
-        if (De && De[Ue] !== void 0)
-          return De[Ue];
-        var He = Pe.options.foldOptions;
-        return He && He[Ue] !== void 0 ? He[Ue] : Se[Ue];
-      }
-      je.defineExtension("foldOption", function(Pe, De) {
-        return Te(this, Pe, De);
-      });
+    }), je.registerHelper("fold", "auto", function(Pe, De) {
+      for (var Ue = Pe.getHelpers(De, "fold"), He = 0; He < Ue.length; He++) {
+        var Ge = Ue[He](Pe, De);
+        if (Ge) return Ge;
+      }
     });
-  }()), foldcode.exports;
-}
-requireFoldcode();
+    var Se = {
+      rangeFinder: je.fold.auto,
+      widget: "↔",
+      minFoldSize: 0,
+      scanUp: !1,
+      clearOnEnter: !0
+    };
+    je.defineOption("foldOptions", null);
+    function Te(Pe, De, Ue) {
+      if (De && De[Ue] !== void 0)
+        return De[Ue];
+      var He = Pe.options.foldOptions;
+      return He && He[Ue] !== void 0 ? He[Ue] : Se[Ue];
+    }
+    je.defineExtension("foldOption", function(Pe, De) {
+      return Te(this, Pe, De);
+    });
+  });
+})();
+var foldcodeExports = foldcode.exports;
 (function(Ie, Ae) {
   (function(je) {
-    je(requireCodemirror(), requireFoldcode());
+    je(requireCodemirror(), foldcodeExports);
   })(function(je) {
     je.defineOption("foldGutter", !1, function(St, Ke, rr) {
       rr && rr != je.Init && (St.clearGutter(St.state.foldGutter.options.gutter), St.state.foldGutter = null, St.off("gutterClick", Ge), St.off("changes", Qe), St.off("viewportChange", Ye), St.off("fold", Je), St.off("unfold", Je), St.off("swapDoc", Qe), St.off("optionChange", Oe)), Ke && (St.state.foldGutter = new Ee(Se(Ke)), He(St), St.on("gutterClick", Ge), St.on("changes", Qe), St.on("viewportChange", Ye), St.on("fold", Je), St.on("unfold", Je), St.on("swapDoc", Qe), St.on("optionChange", Oe));