vue2-client 1.12.3 → 1.12.4

package/src/plugins/HiPrintPlugin.js

@@ -1,124 +1,132 @@
-import {
-  autoConnect,
-  disAutoConnect,
-  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') {
-    if (!autoConnect) {
-      disAutoConnect()
-    }
-    const globalVue = Vue.prototype || Vue.config.globalProperties
-    globalVue[name] = hiprint
-    /**
-     * 预览打印，调起系统打印预览
-     * provider 左侧拖拽元素
-     * template 模版json字符串
-     * args 打印数据data, options,
-     */
-    globalVue.$print = function (provider = defaultElementTypeProvider, template, ...args) {
-      hiprint.init({
-        // eslint-disable-next-line new-cap
-        providers: [new provider()]
-      })
-      const hiprintTemplate = new hiprint.PrintTemplate({
-        template: template,
-      })
-      hiprintTemplate.print(...args)
-      return hiprintTemplate
-    }
-    /**
-     * 单模版直接打印， 需客户端支持
-     * provider 左侧拖拽项对象
-     * template 模版json字符串
-     * args 打印数据data, options,
-     */
-    globalVue.$print2 = function (provider = defaultElementTypeProvider, template, ...args) {
-      hiprint.init({
-        // eslint-disable-next-line new-cap
-        providers: [new provider()]
-      })
-      const hiprintTemplate = new hiprint.PrintTemplate({
-        template: template,
-      })
-      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('客户端打印失败，未连接打印服务'))
-      }
-    }
-  }
-}
-
-window.hiprint = hiprint
-
-export {
-  autoConnect,
-  disAutoConnect,
-  hiprint,
-  hiPrintPlugin,
-  defaultElementTypeProvider,
-}
+import {
+  autoConnect,
+  disAutoConnect,
+  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') {
+    if (!autoConnect) {
+      disAutoConnect()
+    }
+    const globalVue = Vue.prototype || Vue.config.globalProperties
+    globalVue[name] = hiprint
+    /**
+     * 预览打印，调起系统打印预览
+     * provider 左侧拖拽元素
+     * template 模版json字符串
+     * args 打印数据data, options,
+     */
+    globalVue.$print = function (provider = defaultElementTypeProvider, template, ...args) {
+      hiprint.init({
+        // eslint-disable-next-line new-cap
+        providers: [new provider()]
+      })
+      const hiprintTemplate = new hiprint.PrintTemplate({
+        template: template,
+      })
+      hiprintTemplate.print(...args)
+      return hiprintTemplate
+    }
+    /**
+     * 单模版直接打印， 需客户端支持
+     * provider 左侧拖拽项对象
+     * template 模版json字符串
+     * args 打印数据data, options,
+     */
+    globalVue.$print2 = function (provider = defaultElementTypeProvider, template, ...args) {
+      hiprint.init({
+        // eslint-disable-next-line new-cap
+        providers: [new provider()]
+      })
+      const hiprintTemplate = new hiprint.PrintTemplate({
+        template: template,
+      })
+      hiprintTemplate.print2(...args)
+      return hiprintTemplate
+    }
+    /**
+     * 通用打印方法
+     * @param {string} templateName 模板名称
+     * @param {object} printData 打印数据
+     * @param {string} type 打印类型
+     */
+    const _commonPrint = async function (templateName, printData, type = 'B') {
+      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,
+            })
+            if (type === 'H') {
+              resolve(hiprintTemplate.getHtml(printData))
+            } else {
+              const printMethod = type === 'C' ? 'print2' : 'print'
+              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, 'B')
+    }
+
+    /**
+     * 客户端打印
+     */
+    globalVue.$printC = async function (templateName, printData) {
+      if (window.hiwebSocket.opened) {
+        return _commonPrint(templateName, printData, 'C')
+      } else {
+        this.$message.error('请确保打印服务已经启动')
+        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
+      }
+    }
+
+    /**
+     * 输出html
+     */
+    globalVue.$printH = async function (templateName, printData) {
+        return _commonPrint(templateName, printData, 'H')
+    }
+  }
+}
+
+window.hiprint = hiprint
+
+export {
+  autoConnect,
+  disAutoConnect,
+  hiprint,
+  hiPrintPlugin,
+  defaultElementTypeProvider,
+}

package/src/router/async/config.async.js

@@ -1,35 +1,35 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@vue2-client/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'submitTicket',
-  'ServiceReview',
-  'dynamicStatistics',
-  'newDynamicStatistics',
-  'XReportGrid',
-  'example',
-  'settings',
-  'createQuery',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  base: `/${process.env.VUE_APP_PUBLIC_PATH}/`.replaceAll('//', '/'),
-  routes: parseRoutes(routesConfig, routerMap),
-  config: routesConfig
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'submitTicket',
+  'ServiceReview',
+  'dynamicStatistics',
+  'newDynamicStatistics',
+  'XReportGrid',
+  'example',
+  'settings',
+  'createQuery',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  base: `/${process.env.VUE_APP_PUBLIC_PATH}/`.replaceAll('//', '/'),
+  routes: parseRoutes(routesConfig, routerMap),
+  config: routesConfig
+}
+
+export default options

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/router.js

@@ -1,19 +1,19 @@
-// 动态导入你的组件
-function loadView (view) {
-  console.log('view', view)
-  return () => import(/* webpackChunkName: "view-[request]" */ `@vue2-client/base-client/components/common/${view}`)
-}
-
-const routes = [
-  // 对于每个路由，你都可以使用 'loadView' 方法动态加载对应的组件
-  { path: '/Tree', component: loadView('Tree') },
-  { path: '/XStepView', component: loadView('XStepView') },
-  { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
-  { path: '/Amis2', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo2') },
-  { path: '/DynamicStatistics', component: () => import('@vue2-client/pages/DynamicStatistics/index') },
-  { path: '/NewDynamicStatistics', component: () => import('@vue2-client/pages/NewDynamicStatistics/index') },
-  { path: '/submitTicket', component: () => import('@vue2-client/pages/system/ticket') },
-  { path: '/submitTicket/', component: () => import('@vue2-client/pages/system/ticket') }
-  // ... 其他路由
-]
-export default routes
+// 动态导入你的组件
+function loadView (view) {
+  console.log('view', view)
+  return () => import(/* webpackChunkName: "view-[request]" */ `@vue2-client/base-client/components/common/${view}`)
+}
+
+const routes = [
+  // 对于每个路由，你都可以使用 'loadView' 方法动态加载对应的组件
+  { path: '/Tree', component: loadView('Tree') },
+  { path: '/XStepView', component: loadView('XStepView') },
+  { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
+  { path: '/Amis2', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo2') },
+  { path: '/DynamicStatistics', component: () => import('@vue2-client/pages/DynamicStatistics/index') },
+  { path: '/NewDynamicStatistics', component: () => import('@vue2-client/pages/NewDynamicStatistics/index') },
+  { path: '/submitTicket', component: () => import('@vue2-client/pages/system/ticket') },
+  { path: '/submitTicket/', component: () => import('@vue2-client/pages/system/ticket') }
+  // ... 其他路由
+]
+export default routes

package/src/services/DataModel.js

@@ -1,30 +1,30 @@
-import { post } from '@vue2-client/services/api'
-import { message } from 'ant-design-vue'
-
-export default class DataModel {
-  // 用url及pageSize构造
-  // url - 加载数据的url
-  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
-  constructor ({ billUrl, serviceName, ...params }) {
-    this.billUrl = billUrl
-    this.params = params
-    this.serviceName = serviceName
-    this.data = undefined
-  }
-
-  // 执行查询过程，加载数据汇总信息
-  // condition - 查询组件产生的查询条件
-  // model - 查询组件收集到的输入数据
-  search () {
-    return post(`/api/${this.serviceName}/report/${this.billUrl}`, { data: this.params }).then(
-      (res) => {
-        this.data = res.value || res
-      }
-    ).catch(
-      () => {
-        this.data = undefined
-        message.error('获取票据信息失败')
-      }
-    )
-  }
-}
+import { post } from '@vue2-client/services/api'
+import { message } from 'ant-design-vue'
+
+export default class DataModel {
+  // 用url及pageSize构造
+  // url - 加载数据的url
+  // params - 除正常查询条件外，附加到后台sql中的参数，可以为空。格式为:{参数名:参数值}
+  constructor ({ billUrl, serviceName, ...params }) {
+    this.billUrl = billUrl
+    this.params = params
+    this.serviceName = serviceName
+    this.data = undefined
+  }
+
+  // 执行查询过程，加载数据汇总信息
+  // condition - 查询组件产生的查询条件
+  // model - 查询组件收集到的输入数据
+  search () {
+    return post(`/api/${this.serviceName}/report/${this.billUrl}`, { data: this.params }).then(
+      (res) => {
+        this.data = res.value || res
+      }
+    ).catch(
+      () => {
+        this.data = undefined
+        message.error('获取票据信息失败')
+      }
+    )
+  }
+}