af-mobile-client-vue3 1.3.30 → 1.3.32

package/src/utils/dictUtil.ts

@@ -1,52 +1,52 @@
-/**
- * 字典工具
- */
-import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
-
-/**
- * 获取字典
- * @param configName 配置名
- * @param callback 获取到字典的回调
- * @param serviceName 服务名
- */
-export function getDict(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  getConfigByName(configName, (result) => {
-    if (result != null && result.value) {
-      callback(result.value)
-    }
-    else {
-      console.warn(`dict [${configName}] not found`)
-      callback(null)
-    }
-  }, serviceName)
-}
-
-export function getDictItemByValue(configName: string, serviceName: string, value: string, callback: Function) {
-  getDict(configName, (result) => {
-    if (result != null) {
-      for (const item of result) {
-        if (item.value.toString() === value) {
-          callback(item)
-          return
-        }
-      }
-      console.warn(`dict [${configName}] 's value [${value}] not found`)
-    }
-    callback(null)
-  }, serviceName)
-}
-
-export function getDictItemByLabel(configName: string, serviceName: string, label: string, callback: Function) {
-  getDict(configName, (result) => {
-    if (result != null) {
-      for (const item of result) {
-        if (item.label.toString() === label) {
-          callback(item)
-          return
-        }
-      }
-      console.warn(`dict [${configName}] 's label [${label}] not found`)
-    }
-    callback(null)
-  }, serviceName)
-}
+/**
+ * 字典工具
+ */
+import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
+
+/**
+ * 获取字典
+ * @param configName 配置名
+ * @param callback 获取到字典的回调
+ * @param serviceName 服务名
+ */
+export function getDict(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  getConfigByName(configName, (result) => {
+    if (result != null && result.value) {
+      callback(result.value)
+    }
+    else {
+      console.warn(`dict [${configName}] not found`)
+      callback(null)
+    }
+  }, serviceName)
+}
+
+export function getDictItemByValue(configName: string, serviceName: string, value: string, callback: Function) {
+  getDict(configName, (result) => {
+    if (result != null) {
+      for (const item of result) {
+        if (item.value.toString() === value) {
+          callback(item)
+          return
+        }
+      }
+      console.warn(`dict [${configName}] 's value [${value}] not found`)
+    }
+    callback(null)
+  }, serviceName)
+}
+
+export function getDictItemByLabel(configName: string, serviceName: string, label: string, callback: Function) {
+  getDict(configName, (result) => {
+    if (result != null) {
+      for (const item of result) {
+        if (item.label.toString() === label) {
+          callback(item)
+          return
+        }
+      }
+      console.warn(`dict [${configName}] 's label [${label}] not found`)
+    }
+    callback(null)
+  }, serviceName)
+}

package/src/utils/http/index.ts

@@ -1,199 +1,201 @@
-import type { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
-import { ContentTypeEnum, ResultEnum } from '@af-mobile-client-vue3/enums/requestEnum'
-import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
-import { ACCESS_TOKEN } from '@af-mobile-client-vue3/stores/mutation-type'
-import axios from 'axios'
-import { showToast } from 'vant'
-
-// 默认 axios 实例请求配置
-const configDefault = {
-  headers: {
-    'Content-Type': ContentTypeEnum.JSON,
-  },
-  // 请求超时时间
-  timeout: 20000,
-  // API 请求的默认前缀
-  baseURL: import.meta.env.VITE_APP_API_BASE_URL,
-  data: {},
-}
-
-class Http {
-  // 当前实例
-  private static axiosInstance: AxiosInstance
-  // 请求配置
-  private static axiosConfigDefault: AxiosRequestConfig
-
-  // 请求拦截
-  private httpInterceptorsRequest(): void {
-    Http.axiosInstance.interceptors.request.use(
-      (config) => {
-        // 发送请求前，可在此让每个请求携带自定义 token, 请根据实际情况修改
-        const savedToken = useUserStore().getToken()
-        // 如果 token 存在
-        if (savedToken)
-          config.headers[ACCESS_TOKEN] = savedToken
-        return config
-      },
-      (error: AxiosError) => {
-        showToast({
-          message: error.message,
-          position: 'bottom',
-        })
-        return Promise.reject(error)
-      },
-    )
-  }
-
-  // 响应拦截
-  private httpInterceptorsResponse(): void {
-    Http.axiosInstance.interceptors.response.use(
-      async (response: AxiosResponse) => {
-        const compatible = import.meta.env.VITE_APP_COMPATIBLE
-        if (compatible !== 'V4') {
-          return response.data
-        }
-        // 与后端协定的返回字段
-        const { code, msg, data } = response.data
-        // 临时向v3请求上传服务，因为没有code，未来会改
-        if (code === undefined) {
-          return response.data
-        }
-        // 判断请求是否成功
-        const isSuccess = code === ResultEnum.SUCCESS
-        if (isSuccess) {
-          // 兼容 V3 请求没有data的情况
-          if (data) {
-            return data
-          }
-          else {
-            return response.data
-          }
-        }
-        else {
-          if (code === 401) {
-            showToast({
-              message: '登录态已失效，请重新登录',
-              position: 'bottom',
-            })
-            await useUserStore().logout()
-          }
-          else {
-            showToast({
-              message: msg,
-              position: 'bottom',
-            })
-            console.error(`请求失败，返回结果：${msg}`)
-          }
-          return Promise.reject(response.data)
-        }
-      },
-      (error: AxiosError) => {
-        // 处理 HTTP 网络错误
-        let message: string = error.response?.data as string
-        if (!message) {
-          // HTTP 状态码
-          const status = error.response?.status
-          switch (status) {
-            case 400:
-              message = '请求错误'
-              break
-            case 401:
-              message = '未授权，请登录'
-              break
-            case 403:
-              message = '拒绝访问'
-              break
-            case 404:
-              message = `请求地址出错: ${error.response?.config?.url}`
-              break
-            case 408:
-              message = '请求超时'
-              break
-            case 500:
-              message = '服务器内部错误'
-              break
-            case 501:
-              message = '服务未实现'
-              break
-            case 502:
-              message = '网关错误'
-              break
-            case 503:
-              message = '服务不可用'
-              break
-            case 504:
-              message = '网关超时'
-              break
-            case 505:
-              message = 'HTTP版本不受支持'
-              break
-            default:
-              message = '网络连接故障'
-          }
-        }
-        showToast({
-          message,
-          position: 'bottom',
-        })
-        return Promise.reject(error)
-      },
-    )
-  }
-
-  constructor(config: AxiosRequestConfig) {
-    Http.axiosConfigDefault = config
-    Http.axiosInstance = axios.create(config)
-    this.httpInterceptorsRequest()
-    this.httpInterceptorsResponse()
-  }
-
-  // 通用请求函数
-  public request<T>(paramConfig: AxiosRequestConfig): Promise<T> {
-    const config = { ...Http.axiosConfigDefault, ...paramConfig }
-    return new Promise((resolve, reject) => {
-      Http.axiosInstance
-        .request(config)
-        .then((response: any) => {
-          resolve(response)
-        })
-        .catch((error) => {
-          reject(error)
-        })
-    })
-  }
-}
-
-const METHOD = {
-  GET: 'get',
-  POST: 'post',
-  PUT: 'put',
-  DELETE: 'delete',
-}
-/**
- * axios请求
- * @param url 请求地址
- * @param method {METHOD} http method
- * @param params 请求参数
- * @param config
- * @returns {Promise<AxiosResponse<T>>}
- */
-async function request(url, method, params, config) {
-  switch (method) {
-    case METHOD.GET:
-      return axios.get(url, { params, ...config })
-    case METHOD.POST:
-      return axios.post(url, params, config)
-    case METHOD.PUT:
-      return axios.put(url, params, config)
-    case METHOD.DELETE:
-      return axios.delete(url, { params, ...config })
-    default:
-      return axios.get(url, { params, ...config })
-  }
-}
-
-export const http = new Http(configDefault)
-export {
-  METHOD,
-  request,
-}
+import type { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios'
+import { ContentTypeEnum, ResultEnum } from '@af-mobile-client-vue3/enums/requestEnum'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
+import { ACCESS_TOKEN } from '@af-mobile-client-vue3/stores/mutation-type'
+import axios from 'axios'
+import { showToast } from 'vant'
+
+// 默认 axios 实例请求配置
+const configDefault = {
+  headers: {
+    'Content-Type': ContentTypeEnum.JSON,
+  },
+  // 请求超时时间
+  timeout: 20000,
+  // API 请求的默认前缀
+  baseURL: import.meta.env.VITE_APP_API_BASE_URL,
+  data: {},
+}
+
+class Http {
+  // 当前实例
+  private static axiosInstance: AxiosInstance
+  // 请求配置
+  private static axiosConfigDefault: AxiosRequestConfig
+
+  // 请求拦截
+  private httpInterceptorsRequest(): void {
+    Http.axiosInstance.interceptors.request.use(
+      (config) => {
+        // 发送请求前，可在此让每个请求携带自定义 token, 请根据实际情况修改
+        const savedToken = useUserStore().getToken()
+        // 如果 token 存在
+        if (savedToken)
+          config.headers[ACCESS_TOKEN] = savedToken
+        return config
+      },
+      (error: AxiosError) => {
+        showToast({
+          message: error.message,
+          position: 'bottom',
+        })
+        return Promise.reject(error)
+      },
+    )
+  }
+
+  // 响应拦截
+  private httpInterceptorsResponse(): void {
+    Http.axiosInstance.interceptors.response.use(
+      async (response: AxiosResponse) => {
+        const compatible = import.meta.env.VITE_APP_COMPATIBLE
+        if (compatible !== 'V4') {
+          return response.data
+        }
+        // 与后端协定的返回字段
+        const { code, msg, data } = response.data
+        // 临时向v3请求上传服务，因为没有code，未来会改
+        if (code === undefined) {
+          return response.data
+        }
+        // 判断请求是否成功
+        const isSuccess = code === ResultEnum.SUCCESS
+        if (isSuccess) {
+          // 兼容 V3 请求没有data的情况
+          if (data) {
+            return data
+          }
+          else {
+            return response.data
+          }
+        }
+        else {
+          if (code === 401) {
+            showToast({
+              message: '登录态已失效，请重新登录',
+              position: 'bottom',
+            })
+            await useUserStore().logout()
+          }
+          else {
+            showToast({
+              message: msg,
+              position: 'bottom',
+            })
+            console.error(`请求失败，返回结果：${msg}`)
+          }
+          return Promise.reject(response.data)
+        }
+      },
+      (error: AxiosError) => {
+        // 处理 HTTP 网络错误
+        let message: string = error.response?.data as string
+        if (!message) {
+          // HTTP 状态码
+          const status = error.response?.status
+          switch (status) {
+            case 400:
+              message = '请求错误'
+              break
+            case 401:
+              message = '登录态已失效，请重新登录'
+              // 401状态码处理：自动登出并跳转到登录页
+              useUserStore().logout()
+              break
+            case 403:
+              message = '拒绝访问'
+              break
+            case 404:
+              message = `请求地址出错: ${error.response?.config?.url}`
+              break
+            case 408:
+              message = '请求超时'
+              break
+            case 500:
+              message = '服务器内部错误'
+              break
+            case 501:
+              message = '服务未实现'
+              break
+            case 502:
+              message = '网关错误'
+              break
+            case 503:
+              message = '服务不可用'
+              break
+            case 504:
+              message = '网关超时'
+              break
+            case 505:
+              message = 'HTTP版本不受支持'
+              break
+            default:
+              message = '网络连接故障'
+          }
+        }
+        showToast({
+          message,
+          position: 'bottom',
+        })
+        return Promise.reject(error)
+      },
+    )
+  }
+
+  constructor(config: AxiosRequestConfig) {
+    Http.axiosConfigDefault = config
+    Http.axiosInstance = axios.create(config)
+    this.httpInterceptorsRequest()
+    this.httpInterceptorsResponse()
+  }
+
+  // 通用请求函数
+  public request<T>(paramConfig: AxiosRequestConfig): Promise<T> {
+    const config = { ...Http.axiosConfigDefault, ...paramConfig }
+    return new Promise((resolve, reject) => {
+      Http.axiosInstance
+        .request(config)
+        .then((response: any) => {
+          resolve(response)
+        })
+        .catch((error) => {
+          reject(error)
+        })
+    })
+  }
+}
+
+const METHOD = {
+  GET: 'get',
+  POST: 'post',
+  PUT: 'put',
+  DELETE: 'delete',
+}
+/**
+ * axios请求
+ * @param url 请求地址
+ * @param method {METHOD} http method
+ * @param params 请求参数
+ * @param config
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+async function request(url, method, params, config) {
+  switch (method) {
+    case METHOD.GET:
+      return axios.get(url, { params, ...config })
+    case METHOD.POST:
+      return axios.post(url, params, config)
+    case METHOD.PUT:
+      return axios.put(url, params, config)
+    case METHOD.DELETE:
+      return axios.delete(url, { params, ...config })
+    default:
+      return axios.get(url, { params, ...config })
+  }
+}
+
+export const http = new Http(configDefault)
+export {
+  METHOD,
+  request,
+}

package/src/utils/i18n.ts

@@ -1,72 +1,72 @@
-import type { PickerColumn } from 'vant'
-import { Locale } from 'vant'
-import enUS from 'vant/es/locale/lang/en-US'
-import zhCN from 'vant/es/locale/lang/zh-CN'
-import { computed } from 'vue'
-import { createI18n } from 'vue-i18n'
-
-const FALLBACK_LOCALE = 'zh-CN'
-
-const vantLocales = {
-  'zh-CN': zhCN,
-  'en-US': enUS,
-}
-
-export const languageColumns: PickerColumn = [
-  { text: '简体中文', value: 'zh-CN' },
-  { text: 'English', value: 'en-US' },
-]
-
-export const i18n = setupI18n()
-type I18n = typeof i18n
-
-export const locale = computed({
-  get() {
-    return i18n.global.locale.value
-  },
-  set(language: string) {
-    setLang(language, i18n)
-  },
-})
-
-function setupI18n() {
-  const locale = getI18nLocale()
-  const i18n = createI18n({
-    locale,
-    legacy: false,
-  })
-  setLang(locale, i18n)
-  return i18n
-}
-
-async function setLang(lang: string, i18n: I18n) {
-  await loadLocaleMsg(lang, i18n)
-
-  document.querySelector('html').setAttribute('lang', lang)
-  localStorage.setItem('language', lang)
-  i18n.global.locale.value = lang
-
-  // 设置 vant 组件语言包
-  Locale.use(lang, vantLocales[lang])
-}
-
-// 加载本地语言包
-async function loadLocaleMsg(locale: string, i18n: I18n) {
-  const messages = await import(`../locales/${locale}.json`)
-  i18n.global.setLocaleMessage(locale, messages.default)
-}
-
-// 获取当前语言对应的语言包名称
-function getI18nLocale() {
-  const storedLocale = localStorage.getItem('language') || navigator.language
-
-  const langs = languageColumns.map(v => v.value as string)
-
-  // 存在当前语言的语言包 或 存在当前语言的任意地区的语言包
-  const foundLocale = langs.find(v => v === storedLocale || v.indexOf(storedLocale) === 0)
-
-  // 若未找到，则使用 默认语言包
-  const locale = foundLocale || FALLBACK_LOCALE
-
-  return locale
-}
+import type { PickerColumn } from 'vant'
+import { Locale } from 'vant'
+import enUS from 'vant/es/locale/lang/en-US'
+import zhCN from 'vant/es/locale/lang/zh-CN'
+import { computed } from 'vue'
+import { createI18n } from 'vue-i18n'
+
+const FALLBACK_LOCALE = 'zh-CN'
+
+const vantLocales = {
+  'zh-CN': zhCN,
+  'en-US': enUS,
+}
+
+export const languageColumns: PickerColumn = [
+  { text: '简体中文', value: 'zh-CN' },
+  { text: 'English', value: 'en-US' },
+]
+
+export const i18n = setupI18n()
+type I18n = typeof i18n
+
+export const locale = computed({
+  get() {
+    return i18n.global.locale.value
+  },
+  set(language: string) {
+    setLang(language, i18n)
+  },
+})
+
+function setupI18n() {
+  const locale = getI18nLocale()
+  const i18n = createI18n({
+    locale,
+    legacy: false,
+  })
+  setLang(locale, i18n)
+  return i18n
+}
+
+async function setLang(lang: string, i18n: I18n) {
+  await loadLocaleMsg(lang, i18n)
+
+  document.querySelector('html').setAttribute('lang', lang)
+  localStorage.setItem('language', lang)
+  i18n.global.locale.value = lang
+
+  // 设置 vant 组件语言包
+  Locale.use(lang, vantLocales[lang])
+}
+
+// 加载本地语言包
+async function loadLocaleMsg(locale: string, i18n: I18n) {
+  const messages = await import(`../locales/${locale}.json`)
+  i18n.global.setLocaleMessage(locale, messages.default)
+}
+
+// 获取当前语言对应的语言包名称
+function getI18nLocale() {
+  const storedLocale = localStorage.getItem('language') || navigator.language
+
+  const langs = languageColumns.map(v => v.value as string)
+
+  // 存在当前语言的语言包 或 存在当前语言的任意地区的语言包
+  const foundLocale = langs.find(v => v === storedLocale || v.indexOf(storedLocale) === 0)
+
+  // 若未找到，则使用 默认语言包
+  const locale = foundLocale || FALLBACK_LOCALE
+
+  return locale
+}