@ningboyz/vue 1.0.101 → 1.0.103

package/es/stimulsoft/dataUtils/stimulsoftUtil.js

@@ -1,10 +1,10 @@
 import e from "lodash";
-import { Stimulsoft as i } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
+import { Stimulsoft as a } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.chart.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.export.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.import.xlsx.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.maps.js";
-class m {
+class g {
   static url = "";
   // 创建字体配置对象
   static fonts = [
@@ -32,44 +32,62 @@ class m {
   /**
    * 加载字体
    */
-  static loadFonts = (o) => {
-    let t = "/printer/fonts/";
-    e.isEmpty(o) || (t = `${o}/upload` + t), this.fonts.forEach((a) => {
-      switch (a.fontType) {
+  static loadFonts = (t) => {
+    let o = "/printer/fonts/";
+    e.isEmpty(this.url) || (o = `${this.url}/upload` + o), e.isNil(t) && (t = this.fonts), t.forEach((i) => {
+      switch (i.fontType) {
         case "ttf":
-          i.Base.StiFontCollection.addFontFile(t + a.fontPath, a.fontName);
+          a.Base.StiFontCollection.addFontFile(o + i.fontPath, i.fontName);
           break;
         case "otf":
-          i.Base.StiFontCollection.addOpentypeFontFile(t + a.fontPath, a.fontName);
+          a.Base.StiFontCollection.addOpentypeFontFile(o + i.fontPath, i.fontName);
           break;
       }
     });
-    const n = i.Base.StiFontCollection.getBinFonts();
+    const n = a.Base.StiFontCollection.getBinFonts();
     console.log("已注册字体 =>", n);
   };
   /**
    * 加载授权
    */
   static loadLicense = () => {
-    i.Base.StiLicense.key = "6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkVaUjYnRU/wphl9h6TkK9UtvGvwIZ/qCzU7vjHmM5RWbvCAfAhZhn+eMayEo4PRtUFJINrdMkfnVj1/HeyPgSgAKdpQpP1wzGj2ri5UgGNU8p7Pi59UAegRyUxjTI96rT+khTJIcSoTTPkqZwt0uC+IGtEdehlDchk7madvSLA9guSEZZuSHsc+adQ93NZogak6uo7LbqRh2xC23iGH4sValMR9CBxAsjWUYJH0yrcXODeYrX6ARDlVCW40MGOMrYnx/2W3O8L26oTyAFEdQ1TN1KzYjP4zenjvu4KBAWIopWG6Gk2ydffI0zldxHaPeEl0Lt6U77ykFtsXqW5fN/9t040SfeZfzMAq2ZoVGXPXKCjBo+asFZHrxn7iLpsxF7zwWkYIto8ObpimosoY0on8aLx7At7Qo3VaUOST48gIdqBabUpVz3O9h8UULJa23nlwMVMXheIMMmp6ACD9Bupla/giERFXIYIfpE4eFCD93sR2Cq2f8jdm5Z9B/faB8j4iz0IugVhK4BYhw2q9jAufdWTIx3nsE2Qw7ah0jNsgkR9kWWnHQ3qI/lwFLcFr81SVgyNpFzZ/zcV6vM+xaqbuEMivQx5uFx9WLOMU/ZYkyV8Hi/IEmU+O72NObJtWDxnhUkl4iV0WsYT2V2EU8t0NZP9SBCrLU+rd0SERAdGnRUfoJrm8mXPgcN6+FGNyTgiw0Do8oLU/Skqa/TohVeT";
+    a.Base.StiLicense.key = "6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkVaUjYnRU/wphl9h6TkK9UtvGvwIZ/qCzU7vjHmM5RWbvCAfAhZhn+eMayEo4PRtUFJINrdMkfnVj1/HeyPgSgAKdpQpP1wzGj2ri5UgGNU8p7Pi59UAegRyUxjTI96rT+khTJIcSoTTPkqZwt0uC+IGtEdehlDchk7madvSLA9guSEZZuSHsc+adQ93NZogak6uo7LbqRh2xC23iGH4sValMR9CBxAsjWUYJH0yrcXODeYrX6ARDlVCW40MGOMrYnx/2W3O8L26oTyAFEdQ1TN1KzYjP4zenjvu4KBAWIopWG6Gk2ydffI0zldxHaPeEl0Lt6U77ykFtsXqW5fN/9t040SfeZfzMAq2ZoVGXPXKCjBo+asFZHrxn7iLpsxF7zwWkYIto8ObpimosoY0on8aLx7At7Qo3VaUOST48gIdqBabUpVz3O9h8UULJa23nlwMVMXheIMMmp6ACD9Bupla/giERFXIYIfpE4eFCD93sR2Cq2f8jdm5Z9B/faB8j4iz0IugVhK4BYhw2q9jAufdWTIx3nsE2Qw7ah0jNsgkR9kWWnHQ3qI/lwFLcFr81SVgyNpFzZ/zcV6vM+xaqbuEMivQx5uFx9WLOMU/ZYkyV8Hi/IEmU+O72NObJtWDxnhUkl4iV0WsYT2V2EU8t0NZP9SBCrLU+rd0SERAdGnRUfoJrm8mXPgcN6+FGNyTgiw0Do8oLU/Skqa/TohVeT";
   };
   /**
    * 加载语言
    */
-  static loadLanguage = (o) => {
+  static loadLanguage = () => {
     let t = "/printer/localizations/";
-    e.isEmpty(o) || (t = `${o}/upload` + t), i.Base.Localization.StiLocalization.addLocalizationFile(`${t}zh.xml`, !1, "中文"), i.Base.Localization.StiLocalization.cultureName = "中文";
+    e.isEmpty(this.url) || (t = `${this.url}/upload` + t), a.Base.Localization.StiLocalization.addLocalizationFile(`${t}zh.xml`, !1, "中文"), a.Base.Localization.StiLocalization.cultureName = "中文";
   };
-  static setUrl = (o) => {
-    this.url = o;
+  static setUrl = (t) => {
+    this.url = t;
   };
   /**
    * 初始化
    */
-  static initialize = () => {
-    console.info("打印控件初始化, url:=>", this.url), this.loadLicense(), this.loadLanguage(this.url), this.loadFonts(this.url);
+  static initialize = (t) => {
+    console.info("打印控件初始化, url:=>", this.url), this.loadLicense(), this.loadLanguage(), t && this.loadFonts();
+  };
+  /**
+   * 获取report内所有使用的自定义字体
+   * @param reports
+   * @returns
+   */
+  static getAllUsedFonts = (t) => {
+    const o = /* @__PURE__ */ new Set();
+    return t.forEach((n) => {
+      n.pages.list.forEach((i) => {
+        i.components.list.forEach((l) => {
+          l.getFonts().forEach((f) => {
+            const s = this.fonts.find((r) => r.fontName === f.name);
+            e.isNil(s) || o.add(s);
+          });
+        });
+      });
+    }), Array.from(o);
   };
 }
 export {
-  m as default
+  g as default
 };

package/es/stimulsoft/desginer/desginer.vue.js

@@ -13,11 +13,11 @@ const N = /* @__PURE__ */ d({
     listData: {}
   },
   emits: ["saveReport"],
-  setup(c, { expose: m, emit: f }) {
-    y.initialize();
+  setup(c, { expose: m, emit: u }) {
+    y.initialize(!0);
     const s = c, n = a(), i = a(!1), r = new b.Designer.StiDesignerOptions();
     r.appearance.fullScreenMode = !0, r.toolbar.showFileMenu = !1;
-    const u = f;
+    const f = u;
     D(
       () => [s.templateJson, s.listData],
       async (e) => {
@@ -31,7 +31,7 @@ const N = /* @__PURE__ */ d({
     const v = (e) => {
       e.preventDefault = !0;
       const o = e.report.saveToJsonString(), t = e.fileName;
-      u("saveReport", t, o);
+      f("saveReport", t, o);
     }, p = async (e, o) => {
       try {
         const t = new _(e, o);

package/es/stimulsoft/printer/printer.js

@@ -1,11 +1,11 @@
-import { Stimulsoft as s } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
+import { Stimulsoft as o } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.chart.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.export.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.import.xlsx.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.maps.js";
-import a from "../dataUtils/stimulsoftData.js";
-import o from "lodash";
-import n from "../dataUtils/stimulsoftUtil.js";
+import p from "../dataUtils/stimulsoftData.js";
+import n from "lodash";
+import a from "../dataUtils/stimulsoftUtil.js";
 class g {
   reports = [];
   report;
@@ -17,7 +17,7 @@ class g {
    * @param listData
    */
   constructor(t) {
-    this.printDatas = t, this.report = new s.Report.StiReport();
+    this.printDatas = t, this.report = new o.Report.StiReport();
   }
   /**
    * 初始化报表
@@ -26,31 +26,42 @@ class g {
   initReport = () => {
     for (let t = 0; t < this.printDatas.length; t++) {
       const r = this.printDatas[t];
-      for (let i = 0; i < r.listData.length; i++) {
-        const p = r.listData[i], e = new s.Report.StiReport();
-        e.load(r.jsonTemplate), a.createDataSet(e, p), this.reports.push(e);
+      for (let e = 0; e < r.listData.length; e++) {
+        const i = r.listData[e], s = new o.Report.StiReport();
+        s.load(r.jsonTemplate), p.createDataSet(s, i), this.reports.push(s);
       }
     }
     return this;
   };
+  renderReport = (t) => new Promise((r) => {
+    t.renderAsync((e) => {
+      r(e);
+    });
+  });
   /**
    * 合并报表
    * @returns
    */
   mergeReport = async () => {
     for (let t = 0; t < this.reports.length; t++) {
-      const r = this.reports[t];
-      r.render(), t === 0 ? this.report = r : r.renderedPages.toList().forEach((i) => {
+      const r = this.reports[t], e = await this.renderReport(r);
+      t === 0 ? this.report = e : e.renderedPages.toList().forEach((i) => {
         this.report.renderedPages.add(i.clone());
       });
     }
     return this;
   };
-  print() {
-    o.isNil(this.printDatas) || this.printDatas.length === 0 || (this.printDatas.forEach((t) => {
-      o.isEmpty(t.jsonTemplate) || o.isNil(t.listData) || t.listData.length;
-    }), n.initialize(), this.report = new s.Report.StiReport(), this.initReport(), this.mergeReport(), this.report.print());
-  }
+  print = async () => {
+    if (n.isNil(this.printDatas) || this.printDatas.length === 0)
+      return;
+    this.printDatas.forEach((r) => {
+      n.isEmpty(r.jsonTemplate) || n.isNil(r.listData) || r.listData.length;
+    }), a.initialize(!1), this.report = new o.Report.StiReport(), this.initReport(), await this.mergeReport();
+    const t = a.getAllUsedFonts(this.reports);
+    a.loadFonts(t), this.report.renderAsync((r) => {
+      r.print();
+    });
+  };
 }
 export {
   g as default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ningboyz/vue",
-  "version": "1.0.101",
+  "version": "1.0.103",
   "private": false,
   "type": "module",
   "description": "宁波甬政vue-ui库",

package/types/stimulsoft/dataUtils/index.d.ts

@@ -1,7 +1,10 @@
 import StimulsoftData from "./stimulsoftData";
 import StimulsoftUtil from "./StimulsoftUtil";
+import { IFontList } from "./StimulsoftUtil";
 
 export const StimulsoftCommon = {
   StimulsoftData,
   StimulsoftUtil
 };
+
+export type { IFontList };

package/types/stimulsoft/dataUtils/stimulsoftData.d.ts

@@ -1,5 +1,6 @@
 import { TWldy } from "@ningboyz/types";
 import { Stimulsoft } from "stimulsoft-reports-js-vuejs/designer";
+
 declare class StimulsoftData {
   private static DATA_SET_NAME: string;
   public createDataSet: (report: Stimulsoft.Report.StiReport, listData: TWldy.IWldyDataResponse[]) => void;

package/types/stimulsoft/dataUtils/stimulsoftUtil.d.ts

@@ -1,8 +1,14 @@
+export interface IFontList {
+  fontName: string;
+  fontPath: string;
+  fontType: "ttf" | "otf";
+}
+
 declare class StimulsoftUtil {
   private static loadLicense: () => void;
-  private static loadLanguage: (url: string) => void;
-  private static loadFonts: (url: string) => void;
+  private static loadLanguage: () => void;
+  private static loadFonts: (fonts: IFontList) => void;
   public static setUrl: (url: string) => void;
-  public static initialize: () => Promise<boolean>;
+  public static initialize: (loadFont: boolean) => Promise<boolean>;
 }
 export default StimulsoftUtil;