vue2-client 1.22.2 → 1.22.3

package/src/services/api/cas.js

@@ -1,79 +1,79 @@
-import { post } from '@vue2-client/services/api/restTools'
-import notification from 'ant-design-vue/lib/notification'
-import { logout } from '@vue2-client/services/user'
-import Cookie from 'js-cookie'
-
-const casApi = {
-  // 根据用户信息校验服务访问权限并生成ST
-  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
-  // 根据TGC生成ST
-  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
-  // 验证ST
-  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
-  // 其他验证
-  otherValidate: '/api/af-sso/logic'
-}
-
-function setTGTCookie (cookie) {
-  return Cookie.set('TGT-Cookie', cookie)
-}
-function removeTGTCookie () {
-  return Cookie.remove('TGT-Cookie')
-}
-export function getTGTCookie () {
-  return Cookie.get('TGT-Cookie')
-}
-
-export function CASLoginByAuth (serviceKey) {
-  return new Promise((resolve, reject) => {
-    post(casApi.createSTByUserInfo, {
-      serviceKey: serviceKey
-    }).then(res => {
-      setTGTCookie(res.tgc)
-      resolve(res)
-    }).catch(msg => {
-      reject(msg)
-    })
-  })
-}
-
-export function CASLogin (serviceKey, inner) {
-  // 从第三方跳转登录
-  const tgc = getTGTCookie()
-  if (tgc && !inner) {
-    return new Promise((resolve, reject) => {
-      post(casApi.createSTByTGC, {
-        serviceKey: serviceKey,
-        tgc: tgc
-      }).then(res => {
-        resolve(res)
-      }).catch(msg => {
-        if (msg === '当前操作没有权限') {
-          removeTGTCookie()
-          notification.error({
-            message: '授权已过期，请重新登录',
-            description: '2秒后自动跳转回登陆页面'
-          })
-          logout().then(() => {
-            setTimeout(() => {
-              window.location.href = '/login?serviceKey=' + serviceKey
-            }, 1500)
-          })
-        } else {
-          reject(msg)
-        }
-      })
-    })
-  } else {
-    return CASLoginByAuth(serviceKey)
-  }
-}
-
-export function doOtherValidate (logicName, st, serviceKey) {
-  return post(casApi.otherValidate + '/' + logicName, {
-    st: st,
-    serviceKey: serviceKey
-  }, null)
-}
-
-export default casApi
+import { post } from '@vue2-client/services/api/restTools'
+import notification from 'ant-design-vue/lib/notification'
+import { logout } from '@vue2-client/services/user'
+import Cookie from 'js-cookie'
+
+const casApi = {
+  // 根据用户信息校验服务访问权限并生成ST
+  createSTByUserInfo: '/api/af-sso/logic/createSTByUserInfo',
+  // 根据TGC生成ST
+  createSTByTGC: '/api/af-sso/logic/createSTByTGC',
+  // 验证ST
+  serviceValidate: '/api/af-sso/logic/openapi/serviceValidate',
+  // 其他验证
+  otherValidate: '/api/af-sso/logic'
+}
+
+function setTGTCookie (cookie) {
+  return Cookie.set('TGT-Cookie', cookie)
+}
+function removeTGTCookie () {
+  return Cookie.remove('TGT-Cookie')
+}
+export function getTGTCookie () {
+  return Cookie.get('TGT-Cookie')
+}
+
+export function CASLoginByAuth (serviceKey) {
+  return new Promise((resolve, reject) => {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, inner) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !inner) {
+    return new Promise((resolve, reject) => {
+      post(casApi.createSTByTGC, {
+        serviceKey: serviceKey,
+        tgc: tgc
+      }).then(res => {
+        resolve(res)
+      }).catch(msg => {
+        if (msg === '当前操作没有权限') {
+          removeTGTCookie()
+          notification.error({
+            message: '授权已过期，请重新登录',
+            description: '2秒后自动跳转回登陆页面'
+          })
+          logout().then(() => {
+            setTimeout(() => {
+              window.location.href = '/login?serviceKey=' + serviceKey
+            }, 1500)
+          })
+        } else {
+          reject(msg)
+        }
+      })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
+}
+
+export function doOtherValidate (logicName, st, serviceKey) {
+  return post(casApi.otherValidate + '/' + logicName, {
+    st: st,
+    serviceKey: serviceKey
+  }, null)
+}
+
+export default casApi

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/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/.idea/MarsCodeWorkspaceAppSettings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="com.codeverse.userSettings.MarscodeWorkspaceAppSettingsState">
-    <option name="ckgOperationStatus" value="SUCCESS" />
-    <option name="progress" value="0.98264986" />
-  </component>
-</project>

package/.idea/google-java-format.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GoogleJavaFormatSettings">
-    <option name="enabled" value="false" />
-  </component>
-</project>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,24 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="HtmlUnknownTag" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="myValues">
-        <value>
-          <list size="9">
-            <item index="0" class="java.lang.String" itemvalue="nobr" />
-            <item index="1" class="java.lang.String" itemvalue="noembed" />
-            <item index="2" class="java.lang.String" itemvalue="comment" />
-            <item index="3" class="java.lang.String" itemvalue="noscript" />
-            <item index="4" class="java.lang.String" itemvalue="embed" />
-            <item index="5" class="java.lang.String" itemvalue="script" />
-            <item index="6" class="java.lang.String" itemvalue="a-month-picker" />
-            <item index="7" class="java.lang.String" itemvalue="a-select-option" />
-            <item index="8" class="java.lang.String" itemvalue="a-menu-item" />
-          </list>
-        </value>
-      </option>
-      <option name="myCustomValuesEnabled" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

package/.idea/jsLinters/eslint.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EslintConfiguration">
-    <option name="fix-on-save" value="true" />
-  </component>
-</project>

package/.idea/vue2-client.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.vscode/settings.json

@@ -1,28 +0,0 @@
-{
-  // 保存时自动格式化
-  "editor.formatOnSave": true,
-  // 保存时自动修复 ESLint 问题
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  },
-  // 统一使用 Prettier 格式化（跨 IDE 一致性）
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[vue]": {
-    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
-  },
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  // ESLint 验证的文件类型
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "vue"
-  ],
-  "i18n-ally.localesPaths": [
-    "public/his/editor/vender/date97/lang"
-  ]
-}