@ningboyz/vue 1.0.96 → 1.0.98

package/es/stimulsoft/dataUtils/stimulsoftUtil.js

@@ -1,33 +1,29 @@
-import { Stimulsoft as o } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
+import { Stimulsoft as t } 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 c {
+class h {
   // 创建字体配置对象
   static fonts = [
     {
-      fontName: "有色标题黑",
-      fontPath: "/printer/fonts/YouSheBiaoTiHei.ttf",
-      fontStyle: void 0,
+      fontName: "YZ-有色标题黑",
+      fontPath: "YouSheBiaoTiHei.ttf",
       fontType: "ttf"
     },
     {
       fontName: "YZ-宋体",
-      fontPath: "/printer/fonts/SimSun.ttf",
-      fontStyle: void 0,
+      fontPath: "SimSun.ttf",
       fontType: "ttf"
     },
     {
       fontName: "YZ-仿宋GB2312",
-      fontPath: "/printer/fonts/FangSong_GB2312.ttf",
-      fontStyle: void 0,
+      fontPath: "FangSong_GB2312.ttf",
       fontType: "ttf"
     },
     {
       fontName: "YZ-微软雅黑",
-      fontPath: "/printer/fonts/MicrosoftYaHei.ttf",
-      fontStyle: void 0,
+      fontPath: "MicrosoftYaHei.ttf",
       fontType: "ttf"
     }
   ];
@@ -35,30 +31,31 @@ class c {
    * 加载字体
    */
   static loadFonts = () => {
-    this.fonts.forEach((t) => {
-      switch (t.fontType) {
+    const a = "printer/fonts/";
+    this.fonts.forEach((o) => {
+      switch (o.fontType) {
         case "ttf":
-          o.Base.StiFontCollection.addFontFile(t.fontPath, t.fontName, t.fontStyle);
+          t.Base.StiFontCollection.addFontFile(a + o.fontPath, o.fontName);
           break;
         case "otf":
-          o.Base.StiFontCollection.addOpentypeFontFile(t.fontPath, t.fontName, t.fontStyle);
+          t.Base.StiFontCollection.addOpentypeFontFile(a + o.fontPath, o.fontName);
           break;
       }
     });
-    const a = o.Base.StiFontCollection.getBinFonts();
-    console.log("已注册字体 =>", a);
+    const i = t.Base.StiFontCollection.getBinFonts();
+    console.log("已注册字体 =>", i);
   };
   /**
    * 加载授权
    */
   static loadLicense = () => {
-    o.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";
+    t.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.Base.Localization.StiLocalization.addLocalizationFile("/printer/localizations/zh.xml", !1, "中文"), o.Base.Localization.StiLocalization.cultureName = "中文";
+    t.Base.Localization.StiLocalization.addLocalizationFile("printer/localizations/zh.xml", !1, "中文"), t.Base.Localization.StiLocalization.cultureName = "中文";
   };
   /**
    * 初始化
@@ -68,5 +65,5 @@ class c {
   };
 }
 export {
-  c as default
+  h as default
 };

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

@@ -1,51 +1,55 @@
-import { defineComponent as d, ref as a, watch as D, createBlock as g, openBlock as R, unref as i } from "vue";
-import { Designer as _ } from "../../node_modules/stimulsoft-reports-js-vuejs/designer.js";
-import y from "./factory.js";
-import { Stimulsoft as S } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
+import { defineComponent as d, ref as a, watch as D, createBlock as g, openBlock as R, unref as l } from "vue";
+import { Designer as S } from "../../node_modules/stimulsoft-reports-js-vuejs/designer.js";
+import _ from "./factory.js";
+import y from "../dataUtils/stimulsoftUtil.js";
+import { Stimulsoft as b } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.viewer.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.designer.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.blockly.editor.js";
-const F = /* @__PURE__ */ d({
+const N = /* @__PURE__ */ d({
   __name: "desginer",
   props: {
     templateJson: {},
     listData: {}
   },
   emits: ["saveReport"],
-  setup(c, { expose: l, emit: m }) {
-    const r = c, s = a(!1), n = a(), p = new S.Designer.StiDesignerOptions();
-    p.appearance.fullScreenMode = !0;
-    const u = m;
+  setup(c, { expose: m, emit: f }) {
+    y.initialize();
+    const s = c, n = a(), i = a(!1), r = new b.Designer.StiDesignerOptions();
+    r.appearance.fullScreenMode = !0, r.toolbar.showFileMenu = !1;
+    const u = f;
     D(
-      () => [r.templateJson, r.listData],
+      () => [s.templateJson, s.listData],
       async (e) => {
         const o = e[0], t = e[1];
-        v(o, t), s.value = !0;
+        p(o, t);
       },
       {
         deep: !0
       }
     );
-    const f = (e) => {
+    const v = (e) => {
       e.preventDefault = !0;
       const o = e.report.saveToJsonString(), t = e.fileName;
       u("saveReport", t, o);
-    }, v = async (e, o) => {
+    }, p = async (e, o) => {
       try {
-        const t = new y(e, o);
-        n.value = t.getReport();
+        const t = new _(e, o);
+        n.value = t.getReport(), i.value = !0;
       } catch (t) {
         console.error(t.message);
       }
     };
-    return l(), (e, o) => (R(), g(i(_), {
-      visible: s.value,
+    return m({
+      renderReport: p
+    }), (e, o) => (R(), g(l(S), {
+      visible: i.value,
       report: n.value,
-      options: i(p),
-      onSaveReport: f
+      options: l(r),
+      onSaveReport: v
     }, null, 8, ["visible", "report", "options"]));
   }
 });
 export {
-  F as default
+  N as default
 };

package/es/stimulsoft/desginer/factory.js

@@ -1,7 +1,7 @@
 import t from "lodash";
 import "../../node_modules/stimulsoft-reports-js-vuejs/designer.js";
 import o from "../dataUtils/stimulsoftData.js";
-import { Stimulsoft as s } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
+import { Stimulsoft as r } from "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.reports.engine.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.viewer.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.designer.js";
 import "../../node_modules/stimulsoft-reports-js-vuejs/stimulsoft.blockly.editor.js";
@@ -9,15 +9,15 @@ class f {
   jsonTemplate;
   listData;
   report;
-  constructor(r, i) {
-    this.jsonTemplate = r, this.listData = i, this.report = new s.Report.StiReport();
+  constructor(i, s) {
+    this.jsonTemplate = i, this.listData = s, this.report = new r.Report.StiReport();
   }
   /**
    * 加载打印模版json
    * @param json
    * @returns
    */
-  loadJson = () => (t.isNil(this.jsonTemplate) || this.report.load(this.jsonTemplate), this);
+  loadJson = () => (!t.isNil(this.jsonTemplate) && !t.isEmpty(this.jsonTemplate) && this.report.load(this.jsonTemplate), this);
   /**
    * 加在数据
    * @returns

package/es/stimulsoft/printer/printer.js

@@ -1,14 +1,14 @@
-import { Stimulsoft as n } 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 l from "../dataUtils/stimulsoftData.js";
-import o from "lodash";
+import p from "../dataUtils/stimulsoftData.js";
+import s from "lodash";
 class d {
   reports = [];
   report;
-  printData;
+  printDatas;
   /**
    * json模版
    * 打印数据
@@ -16,21 +16,18 @@ class d {
    * @param listData
    */
   constructor(t) {
-    this.printData = t, this.report = new n.Report.StiReport();
+    this.printDatas = t, this.report = new o.Report.StiReport();
   }
   /**
    * 初始化报表
    * @returns
    */
   initReport = () => {
-    for (let t = 0; t < this.printData.length; t++) {
-      const r = this.printData[t];
-      for (let e = 0; e < r.jsonTemplates.length; e++) {
-        const p = r.jsonTemplates[e];
-        for (let i = 0; i < r.listData.length; i++) {
-          const a = r.listData[i], s = new n.Report.StiReport();
-          s.load(p), l.createDataSet(s, a), this.reports.push(s);
-        }
+    for (let t = 0; t < this.printDatas.length; t++) {
+      const r = this.printDatas[t];
+      for (let e = 0; e < r.listData.length; e++) {
+        const a = r.listData[e], i = new o.Report.StiReport();
+        i.load(r.jsonTemplate), p.createDataSet(i, a), this.reports.push(i);
       }
     }
     return this;
@@ -49,8 +46,8 @@ class d {
     return this;
   };
   print() {
-    o.isNil(this.printData) || this.printData.length === 0 || (this.printData.forEach((t) => {
-      o.isNil(t.jsonTemplates) || t.jsonTemplates.length === 0 || o.isNil(t.listData) || t.listData.length;
+    s.isNil(this.printDatas) || this.printDatas.length === 0 || (this.printDatas.forEach((t) => {
+      s.isEmpty(t.jsonTemplate) || s.isNil(t.listData) || t.listData.length;
     }), this.initReport(), this.mergeReport(), this.report.print());
   }
 }

package/package.json

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

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

@@ -2,6 +2,6 @@ declare class StimulsoftUtil {
   private static loadLicense: () => void;
   private static loadLanguage: () => void;
   private static loadFonts: () => void;
-  public static initialize: () => boolean;
+  public static initialize: () => Promise<boolean>;
 }
 export default StimulsoftUtil;

package/types/stimulsoft/desginer/desginer.d.ts

@@ -17,4 +17,6 @@ export interface YzDesginerSlots {
   title?: () => any;
 }
 
-export type YzDesginerInstance = {};
+export type YzDesginerInstance = {
+  renderReport: (jsonTemplate: string, listData: TWldy.IWldyDataResponse[]) => void;
+};