合并分支 '3.x' 到 'main'

3.x

查看合并请求 !30

build/getConfigFileName.ts

@@ -2,6 +2,6 @@
  * Get the configuration file variable name
  * @param env
  */
-export const getConfigFileName = (env: Record<string, any>) => {
+export function getConfigFileName(env: Record<string, any>) {
     return `__PRODUCTION__${env.VITE_GLOB_APP_SHORT_NAME || '__APP'}__CONF__`.toUpperCase().replace(/\s/g, '')
 }

build/vite/uni.ts

@@ -4,6 +4,7 @@ import prettier from 'prettier'
 
 // uni-app
 import uni from '@dcloudio/vite-plugin-uni'
+
 // @dcloudio/uni-helper-json
 import tags from '@dcloudio/uni-helper-json/dist/tags.json'
 
@@ -33,6 +34,7 @@ function generateUniComponentsTypes() {
 
     const formatted = prettier.format(content, {
         parser: 'typescript',
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         ...require('../../prettier.config'),
     })
     fs.writeFileSync('./types/uni.d.ts', formatted, 'utf8')

build/vite/unplugin.ts

@@ -3,6 +3,7 @@ import type { Plugin } from 'vite'
 
 // https://github.com/antfu/unplugin-auto-import
 import AutoImport from 'unplugin-auto-import/vite'
+
 // https://github.com/antfu/unplugin-vue-components
 import Components from 'unplugin-vue-components/vite'
 

package.json

@@ -79,16 +79,16 @@
         "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3071320230417001",
         "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3071320230417001",
         "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3071320230417001",
-        "@dcloudio/uni-ui": "^1.4.26",
+        "@dcloudio/uni-ui": "^1.4.27",
         "@faker-js/faker": "^7.6.0",
         "@vue/runtime-core": "^3.2.47",
-        "@vueuse/core": "^10.0.2",
+        "@vueuse/core": "^10.1.0",
         "axios": "^0.26.1",
         "crypto-js": "^4.1.1",
         "dayjs": "^1.11.7",
         "lodash-es": "^4.17.21",
         "nanoid": "^4.0.2",
-        "pinia": "^2.0.34",
+        "pinia": "^2.0.35",
         "qs": "~6.9.7",
         "stompjs": "^2.3.3",
         "urijs": "^1.19.11",
@@ -107,16 +107,16 @@
         "@dcloudio/uni-helper-json": "^1.0.13",
         "@dcloudio/uni-stacktracey": "3.0.0-alpha-3071320230417001",
         "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3071320230417001",
-        "@iconify/json": "^2.2.52",
+        "@iconify/json": "^2.2.55",
         "@types/crypto-js": "^4.1.1",
         "@types/lodash-es": "^4.17.7",
-        "@types/node": "^18.15.12",
+        "@types/node": "^18.16.0",
         "@types/prettier": "^2.7.2",
         "@types/qs": "^6.9.7",
         "@types/stompjs": "^2.3.5",
         "@types/urijs": "^1.19.19",
-        "@typescript-eslint/eslint-plugin": "^5.59.0",
-        "@typescript-eslint/parser": "^5.59.0",
+        "@typescript-eslint/eslint-plugin": "^5.59.1",
+        "@typescript-eslint/parser": "^5.59.1",
         "commitizen": "^4.3.0",
         "conventional-changelog-cli": "^2.2.2",
         "cz-conventional-changelog": "^3.3.0",
@@ -124,7 +124,7 @@
         "cz-git": "^1.6.1",
         "czg": "^1.6.1",
         "dotenv": "^16.0.3",
-        "eslint": "^8.38.0",
+        "eslint": "^8.39.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-vue": "^9.11.0",
@@ -139,21 +139,21 @@
         "postcss": "^8.4.23",
         "postcss-html": "^1.5.0",
         "postcss-less": "^6.0.0",
-        "prettier": "^2.8.7",
-        "rimraf": "^4.4.1",
+        "prettier": "^2.8.8",
+        "rimraf": "^5.0.0",
         "sass": "^1.62.0",
         "sort-package-json": "^2.4.1",
-        "stylelint": "^15.5.0",
+        "stylelint": "^15.6.0",
         "stylelint-config-html": "^1.1.0",
-        "stylelint-config-recommended": "^11.0.0",
-        "stylelint-config-standard": "^32.0.0",
+        "stylelint-config-recommended": "^12.0.0",
+        "stylelint-config-standard": "^33.0.0",
         "stylelint-order": "^6.0.3",
         "typescript": "^5.0.4",
         "unocss": "^0.50.8",
         "unocss-preset-weapp": "^0.5.3",
         "unplugin-auto-import": "^0.15.3",
         "unplugin-vue-components": "^0.24.1",
-        "vite": "^4.2.2",
+        "vite": "^4.3.1",
         "vue-eslint-parser": "^9.1.1"
     },
     "engines": {

pont-template.ts

@@ -8,6 +8,7 @@ const API_URL_PREFIX = '/api'
 
 export default class BasicGenerator extends CodeGenerator {
     checkJsonParam(inter: Interface, paramsCode: string): boolean {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         const prettier = require('prettier')
         const requestParams = inter.getRequestParams(this.surrounding)
         const code = prettier.format(paramsCode, { parser: 'typescript' })
@@ -29,6 +30,7 @@ export default class BasicGenerator extends CodeGenerator {
         let requestParams = inter.getRequestParams(this.surrounding)
         let bodyTypeDef = ''
 
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
         const prettier = require('prettier')
         if (prettier.format(paramsCode, { parser: 'typescript' }).includes('{}')) {
             if (!requestParams.includes('form')) {

src/App.vue

 <script setup lang="ts">
     import { checkUpgrade } from '@/utils/upgrade'
+
     // import * as Push from '@/utils/push'
 
     onLaunch(() => {

src/components/Empty/index.vue

-<script>
-    export default {
-        props: {
-            tips: {
-                type: String,
-                default: '',
-            },
-            tipsColor: {
-                type: String,
-                default: '#9C9C9C',
-            },
-            bgColor: {
-                type: String,
-                default: 'transparent',
-            },
+<script setup lang="ts">
+    defineProps({
+        /**
+         * 提示内容
+         */
+        tips: {
+            type: String,
+            default: '',
         },
-    }
+        /**
+         * 提示内容颜色
+         */
+        tipsColor: {
+            type: String,
+            default: '#9C9C9C',
+        },
+        /**
+         * 背景颜色
+         */
+        bgColor: {
+            type: String,
+            default: 'transparent',
+        },
+    })
 </script>
 
 <template>

src/components/firstui/fui-alert/fui-alert.vue

@@ -122,6 +122,9 @@
 				default: false
 			}
 		},
+        data() {
+            return {}
+        },
 		methods: {
 			getColor(type) {
 				const color = "#465CFF"

src/components/firstui/fui-collapse-item/fui-collapse-item.vue

@@ -112,7 +112,7 @@
 						if (parentName === 'fui-collapse-item') {
 							await parent.init()
 						}
-						
+
 						parent = parent.$parent;
 						if (!parent) return false;
 						parentName = parent.$options.name;

src/components/firstui/fui-collapse/fui-collapse.vue

@@ -14,6 +14,9 @@
 				default: false
 			}
 		},
+        data() {
+            return {}
+        },
 		created() {
 			this.children = []
 		},

src/components/firstui/fui-divider/fui-divider.vue

@@ -54,6 +54,9 @@
 				default: '#F1F4FA'
 			}
 		},
+        data() {
+            return {}
+        },
 		computed: {
 			getTop() {
 				return Number(this.height) / 2 + 'rpx'

src/components/firstui/fui-empty/fui-empty.vue

@@ -67,7 +67,10 @@
 				type: [Number, String],
 				default: 0
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-form-field/fui-form-field.vue

@@ -17,7 +17,10 @@
 				type: Boolean,
 				default: false
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-index-list/f-index-list-item.vue

@@ -74,6 +74,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		methods: {
 			onClick() {
 				this.$emit("itemClick", {

src/components/firstui/fui-label/fui-label.vue

@@ -34,6 +34,9 @@
 				default: false
 			}
 		},
+        data() {
+            return {}
+        },
 		created() {
 			this.childrens = [];
 		},

src/components/firstui/fui-list-cell/fui-list-cell.vue

@@ -114,6 +114,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		methods: {
 			handleClick() {
 				this.$emit('click', {

src/components/firstui/fui-list/fui-list.vue

@@ -119,7 +119,10 @@
 				type: [Number, String],
 				default: 0
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-load-ani/fui-load-ani.vue

@@ -62,7 +62,10 @@
 				type: Boolean,
 				default: false
 			}
-		}
+		},
+        data() {
+            return {}
+        },
 	}
 </script>
 

src/components/firstui/fui-overflow-hidden/fui-overflow-hidden.vue

@@ -84,6 +84,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		computed: {
 			getGradientBgColor() {
 				// #ifdef APP-NVUE

src/components/firstui/fui-swipe-action/fui-swipe-action.vue

@@ -113,6 +113,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		// #ifndef VUE3
 		beforeDestroy() {
 			if (this.__beforeUnmount) return

src/components/firstui/fui-text/fui-text.vue

@@ -110,6 +110,9 @@
 				default: ''
 			}
 		},
+        data() {
+            return {}
+        },
 		computed: {
 			getSize() {
 				const size = (uni.$fui && uni.$fui.fuiText && uni.$fui.fuiText.size) || 32

src/components/firstui/fui-timeaxis/fui-timeaxis.vue

@@ -37,6 +37,9 @@
 				// #endif
 			}
 		},
+        data() {
+            return {}
+        },
 		provide() {
 			return {
 				timeaxis: this

src/components/firstui/fui-vtabs-content/fui-vtabs-content.vue

@@ -17,6 +17,9 @@
 				default: 0
 			}
 		},
+        data() {
+            return {}
+        },
 		mounted() {
 			if (this.vtabs && this.vtabs.linkage) {
 				this.vtabs.children.push(this)

src/pages/index/index.vue

@@ -53,15 +53,17 @@
             radius="14"
             size="large"
             background="transparent"
-            class="!mb-5"
+            class="!mb-3"
             @click="surprise"
         />
-        <view class="flex-center flex-col mb-5">
+        <view class="flex-center flex-col mb-3">
             <text class="title">{{ title }}</text>
             <text class="title">{{ $t('app.hello') }}</text>
             <Icon icon="emojione:grinning-face" size="48" class="mt-3" />
 
-            <uni-icons type="hand-up" size="30" class="mt-3" :class="[animate]" @click="handUp" />
+            <fui-divider />
+
+            <uni-icons type="hand-up" size="30" :class="[animate]" @click="handUp" />
         </view>
         <fui-footer isFixed>
             <template #text>

src/utils/http/axios/axiosRetry.ts

 import type { AxiosError, AxiosInstance } from 'axios'
+
 /**
  *  请求重试机制
  */

src/utils/upgrade/index.ts

 // #ifdef APP-PLUS
 import checkVersion from '@/uni_modules/uni-upgrade-center-app/utils/check-update'
+
 // #endif
 
 export function checkUpgrade(toast = false) {