vue2-client 1.16.27 → 1.16.28

package/src/pages/userInfoDetailManage/WatchCollectionRecordQuery/index.vue

@@ -1,64 +1,64 @@
-<template>
-  <a-card :bordered="false" v-if="currUserInfo">
-    <x-form-table
-      title="表具采集"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      service-name="af-revenue"
-      @action="action"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-
-export default {
-  name: 'WatchCollectionRecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'UserWatchCollectionRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: { wc_f_userfiles_id: this.currUserInfo.f_userfiles_id },
-      // 是否显示详情抽屉
-      detailVisible: false,
-      // 当前记录
-      record: {}
-    }
-  },
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  mounted () {
-    this.$refs.xFormTable.refresh(true)
-  },
-  methods: {
-    action (record, id, actionType) {
-      this.detailVisible = true
-      console.log('触发了详情操作', record, id, actionType)
-    },
-    onClose () {
-      this.detailVisible = false
-      // 关闭详情之后重新查询表单
-      this.$refs.xFormTable.refreshTable(true)
-    }
-  },
-
-  computed: {
-    ...mapState('account', { currUser: 'user' }),
-    ...mapState('setting', { isMobile: 'isMobile' })
-  },
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="表具采集"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      service-name="af-revenue"
+      @action="action"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'WatchCollectionRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'UserWatchCollectionRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { wc_f_userfiles_id: this.currUserInfo.f_userfiles_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

package/src/plugins/EventLogPlugin.js

@@ -1,33 +1,33 @@
-const EventLogger = {
-
-  install (Vue) {
-    const originalEmit = Vue.prototype.$emit
-    // const originalOn = Vue.prototype.$on
-    // 排除 一些 vue 框架 / 前端脚手架 底层的一些事件日志
-    const exclude = ['menuSelect', 'menuDeselect', 'popupScroll', 'popupFocus', 'mouseenter',
-      'mouseleave', 'popupVisibleChange', 'popupScroll', 'click', 'keypress', 'keydown ', 'input ',
-      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted', 'update:visible',
-    ]
-    // 劫持 $emit
-    Vue.prototype.$emit = function (eventName, ...args) {
-      if (!exclude.includes(eventName) && !eventName.startsWith('hook:')) {
-        console.info(`Event emitted: ${eventName}`, args)
-      }
-      return originalEmit.call(this, eventName, ...args)
-    }
-    //
-    // Vue.prototype.$on = function (eventName, callback) {
-    //   // 包装原始回调函数，以便在触发时打印参数
-    //   const wrappedCallback = (...args) => {
-    //     if (!exclude.includes(eventName)) {
-    //       console.log(`Event handled: "${eventName}" triggered with:`, args)
-    //     }
-    //     callback.apply(this, args) // 执行原始回调
-    //   }
-    //   // 使用包装后的回调注册事件
-    //   return originalOn.call(this, eventName, wrappedCallback)
-    // }
-  }
-}
-
-export default EventLogger
+const EventLogger = {
+
+  install (Vue) {
+    const originalEmit = Vue.prototype.$emit
+    // const originalOn = Vue.prototype.$on
+    // 排除 一些 vue 框架 / 前端脚手架 底层的一些事件日志
+    const exclude = ['menuSelect', 'menuDeselect', 'popupScroll', 'popupFocus', 'mouseenter',
+      'mouseleave', 'popupVisibleChange', 'popupScroll', 'click', 'keypress', 'keydown ', 'input ',
+      'change', 'popupVisibleChange', 'beforeCreate', 'created', 'beforeMount', 'mounted', 'componentDidMounted', 'update:visible',
+    ]
+    // 劫持 $emit
+    Vue.prototype.$emit = function (eventName, ...args) {
+      if (!exclude.includes(eventName) && !eventName.startsWith('hook:')) {
+        console.info(`Event emitted: ${eventName}`, args)
+      }
+      return originalEmit.call(this, eventName, ...args)
+    }
+    //
+    // Vue.prototype.$on = function (eventName, callback) {
+    //   // 包装原始回调函数，以便在触发时打印参数
+    //   const wrappedCallback = (...args) => {
+    //     if (!exclude.includes(eventName)) {
+    //       console.log(`Event handled: "${eventName}" triggered with:`, args)
+    //     }
+    //     callback.apply(this, args) // 执行原始回调
+    //   }
+    //   // 使用包装后的回调注册事件
+    //   return originalOn.call(this, eventName, wrappedCallback)
+    // }
+  }
+}
+
+export default EventLogger

package/src/plugins/FindParentsData.js

@@ -1,17 +1,17 @@
-export default {
-    install (Vue) {
-      // 添加公共方法到 Vue 原型上
-      Vue.prototype.$findParentData = function (dataName) {
-        // 尝试从父组件获取数据
-        let parent = this.$parent
-        while (parent) {
-          const parentData = parent[dataName]
-          if (parentData !== undefined) {
-            return parentData // 找到返回数据
-          }
-          parent = parent.$parent // 继续向上寻找
-        }
-      return null // 如果没有找到，返回空
-    }
-  }
-}
+export default {
+    install (Vue) {
+      // 添加公共方法到 Vue 原型上
+      Vue.prototype.$findParentData = function (dataName) {
+        // 尝试从父组件获取数据
+        let parent = this.$parent
+        while (parent) {
+          const parentData = parent[dataName]
+          if (parentData !== undefined) {
+            return parentData // 找到返回数据
+          }
+          parent = parent.$parent // 继续向上寻找
+        }
+      return null // 如果没有找到，返回空
+    }
+  }
+}

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/guards.js

@@ -11,6 +11,7 @@ import AES from '@vue2-client/utils/EncryptUtil'
 import Vue from 'vue'
 import { funcToRouter, loadRoutes } from '@vue2-client/utils/routerUtil'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
 
 NProgress.configure({ showSpinner: false })
 
@@ -191,7 +192,7 @@ const loginGuard = (to, form, next, options) => {
       //     next({ path: '/login' })
       //   })
       // } else {
-        next()
+      next()
       // }
     }
   }
@@ -256,7 +257,11 @@ const progressDone = () => {
   NProgress.done()
 }
 
+const microAppGuard = () => {
+  microDispatch({ type: 'microMounted', appName: window.__MICRO_APP_NAME__ })
+}
+
 export default {
   beforeEach: [progressStart, loginGuard, authorityGuard, redirectGuard],
-  afterEach: [progressDone],
+  afterEach: [progressDone, microAppGuard],
 }

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('获取票据信息失败')
+      }
+    )
+  }
+}