yh-hiprint 2.2.7 → 2.2.9

package/HiprintDesigner.vue

@@ -222,7 +222,7 @@
             label-position="top"
             size="small">
             <el-form-item label="表数据选择">
-              <template v-if="formCode">
+              <template v-if="hasDataSource">
                 <el-select
                   v-model="listCode"
                   @change="tableFieldChange">
@@ -243,7 +243,7 @@
                 :span="12"
                 v-for="col in currentElementObjColumns">
                 <el-form-item :label="col.title">
-                  <template v-if="formCode">
+                  <template v-if="hasDataSource">
                     <el-select v-model="col.field">
                       <el-option
                         v-for="d in listColumns"
@@ -601,6 +601,10 @@ async function updateTemplate(code) {
   }
   updateing = false;
 }
+
+const hasDataSource = computed(() => {
+  return Array.isArray(formCode.value) ? formCode.value.length > 0 : formCode.value;
+});
 onActivated(() => {
   updateTemplate(route.query.code);
 });

package/hiprintPreview.vue

@@ -11,28 +11,32 @@
     sub-title="请求参数或者返回数据错误"></el-result>
 </template>
 <script setup>
-import { ElLoading, ElResult, ElMessageBox } from "element-plus";
-import { onMounted, ref } from "vue";
-import { useRoute } from "vue-router";
-import axios from "@/libs/api.request.js";
-import { hiprint } from "yh-hiprint";
+import {ElLoading, ElResult, ElMessageBox} from 'element-plus';
+import {onMounted, ref} from 'vue';
+import {useRoute} from 'vue-router';
+import axios from '@/libs/api.request.js';
+import {hiprint} from 'yh-hiprint';
 
-function getQuery(){
-  let query = {}
+function getQuery() {
+  let query = {};
   try {
-    decodeURIComponent(location.hash).split("?")[1].split('&').forEach(str => {
-      let strArr = str.split("=");
-      query[strArr[0]] = strArr[1];
-    })
+    decodeURIComponent(location.hash)
+      .split('?')[1]
+      .split('&')
+      .forEach((str) => {
+        let index = str.indexOf('=');
+        let key = str.substring(0, index);
+        let value = str.substring(index + 1);
+        query[key] = value;
+      });
   } catch (error) {
-    console.error("hiprint Preview getQuery on error:",error);
+    console.error('hiprint Preview getQuery on error:', error);
   }
-  return query
+  return query;
 }
 
 onMounted(() => {
   let query = getQuery();
-  debugger;
   if (query.code) {
     sessionStorage.printQuery = JSON.stringify(query);
     getData(query);
@@ -45,7 +49,7 @@ onMounted(() => {
       error.value = true;
     }
   }
-  window.addEventListener("afterprint", () => {
+  window.addEventListener('afterprint', () => {
     self.close();
   });
 });
@@ -55,24 +59,24 @@ const success = ref(false);
 const error = ref(false);
 
 let loading = ElLoading.service({
-  text: "正在加载数据……",
+  text: '正在加载数据……',
 });
 
 function getData(query) {
-  let { code, params, data, isCustom } = query;
-  loading.setText("获取打印配置和数据");
+  let {code, params, data, isCustom} = query;
+  loading.setText('获取打印配置和数据');
   let reqParams = params ? JSON.parse(params) : [];
 
   axios
     .request({
       url: `/printTemplate/data/${code}`,
-      method: "post",
-      type: "json",
+      method: 'post',
+      type: 'json',
       data: reqParams,
     })
     .then(async (res) => {
-      loading.setText("格式化数据，初始化打印插件");
-      let { list, json } = res.data;
+      loading.setText('格式化数据，初始化打印插件');
+      let {list, json} = res.data;
       if (json) {
         let hasData = false;
         if (Array.isArray(list) && list.length > 0) {
@@ -98,11 +102,11 @@ function getData(query) {
         } else {
           list = [];
         }
-        let hiprintTemplate = new hiprint.PrintTemplate({ template: JSON.parse(json) });
+        let hiprintTemplate = new hiprint.PrintTemplate({template: JSON.parse(json)});
         // 如若有本地数据，那么将本地数据替换远端数据。传入预览中。
-        if (isCustom === "1") {
-          await ElMessageBox.prompt("在下面输入框中输入您给的自定义数据", "自定义数据", {
-            inputType: "textarea",
+        if (isCustom === '1') {
+          await ElMessageBox.prompt('在下面输入框中输入您给的自定义数据', '自定义数据', {
+            inputType: 'textarea',
             inputValue: localStorage.hiprintCustomValue || null,
           }).then((e) => {
             try {
@@ -129,14 +133,14 @@ function getData(query) {
           }
         }
         let html = hiprintTemplate.getHtml(list);
-        document.body.innerHTML = "";
+        document.body.innerHTML = '';
         document.body.appendChild(html[0]);
         if (hasData) {
           setTimeout(() => {
             window.print();
           }, 1000);
         } else {
-          ElMessageBox.alert("数据源没有数据，打印将取消").then(() => {
+          ElMessageBox.alert('数据源没有数据，打印将取消').then(() => {
             window.close();
           });
         }

package/package.json

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