vue2-client 1.18.16 → 1.18.17

package/src/store/modules/setting.js

@@ -1,119 +1,119 @@
-import config from '@vue2-client/config'
-import { ADMIN } from '@vue2-client/config/default'
-import { formatFullPath } from '@vue2-client/utils/i18n'
-import { filterMenu } from '@vue2-client/utils/authority-utils'
-import { getLocalSetting } from '@vue2-client/utils/themeUtil'
-import deepClone from 'lodash.clonedeep'
-
-const localSetting = getLocalSetting(true)
-const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
-const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
-
-export default {
-  namespaced: true,
-  state: {
-    isMobile: false,
-    animates: ADMIN.animates,
-    palettes: ADMIN.palettes,
-    pageMinHeight: 0,
-    menuData: [],
-    activatedFirst: undefined,
-    customTitles,
-    ...config,
-    ...localSetting
-  },
-  getters: {
-    menuData (state, getters, rootState) {
-      if (state.filterMenu) {
-        const { permissions, roles } = rootState.account
-        return filterMenu(deepClone(state.menuData), permissions, roles)
-      }
-      return state.menuData
-    },
-    firstMenu (state, getters) {
-      const { menuData } = getters
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      return menuData.map(item => {
-        const menuItem = { ...item }
-        delete menuItem.children
-        return menuItem
-      })
-    },
-    subMenu (state) {
-      const { menuData, activatedFirst } = state
-      if (menuData.length > 0 && !menuData[0].fullPath) {
-        formatFullPath(menuData)
-      }
-      const current = menuData.find(menu => menu.fullPath === activatedFirst)
-      return current && current.children || []
-    }
-  },
-  mutations: {
-    setDevice (state, isMobile) {
-      state.isMobile = isMobile
-    },
-    setTheme (state, theme) {
-      state.theme = theme
-    },
-    setLayout (state, layout) {
-      state.layout = layout
-    },
-    setMultiPage (state, multiPage) {
-      state.multiPage = multiPage
-    },
-    setAnimate (state, animate) {
-      state.animate = animate
-    },
-    setWeekMode (state, weekMode) {
-      state.weekMode = weekMode
-    },
-    setFixedHeader (state, fixedHeader) {
-      state.fixedHeader = fixedHeader
-    },
-    setFixedSideBar (state, fixedSideBar) {
-      state.fixedSideBar = fixedSideBar
-    },
-    setLang (state, lang) {
-      state.lang = lang
-    },
-    setHideSetting (state, hideSetting) {
-      state.hideSetting = hideSetting
-    },
-    correctPageMinHeight (state, minHeight) {
-      state.pageMinHeight += minHeight
-    },
-    setMenuData (state, menuData) {
-      state.menuData = menuData
-    },
-    setAsyncRoutes (state, asyncRoutes) {
-      state.asyncRoutes = asyncRoutes
-    },
-    setPageWidth (state, pageWidth) {
-      state.pageWidth = pageWidth
-    },
-    setActivatedFirst (state, activatedFirst) {
-      state.activatedFirst = activatedFirst
-    },
-    setFixedTabs (state, fixedTabs) {
-      state.fixedTabs = fixedTabs
-    },
-    setCustomTitle (state, { path, title }) {
-      if (title) {
-        const obj = state.customTitles.find(item => item.path === path)
-        if (obj) {
-          obj.title = title
-        } else {
-          state.customTitles.push({ path, title })
-        }
-        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
-      }
-    },
-    setSetting (state, setting) {
-      for (const key in setting) {
-        state[key] = setting[key]
-      }
-    }
-  }
-}
+import config from '@vue2-client/config'
+import { ADMIN } from '@vue2-client/config/default'
+import { formatFullPath } from '@vue2-client/utils/i18n'
+import { filterMenu } from '@vue2-client/utils/authority-utils'
+import { getLocalSetting } from '@vue2-client/utils/themeUtil'
+import deepClone from 'lodash.clonedeep'
+
+const localSetting = getLocalSetting(true)
+const customTitlesStr = sessionStorage.getItem(process.env.VUE_APP_TBAS_TITLES_KEY)
+const customTitles = (customTitlesStr && JSON.parse(customTitlesStr)) || []
+
+export default {
+  namespaced: true,
+  state: {
+    isMobile: false,
+    animates: ADMIN.animates,
+    palettes: ADMIN.palettes,
+    pageMinHeight: 0,
+    menuData: [],
+    activatedFirst: undefined,
+    customTitles,
+    ...config,
+    ...localSetting
+  },
+  getters: {
+    menuData (state, getters, rootState) {
+      if (state.filterMenu) {
+        const { permissions, roles } = rootState.account
+        return filterMenu(deepClone(state.menuData), permissions, roles)
+      }
+      return state.menuData
+    },
+    firstMenu (state, getters) {
+      const { menuData } = getters
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      return menuData.map(item => {
+        const menuItem = { ...item }
+        delete menuItem.children
+        return menuItem
+      })
+    },
+    subMenu (state) {
+      const { menuData, activatedFirst } = state
+      if (menuData.length > 0 && !menuData[0].fullPath) {
+        formatFullPath(menuData)
+      }
+      const current = menuData.find(menu => menu.fullPath === activatedFirst)
+      return current && current.children || []
+    }
+  },
+  mutations: {
+    setDevice (state, isMobile) {
+      state.isMobile = isMobile
+    },
+    setTheme (state, theme) {
+      state.theme = theme
+    },
+    setLayout (state, layout) {
+      state.layout = layout
+    },
+    setMultiPage (state, multiPage) {
+      state.multiPage = multiPage
+    },
+    setAnimate (state, animate) {
+      state.animate = animate
+    },
+    setWeekMode (state, weekMode) {
+      state.weekMode = weekMode
+    },
+    setFixedHeader (state, fixedHeader) {
+      state.fixedHeader = fixedHeader
+    },
+    setFixedSideBar (state, fixedSideBar) {
+      state.fixedSideBar = fixedSideBar
+    },
+    setLang (state, lang) {
+      state.lang = lang
+    },
+    setHideSetting (state, hideSetting) {
+      state.hideSetting = hideSetting
+    },
+    correctPageMinHeight (state, minHeight) {
+      state.pageMinHeight += minHeight
+    },
+    setMenuData (state, menuData) {
+      state.menuData = menuData
+    },
+    setAsyncRoutes (state, asyncRoutes) {
+      state.asyncRoutes = asyncRoutes
+    },
+    setPageWidth (state, pageWidth) {
+      state.pageWidth = pageWidth
+    },
+    setActivatedFirst (state, activatedFirst) {
+      state.activatedFirst = activatedFirst
+    },
+    setFixedTabs (state, fixedTabs) {
+      state.fixedTabs = fixedTabs
+    },
+    setCustomTitle (state, { path, title }) {
+      if (title) {
+        const obj = state.customTitles.find(item => item.path === path)
+        if (obj) {
+          obj.title = title
+        } else {
+          state.customTitles.push({ path, title })
+        }
+        sessionStorage.setItem(process.env.VUE_APP_TBAS_TITLES_KEY, JSON.stringify(state.customTitles))
+      }
+    },
+    setSetting (state, setting) {
+      for (const key in setting) {
+        state[key] = setting[key]
+      }
+    }
+  }
+}

package/src/utils/authority-utils.js

@@ -1,85 +1,85 @@
-/**
- * 判断是否有路由的权限
- * @param authority 路由权限配置
- * @param permissions 用户权限集合
- * @returns {boolean|*}
- */
-function hasPermission (authority, permissions) {
-  let required = '*'
-  if (typeof authority === 'string') {
-    required = authority
-  } else if (Array.isArray(authority)) {
-    required = authority
-  } else if (typeof authority === 'object') {
-    required = authority.permission
-  }
-  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断是否有路由需要的角色
- * @param authority 路由权限配置
- * @param roles 用户角色集合
- */
-function hasRole (authority, roles) {
-  let required
-  if (typeof authority === 'object') {
-    required = authority.role
-  }
-  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
-}
-
-/**
- * 判断目标数组是否有所需元素
- * @param {String | String[]}required 所需元素，数组或单个元素
- * @param {String[]|Object[]} source 目标数组
- * @param {Function} filter 匹配条件
- * (r: String, s: String|Object) => boolean
- * @returns {boolean}
- */
-function hasAnyItem (required, source, filter) {
-  if (!required) {
-    return false
-  }
-  const checkedList = Array.isArray(required) ? required : [required]
-  return !!source.find(s => checkedList.find(r => filter(r, s)))
-}
-
-/**
- * 路由权限校验
- * @param route 路由
- * @param permissions 用户权限集合
- * @param roles 用户角色集合
- * @returns {boolean}
- */
-function hasAuthority (route, permissions, roles) {
-  const authorities = [...route.meta.pAuthorities, route.meta.authority]
-  for (const authority of authorities) {
-    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
-      return false
-    }
-  }
-  return true
-}
-
-/**
- * 根据权限配置过滤菜单数据
- * @param menuData
- * @param permissions
- * @param roles
- */
-function filterMenu (menuData, permissions, roles) {
-  return menuData.filter(menu => {
-    if (menu.meta && menu.meta.invisible === undefined) {
-      if (!hasAuthority(menu, permissions, roles)) {
-        return false
-      }
-    }
-    if (menu.children && menu.children.length > 0) {
-      menu.children = filterMenu(menu.children, permissions, roles)
-    }
-    return true
-  })
-}
-
-export { filterMenu, hasAuthority }
+/**
+ * 判断是否有路由的权限
+ * @param authority 路由权限配置
+ * @param permissions 用户权限集合
+ * @returns {boolean|*}
+ */
+function hasPermission (authority, permissions) {
+  let required = '*'
+  if (typeof authority === 'string') {
+    required = authority
+  } else if (Array.isArray(authority)) {
+    required = authority
+  } else if (typeof authority === 'object') {
+    required = authority.permission
+  }
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断是否有路由需要的角色
+ * @param authority 路由权限配置
+ * @param roles 用户角色集合
+ */
+function hasRole (authority, roles) {
+  let required
+  if (typeof authority === 'object') {
+    required = authority.role
+  }
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
+}
+
+/**
+ * 判断目标数组是否有所需元素
+ * @param {String | String[]}required 所需元素，数组或单个元素
+ * @param {String[]|Object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
+ * @returns {boolean}
+ */
+function hasAnyItem (required, source, filter) {
+  if (!required) {
+    return false
+  }
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
+}
+
+/**
+ * 路由权限校验
+ * @param route 路由
+ * @param permissions 用户权限集合
+ * @param roles 用户角色集合
+ * @returns {boolean}
+ */
+function hasAuthority (route, permissions, roles) {
+  const authorities = [...route.meta.pAuthorities, route.meta.authority]
+  for (const authority of authorities) {
+    if (!hasPermission(authority, permissions) && !hasRole(authority, roles)) {
+      return false
+    }
+  }
+  return true
+}
+
+/**
+ * 根据权限配置过滤菜单数据
+ * @param menuData
+ * @param permissions
+ * @param roles
+ */
+function filterMenu (menuData, permissions, roles) {
+  return menuData.filter(menu => {
+    if (menu.meta && menu.meta.invisible === undefined) {
+      if (!hasAuthority(menu, permissions, roles)) {
+        return false
+      }
+    }
+    if (menu.children && menu.children.length > 0) {
+      menu.children = filterMenu(menu.children, permissions, roles)
+    }
+    return true
+  })
+}
+
+export { filterMenu, hasAuthority }

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
-export default {
-  401: '认证失败，无法访问系统资源',
-  403: '当前操作没有权限',
-  404: '访问资源不存在',
-  default: '系统未知错误，请反馈给管理员'
-}
+export default {
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
+}

package//350/277/201/347/247/273/346/227/245/345/277/227.md

@@ -1,15 +1,15 @@
-# vue2迁移vue3
-
-1. 完成vue-cli，webpack，babel，eslint的升级
-   - core-js 3.30.1 -> 3.33.0
-   - add regenerator-runtime
-   - @babel/core 7.21.4 -> 7.22.20
-   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
-   - @vue/cli 4.5.19 -> 5.0.8
-   - babel-jest 25.5.1 -> 26.6.3
-   - eslint 6.8.0 -> 7.32.0
-   - jest 24.0.0 -> 26.6.3
-   - webpack 4.46.0 -> 5.88.2
-2. 完成vue2的2.7升级
-   - vue 2.6.14 -> 2.7.14
-   - eslint 7.32.0 -> 8.51.0
+# vue2迁移vue3
+
+1. 完成vue-cli，webpack，babel，eslint的升级
+   - core-js 3.30.1 -> 3.33.0
+   - add regenerator-runtime
+   - @babel/core 7.21.4 -> 7.22.20
+   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
+   - @vue/cli 4.5.19 -> 5.0.8
+   - babel-jest 25.5.1 -> 26.6.3
+   - eslint 6.8.0 -> 7.32.0
+   - jest 24.0.0 -> 26.6.3
+   - webpack 4.46.0 -> 5.88.2
+2. 完成vue2的2.7升级
+   - vue 2.6.14 -> 2.7.14
+   - eslint 7.32.0 -> 8.51.0

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

@@ -1,64 +0,0 @@
-<template>
-  <a-card :bordered="false" v-if="currUserInfo">
-    <x-form-table
-      title="报建记录查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      @action="action"
-      service-name="af-revenue"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-
-export default {
-  name: 'ApplyRecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'ApplyRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: { ab_f_userinfo_id: this.currUserInfo.f_userinfo_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/pages/userInfoDetailManage/SafeCheckPaperV3RecordQuery/index.vue

@@ -1,64 +0,0 @@
-<template>
-  <a-card :bordered="false" v-if="currUserInfo">
-    <x-form-table
-      title="安检记录查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      @action="action"
-      service-name="af-revenue"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-
-export default {
-  name: 'SafeCheckPaperV3RecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'SafeCheckRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: { tcp_f_userinfoid: this.currUserInfo.f_userinfo_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/pages/userInfoDetailManage/TelephoneV3RecordQuery/index.vue

@@ -1,64 +0,0 @@
-<template>
-  <a-card :bordered="false" v-if="currUserInfo">
-    <x-form-table
-      title="工单记录查询"
-      :queryParamsName="queryParamsName"
-      :fixedQueryForm="fixedQueryForm"
-      @action="action"
-      service-name="af-revenue"
-      ref="xFormTable">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-
-export default {
-  name: 'TelephoneV3RecordQuery',
-  components: {
-    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
-  },
-  data () {
-    return {
-      // 查询配置名称
-      queryParamsName: 'TelephoneRecordQueryCRUD',
-      // 查询表单固定值
-      fixedQueryForm: { ts_f_userinfo_id: this.currUserInfo.f_userinfo_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>