yh-hiprint 2.2.5 → 2.2.6

package/HiprintDesigner.vue

@@ -265,24 +265,33 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
+// @ts-nocheck
 import { onMounted, ref, onActivated, onDeactivated, computed, watch } from "vue";
 import { hiprint, defaultElementTypeProvider, fontSize, scale, zIndex, panel, usePaper, useScale, useDataSource, jquery as $ } from "yh-hiprint";
 import { useRoute, onBeforeRouteUpdate } from "vue-router";
 import { ElMessageBox, ElMessage } from "element-plus";
 import axios from "@/libs/api.request";
 
+interface HiprintTemplate {
+  setPaper: (width: number, height: number) => void;
+  zoom: (scale: number) => void;
+  getJson: () => any;
+  clear: () => void;
+}
+
 const route = useRoute();
+const hiprintTemplate = ref<HiprintTemplate | null>(null);
+
 const { paperType, paperWidth, paperHeight, setPaper } = usePaper();
 function setPaperHandler(type) {
   setPaper(type, () => {
-    hiprintTemplate.value.setPaper(paperWidth.value, paperHeight.value);
+    hiprintTemplate.value?.setPaper(paperWidth.value, paperHeight.value);
   });
 }
 
-const hiprintTemplate = ref(null);
 const canvasRef = ref();
 const { scaleValue, scalePercentage, canZoomIn, canZoomOut, zoomIn, zoomOut } = useScale(() => {
-  hiprintTemplate.value.zoom(scaleValue.value);
+  hiprintTemplate.value?.zoom(scaleValue.value);
   canvasRef?.value.update();
 });
 
@@ -327,7 +336,6 @@ async function previewPrint() {
     previewShow.value = true;
   } else {
     ElMessage.warning({
-      title: "警告",
       message: "模板配置不存在，请检查",
     });
   }
@@ -335,7 +343,7 @@ async function previewPrint() {
 
 function saveConfig() {
   let arr = [].concat(formCode.value);
-  let json = hiprintTemplate.value.getJson();
+  let json = hiprintTemplate.value?.getJson();
   json.panels[0].printElements.forEach((item) => {
     if (item.printElementType.type === "table") {
       arr.push(item.options.field);

package/font-size.js

@@ -1,42 +1,42 @@
-import $ from "jquery";
-export default (function () {
-  function t() {
-    this.name = "fontSize"; // 重写的参数 key
-  }
-  // 涉及修改元素样式， 添加一个 css 方法
-  return (
-    (t.prototype.css = function (t, e) {
-      if (t && t.length) {
-        if (e) return t.css("font-size", e + "pt"), "font-size:" + e + "pt";
-        t[0].style.fontSize = "";
-      }
-      return null;
-    }),
-    // 创建 DOM
-    (t.prototype.createTarget = function () {
-      let list = [4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72];
-      let fontSizeList = '\n            <option value="" >默认</option>';
-      list.forEach(function (e) {
-        fontSizeList += '\n            <option value="' + e + '">' + e + "pt</option>";
-      });
-      this.target = $(' <div class="hiprint-option-item">\n        <div class="hiprint-option-item-label">\n        字体大小\n        </div>\n        <div class="hiprint-option-item-field">\n        <select class="auto-submit">        </select>\n        </div>\n    </div>');
-      this.target.find(".auto-submit").append($(fontSizeList));
-      return this.target;
-    }),
-    // 获取值
-    (t.prototype.getValue = function () {
-      var t = this.target.find("select").val();
-      if (t) return parseFloat(t.toString());
-    }),
-    // 设置值
-    (t.prototype.setValue = function (t) {
-      t && (this.target.find('option[value="' + t + '"]').length || this.target.find("select").prepend('<option value="' + t + '" >' + t + "</option>"));
-      this.target.find("select").val(t);
-    }),
-    // 销毁 DOM
-    (t.prototype.destroy = function () {
-      this.target.remove();
-    }),
-    t
-  );
-})();
+import $ from "jquery";
+export default (function () {
+  function t() {
+    this.name = "fontSize"; // 重写的参数 key
+  }
+  // 涉及修改元素样式， 添加一个 css 方法
+  return (
+    (t.prototype.css = function (t, e) {
+      if (t && t.length) {
+        if (e) return t.css("font-size", e + "pt"), "font-size:" + e + "pt";
+        t[0].style.fontSize = "";
+      }
+      return null;
+    }),
+    // 创建 DOM
+    (t.prototype.createTarget = function () {
+      let list = [4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16, 18, 20, 22, 24, 26, 28, 36, 48, 72];
+      let fontSizeList = '\n            <option value="" >默认</option>';
+      list.forEach(function (e) {
+        fontSizeList += '\n            <option value="' + e + '">' + e + "pt</option>";
+      });
+      this.target = $(' <div class="hiprint-option-item">\n        <div class="hiprint-option-item-label">\n        字体大小\n        </div>\n        <div class="hiprint-option-item-field">\n        <select class="auto-submit">        </select>\n        </div>\n    </div>');
+      this.target.find(".auto-submit").append($(fontSizeList));
+      return this.target;
+    }),
+    // 获取值
+    (t.prototype.getValue = function () {
+      var t = this.target.find("select").val();
+      if (t) return parseFloat(t.toString());
+    }),
+    // 设置值
+    (t.prototype.setValue = function (t) {
+      t && (this.target.find('option[value="' + t + '"]').length || this.target.find("select").prepend('<option value="' + t + '" >' + t + "</option>"));
+      this.target.find("select").val(t);
+    }),
+    // 销毁 DOM
+    (t.prototype.destroy = function () {
+      this.target.remove();
+    }),
+    t
+  );
+})();

package/hiprintPreview.vue

@@ -17,8 +17,22 @@ import { useRoute } from "vue-router";
 import axios from "@/libs/api.request.js";
 import { hiprint } from "yh-hiprint";
 
+function getQuery(){
+  let query = {}
+  try {
+    decodeURIComponent(location.hash).split("?")[1].split('&').forEach(str => {
+      let strArr = str.split("=");
+      query[strArr[0]] = strArr[1];
+    })
+  } catch (error) {
+    console.error("hiprint Preview getQuery on error:",error);
+  }
+  return query
+}
+
 onMounted(() => {
-  let query = route.query;
+  let query = getQuery();
+  debugger;
   if (query.code) {
     sessionStorage.printQuery = JSON.stringify(query);
     getData(query);