合并分支 '3.0' 到 'main'

3.0

查看合并请求 !15

.eslintrc.js

@@ -10,7 +10,12 @@ module.exports = {
             jsx: true,
         },
     },
-    extends: ['plugin:vue/vue3-recommended', 'plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended'],
+    extends: [
+        '@antfu',
+        'plugin:vue/vue3-recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:prettier/recommended',
+    ],
     rules: {
         'vue/script-setup-uses-vars': 'error',
         '@typescript-eslint/ban-ts-ignore': 'off',
@@ -62,5 +67,6 @@ module.exports = {
             },
         ],
         'vue/multi-word-component-names': 'off',
+        'no-console': 'off',
     },
 }

build/utils.ts

-import fs from 'fs'
-import path from 'path'
+import fs from 'node:fs'
+import path from 'node:path'
 import dotenv from 'dotenv'
 
 export function isDevFn(mode: string): boolean {
@@ -40,7 +40,7 @@ export function wrapperEnv(envConf: Recordable): ViteEnv {
  */
 function getConfFiles() {
     const script = process.env.npm_lifecycle_script
-    const reg = new RegExp('--mode ([a-z_\\d]+)')
+    const reg = /--mode ([a-z_\d]+)/
     const result = reg.exec(script as string) as any
     if (result) {
         const mode = result[1] as string

build/vite/imagemin.ts

@@ -6,6 +6,7 @@ import imagemin from 'unplugin-imagemin/vite'
 export function configImageminPlugin(): Plugin {
     return imagemin({
         // https://github.com/ErKeLost/unplugin-imagemin#warning
-        mode: 'sharp',
+        // mode: 'sharp',
+        cache: true,
     })
 }

build/vite/index.ts

 import type { Plugin } from 'vite'
 import colors from 'picocolors'
+import pkg from '../../package.json'
 import { configUniPlugin } from './uni'
 import { configImportPlugin } from './unplugin'
 import { configUnocssPlugin } from './unocss'
-import { configImageminPlugin } from './imagemin'
-
-import pkg from '../../package.json'
 
 export function createVitePlugins(viteEnv: ViteEnv) {
     const { VITE_GLOB_APP_NAME, VITE_GLOB_APP_DESCRIPTION, VITE_GLOB_API_URL, VITE_GLOB_API_URL_PREFIX } = viteEnv
@@ -29,7 +27,7 @@ export function createVitePlugins(viteEnv: ViteEnv) {
     vitePlugins.push(configImportPlugin())
 
     // unplugin-imagemin
-    vitePlugins.push(configImageminPlugin())
+    // vitePlugins.push(configImageminPlugin())
 
     // uni-app
     vitePlugins.push(configUniPlugin())

build/vite/unocss.ts

@@ -2,7 +2,17 @@ import type { Plugin } from 'vite'
 
 // https://github.com/antfu/unocss
 import Unocss from 'unocss/vite'
+import { presetIcons } from 'unocss'
 
 export function configUnocssPlugin(): Plugin[] {
-    return Unocss()
+    return Unocss({
+        presets: [
+            presetIcons({
+                prefix: 'icon-',
+                extraProperties: {
+                    display: 'inline-flex',
+                },
+            }),
+        ],
+    })
 }

build/vite/unplugin.ts

+import path from 'node:path'
 import type { Plugin } from 'vite'
-import path from 'path'
 
 // https://github.com/antfu/unplugin-auto-import
 import AutoImport from 'unplugin-auto-import/vite'
@@ -39,7 +39,7 @@ export function configComponentsImportPlugin(): Plugin {
             (name: string) => {
                 // FIX: 修复 easycom 在 APP 下不生效问题（原因不明
                 if (name.startsWith('fui-')) {
-                    return path.resolve(__dirname, `src/components/firstui/${name}/${name}.vue`).replaceAll('\\', '/')
+                    return path.resolve(__dirname, `src/components/FirstUI/${name}/${name}.vue`).replaceAll('\\', '/')
                 }
                 // if (name.startsWith('uni-')) {
                 //     return `@dcloudio/uni-ui/lib/${name}/${name}.vue`

package.json

 {
     "name": "basic-app",
-    "version": "3.0.2.3",
+    "version": "3.0.2.5",
     "description": "APP 基础工程",
     "keywords": [
         "app",
@@ -82,7 +82,6 @@
         "@dcloudio/uni-ui": "^1.4.26",
         "@vue/runtime-core": "^3.2.47",
         "@vueuse/core": "^9.13.0",
-        "animate.css": "^4.1.1",
         "axios": "^0.26.1",
         "dayjs": "^1.11.7",
         "lodash-es": "^4.17.21",
@@ -98,6 +97,7 @@
         "vue-types": "^5.0.2"
     },
     "devDependencies": {
+        "@antfu/eslint-config": "^0.37.0",
         "@commitlint/cli": "^17.4.4",
         "@commitlint/config-conventional": "^17.4.4",
         "@dcloudio/types": "^3.3.2",
@@ -106,6 +106,7 @@
         "@dcloudio/uni-helper-json": "^1.0.13",
         "@dcloudio/uni-stacktracey": "3.0.0-alpha-3070720230316001",
         "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3070720230316001",
+        "@iconify/json": "^2.2.36",
         "@types/lodash-es": "^4.17.7",
         "@types/mockjs": "^1.0.7",
         "@types/node": "^18.15.3",

src/App.vue

@@ -24,11 +24,11 @@
     })
 
     onError((err) => {
-        Message.toast('App Error: ' + err)
+        Message.toast(`App Error: ${err}`)
     })
 
     onUnhandledRejection((err) => {
-        Message.toast('App UnhandledRejection: ' + err)
+        Message.toast(`App UnhandledRejection: ${err}`)
     })
 </script>
 

src/common/message.ts

@@ -30,10 +30,10 @@ export const Message = {
         return new Promise((resolve, reject) => {
             // #ifndef APP-PLUS
             uni.showModal({
-                title: title,
+                title,
                 content: message,
                 showCancel: false,
-                confirmText: confirmText,
+                confirmText,
                 success: () => resolve(),
                 fail: (err) => reject(err),
             })
@@ -56,10 +56,10 @@ export const Message = {
         return new Promise((resolve, reject) => {
             // #ifndef APP-PLUS
             uni.showModal({
-                title: title,
+                title,
                 content: message,
-                showCancel: showCancel,
-                confirmText: confirmText,
+                showCancel,
+                confirmText,
                 success: (res) => resolve(res.confirm),
                 fail: (err) => reject(err),
             })

src/components/Empty/index.vue

-<template>
-    <view class="empty" :style="[{ background: bgColor }]">
-        <!-- 暂无数据/空数据 -->
-        <image src="../../static/images/empty.png" />
-        <!-- 提示内容 -->
-        <view class="empty-tips" :style="[{ color: tipsColor }]">{{ tips }}</view>
-    </view>
-</template>
 <script>
     export default {
         props: {
@@ -24,6 +16,16 @@
         },
     }
 </script>
+
+<template>
+    <view class="empty" :style="[{ background: bgColor }]">
+        <!-- 暂无数据/空数据 -->
+        <image src="../../static/images/empty.png" />
+        <!-- 提示内容 -->
+        <view class="empty-tips" :style="[{ color: tipsColor }]">{{ tips }}</view>
+    </view>
+</template>
+
 <style>
     .empty {
         width: 100%;

src/components/Icon/index.vue

+<script setup lang="ts">
+    const props = defineProps({
+        icon: {
+            type: String,
+            required: true,
+        },
+        size: {
+            type: [Number, String],
+            default: 32,
+        },
+        color: {
+            type: String,
+            default: '#000',
+        },
+    })
+
+    const size = computed(() => `${props.size}rpx`)
+    const color = computed(() => props.color)
+</script>
+
+<template>
+    <view class="icon" />
+</template>
+
+<style lang="less" scoped>
+    .icon {
+        width: v-bind(size);
+        height: v-bind(size);
+        color: v-bind(color);
+    }
+</style>

src/components/ThumbnailPreview/index.vue

 <script lang="ts" setup>
     import type { PropType } from 'vue'
     import { nanoid } from 'nanoid'
-    import { isImage, isVideo, getPoster } from './utils'
+    import { getPoster, isImage, isVideo } from './utils'
 
     type URLs = { url: string }[]
     const props = defineProps({

src/components/ThumbnailPreview/utils.ts

@@ -17,5 +17,5 @@ export function getPoster(url: string) {
         return url
     }
 
-    return url + '.jpg'
+    return `${url}.jpg`
 }

src/hooks/app/useI18n.ts

 import { i18n } from '/@/locales'
 
-type I18nGlobalTranslation = {
+interface I18nGlobalTranslation {
     (key: string): string
     (key: string, locale: string): string
     (key: string, locale: string, list: unknown[]): string
@@ -37,9 +37,13 @@ export function useI18n(namespace?: string): {
     const { t, ...methods } = i18n.global
 
     const tFn: I18nGlobalTranslation = (key: string, ...arg: any[]) => {
-        if (!key) return ''
-        if (!key.includes('.') && !namespace) return key
-        // @ts-ignore
+        if (!key) {
+            return ''
+        }
+        if (!key.includes('.') && !namespace) {
+            return key
+        }
+        // @ts-expect-error
         return t(getKey(namespace, key), ...(arg as I18nTranslationRestParameters))
     }
     return {

src/locales/index.ts

@@ -3,6 +3,7 @@ import type { I18n, I18nOptions } from 'vue-i18n'
 import { createI18n } from 'vue-i18n'
 import langs from './lang'
 
+// eslint-disable-next-line import/no-mutable-exports
 export let i18n: ReturnType<typeof createI18n>
 
 function createI18nOptions(): I18nOptions {

src/main.ts

@@ -6,7 +6,7 @@ import { setupAppConfig } from '/@/config/app'
 import { setupStore } from '/@/store'
 import { setupI18n } from '/@/locales'
 
-import fuiConfig from './components/firstui/fui-config'
+import fuiConfig from './components/FirstUI/fui-config'
 
 import 'uno.css'
 
@@ -22,8 +22,8 @@ export function createApp() {
     // 配置 i18n
     setupI18n(app)
 
-    //全局组件配置
-    // @ts-ignore
+    // 全局组件配置
+    // @ts-expect-error
     uni.$fui = fuiConfig
 
     return {

src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "Beta App",
     "appid" : "__UNI__2E9441A",
     "description" : "APP 基础工程",
-    "versionName" : "3.0.2.3",
-    "versionCode" : 109,
+    "versionName" : "3.0.2.5",
+    "versionCode" : 111,
     "transformPx" : false,
     "locale" : "zh-Hans",
     /* 5+App特有相关 */// 配置文件详细说明

src/pages.json

@@ -55,7 +55,7 @@
         "autoscan": true,
         "custom": {
             // https://doc.firstui.cn/docs/introduce.html
-            "^fui-(.*)": "@/components/firstui/fui-$1/fui-$1.vue",
+            "^fui-(.*)": "@/components/FirstUI/fui-$1/fui-$1.vue",
             // https://ext.dcloud.net.cn/plugin?id=55#detail
             "^uni-(.*)": "@dcloudio/uni-ui/lib/uni-$1/uni-$1.vue"
         }

src/pages/common/coding/coding.vue

+<script>
+    export default {
+        data() {
+            return {
+                resUrl: this.fui.resUrl(),
+            }
+        },
+        methods: {
+            goIndex() {
+                this.fui.href('/pages/tabbar/index/index', true)
+            },
+        },
+    }
+</script>
+
 <template>
     <view class="fui-wrap">
         <view class="fui-content__box">
@@ -23,21 +38,6 @@
     </view>
 </template>
 
-<script>
-    export default {
-        data() {
-            return {
-                resUrl: this.fui.resUrl(),
-            }
-        },
-        methods: {
-            goIndex() {
-                this.fui.href('/pages/tabbar/index/index', true)
-            },
-        },
-    }
-</script>
-
 <style>
     page {
         background-color: #fff;

src/pages/common/viewer/pdf.vue

@@ -7,7 +7,6 @@
     onLoad(({ uri }) => {
         link.value = getExtranetUrl(uri)
         name.value = URI(uri).filename()
-        console.log(uri, link.value, name.value)
 
         // 设置标题栏为文件名
         uni.setNavigationBarTitle({

src/pages/index/index.vue

@@ -36,19 +36,32 @@
 
     const animate = ref()
     const handUp = () => {
+        if (animate.value) {
+            return
+        }
+
         Message.toast('👋🏻')
-        animate.value = 'animate-iteration-infinite'
-        setTimeout(() => (animate.value = ''), 1000)
+        animate.value = 'animate-swing'
+        setTimeout(() => (animate.value = null), 1500)
     }
 </script>
 
 <template>
     <view class="content flex-center flex-col">
-        <fui-avatar src="/static/logo.png" radius="14" size="large" background="transparent" @click="surprise" />
-        <view class="flex flex-col justify-center mb-3">
+        <fui-avatar
+            src="/static/logo.png"
+            radius="14"
+            size="large"
+            background="transparent"
+            class="!mb-5"
+            @click="surprise"
+        />
+        <view class="flex-center flex-col mb-5">
             <text class="title">{{ title }}</text>
             <text class="title">{{ $t('app.hello') }}</text>
-            <uni-icons type="hand-up" size="30" :class="['mt-5', 'animate-heart-beat', animate]" @click="handUp" />
+            <Icon icon="emojione:grinning-face" size="48" class="mt-3" />
+
+            <uni-icons type="hand-up" size="30" class="mt-3" :class="[animate]" @click="handUp" />
         </view>
         <fui-footer isFixed>
             <template #text>

src/uni_modules/uni-config-center/changelog.md

+## 0.0.3（2022-11-11）
+- 修复 config 方法获取根节点为数组格式配置时错误的转化为了对象的Bug
+## 0.0.2（2021-04-16）
+- 修改插件package信息
+## 0.0.1（2021-03-15）
+- 初始化项目

src/uni_modules/uni-config-center/package.json

+{
+  "displayName": "uni-config-center",
+  "version": "0.0.3",
+  "description": "uniCloud 配置中心",
+  "keywords": [
+    "配置",
+    "配置中心"
+  ],
+  "repository": "",
+  "directories": {
+    "example": "../../../scripts/dist"
+  },
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "",
+    "type": "unicloud-template-function"
+  },
+  "id": "uni-config-center",
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "u",
+          "Android Browser": "u",
+          "微信浏览器(Android)": "u",
+          "QQ浏览器(Android)": "u"
+        },
+        "H5-pc": {
+          "Chrome": "u",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "u"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+          "vue2": "y",
+          "vue3": "u"
+        }
+      }
+    }
+  }
+}

src/uni_modules/uni-config-center/readme.md

+# 为什么使用uni-config-center
+
+实际开发中很多插件需要配置文件才可以正常运行，如果每个插件都单独进行配置的话就会产生下面这样的目录结构
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  ├─index.js
+        │  ├─config.json // plugin-a对应的配置文件
+        │  └─other-file.cert  // plugin-a依赖的其他文件
+        └─plugin-b // plugin-b对应的目录
+           ├─index.js
+           └─config.json // plugin-b对应的配置文件
+```
+
+假设插件作者要发布一个项目模板，里面使用了很多需要配置的插件，无论是作者发布还是用户使用都是一个大麻烦。
+
+uni-config-center就是用了统一管理这些配置文件的，使用uni-config-center后的目录结构如下
+
+```bash
+cloudfunctions
+└─────common 公共模块
+        ├─plugin-a // 插件A对应的目录
+        │  └─index.js
+        ├─plugin-b // plugin-b对应的目录
+        │  └─index.js
+        └─uni-config-center
+           ├─index.js // config-center入口文件
+           ├─plugin-a
+           │  ├─config.json  // plugin-a对应的配置文件
+           │  └─other-file.cert  // plugin-a依赖的其他文件
+           └─plugin-b
+              └─config.json  // plugin-b对应的配置文件
+```
+
+使用uni-config-center后的优势
+
+- 配置文件统一管理，分离插件主体和配置信息，更新插件更方便
+- 支持对config.json设置schema，插件使用者在HBuilderX内编写config.json文件时会有更好的提示（后续HBuilderX会提供支持）
+
+# 用法
+
+在要使用uni-config-center的公共模块或云函数内引入uni-config-center依赖，请参考：[使用公共模块](https://uniapp.dcloud.net.cn/uniCloud/cf-common)
+
+```js
+const createConfig = require('uni-config-center')
+
+const uniIdConfig = createConfig({
+    pluginId: 'uni-id', // 插件id
+    defaultConfig: { // 默认配置
+        tokenExpiresIn: 7200,
+        tokenExpiresThreshold: 600,
+    },
+    customMerge: function(defaultConfig, userConfig) { // 自定义默认配置和用户配置的合并规则，不设置的情况侠会对默认配置和用户配置进行深度合并
+        // defaudltConfig 默认配置
+        // userConfig 用户配置
+        return Object.assign(defaultConfig, userConfig)
+    }
+})
+
+
+// 以如下配置为例
+// {
+//   "tokenExpiresIn": 7200,
+//   "passwordErrorLimit": 6,
+//   "bindTokenToDevice": false,
+//   "passwordErrorRetryTime": 3600,
+//   "app-plus": {
+//     "tokenExpiresIn": 2592000
+//   },
+//   "service": {
+//     "sms": {
+//       "codeExpiresIn": 300
+//     }
+//   }
+// }
+
+// 获取配置
+uniIdConfig.config() // 获取全部配置，注意：uni-config-center内不存在对应插件目录时会返回空对象
+uniIdConfig.config('tokenExpiresIn') // 指定键值获取配置，返回：7200
+uniIdConfig.config('service.sms.codeExpiresIn') // 指定键值获取配置，返回：300
+uniIdConfig.config('tokenExpiresThreshold', 600) // 指定键值获取配置，如果不存在则取传入的默认值，返回：600
+
+// 获取文件绝对路径
+uniIdConfig.resolve('custom-token.js') // 获取uni-config-center/uni-id/custom-token.js文件的路径
+
+// 引用文件（require）
+uniIDConfig.requireFile('custom-token.js') // 使用require方式引用uni-config-center/uni-id/custom-token.js文件。文件不存在时返回undefined，文件内有其他错误导致require失败时会抛出错误。
+
+// 判断是否包含某文件
+uniIDConfig.hasFile('custom-token.js') // 配置目录是否包含某文件，true: 文件存在，false: 文件不存在
+```
\ No newline at end of file

src/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json

+{
+  "name": "uni-config-center",
+  "version": "0.0.3",
+  "description": "配置中心",
+  "keywords": [],
+  "license": "Apache-2.0",
+  "author": "DCloud",
+  "main": "index.js"
+}
\ No newline at end of file

src/uni_modules/uni-id-common/changelog.md

+## 1.0.14（2023-03-07）
+- 修复 admin用户包含其他角色时未包含在token的Bug
+## 1.0.13（2022-07-21）
+- 修复 创建token时未传角色权限信息生成的token不正确的bug
+## 1.0.12（2022-07-15）
+- 提升与旧版本uni-id的兼容性（补充读取配置文件时回退平台app-plus、h5），但是仍推荐使用新平台名进行配置（app、web）
+## 1.0.11（2022-07-14）
+- 修复 部分情况下报`read property 'reduce' of undefined`的错误
+## 1.0.10（2022-07-11）
+- 将token存储在用户表的token字段内，与旧版本uni-id保持一致
+## 1.0.9（2022-07-01）
+- checkToken兼容token内未缓存角色权限的情况，此时将查库获取角色权限
+## 1.0.8（2022-07-01）
+- 修复clientDB默认依赖时部分情况下获取不到uni-id配置的Bug
+## 1.0.7（2022-06-30）
+- 修复config文件不合法时未抛出具体错误的Bug
+## 1.0.6（2022-06-28）
+- 移除插件内的数据表schema
+## 1.0.5（2022-06-27）
+- 修复使用多应用配置时报`Cannot read property 'appId' of undefined`的Bug
+## 1.0.4（2022-06-27）
+- 修复使用自定义token内容功能报错的Bug [详情](https://ask.dcloud.net.cn/question/147945)
+## 1.0.2（2022-06-23）
+- 对齐旧版本uni-id默认配置
+## 1.0.1（2022-06-22）
+- 补充对uni-config-center的依赖
+## 1.0.0（2022-06-21）
+- 提供uni-id token创建、校验、刷新接口，简化旧版uni-id公共模块

src/uni_modules/uni-id-common/package.json

+{
+	"displayName": "uni-id-common",
+	"version": "1.0.14",
+	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
+	"keywords": [
+		"uni-id-common",
+		"uniCloud",
+		"token",
+		"权限"
+	],
+	"repository": "https://gitcode.net/dcloud/uni-id-common",
+	"engines": {
+		"HBuilderX": "^3.1.0"
+	},
+	"dcloudext": {
+		"sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+		"npmurl": "",
+		"type": "unicloud-template-function"
+	},
+	"id": "uni-id-common",
+	"uni_modules": {
+		"dependencies": [
+			"uni-config-center"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"Vue": {
+					"vue2": "u",
+					"vue3": "u"
+				},
+				"App": {
+					"app-vue": "u",
+					"app-nvue": "u"
+				},
+				"H5-mobile": {
+					"Safari": "u",
+					"Android Browser": "u",
+					"微信浏览器(Android)": "u",
+					"QQ浏览器(Android)": "u"
+				},
+				"H5-pc": {
+					"Chrome": "u",
+					"IE": "u",
+					"Edge": "u",
+					"Firefox": "u",
+					"Safari": "u"
+				},
+				"小程序": {
+					"微信": "u",
+					"阿里": "u",
+					"百度": "u",
+					"字节跳动": "u",
+					"QQ": "u",
+					"钉钉": "u",
+					"快手": "u",
+					"飞书": "u",
+					"京东": "u"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+				}
+			}
+		}
+	}
+}

src/uni_modules/uni-id-common/readme.md

+# uni-id-common
+
+文档请参考：[uni-id-common](https://uniapp.dcloud.net.cn/uniCloud/uni-id-common.html)
\ No newline at end of file

src/uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json

+{
+  "name": "uni-id-common",
+  "version": "1.0.14",
+  "description": "uni-id token生成、校验、刷新",
+  "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/dcloud/uni-id-common.git"
+  },
+  "license": "Apache-2.0",
+  "author": "DCloud",
+  "main": "index.js",
+  "dependencies": {
+    "uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center"
+  }
+}
\ No newline at end of file

src/utils/http/axios/Axios.ts

-import type { AxiosRequestConfig, AxiosInstance, AxiosResponse, AxiosPromise, AxiosError } from 'axios'
+import type { AxiosError, AxiosInstance, AxiosPromise, AxiosRequestConfig, AxiosResponse } from 'axios'
 import type { RequestOptions, Result, UploadFileParams } from '/#/axios'
 import type { CreateAxiosOptions } from './axiosTransform'
 import axios from 'axios'
@@ -7,8 +7,7 @@ import qs from 'qs'
 import { AxiosCanceler } from './axiosCancel'
 import { isFunction } from '/@/utils/is'
 import { cloneDeep } from 'lodash-es'
-import { ContentTypeEnum } from '/@/enums/httpEnum'
-import { RequestEnum } from '/@/enums/httpEnum'
+import { ContentTypeEnum, RequestEnum } from '/@/enums/httpEnum'
 
 /**
  * 覆盖实现，使用 uni.request 实现网络请求
@@ -35,7 +34,7 @@ axios.defaults.adapter = function (config: CreateAxiosOptions): AxiosPromise<any
                 })
             },
             fail: (response) => {
-                // @ts-ignore
+                // @ts-expect-error
                 const { errMsg, statusCode } = response
                 const error = createError(errMsg, config, statusCode, request, {
                     config,
@@ -117,7 +116,7 @@ export class VAxios {
         // Request interceptor configuration processing
         this.axiosInstance.interceptors.request.use((config: AxiosRequestConfig) => {
             // If cancel repeat request is turned on, then cancel repeat request is prohibited
-            // @ts-ignore
+            // @ts-expect-error
             const { ignoreCancelToken } = config.requestOptions
             const ignoreCancel =
                 ignoreCancelToken !== undefined ? ignoreCancelToken : this.options.requestOptions?.ignoreCancelToken
@@ -147,7 +146,7 @@ export class VAxios {
         responseInterceptorsCatch &&
             isFunction(responseInterceptorsCatch) &&
             this.axiosInstance.interceptors.response.use(undefined, (error) => {
-                // @ts-ignore
+                // @ts-expect-error
                 responseInterceptorsCatch(this.axiosInstance, error)
             })
     }
@@ -191,7 +190,6 @@ export class VAxios {
                     data: formData,
                     headers: {
                         'Content-Type': ContentTypeEnum.FORM_DATA,
-                        // @ts-ignore
                         ignoreCancelToken: true,
                     },
                 })

src/utils/http/axios/axiosRetry.ts

-import { AxiosError, AxiosInstance } from 'axios'
+import type { AxiosError, AxiosInstance } from 'axios'
 /**
  *  请求重试机制
  */
@@ -9,15 +9,15 @@ export class AxiosRetry {
      */
     retry(AxiosInstance: AxiosInstance, error: AxiosError) {
         const { config } = error.response
-        // @ts-ignore
+        // @ts-expect-error
         const { waitTime, count } = config?.requestOptions?.retryRequest
-        // @ts-ignore
+        // @ts-expect-error
         config.__retryCount = config.__retryCount || 0
-        // @ts-ignore
+        // @ts-expect-error
         if (config.__retryCount >= count) {
             return Promise.reject(error)
         }
-        // @ts-ignore
+        // @ts-expect-error
         config.__retryCount += 1
         return this.delay(waitTime).then(() => AxiosInstance(config))
     }

src/utils/http/axios/index.ts

@@ -10,11 +10,11 @@ import { checkStatus } from './checkStatus'
 import { useGlobSetting } from '/@/hooks/setting'
 import { useI18n } from '/@/hooks/app/useI18n'
 import { useMessage } from '/@/hooks/app/useMessage'
-import { RequestEnum, ContentTypeEnum } from '/@/enums/httpEnum'
+import { ContentTypeEnum, RequestEnum } from '/@/enums/httpEnum'
 import { isString } from '/@/utils/is'
-import { getToken, clearAuthCache } from '/@/utils/auth'
-import { setObjToUrlParams, deepMerge } from '/@/utils'
-import { joinTimestamp, formatRequestDate } from './helper'
+import { clearAuthCache, getToken } from '/@/utils/auth'
+import { deepMerge, setObjToUrlParams } from '/@/utils'
+import { formatRequestDate, joinTimestamp } from './helper'
 import { AxiosRetry } from '/@/utils/http/axios/axiosRetry'
 import * as HTTP from '/@/api/types'
 import { API_URL, API_URL_PREFIX } from '/@/utils/net'
@@ -112,7 +112,7 @@ const transform: AxiosTransform = {
                 config.params = Object.assign(params || {}, joinTimestamp(joinTime, false))
             } else {
                 // 兼容restful风格
-                config.url = config.url + params + `${joinTimestamp(joinTime, true)}`
+                config.url = `${config.url + params}${joinTimestamp(joinTime, true)}`
                 config.params = undefined
             }
         } else {
@@ -172,7 +172,7 @@ const transform: AxiosTransform = {
         let errMessage = ''
 
         try {
-            if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
+            if (code === 'ECONNABORTED' && message.includes('timeout')) {
                 errMessage = t('sys.api.apiTimeoutMessage')
             }
             if (err?.includes('Network Error')) {
@@ -198,7 +198,7 @@ const transform: AxiosTransform = {
         const { isOpenRetry } = config.requestOptions.retryRequest
         config.method?.toUpperCase() === RequestEnum.GET &&
             isOpenRetry &&
-            // @ts-ignore
+            // @ts-expect-error
             retryRequest.retry(axiosInstance, error)
         return Promise.reject(error)
     },
@@ -238,7 +238,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
                     // 接口地址
                     apiUrl: globSetting.apiUrl,
                     // 接口拼接地址
-                    urlPrefix: urlPrefix,
+                    urlPrefix,
                     //  是否加入时间戳
                     joinTime: true,
                     // 忽略重复请求

src/utils/index.ts

@@ -25,7 +25,7 @@ export function getPopupContainer(node?: HTMLElement): HTMLElement {
 export function setObjToUrlParams(baseUrl: string, obj: any): string {
     let parameters = ''
     for (const key in obj) {
-        parameters += key + '=' + encodeURIComponent(obj[key]) + '&'
+        parameters += `${key}=${encodeURIComponent(obj[key])}&`
     }
     parameters = parameters.replace(/&$/, '')
     return /\?$/.test(baseUrl) ? baseUrl + parameters : baseUrl.replace(/\/?$/, '?') + parameters
@@ -43,7 +43,7 @@ export function deepMerge<T = any>(src: any = {}, target: any = {}): T {
 export function getDynamicProps<T, U>(props: T): Partial<U> {
     const ret: Recordable = {}
 
-    Object.keys(props).map((key) => {
+    Object.keys(props).forEach((key) => {
         ret[key] = unref((props as Recordable)[key])
     })
 

src/utils/net.ts

+/* eslint-disable import/no-mutable-exports */
 import { useGlobSetting } from '/@/hooks/setting'
 
 const globSetting = useGlobSetting()

src/utils/push/index.ts

@@ -2,7 +2,7 @@ export function setBadge(number = 0) {
     // #ifdef APP-PLUS
     // 清除消息角标
     plus.runtime.setBadgeNumber(number)
-    if (plus.os.name.toLowerCase() == 'ios') {
+    if (plus.os.name.toLowerCase() === 'ios') {
         // 导入个推原生类
         const GeTuiSdk = plus.ios.importClass('GeTuiSdk')
         GeTuiSdk?.setBadge(number)

src/utils/stomp/index.ts

-import type { Client, Message, Frame } from 'stompjs'
+import type { Client, Frame, Message } from 'stompjs'
 import Stomp from './uni-stomp'
 import UniWebSocket from './uni-websocket'
 import { getToken } from '/@/utils/auth'
@@ -156,7 +156,7 @@ class StompInstance {
 
         // 订阅状态置false
         Object.keys(this.subscribes).forEach((key) => {
-            this.subscribes[key]['subscribed'] = false
+            this.subscribes[key].subscribed = false
         })
 
         // 连接
@@ -191,16 +191,15 @@ class StompInstance {
      * @param {Function} callback 回调
      */
     subscribe(destination: string, callback: (message: Message) => any) {
-        if (this.subscribes[destination] && this.subscribes[destination]['subscribed']) {
+        if (this.subscribes[destination] && this.subscribes[destination].subscribed) {
             // 已订阅
-            return
         } else if (this.client && this.client.connected) {
             // 已连接：调用订阅，缓存订阅信息
             const subscribe = this.client.subscribe(destination, (res) => callback(res))
-            this.subscribes[destination] = { callback: callback, subscribed: true, subscribe: subscribe }
+            this.subscribes[destination] = { callback, subscribed: true, subscribe }
         } else {
             // 未连接：缓存订阅信息
-            this.subscribes[destination] = { callback: callback, subscribed: false }
+            this.subscribes[destination] = { callback, subscribed: false }
         }
     }
 

src/utils/stomp/uni-stomp.js

+/* eslint-disable eslint-comments/no-unlimited-disable */
 /* eslint-disable */
 // @ts-nocheck
 

src/utils/stomp/uni-websocket.ts

@@ -129,7 +129,7 @@ class UniWebSocket {
      */
     send(data: string | ArrayBuffer) {
         this.ws.send({
-            data: data,
+            data,
         })
     }
 

unocss.config.ts

 import { defineConfig } from 'unocss'
 import presetWeapp from 'unocss-preset-weapp'
-import { transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer'
+import { defaultAttributes, transformerAttributify, transformerClass } from 'unocss-preset-weapp/transformer'
+
+const transformRules = {
+    ':': '-',
+    '.': '_dl_',
+    '/': '_sl_',
+    '%': '_pes_',
+    '!': '_el_',
+    '#': '_wn_',
+    '(': '_lbl_',
+    ')': '_lbr_',
+    '[': '_lfl_',
+    ']': '_lfr_',
+    $: '_do_',
+    ',': '_lco_',
+    '=': '_eqe_',
+}
 
 export default defineConfig({
     presets: [
@@ -20,9 +36,14 @@ export default defineConfig({
     ],
     transformers: [
         // https://github.com/MellowCo/unocss-preset-weapp/tree/main/src/transformer/transformerAttributify
-        transformerAttributify(),
+        transformerAttributify({
+            attributes: [...defaultAttributes, 'icon'],
+            transformRules,
+        }),
 
         // https://github.com/MellowCo/unocss-preset-weapp/tree/main/src/transformer/transformerClass
-        transformerClass(),
+        transformerClass({
+            transformRules,
+        }),
     ],
 })

vite.config.ts

@@ -4,7 +4,7 @@ import type { ConfigEnv, UserConfig } from 'vite'
 import dayjs from 'dayjs'
 import pkg from './package.json'
 import { createVitePlugins } from './build/vite'
-import { getRootPath, wrapperEnv, isDevFn } from './build/utils'
+import { getRootPath, isDevFn, wrapperEnv } from './build/utils'
 
 // https://vitejs.dev/config/
 export default ({ mode }: ConfigEnv): UserConfig => {
@@ -17,12 +17,12 @@ export default ({ mode }: ConfigEnv): UserConfig => {
                 // /@xxxx => src/xxxx
                 {
                     find: /\/?@\//,
-                    replacement: getRootPath('./src') + '/',
+                    replacement: `${getRootPath('./src')}/`,
                 },
                 // /#xxxx => types/xxxx
                 {
                     find: /\/#\//,
-                    replacement: getRootPath('./types') + '/',
+                    replacement: `${getRootPath('./types')}/`,
                 },
             ],
         },
@@ -32,7 +32,7 @@ export default ({ mode }: ConfigEnv): UserConfig => {
         },
         build: {
             target: 'es2015',
-            sourcemap: isDevFn(mode) ? true : false,
+            sourcemap: !!isDevFn(mode),
             rollupOptions: {
                 output: {
                     inlineDynamicImports: false,