yh-hiprint 2.4.1 → 2.4.2

package/HiprintDesigner.vue

@@ -842,8 +842,11 @@ function init() {
       fontList: [
         {title: '微软雅黑', value: 'Microsoft YaHei'},
         {title: '黑体', value: 'STHeitiSC-Light'},
+        {title: '思源黑体', value: 'SourceHanSansCN-Normal'},
         {title: '宋体', value: 'SimSun'},
+        {title: '华为楷体', value: 'STKaiti'},
         {title: 'cursive', value: 'cursive'},
+        {title: 'Times New Roman', value: 'Times New Roman'},
       ],
       dataMode: 1,
       history: true,

package/designer.vue

@@ -265,14 +265,14 @@
   </el-dialog>
 </template>
 <script setup>
-import { onMounted, ref, onActivated, onDeactivated, computed, watch, nextTick } from "vue";
-import { hiprint, defaultElementTypeProvider, fontSize, scale, zIndex, panel, usePaper, useScale, useDataSource } from "yh-hiprint";
-import { useRoute, onBeforeRouteUpdate } from "vue-router/dist/vue-router";
-import { ElMessageBox } from "element-plus";
-import axios from "@/libs/api.request";
+import {onMounted, ref, onActivated, onDeactivated, computed, watch, nextTick} from 'vue';
+import {hiprint, defaultElementTypeProvider, fontSize, scale, zIndex, panel, usePaper, useScale, useDataSource} from 'yh-hiprint';
+import {useRoute, onBeforeRouteUpdate} from 'vue-router/dist/vue-router';
+import {ElMessageBox} from 'element-plus';
+import axios from '@/libs/api.request';
 
 const route = useRoute();
-const { paperType, paperWidth, paperHeight, setPaper } = usePaper();
+const {paperType, paperWidth, paperHeight, setPaper} = usePaper();
 function setPaperHandler(type) {
   setPaper(type, () => {
     hiprintTemplate.value.setPaper(paperWidth.value, paperHeight.value);
@@ -281,23 +281,23 @@ function setPaperHandler(type) {
 
 const hiprintTemplate = ref(null);
 const canvasRef = ref();
-const { scaleValue, scalePercentage, canZoomIn, canZoomOut, zoomIn, zoomOut } = useScale(() => {
+const {scaleValue, scalePercentage, canZoomIn, canZoomOut, zoomIn, zoomOut} = useScale(() => {
   hiprintTemplate.value.zoom(scaleValue.value);
   canvasRef?.value.update();
 });
 
 const previewShow = ref(false);
-const previewHtml = ref("");
+const previewHtml = ref('');
 async function previewPrint() {
   let {
-    data: { list, json },
+    data: {list, json},
   } = await axios.request({
     url: `/printTemplate/data/${detailData.value.code}`,
-    method: "post",
-    type: "json",
+    method: 'post',
+    type: 'json',
     data: [
       {
-        code: "50101820",
+        code: '50101820',
       },
     ],
   });
@@ -323,12 +323,12 @@ async function previewPrint() {
     } else {
       list = [];
     }
-    previewHtml.value = new hiprint.PrintTemplate({ template: JSON.parse(json) }).getHtml(list)[0].innerHTML;
+    previewHtml.value = new hiprint.PrintTemplate({template: JSON.parse(json)}).getHtml(list)[0].innerHTML;
     previewShow.value = true;
   } else {
     ElMessage.warning({
-      title: "警告",
-      message: "模板配置不存在，请检查",
+      title: '警告',
+      message: '模板配置不存在，请检查',
     });
   }
 }
@@ -337,25 +337,25 @@ function saveConfig() {
   let arr = [].concat(formCode.value);
   let json = hiprintTemplate.value.getJson();
   json.panels[0].printElements.forEach((item) => {
-    if (item.printElementType.type === "table") {
+    if (item.printElementType.type === 'table') {
       arr.push(item.options.field);
     }
   });
 
   axios
     .request({
-      url: "/printTemplate/save",
-      method: "post",
-      type: "json",
+      url: '/printTemplate/save',
+      method: 'post',
+      type: 'json',
       data: {
         id: detailData.value.id,
         json: JSON.stringify(json),
-        dsIds: arr.join(","),
+        dsIds: arr.join(','),
       },
     })
     .then((res) => {
       ElMessage.success({
-        message: "恭喜模板保存成功",
+        message: '恭喜模板保存成功',
       });
     });
 }
@@ -364,7 +364,7 @@ function clearPrint() {
   hiprintTemplate.value?.clear();
 }
 
-const { detailData, getDetail, listCode, dataSourceList, listColumns, formCode, formColumns, dataSourceForm, getDataSourceList } = useDataSource(axios);
+const {detailData, getDetail, listCode, dataSourceList, listColumns, formCode, formColumns, dataSourceForm, getDataSourceList} = useDataSource(axios);
 
 watch(
   () => formColumns.value,
@@ -387,15 +387,15 @@ watch(
 );
 let currentElementObj = ref(null);
 let currentElementObjColumns = computed(() => {
-  if (currentElementObj.value?.printElementType.type === "table") {
-    return currentElementObj.value.options.columns[0]["columns"] || [];
+  if (currentElementObj.value?.printElementType.type === 'table') {
+    return currentElementObj.value.options.columns[0]['columns'] || [];
   } else {
     return [];
   }
 });
 
 function tableFieldChange(val) {
-  currentElementObj.value.updateOption("field", val);
+  currentElementObj.value.updateOption('field', val);
 }
 
 function tableColumnCancel() {
@@ -417,11 +417,11 @@ function init() {
             options: [],
           },
           {
-            name: "样式",
+            name: '样式',
             options: [
               {
-                name: "scale",
-                after: "transform",
+                name: 'scale',
+                after: 'transform',
                 hidden: false,
               },
             ],
@@ -429,16 +429,16 @@ function init() {
         ],
         supportOptions: [
           {
-            name: "styler",
+            name: 'styler',
             hidden: true,
           },
           {
-            name: "scale",
-            after: "transform",
+            name: 'scale',
+            after: 'transform',
             hidden: false,
           },
           {
-            name: "formatter",
+            name: 'formatter',
             hidden: true,
           },
         ],
@@ -447,18 +447,18 @@ function init() {
         tabs: [
           {
             replace: true,
-            name: "基本",
+            name: '基本',
             options: [
               {
-                name: "field",
+                name: 'field',
                 hidden: false,
               },
               {
-                name: "src",
+                name: 'src',
                 hidden: false,
               },
               {
-                name: "fit",
+                name: 'fit',
                 hidden: false,
               },
             ],
@@ -466,31 +466,30 @@ function init() {
         ],
       },
       table: {
-        tabs: [{ options: [{ name: "field", hidden: true }] }],
+        tabs: [{options: [{name: 'field', hidden: true}]}],
       },
     });
 
-    hiprint.PrintElementTypeManager.buildByHtml(hiprintJQuery(".ep-draggable-item"));
-    hiprintJQuery("#hiprint-printTemplate").empty();
+    hiprint.PrintElementTypeManager.buildByHtml(hiprintJQuery('.ep-draggable-item'));
+    hiprintJQuery('#hiprint-printTemplate').empty();
     let template = JSON.parse(detailData.value.json) || panel;
     hiprintTemplate.value = new hiprint.PrintTemplate({
       template,
       onImageChooseClick: (target) => {
         // 测试 3秒后修改图片地址值
         setTimeout(() => {
-          target.refresh("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAtAAAAIIAQMAAAB99EudAAAABlBMVEUmf8vG2O41LStnAAABD0lEQVR42u3XQQqCQBSAYcWFS4/QUTpaHa2jdISWLUJjjMpclJoPGvq+1WsYfiJCZ4oCAAAAAAAAAAAAAAAAAHin6pL9c6H/fOzHbRrP0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0u/SY9LS0tLS0tLS0tLS0n+edm+UlpaWlpaWlpaWlpaW/tl0Ndyzbno7/+tPTJdd1wal69dNa6abx+Lq6TSeYtK7BX/Diek0XULSZZrakPRtV0i6Hu/KIt30q4fM0pvBqvR9mvsQkZaW9gyJT+f5lsnzjR54xAk8mAUeJyMPwYFH98ALx5Jr0kRLLndT7b64UX9QR/0eAAAAAAAAAAAAAAAAAAD/4gpryzr/bja4QgAAAABJRU5ErkJggg==", {
+          target.refresh('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAtAAAAIIAQMAAAB99EudAAAABlBMVEUmf8vG2O41LStnAAABD0lEQVR42u3XQQqCQBSAYcWFS4/QUTpaHa2jdISWLUJjjMpclJoPGvq+1WsYfiJCZ4oCAAAAAAAAAAAAAAAAAHin6pL9c6H/fOzHbRrP0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0u/SY9LS0tLS0tLS0tLS0n+edm+UlpaWlpaWlpaWlpaW/tl0Ndyzbno7/+tPTJdd1wal69dNa6abx+Lq6TSeYtK7BX/Diek0XULSZZrakPRtV0i6Hu/KIt30q4fM0pvBqvR9mvsQkZaW9gyJT+f5lsnzjR54xAk8mAUeJyMPwYFH98ALx5Jr0kRLLndT7b64UX9QR/0eAAAAAAAAAAAAAAAAAAD/4gpryzr/bja4QgAAAABJRU5ErkJggg==', {
             real: true,
           });
         }, 3000);
       },
       fontList: [
-        { title: "微软雅黑", value: "Microsoft YaHei" },
-        { title: "黑体", value: "STHeitiSC-Light" },
-        { title: "思源黑体", value: "SourceHanSansCN-Normal" },
-        { title: "王羲之书法体", value: "王羲之书法体" },
-        { title: "宋体", value: "SimSun" },
-        { title: "华为楷体", value: "STKaiti" },
-        { title: "cursive", value: "cursive" },
+        {title: '微软雅黑', value: 'Microsoft YaHei'},
+        {title: '黑体', value: 'STHeitiSC-Light'},
+        {title: '思源黑体', value: 'SourceHanSansCN-Normal'},
+        {title: '宋体', value: 'SimSun'},
+        {title: 'cursive', value: 'cursive'},
+        {title: 'Times New Roman', value: 'Times New Roman'},
       ],
       dataMode: 1,
       history: true,
@@ -501,11 +500,11 @@ function init() {
       onUpdateError: (e) => {
         // console.error(e);
       },
-      settingContainer: "#PrintElementOptionSetting",
-      paginationContainer: ".hiprint-printPagination",
+      settingContainer: '#PrintElementOptionSetting',
+      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;
 
@@ -519,7 +518,7 @@ function init() {
         })
       );
     }
-    hiprintJQuery(".hiprint-designer").on("mousedown", ".hiprint-printElement", (e) => {
+    hiprintJQuery('.hiprint-designer').on('mousedown', '.hiprint-printElement', (e) => {
       let t = e.currentTarget;
       let pes = hiprintTemplate.value.editingPanel.printElements;
       let index = pes.map((item) => item.designTarget[0]).indexOf(t);
@@ -533,8 +532,8 @@ function init() {
     console.log(error.message);
     clearPrint();
     hiprintTemplate.value = null;
-    if (error.message.indexOf("setTemplateId") > -1) {
-      ElMessageBox.alert("模板有错误，请返回列表手动修改或这清空模板！");
+    if (error.message.indexOf('setTemplateId') > -1) {
+      ElMessageBox.alert('模板有错误，请返回列表手动修改或这清空模板！');
     }
   }
 }
@@ -550,7 +549,7 @@ async function updateTemplate() {
     if (detailData.value && detailData.value.json) {
       let jsonObj = JSON.parse(detailData.value.json);
       hiprintTemplate.value.update(jsonObj);
-      let { width, height } = jsonObj.panels[0];
+      let {width, height} = jsonObj.panels[0];
       paperWidth.value = width;
       paperHeight.value = height;
       hiprintTemplate.value.setPaper(width, height);
@@ -567,7 +566,7 @@ async function updateTemplate() {
             paperNumberLeft: 430,
             paperNumberTop: 5,
             printElements: [],
-            watermarkOptions: { content: "", rotate: 25, timestamp: false, format: "YYYY-MM-DD HH:mm" },
+            watermarkOptions: {content: '', rotate: 25, timestamp: false, format: 'YYYY-MM-DD HH:mm'},
           },
         ],
       });

package/package.json

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