@gx-design-vue/create-gx-cli 0.1.14 → 0.1.16

package/template-mobile-vant-cli/src/utils/request/XHR.ts

@@ -1,14 +1,11 @@
 import type { AxiosError } from 'axios'
+import type { GAxiosInstance, GAxiosOptions, GAxiosResponse } from './typings'
+import { isFunction } from '@gx-design-vue/pro-utils'
 import axios from 'axios'
 import { cloneDeep } from 'lodash-es'
 import qs from 'qs'
-import { isFunction } from '@gx-design-vue/pro-utils'
-import type { GAxiosInstance, GAxiosOptions, GAxiosResponse } from './typings'
-import { ContentTypeEnum, RequestEnum } from './typings'
 import { AxiosCanceler } from './axiosCancel'
-
-export const getPendingUrl = (config: GAxiosOptions) => config.cancelKey || [ config.method, config.url ].join(
-  '&')
+import { ContentTypeEnum, RequestEnum } from './typings'
 
 /**
  * @Author      gx12358
@@ -99,8 +96,8 @@ export class GAxios {
     }
   }
 
-  request<T = ResponseResult | boolean>(config: GAxiosOptions): Promise<T> {
-    let conf: GAxiosOptions = cloneDeep(config)
+  request<T = ResponseResult | boolean>(config?: GAxiosOptions): Promise<T> {
+    let conf = cloneDeep(config || {} as GAxiosOptions)
 
     const opt: GAxiosOptions = Object.assign({}, this.options, conf)
 
@@ -117,10 +114,11 @@ export class GAxios {
         .then((res: GAxiosResponse) => {
           if (transformResponseHook && isFunction(transformResponseHook)) {
             try {
-              const ret = transformResponseHook(res, config)
+              const ret = transformResponseHook(res, config || {})
               resolve(ret)
-            } catch (err) {
-              resolve(false as any)
+            } catch (error) {
+              console.error('request-error', error)
+              resolve(false as unknown as Promise<T>)
               return
             }
             return

package/template-mobile-vant-cli/src/utils/request/axiosCancel.ts

@@ -1,7 +1,7 @@
 import type { Canceler } from 'axios'
-import axios from 'axios'
-import { isFunction } from '@gx-design-vue/pro-utils'
 import type { GAxiosOptions } from './typings'
+import { isFunction } from '@gx-design-vue/pro-utils'
+import axios from 'axios'
 
 export const getPendingUrl = (
   config: GAxiosOptions,
@@ -15,12 +15,12 @@ export class AxiosCanceler {
   constructor(ignoreCancel?: boolean) {
     this.pendingMap = new Map<string, Canceler>()
 
-    this.ignoreCancelToken = ignoreCancel
+    this.ignoreCancelToken = !!ignoreCancel
   }
 
   /**
    * Add request
-   * @param {Object} config
+   * @param {object} config
    */
   addPending(config: GAxiosOptions) {
     !this.ignoreCancelToken && this.removePending(config)
@@ -46,7 +46,7 @@ export class AxiosCanceler {
 
   /**
    * Removal request
-   * @param {Object} config
+   * @param {object} config
    */
   removePending(config: GAxiosOptions, key?: string) {
     const url = getPendingUrl(config, key)

package/template-mobile-vant-cli/src/utils/request/checkStatus.ts

@@ -1,9 +1,25 @@
+import { router } from '@/router'
+import { useStoreUser } from '@/store'
+import { showToast } from 'vant'
+
 /**
  * @author gx12358 2539306317@qq.com
  * @description 处理code异常
  * @param {*} code
  * @param {*} msg
  */
-export const handleCode = (_code: number, _msg: string) => {
-  // 这里处理不同状态
+export const handleCode = (code: number, msg: string) => {
+  const user = useStoreUser()
+  switch (code) {
+    case 401:
+      user.resetPermissions()
+      router.push({ path: '/user/login' })
+      break
+    default:
+      showToast({
+        type: 'fail',
+        message: msg || '后端接口异常'
+      })
+      break
+  }
 }

package/template-mobile-vant-cli/src/utils/request/index.ts

@@ -1,16 +1,18 @@
-import { showFailToast } from 'vant'
-import settings from '@/settings'
-import { useStoreGlobal } from '@/store'
-import { isDev } from '@/utils/env'
+import type { GAxiosOptions, XhtInstance } from './typings'
+import { useStoreUser } from '@/store'
+import { isDev, typeViteEnv } from '@/utils/env'
 import { tansParams } from '@/utils/util'
 import { checkURL } from '@/utils/validate'
+import { defaultSettings, network } from '@gx-config'
 import { isBoolean } from '@gx-design-vue/pro-utils'
-import { GAxios } from './XHR'
-import type { GAxiosOptions, XhtInstance } from './typings'
-import { RequestEnum } from './typings'
+import { showToast } from 'vant'
 import { handleCode } from './checkStatus'
+import { RequestEnum } from './typings'
+import { GAxios } from './XHR'
 
-const { requestPrefix, successCode, requestTimeout, tokenName, contentType } = settings
+const { token, mock } = defaultSettings
+
+const { requestTimeout, successCode } = network
 
 const xhtInstance: XhtInstance = {
   /**
@@ -34,7 +36,7 @@ const xhtInstance: XhtInstance = {
       throw new Error('请求出错，请稍候重试')
     }
     //  这里 code，result，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
-    const { code, msg = '', message = '' } = data
+    const { code, message = '' } = data
 
     const codeVerificationArray = successCode
 
@@ -46,7 +48,7 @@ const xhtInstance: XhtInstance = {
 
     // 在此处根据自己项目的实际情况对不同的code执行不同的操作
     // 如果不希望中断当前请求，请return数据，否则直接抛出异常即可
-    handleCode(code, message || msg)
+    handleCode(code, message)
 
     return Promise.resolve(false)
   },
@@ -62,11 +64,10 @@ const xhtInstance: XhtInstance = {
     }
 
     if (!checkURL(config.url)) {
-      if (config.isMock) {
-        config.url = `/mock-server${config.url}`
-      } else {
-        config.url = `${import.meta.env.VITE_BASE_URL}${isDev ? requestPrefix || '' : ''}${config.url}`
-      }
+      const isMock = isBoolean(typeViteEnv('VITE_IS_MOCK')) ? typeViteEnv('VITE_IS_MOCK') : config.isMock
+      const prefix = isDev() && !isMock ? typeViteEnv('VITE_PROXY_PREFIX') : ''
+      const baseUrl = isMock ? mock.prefix : typeViteEnv('VITE_BASE_URL')
+      config.url = `${prefix}${baseUrl}${config.url}`
     }
 
     return config
@@ -76,10 +77,18 @@ const xhtInstance: XhtInstance = {
    * @description: 请求拦截器处理
    */
   requestInterceptors: (config) => {
-    const global = useStoreGlobal()
+    const { name } = token
+    const user = useStoreUser()
     const carryToken = isBoolean(config.carryToken) ? config.carryToken : true
-    if (global.token && carryToken)
-      config.headers[tokenName] = global.token
+    if (user.accessToken && carryToken) {
+      if (config.headers) {
+        config.headers[name] = user.accessToken
+      } else {
+        config.headers = {
+          [name]: user.accessToken
+        }
+      }
+    }
     return config
   },
 
@@ -93,11 +102,11 @@ const xhtInstance: XhtInstance = {
   /**
    * @description: 响应错误处理
    */
-  responseInterceptorsCatch: (error: any) => {
+  responseInterceptorsCatch: (_, error) => {
     const { response } = error
     let errorMessage = error.message || ''
     if (error.response && error.response.data) {
-      const { status } = response
+      const { status = 404 } = response || {}
       handleCode(status, errorMessage)
       return Promise.resolve(false)
     } else {
@@ -111,7 +120,10 @@ const xhtInstance: XhtInstance = {
         const code = errorMessage.substr(errorMessage.length - 3)
         errorMessage = '后端接口' + code || '' + '异常'
       }
-      showFailToast({ message: errorMessage || '服务器出错！' })
+      showToast({
+        type: 'fail',
+        message: errorMessage || '后端接口未知异常'
+      })
       return Promise.resolve(false)
     }
   },
@@ -126,7 +138,7 @@ function createXhr(opt?: Partial<GAxiosOptions>) {
     method: 'get',
     timeout: requestTimeout,
     headers: {
-      'Content-Type': contentType
+      'Content-Type': 'application/json;charset=UTF-8'
     },
     // 忽略重复请求
     ignoreCancelToken: true,
@@ -137,6 +149,7 @@ function createXhr(opt?: Partial<GAxiosOptions>) {
   })
 }
 
-const request: <T = any, R = undefined>(opt?: GAxiosOptions) => Promise<ResponseResult<T, R>> = opt => createXhr().request(opt)
+const request: <T = any, R = undefined>(opt?: GAxiosOptions) => Promise<ResponseResult<T, R>> = opt => createXhr()
+  .request(opt)
 
 export default request

package/template-mobile-vant-cli/src/utils/storage.ts

@@ -1,10 +1,7 @@
+import { isJSONStr, isNumber, isObject, isString } from '@gx-design-vue/pro-utils'
 import dayjs from 'dayjs'
-import { isPro, typeViteEnv } from '@/utils/env'
-import { Decrypt, Encrypt } from '@/utils/crypto'
-import { isJSONStr } from '@/utils/validate'
-import { isObject } from '@gx-design-vue/pro-utils'
-
-export type StorageKey = 'localStorage' | 'sessionStorage' | 'cookie'
+import { Decrypt, Encrypt } from './crypto'
+import { isPro, typeViteEnv } from './env'
 
 function isEncryption(status: boolean) {
   return isPro() ? status : false
@@ -37,27 +34,37 @@ export function getStorageKey(key: string, originKey?: boolean) {
  */
 export function getStorage({
   key,
-  encryption = true,
-  type = 'localStorage',
-  originKey
-}: { key: string, encryption?: boolean, type?: StorageKey, originKey?: boolean }) {
-  const storageValue = type === 'localStorage'
-    ? localStorage.getItem(getStorageKey(key, originKey)) : type === 'sessionStorage'
-      ? sessionStorage.getItem(getStorageKey(key, originKey))
-      : getCookie(
-        getStorageKey(key, originKey))
+  originKey,
+  type = 'local',
+  encryption = true
+}: {
+  key: string;
+  encryption?: boolean;
+  type?: 'local' | 'cookie' | 'session';
+  originKey?: boolean;
+}) {
+  const storageValue = type === 'local'
+    ? localStorage.getItem(getStorageKey(key, originKey))
+    : type === 'session' ? sessionStorage.getItem(getStorageKey(key, originKey)) : getCookie(
+      getStorageKey(
+        key,
+        originKey
+      ))
   const result: string | LocalResult = storageValue
-    ? isEncryption(encryption) ? Decrypt(storageValue) : handleStorageValue(storageValue) : ''
+    ? isEncryption(encryption) ? Decrypt(storageValue) : handleStorageValue(storageValue)
+    : ''
   if (result && isObject(result)) {
     if (result.expired) {
       const expiredStatus = dayjs().diff(dayjs(result.time)) >= result.expired
       if (expiredStatus) {
-        removeStorage(key, type)
+        removeStorage({ key, originKey, type })
         return ''
       }
     }
+  } else if (result && isString(result)) {
+    return isJSONStr(result) ? JSON.parse(result) : result
   }
-  return result?.['value'] || result || ''
+  return typeof result === 'string' ? result : result?.['value'] || result || ''
 }
 
 /**
@@ -71,26 +78,27 @@ export function setStorage({
   value,
   expired,
   originKey,
-  encryption = true,
-  type = 'local'
+  type = 'local',
+  encryption = true
 }: {
   key: string;
   value: any;
   originKey?: boolean;
   expired?: number;
   encryption?: boolean;
-  type?: string;
+  type?: 'local' | 'cookie' | 'session';
 }) {
   const result: LocalResult = originKey ? value : {
     value,
     time: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     expired: expired || 0
   }
-  const storageValue = isEncryption(encryption) ? Encrypt(JSON.stringify(result)) : JSON.stringify(
-    result)
-  if (type === 'local')
-    localStorage.setItem(getStorageKey(key, originKey), storageValue)
-  sessionStorage.setItem(getStorageKey(key, originKey), storageValue)
+  const storageValue = isEncryption(encryption)
+    ? Encrypt(JSON.stringify(result))
+    : isString(result) || isNumber(result) ? result : JSON.stringify(result)
+  if (type === 'local') localStorage.setItem(getStorageKey(key, originKey), storageValue)
+  else if (type === 'cookie') setCookie(getStorageKey(key, originKey), storageValue)
+  else sessionStorage.setItem(getStorageKey(key, originKey), storageValue)
 }
 
 /**
@@ -99,10 +107,18 @@ export function setStorage({
  * @lastTime    2019/12/3
  * @description 删除Storage
  */
-export function removeStorage(key: string, type = 'local', originKey?: boolean) {
-  if (type === 'local')
-    localStorage.removeItem(getStorageKey(key, originKey))
-  sessionStorage.removeItem(getStorageKey(key, originKey))
+export function removeStorage({
+  key,
+  originKey,
+  type = 'local'
+}: {
+  key: string;
+  originKey?: boolean;
+  type?: 'local' | 'cookie' | 'session';
+}) {
+  if (type === 'local') localStorage.removeItem(getStorageKey(key, originKey))
+  else if (type === 'cookie') delCookie(getStorageKey(key, originKey))
+  else sessionStorage.removeItem(getStorageKey(key, originKey))
 }
 
 /**
@@ -135,10 +151,11 @@ function getCookies(cname: string) {
  */
 function GetCookieDomain() {
   let host = location.hostname
-  const ip = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+  const ip = /^(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
   if (ip.test(host) === true || host === 'localhost')
     return host
-  const regex = /([^]*).*/
+  // eslint-disable-next-line regexp/optimal-quantifier-concatenation
+  const regex = /([\s\S]*).*/
   const match = host.match(regex)
   if (typeof match !== 'undefined' && match !== null) {
     const someIndex = 1

package/template-mobile-vant-cli/src/utils/validate.ts

@@ -5,7 +5,7 @@
  * @returns {boolean}
  */
 export function isExternal(path) {
-  return /^(https?:|mailto:|tel:)/.test(path)
+  return /^(?:https?:|mailto:|tel:)/.test(path)
 }
 
 /**
@@ -15,7 +15,7 @@ export function isExternal(path) {
  * @returns {boolean}
  */
 export function isName(value) {
-  const reg = /^[\u4e00-\u9fa5a-zA-Z0-9]+$/
+  const reg = /^[\u4e00-\u9fa5a-z0-9]+$/i
   return reg.test(value)
 }
 
@@ -26,7 +26,7 @@ export function isName(value) {
  * @returns {boolean}
  */
 export function isIP(ip) {
-  const reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+  const reg = /^(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
   return reg.test(ip)
 }
 
@@ -37,7 +37,7 @@ export function isIP(ip) {
  * @returns {boolean}
  */
 export function isUrl(url) {
-  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+  const reg = /^(?:https?|ftp):\/\/(?:[a-zA-Z0-9.-]+(?::[a-zA-Z0-9.&%$-]+)*@)*(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d?)(?:\.(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]?\d)){3}|(?:[a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(?:com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(?::\d+)*(?:\/(?:$|[\w.,?'\\+&%$#=~-]+))*$/
   return reg.test(url)
 }
 
@@ -70,7 +70,7 @@ export function isUpperCase(value) {
  * @returns {boolean}
  */
 export function isAlphabets(value) {
-  const reg = /^[A-Za-z]+$/
+  const reg = /^[A-Z]+$/i
   return reg.test(value)
 }
 
@@ -81,7 +81,7 @@ export function isAlphabets(value) {
  * @returns {boolean}
  */
 export function isPort(value) {
-  const reg = /^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/
+  const reg = /^(?:\d|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/
   return reg.test(value)
 }
 
@@ -91,6 +91,14 @@ export function isPort(value) {
  * @param value
  * @returns {boolean}
  */
+export function isPhone(
+  value: string,
+  backReg?: false,
+): boolean
+export function isPhone(
+  value: string,
+  backReg?: true,
+): RegExp
 export function isPhone(value = '', backReg?: boolean) {
   const reg = /^1\d{10}$/
   return backReg ? reg : reg.test(value)
@@ -103,7 +111,7 @@ export function isPhone(value = '', backReg?: boolean) {
  * @returns {boolean}
  */
 export function isIdCard(value) {
-  const reg = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+  const reg = /^[1-9]\d{5}(?:18|19|[23]\d)\d{2}(?:0[1-9]|10|11|12)(?:[0-2][1-9]|10|20|30|31)\d{3}[0-9X]$/i
   return reg.test(value)
 }
 
@@ -113,6 +121,14 @@ export function isIdCard(value) {
  * @param value
  * @returns {boolean}
  */
+export function isEmail(
+  value: string,
+  backReg?: false,
+): boolean
+export function isEmail(
+  value: string,
+  backReg?: true,
+): RegExp
 export function isEmail(value = '', backReg?: boolean) {
   const reg = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
   return backReg ? reg : reg.test(value)
@@ -147,7 +163,7 @@ export function isBlank(value) {
  * @returns {boolean}
  */
 export function isTel(value) {
-  const reg = /^(400|800)([0-9\\-]{7,10})|(([0-9]{4}|[0-9]{3})([- ])?)?([0-9]{7,8})(([- 转])*([0-9]{1,4}))?$/
+  const reg = /^(?:400|800)[0-9\\-]{7,10}|(?:(?:\d{4}|\d{3})[- ]?)?\d{7,8}(?:[- 转]*\d{1,4})?$/
   return reg.test(value)
 }
 
@@ -158,7 +174,7 @@ export function isTel(value) {
  * @returns {boolean}
  */
 export function isLongitude(value) {
-  const reg = /^[-|+]?(0?\d{1,2}\.\d{1,5}|1[0-7]?\d{1}\.\d{1,5}|180\.0{1,5})$/
+  const reg = /^[-|+]?(?:0?\d{1,2}\.\d{1,5}|1[0-7]?\d\.\d{1,5}|180\.0{1,5})$/
   return reg.test(value)
 }
 
@@ -169,7 +185,7 @@ export function isLongitude(value) {
  * @returns {boolean}
  */
 export function isLatitude(value) {
-  const reg = /^[-|+]?([0-8]?\d{1}\.\d{1,5}|90\.0{1,5})$/
+  const reg = /^[-|+]?(?:[0-8]?\d\.\d{1,5}|90\.0{1,5})$/
   return reg.test(value)
 }
 
@@ -180,37 +196,16 @@ export function isLatitude(value) {
  * @returns {boolean}
  */
 export function isRTSP(value) {
-  const reg = /^rtsp:\/\/([a-z]{0,10}:.{0,10}@)?(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
-  const reg1 = /^rtsp:\/\/([a-z]{0,10}:.{0,10}@)?(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5]):[0-9]{1,5}/
-  const reg2 = /^rtsp:\/\/([a-z]{0,10}:.{0,10}@)?(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\//
+  const reg = /^rtsp:\/\/(?:[a-z]{0,10}:.{0,10}@)?(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+  const reg1 = /^rtsp:\/\/(?:[a-z]{0,10}:.{0,10}@)?(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5]):\d{1,5}/
+  const reg2 = /^rtsp:\/\/(?:[a-z]{0,10}:.{0,10}@)?(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\//
   return reg.test(value) || reg1.test(value) || reg2.test(value)
 }
 
-/**
- * @Author      gaoxiang
- * @DateTime    2020/11/4
- * @lastTime    2020/11/4
- * @description 判断是否是JSON字符串
- */
-export function isJSONStr(str: any) {
-  if (typeof str === 'string') {
-    try {
-      const obj = JSON.parse(str)
-      if (typeof obj === 'object' && obj) {
-        return true
-      } else {
-        return false
-      }
-    } catch (e) {
-      return false
-    }
-  }
-  return false
-}
-
 export function checkURL(URL) {
   const str = URL
-  const Expression = /http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/
+  // eslint-disable-next-line regexp/strict
+  const Expression = /https?:\/\/(?:[\w-]+\.)+[\w-]+(?:\/[\w- ./?%&=]*)?/
   const objExp = new RegExp(Expression)
   return objExp.test(str)
 }

package/template-mobile-vant-cli/tsconfig.json

@@ -3,25 +3,32 @@
     "target": "ESNext",
     "module": "ESNext",
     "moduleResolution": "Node",
-    "forceConsistentCasingInFileNames": true,
-    "allowSyntheticDefaultImports": true,
-    "strictFunctionTypes": false,
     "jsx": "preserve",
+    "jsxImportSource": "vue",
     "baseUrl": "./",
+    "strict": true,
     "allowJs": true,
     "sourceMap": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "experimentalDecorators": true,
     "lib": ["DOM", "ESNext"],
-    "types": ["vite/client"],
+    "types": ["vite/client", "unplugin-turbo-console/client"],
+    "noImplicitAny": false,
     "skipLibCheck": true,
+    "strictFunctionTypes": false,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
     "paths": {
       "@/*": ["src/*"],
+      "@gx-mock": ["mock/index.ts"],
+      "@gx-mock/*": ["mock/*"],
+      "@gx-config": ["config/index.ts"],
+      "@gx-vuex": ["src/store/index.ts"],
       "@gx-mobile/hooks/*": ["src/hooks/*"],
-      "@gx-vuex": ["src/store/index.ts"]
+      "@gx-admin/vite-config/*": ["internal/vite-config/*"],
     }
   },
   "include": [
@@ -33,10 +40,11 @@
     "src/**/*.vue",
     "types/*.d.ts",
     "types/*.ts",
-    "build/**/*.ts",
-    "build/**/*.d.ts",
+    "internal/**/*.ts",
+    "internal/**/*.d.ts",
+    "mock/*.ts",
     "mock/**/*.ts",
     "vite.config.ts"
   ],
-  "exclude": ["node_modules", "tests/server/**/*.ts", "dist", "**/*.js", ".history"]
+  "exclude": ["node_modules", "dist", "**/*.js"]
 }

package/template-mobile-vant-cli/types/auto-imports.d.ts

@@ -1,4 +1,9 @@
-// Generated by 'unplugin-auto-import'
+/* eslint-disable */
+/* prettier-ignore */
+// @ts-nocheck
+// noinspection JSUnusedGlobalSymbols
+// Generated by unplugin-auto-import
+// biome-ignore lint: disable
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
@@ -33,12 +38,12 @@ declare global {
   const onServerPrefetch: typeof import('vue')['onServerPrefetch']
   const onUnmounted: typeof import('vue')['onUnmounted']
   const onUpdated: typeof import('vue')['onUpdated']
+  const onWatcherCleanup: typeof import('vue')['onWatcherCleanup']
   const provide: typeof import('vue')['provide']
   const reactive: typeof import('vue')['reactive']
   const readonly: typeof import('vue')['readonly']
   const ref: typeof import('vue')['ref']
   const resolveComponent: typeof import('vue')['resolveComponent']
-  const resolveDirective: typeof import('vue')['resolveDirective']
   const setupStore: typeof import('../src/store/index')['setupStore']
   const shallowReactive: typeof import('vue')['shallowReactive']
   const shallowReadonly: typeof import('vue')['shallowReadonly']
@@ -46,19 +51,30 @@ declare global {
   const toRaw: typeof import('vue')['toRaw']
   const toRef: typeof import('vue')['toRef']
   const toRefs: typeof import('vue')['toRefs']
+  const toValue: typeof import('vue')['toValue']
   const triggerRef: typeof import('vue')['triggerRef']
   const unref: typeof import('vue')['unref']
   const useAttrs: typeof import('vue')['useAttrs']
   const useCssModule: typeof import('vue')['useCssModule']
   const useCssVars: typeof import('vue')['useCssVars']
+  const useId: typeof import('vue')['useId']
   const useLink: typeof import('vue-router')['useLink']
+  const useModel: typeof import('vue')['useModel']
   const useRoute: typeof import('vue-router')['useRoute']
   const useRouter: typeof import('vue-router')['useRouter']
   const useSlots: typeof import('vue')['useSlots']
   const useStore: typeof import('../src/store/index')['useStore']
   const useStoreGlobal: typeof import('../src/store/index')['useStoreGlobal']
+  const useStoreUser: typeof import('../src/store/index')['useStoreUser']
+  const useTemplateRef: typeof import('vue')['useTemplateRef']
   const watch: typeof import('vue')['watch']
   const watchEffect: typeof import('vue')['watchEffect']
   const watchPostEffect: typeof import('vue')['watchPostEffect']
   const watchSyncEffect: typeof import('vue')['watchSyncEffect']
 }
+// for type re-export
+declare global {
+  // @ts-ignore
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  import('vue')
+}

package/template-mobile-vant-cli/types/components.d.ts

@@ -1,12 +1,7 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
-// Read more: https://github.com/vuejs/vue-next/pull/3399
-import '@vue/runtime-core'
-
-export {}
+import PageContainer from '@/components/PageContainer'
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    GProPageContainer: typeof import('./../src/components/PageContainer')['default']
+    GPageContainer: typeof PageContainer
   }
 }