yh-hiprint 2.0.2 → 2.1.1

package/HiprintDesigner.vue

@@ -378,6 +378,8 @@ watch(
           };
         })
       );
+    } else {
+      hiprintTemplate.value?.setFields("");
     }
   },
   {
@@ -492,12 +494,12 @@ function init() {
       paginationContainer: ".hiprint-printPagination",
     });
 
-    hiprintTemplate.value.design("#hiprint-printTemplate", { grid: true });
+    hiprintTemplate.value?.design("#hiprint-printTemplate", { grid: true });
     scaleValue.value = hiprintTemplate.value.editingPanel.scale || 1;
     window.ht = hiprintTemplate.value;
 
     if (formColumns.value) {
-      hiprintTemplate.value.setFields(
+      hiprintTemplate.value?.setFields(
         formColumns.value.map((item) => {
           return {
             field: item,
@@ -508,7 +510,7 @@ function init() {
     }
     $(".hiprint-designer").on("mousedown", ".hiprint-printElement", (e) => {
       let t = e.currentTarget;
-      let pes = hiprintTemplate.value.editingPanel.printElements;
+      let pes = hiprintTemplate.value?.editingPanel.printElements;
       let index = pes.map((item) => item.designTarget[0]).indexOf(t);
       let pe = pes[index];
       currentElementObj.value = pe;
@@ -516,6 +518,15 @@ function init() {
         listCode.value = pe.options.field;
       }
     });
+    $("#PrintElementOptionSetting").on("input", "input[type=number]", ($el) => {
+      let val = parseInt($el.target.value);
+      if (val < 1) {
+        $el.target.value = 1;
+      }
+      if (val > 2000) {
+        $el.target.value = 2000;
+      }
+    });
   } catch (error) {
     console.log(error.message);
     clearPrint();
@@ -536,14 +547,14 @@ async function updateTemplate(code) {
     await getDetail(code);
     if (detailData.value && detailData.value.json) {
       let jsonObj = JSON.parse(detailData.value.json);
-      hiprintTemplate.value.update(jsonObj);
+      hiprintTemplate.value?.update(jsonObj);
       let { width, height } = jsonObj.panels[0];
       paperWidth.value = width;
       paperHeight.value = height;
-      hiprintTemplate.value.setPaper(width, height);
+      hiprintTemplate.value?.setPaper(width, height);
       scaleValue.value = 1;
     } else {
-      hiprintTemplate.value.update({
+      hiprintTemplate.value?.update({
         panels: [
           {
             index: 0,
@@ -561,7 +572,7 @@ async function updateTemplate(code) {
       });
       paperWidth.value = 210;
       paperHeight.value = 297;
-      hiprintTemplate.value.setPaper(210, 297);
+      hiprintTemplate.value?.setPaper(210, 297);
       scaleValue.value = 1;
     }
   } else {

package/README.md

@@ -113,3 +113,15 @@ export default defineConfig({
 });
 
 ```
+
+## 更新日志
+
+###### 2.1.1
+- 升级 hiprint 方法，兼容打印预览的 data、isCustom 参数
+
+###### 2.1.0
+- 打印预览增加 data、isCustom 参数，并提供 isCustom 参数的GUI部分
+- 修复部分设计器的bug
+
+###### 2.0.0
+- 插件内聚，将能够内聚的代码都提取到包中。

package/hiprintPreview.vue

@@ -45,9 +45,9 @@ let loading = ElLoading.service({
 });
 
 function getData(query) {
-  let { code, params } = query;
+  let { code, params, data, isCustom } = query;
   loading.setText("获取打印配置和数据");
-  let reqParams = JSON.parse(params);
+  let reqParams = JSON.parse(params) || [];
 
   axios
     .request({
@@ -56,7 +56,7 @@ function getData(query) {
       type: "json",
       data: reqParams,
     })
-    .then((res) => {
+    .then(async (res) => {
       loading.setText("格式化数据，初始化打印插件");
       let { list, json } = res.data;
       if (json) {
@@ -64,7 +64,6 @@ function getData(query) {
         if (Array.isArray(list) && list.length > 0) {
           list = list.map((item, index) => {
             let printData = {};
-            let reqData = reqParams[index];
             let datas = Object.entries(item);
             datas.forEach((arr) => {
               if (Array.isArray(arr[1])) {
@@ -86,6 +85,33 @@ function getData(query) {
           list = [];
         }
         let hiprintTemplate = new hiprint.PrintTemplate({ template: JSON.parse(json) });
+        // 如若有本地数据，那么将本地数据替换远端数据。传入预览中。
+        if (isCustom === "1") {
+          await ElMessageBox.prompt("在下面输入框中输入您给的自定义数据", "自定义数据", {
+            inputType: "textarea",
+          }).then((e) => {
+            try {
+              hasData = true;
+              list = JSON.parse(e.value);
+            } catch (error) {
+              try {
+                hasData = true;
+                list = JSON.parse(data);
+              } catch (error) {
+                hasData = false;
+                list = [];
+              }
+            }
+          });
+        } else if (data) {
+          try {
+            hasData = true;
+            list = JSON.parse(data);
+          } catch (error) {
+            hasData = false;
+            list = [];
+          }
+        }
         let html = hiprintTemplate.getHtml(list);
         document.body.innerHTML = "";
         document.body.appendChild(html[0]);

package/index.d.ts

@@ -56,3 +56,12 @@ export declare const useDataSource: (axios) => {
   getDataSourceList: () => void;
   dataSource: Ref<string[]>;
 };
+
+export declare interface HiprintOption {
+  code: string;
+  params: Object;
+  data: Record<string, any> | Record<string, any>[];
+  isCustom: boolean;
+}
+
+export declare const hiprint: (HiprintOption) => void;

package/index.js

@@ -14,19 +14,25 @@ export function cLog(string, isError = false) {
   }
 }
 
-const hiprint = (code, params) => {
+export const hiprint = ({ code, params, data, isCustom }) => {
   let height = document.documentElement.clientHeight;
   let width = (document.documentElement.clientWidth - 1200) / 2;
   // 转换数组
-  let data = params;
+  let paramData = params;
   if (typeof params !== "Array") {
-    data = [params];
+    paramData = [params];
   }
-
-  let windowOpen = window.open("/hiprint/#/preview?code=" + code + "&params=" + JSON.stringify(data), "windowOpen", "height=" + height + ", width=1200, top=20, left=" + width + ", toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no");
-  // window.setTimeout(() => {
-  //   windowOpen.close();
-  // }, 5000);
+  url = "/hiprint/#/preview?code=" + code;
+  if (paramData) {
+    url += `&params=${JSON.stringify(paramData)}`;
+  }
+  if (data) {
+    url += `&data=${JSON.stringify(data)}`;
+  }
+  if (isCustom) {
+    url += `&isCustom=${isCustom ? "1" : "0"}`;
+  }
+  let windowOpen = window.open(url, "hiprintWindow", `height=${height}, width=1200, top=20, left=${width}, toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no`);
 };
 export default {
   install(app, { router, pinia, isAdmin }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yh-hiprint",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "Hiprint for Vue3 by NoahLiu in ForceCon in Hunan Changesha",
   "main": "index.js",
   "types": "index.d.ts",