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

3.x

查看合并请求 !41

package.json

@@ -66,26 +66,26 @@
         }
     },
     "dependencies": {
-        "@dcloudio/uni-app": "3.0.0-3080320230526001",
-        "@dcloudio/uni-app-plus": "3.0.0-3080320230526001",
-        "@dcloudio/uni-components": "3.0.0-3080320230526001",
-        "@dcloudio/uni-h5": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-alipay": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-baidu": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-jd": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-kuaishou": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-lark": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-qq": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-toutiao": "3.0.0-3080320230526001",
-        "@dcloudio/uni-mp-weixin": "3.0.0-3080320230526001",
-        "@dcloudio/uni-quickapp-webview": "3.0.0-3080320230526001",
+        "@dcloudio/uni-app": "3.0.0-3080420230531001",
+        "@dcloudio/uni-app-plus": "3.0.0-3080420230531001",
+        "@dcloudio/uni-components": "3.0.0-3080420230531001",
+        "@dcloudio/uni-h5": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-alipay": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-baidu": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-jd": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-kuaishou": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-lark": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-qq": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-toutiao": "3.0.0-3080420230531001",
+        "@dcloudio/uni-mp-weixin": "3.0.0-3080420230531001",
+        "@dcloudio/uni-quickapp-webview": "3.0.0-3080420230531001",
         "@dcloudio/uni-ui": "^1.4.27",
         "@faker-js/faker": "^8.0.2",
         "@vue/runtime-core": "~3.2.47",
         "@vueuse/core": "^10.1.2",
         "axios": "^1.4.0",
         "crypto-js": "^4.1.1",
-        "dayjs": "^1.11.7",
+        "dayjs": "^1.11.8",
         "lodash-es": "^4.17.21",
         "nanoid": "^4.0.2",
         "pinia": "~2.0.36",
@@ -94,37 +94,37 @@
         "urijs": "^1.19.11",
         "vue": "~3.2.47",
         "vue-i18n": "^9.2.2",
-        "vue-request": "2.0.0-rc.4",
+        "vue-request": "^2.0.2",
         "vue-types": "^5.0.3"
     },
     "devDependencies": {
-        "@antfu/eslint-config": "^0.39.3",
-        "@commitlint/cli": "^17.6.3",
-        "@commitlint/config-conventional": "^17.6.3",
+        "@antfu/eslint-config": "^0.39.5",
+        "@commitlint/cli": "^17.6.5",
+        "@commitlint/config-conventional": "^17.6.5",
         "@dcloudio/types": "^3.3.3",
-        "@dcloudio/uni-automator": "3.0.0-3080320230526001",
-        "@dcloudio/uni-cli-shared": "3.0.0-3080320230526001",
+        "@dcloudio/uni-automator": "3.0.0-3080420230531001",
+        "@dcloudio/uni-cli-shared": "3.0.0-3080420230531001",
         "@dcloudio/uni-helper-json": "^1.0.13",
-        "@dcloudio/uni-stacktracey": "3.0.0-3080320230526001",
-        "@dcloudio/vite-plugin-uni": "3.0.0-3080320230526001",
-        "@iconify/json": "^2.2.71",
+        "@dcloudio/uni-stacktracey": "3.0.0-3080420230531001",
+        "@dcloudio/vite-plugin-uni": "3.0.0-3080420230531001",
+        "@iconify/json": "^2.2.75",
         "@types/crypto-js": "^4.1.1",
         "@types/lodash-es": "^4.17.7",
         "@types/node": "^18.16.16",
-        "@types/prettier": "^2.7.2",
+        "@types/prettier": "^2.7.3",
         "@types/qs": "^6.9.7",
         "@types/stompjs": "^2.3.5",
         "@types/urijs": "^1.19.19",
-        "@typescript-eslint/eslint-plugin": "^5.59.8",
-        "@typescript-eslint/parser": "^5.59.8",
+        "@typescript-eslint/eslint-plugin": "^5.59.9",
+        "@typescript-eslint/parser": "^5.59.9",
         "commitizen": "^4.3.0",
         "conventional-changelog-cli": "^2.2.2",
         "cz-conventional-changelog": "^3.3.0",
         "cz-customizable": "^7.0.0",
         "cz-git": "^1.6.1",
         "czg": "^1.6.1",
-        "dotenv": "^16.0.3",
-        "eslint": "^8.41.0",
+        "dotenv": "^16.1.4",
+        "eslint": "^8.42.0",
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "eslint-plugin-vue": "^9.14.1",
@@ -141,17 +141,17 @@
         "postcss-less": "^6.0.0",
         "prettier": "^2.8.8",
         "rimraf": "^5.0.1",
-        "sass": "^1.62.1",
+        "sass": "^1.63.2",
         "sort-package-json": "^2.4.1",
-        "stylelint": "^15.6.2",
+        "stylelint": "^15.7.0",
         "stylelint-config-html": "^1.1.0",
         "stylelint-config-recommended": "^12.0.0",
         "stylelint-config-standard": "^33.0.0",
         "stylelint-order": "^6.0.3",
-        "typescript": "^5.0.4",
-        "unocss": "^0.52.4",
+        "typescript": "^5.1.3",
+        "unocss": "^0.52.7",
         "unocss-preset-weapp": "^0.52.1",
-        "unplugin-auto-import": "^0.16.2",
+        "unplugin-auto-import": "^0.16.4",
         "unplugin-vue-components": "^0.24.1",
         "vite": "^4.3.9",
         "vue-eslint-parser": "^9.3.0"

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

@@ -103,6 +103,21 @@
 		watch: {
 			open(val) {
 				this.isOpen = val
+			},
+			isOpen(val) {
+				this.$nextTick(async () => {
+					let parent = this.$parent;
+					let parentName = parent.$options.name;
+					while (parentName !== 'PageBody') {
+						if (parentName === 'fui-collapse-item') {
+							await parent.init()
+						}
+
+						parent = parent.$parent;
+						if (!parent) return false;
+						parentName = parent.$options.name;
+					}
+				})
 			}
 		},
 		updated(e) {

src/enums/cacheEnum.ts

@@ -12,19 +12,6 @@ export const ROLES_KEY = 'ROLES__KEY__'
 // project config key
 export const PROJ_CFG_KEY = 'PROJ__CFG__KEY__'
 
-// lock info
-export const LOCK_INFO_KEY = 'LOCK__INFO__KEY__'
-
-export const MULTIPLE_TABS_KEY = 'MULTIPLE_TABS__KEY__'
-
-export const APP_DARK_MODE_KEY_ = '__APP__DARK__MODE__'
-
-// base global local key
-export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__'
-
-// base global session key
-export const APP_SESSION_CACHE_KEY = 'COMMON__SESSION__KEY__'
-
 export enum CacheTypeEnum {
     SESSION,
     LOCAL,