vue2-client 1.9.195 → 1.9.197

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.195",
+  "version": "1.9.197",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -18,14 +18,14 @@
     "test": "jest"
   },
   "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.65",
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@microsoft/fetch-event-source": "^2.0.1",
     "@antv/data-set": "^0.11.8",
     "@antv/g2plot": "^2.4.31",
     "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
     "@vue/babel-preset-jsx": "^1.4.0",
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.62",
     "animate.css": "^4.1.1",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
@@ -47,8 +47,8 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4",
     "lodash.get": "^4.4.2",
-    "mockjs": "^1.1.0",
     "marked": "^4",
+    "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
     "qs": "^6.11.2",
     "regenerator-runtime": "^0.14.0",

package/src/base-client/components/common/XPrint/Demo.vue

@@ -15,6 +15,12 @@ export default {
     },
     printOk () {
       console.log('打印成功')
+    },
+    test1 () {
+      this.$printB('DiagnosisCertificate', { title: '测试浏览器打印' })
+    },
+    test2 () {
+      this.$printC('DiagnosisCertificate', { title: 'DiagnosisCertificate' })
     }
   }
 }
@@ -23,6 +29,9 @@ export default {
 <template>
   <div>
     <a-button @click="print">打印</a-button>
+    <a-button @click="test1">测试打印1</a-button>
+    <a-button @click="test2">测试打印2</a-button>
+
     <print-bill ref="print" @ok="printOk" :autoPrint="false"></print-bill>
   </div>
 </template>

package/src/bootstrap.js

@@ -35,7 +35,7 @@ async function bootstrap ({ router, store, i18n, message }) {
     // 加载路由守卫
     loadGuards(guards, { router, store, i18n, message })
     // 加载通用插件
-    Vue.use(hiPrintPlugin, false)
+    Vue.use(hiPrintPlugin)
   }
 }
 

package/src/components/g2Charts/designer.vue

@@ -15,6 +15,10 @@ defineProps({
   height: {
     type: String,
     default: '500px'
+  },
+  isDev: {
+    type: Boolean,
+    default: false
   }
 })
 
@@ -169,7 +173,7 @@ defineExpose({ init, config, resetConfig })
         :body-style="{maxHeight:height,height:height}">
         <div class="custom-chart-title" v-if="config.title">{{ config.title }}</div>
         <div class="custom-chart-desc" v-if="config.description">{{ config.description }}</div>
-        <g2Charts ref="g2ChartsRef"></g2Charts>
+        <g2Charts ref="g2ChartsRef" :isDev="isDev"></g2Charts>
       </a-card>
     </a-col>
     <a-col :span="8">

package/src/components/g2Charts/index.vue

@@ -137,8 +137,9 @@ const init = (config = {}, requestParameters = {}) => {
     }))
 
     const sanitizedParams = JSON.parse(JSON.stringify({
-      ...requestParameters,
-      chartsConfigArray: undefined
+      conditionParams: {},
+      chartsConfigArray: undefined,
+      ...requestParameters
     }))
 
     // 验证通过后进行数据请求和图表渲染

package/src/plugins/HiPrintPlugin.js

@@ -4,11 +4,12 @@ import {
   hiprint,
   defaultElementTypeProvider,
 } from '@afwenming123/vue-plugin-hiprint'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+import hiPrintCss from '@vue2-client/base-client/components/common/XPrint/css/hiPrintCss'
 
 const hiPrintPlugin = {
   disAutoConnect,
   install: function (Vue, autoConnect = true, name = '$hiPrint') {
-    console.log('开始注册插件了')
     if (!autoConnect) {
       disAutoConnect()
     }
@@ -48,6 +49,67 @@ const hiPrintPlugin = {
       hiprintTemplate.print2(...args)
       return hiprintTemplate
     }
+    /**
+     * 通用打印方法
+     * @param {string} templateName 模板名称
+     * @param {object} printData 打印数据
+     * @param {boolean} isClient 是否客户端打印
+     */
+    const _commonPrint = async function (templateName, printData, isClient = false) {
+      return new Promise((resolve, reject) => {
+        try {
+          getConfigByNameAsync(templateName).then((template) => {
+            if (!template) {
+              this.$message.error(`${templateName} 打印模板不存在`)
+              reject(new Error(`${templateName} 打印模板不存在`))
+              return
+            }
+            hiprint.init({
+              // eslint-disable-next-line new-cap
+              providers: [new defaultElementTypeProvider()]
+            })
+            const hiprintTemplate = new hiprint.PrintTemplate({
+              template: template,
+            })
+            const printMethod = isClient ? 'print2' : 'print'
+            if (isClient) {
+              console.log(hiprintTemplate.getPrinterList())
+            }
+            hiprintTemplate[printMethod](printData, {}, {
+              callback: () => {
+                resolve(hiprintTemplate)
+              },
+              styleHandler: () => {
+                return hiPrintCss()
+              }
+            })
+          }).catch((error) => {
+            reject(error)
+          })
+        } catch (error) {
+          reject(error)
+        }
+      })
+    }
+
+    /**
+     * 浏览器打印
+     */
+    globalVue.$printB = async function (templateName, printData) {
+      return _commonPrint(templateName, printData, false)
+    }
+
+    /**
+     * 客户端打印
+     */
+    globalVue.$printC = async function (templateName, printData) {
+      if (window.hiwebSocket.opened) {
+        return _commonPrint(templateName, printData, true)
+      } else {
+        this.$message.error('请确保打印服务已经启动')
+        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
+      }
+    }
   }
 }
 

package/src/router/async/router.map.js

@@ -86,7 +86,7 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
@@ -95,7 +95,7 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
           // component: () => import('@vue2-client/base-client/components/AI/demo.vue'),
           // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
           meta: {