vue2-client 1.12.2 → 1.12.3-9.alpha

package/src/plugins/HiPrintPlugin.js

@@ -1,124 +1,164 @@
-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, runLogic } from '@vue2-client/services/api/common'
+import hiPrintCss from '@vue2-client/base-client/components/common/XPrint/css/hiPrintCss'
+import { uuid } from '@vue2-client/utils/util'
+
+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', customOption = {}) {
+      return new Promise((resolve, reject) => {
+        try {
+          getConfigByNameAsync(templateName).then(async (template) => {
+            if (!template) {
+              this.$message.error(`${templateName} 打印模板不存在`)
+              reject(new Error(`${templateName} 打印模板不存在`))
+              return
+            }
+            if (template.dataLogicName) {
+              const remoteData = await runLogic(template.dataLogicName, printData).catch(() => {
+                this.$message.error(`${template.dataLogicName} 打印数据逻辑获取失败`)
+                return {}
+              })
+              printData = Object.assign({}, printData, remoteData)
+            }
+            console.log('打印数据', printData)
+            const printConfig = {
+              callback: () => resolve(hiprintTemplate),
+              styleHandler: () => hiPrintCss(),
+              title: '打印测试',
+              pageSize: {
+                height: template.panels[0].height * 1000,
+                width: template.panels[0].width * 1000
+              },
+              ...customOption
+            }
+            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).html())
+            } else if (type === 'C') {
+              hiprintTemplate.print2(printData, printConfig)
+            } else {
+              hiprintTemplate.print(printData, {}, printConfig)
+            }
+          }).catch((error) => {
+            reject(error)
+          })
+        } catch (error) {
+          reject(error)
+        }
+      })
+    }
+
+    /**
+     * 浏览器打印
+     */
+    globalVue.$printB = async function (templateName, printData, customOption) {
+      return _commonPrint(templateName, printData, 'B', customOption)
+    }
+
+    /**
+     * 客户端打印
+     */
+    globalVue.$printC = async function (templateName, printData, customOption) {
+      if (window.hiwebSocket.opened) {
+        return _commonPrint(templateName, printData, 'C', customOption)
+      } else {
+        this.$message.error('请确保打印服务已经启动')
+        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
+      }
+    }
+
+    /**
+     * 返回打印模板生成的 html
+     */
+    globalVue.$getHtml = async function (templateName, printData, customOption) {
+      return _commonPrint(templateName, printData, 'H', customOption)
+    }
+
+    /**
+     * 打印html
+     */
+    globalVue.$printHtml = async function (html, customOption = {}) {
+      if (window.hiwebSocket.opened) {
+        return window.hiwebSocket.send({
+          title: '打印内容',
+          html,
+          imgToBase64: false,
+          templateId: uuid(),
+          id: uuid(),
+          ...customOption
+        })
+      } else {
+        this.$message.error('请确保打印服务已经启动')
+        return Promise.reject(new Error('客户端打印失败，未连接打印服务'))
+      }
+    }
+  }
+}
+
+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/async/router.map.js

@@ -1,116 +1,117 @@
-const { homePage } = require('../../config')
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView'),
-  // his-web$ceshiGrid?type=GridView&configName=RxPreparedMed
-  gridView: () => import('@vue2-client/layouts/GridView'),
-  login: () => import('@vue2-client/pages/login/Login'),
-  loginv3: () => import('@vue2-client/pages/login/LoginV3')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-// 栅格配置视图
-routerResource.gridView = view.gridView
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () =>
-  import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
-// 通用服务评价
-routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
-// 系统设置
-routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// AMIS示例页面
-routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
-// 页面编辑器
-routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
-// 数据检索
-routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
-// 数据检索(新)
-routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
-// 示例页面
-routerResource.example = {
-  path: 'example',
-  name: '示例主页面',
-  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
-  // 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/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'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
-  // 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/AI/demo.vue'),
-  // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
-  // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
-}
-// routerResource.example = () =>
-//    import('@vue2-client/pages/Example')
-routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
-
-routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
-
-routerResource.XTab = () => import('@vue2-client/base-client/components/common/XTab/XTabDemo')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
-      ? view.loginv3 : view.login
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: homePage,
-    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () =>
-      import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () =>
-      import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () =>
-      import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+const { homePage } = require('../../config')
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView'),
+  // his-web$ceshiGrid?type=GridView&configName=RxPreparedMed
+  gridView: () => import('@vue2-client/layouts/GridView'),
+  login: () => import('@vue2-client/pages/login/Login'),
+  loginv3: () => import('@vue2-client/pages/login/LoginV3')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+// 栅格配置视图
+routerResource.gridView = view.gridView
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () =>
+  import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import('@vue2-client/pages/system/dictionary')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
+// 通用服务评价
+routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
+// 系统设置
+routerResource.settings = () => import('@vue2-client/pages/system/settings')
+// AMIS示例页面
+routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
+// 页面编辑器
+routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
+// 数据检索
+routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStatistics')
+// 数据检索(新)
+routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
+// 示例页面
+routerResource.example = {
+  path: 'example',
+  name: '示例主页面',
+  // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
+  // 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/XDatePicker/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
+  component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
+  // 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/AI/demo.vue'),
+  // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
+  // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
+}
+// routerResource.example = () =>
+//    import('@vue2-client/pages/Example')
+routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
+
+routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
+
+routerResource.XTab = () => import('@vue2-client/base-client/components/common/XTab/XTabDemo')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
+      ? view.loginv3 : view.login
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: homePage,
+    component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () =>
+      import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () =>
+      import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () =>
+      import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

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