yh-hiprint 2.6.22 → 2.6.24

package/HiprintDesigner.vue

@@ -208,6 +208,7 @@
             placeholder="请选择数据源"
             multiple
             v-model="formCode"
+            @change="handleFormCodeChange"
             collapse-tags
             collapse-tags-tooltip>
             <el-option
@@ -247,7 +248,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="text">
+                tid="defaultModule.text">
                 <i class="iconfont icon-font-size"></i>
                 <span>文本</span>
               </a>
@@ -255,7 +256,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="textVal">
+                tid="defaultModule.textVal">
                 <i class="iconfont icon-font-size"></i>
                 <span>值（文本）</span>
               </a>
@@ -263,7 +264,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="image">
+                tid="defaultModule.image">
                 <i class="iconfont icon-image-fill"></i>
                 <span>图片</span>
               </a>
@@ -271,7 +272,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="longText">
+                tid="defaultModule.longText">
                 <i class="iconfont icon-file-text"></i>
                 <span>长文本</span>
               </a>
@@ -279,7 +280,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="table">
+                tid="defaultModule.table">
                 <i class="iconfont icon-table"></i>
                 <span>表格</span>
               </a>
@@ -287,7 +288,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="emptyTable">
+                tid="defaultModule.emptyTable">
                 <i class="iconfont icon-layout"></i>
                 <span>空白表格</span>
               </a>
@@ -295,7 +296,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="html">
+                tid="defaultModule.html">
                 <i class="iconfont icon-HTML"></i>
                 <span>html</span>
               </a>
@@ -303,7 +304,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="customText">
+                tid="defaultModule.customText">
                 <i class="iconfont icon-container-fill"></i>
                 <span>自定义文本</span>
               </a>
@@ -311,7 +312,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="barcode">
+                tid="defaultModule.barcode">
                 <i class="iconfont icon-barcode"></i>
                 <span>条形码</span>
               </a>
@@ -319,7 +320,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="qrcode">
+                tid="defaultModule.qrcode">
                 <i class="iconfont icon-qrcode"></i>
                 <span>二维码</span>
               </a>
@@ -330,7 +331,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="hline">
+                tid="defaultModule.hline">
                 <i class="iconfont icon-border-verticle"></i>
                 <span>横线</span>
               </a>
@@ -338,7 +339,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="vline">
+                tid="defaultModule.vline">
                 <i class="iconfont icon-border-horizontal"></i>
                 <span>竖线</span>
               </a>
@@ -346,7 +347,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="rect">
+                tid="defaultModule.rect">
                 <i class="iconfont icon-border"></i>
                 <span>矩形</span>
               </a>
@@ -354,7 +355,7 @@
             <el-col :span="8">
               <a
                 class="ep-draggable-item"
-                tid="oval">
+                tid="defaultModule.oval">
                 <i class="iconfont icon-round"></i>
                 <span>椭圆</span>
               </a>
@@ -431,7 +432,7 @@
 </template>
 <script setup lang="ts">
   // @ts-nocheck
-  import {onMounted, ref, onActivated, onDeactivated, computed, watch, shallowRef} from 'vue';
+  import {onMounted, ref, onActivated, onDeactivated, computed, watch, shallowRef, nextTick} from 'vue';
   import {
     hiprint,
     defaultElementTypeProvider,
@@ -472,6 +473,24 @@
     previewHiprint(detailData.value.code);
   }
 
+  function handleFormCodeChange() {
+    // 手动触发字段更新，解决延迟问题
+    nextTick(() => {
+      if (formColumns.value && formColumns.value.length && hiprintTemplate.value) {
+        hiprintTemplate.value.setFields(
+          formColumns.value.map((item) => {
+            return {
+              field: item,
+              text: item,
+            };
+          })
+        );
+      } else {
+        hiprintTemplate.value?.setFields('');
+      }
+    });
+  }
+
   function saveConfig() {
     let arr = [].concat(formCode.value);
     let json = hiprintTemplate.value?.getJson();

package/index.ts

@@ -198,8 +198,6 @@ interface InstallOptions {
   router?: Router | undefined;
   pinia?: any;
   isAdmin?: boolean;
-  isNew?: boolean;
-  addInitTask: (cl:any) => void
 }
 
 // 客户端打印处理函数
@@ -495,12 +493,13 @@ const serverPrint = (code, params) => {
 export default {
   install(
     app: any,
-    {router, pinia, clientPrint = false,isNew = false, addInitTask}: InstallOptions & {clientPrint?: boolean}
+    config: InstallOptions & {clientPrint?: boolean}
   ): void {
     app.provide('$hiprint', hiprintFun);
     app.provide('$silentHiprint', silentHiprint);
-
+    const isNew = app.config.globalProperties.$isNew;
     if(isNew) {
+      const {$addInitTask:addInitTask,$router:router} = app.config.globalProperties
       app.provide("$serverPrint",serverPrint)
       addInitTask(async () => {
         if (!router || !router.hasRoute('Index')) return;
@@ -524,6 +523,7 @@ export default {
         });
       })
     } else {
+      const {router} = config
       if (router) {
         router.addRoute('Index', {
           path: 'hiprint/designer',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yh-hiprint",
-  "version": "2.6.22",
+  "version": "2.6.24",
   "description": "Hiprint for Vue3 by NoahLiu in ForceCon in Hunan Changesha",
   "type": "module",
   "exports": {