vue2-client 1.16.61 → 1.16.63

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

@@ -1,129 +1,130 @@
-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 = () => import('@vue2-client/layouts/GridView')
-// 测试
-routerResource.businessQuery = view.blank
-// 业务查询 - 收费查询
-routerResource.chargeQuery = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
-// --------------------------------------仪表盘--------------------------------------
-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')
-// 页面编辑器
-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/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
-  // 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/HIS/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/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/XPageViewExample/index.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'),
-  // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
-  // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.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')
-routerResource.addressManage = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
-      ? view.loginv3 : view.login
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
-    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : 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 = () => import('@vue2-client/layouts/GridView')
+// 测试
+routerResource.businessQuery = view.blank
+// 业务查询 - 收费查询
+routerResource.chargeQuery = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+// --------------------------------------仪表盘--------------------------------------
+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')
+// 页面编辑器
+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/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
+  // 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/XReportGrid/XReportDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/HIS/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/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/his/XImportExcelButton/XFrontImportExcelDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/pages/XPageViewExample/index.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'),
+  // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
+  // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/HIS/demo.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')
+routerResource.addressManage = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: process.env.VUE_APP_LOGIN_VERSION === 'V3'
+      ? view.loginv3 : view.login
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
+    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : 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/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/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('获取票据信息失败')
+      }
+    )
+  }
+}