Merge branch 'master' of gitee.com:youlaiorg/vue3-element-admin

# Conflicts:
#	.env.development
#	pnpm-lock.yaml
#	src/composables/index.ts
#	src/utils/request.ts
#	types/env.d.ts
#	vite.config.ts

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "4.8.4",
+  "version": "4.9.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -48,7 +48,10 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.2",
+    "@form-create/designer": "3.5.0",
+    "@form-create/element-ui": "3.3.3",
     "@vueuse/core": "^14.4.0",
+    "@vxe-ui/plugin-export-xlsx": "^4.5.4",
     "@wangeditor-next/editor": "^5.7.16",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "apk-meta-parser": "^0.2.3",
@@ -56,6 +59,7 @@
     "spark-md5": "^3.0.2",
     "animate.css": "^4.1.1",
     "axios": "^1.19.0",
+    "bpmn-js": "^18.27.0",
     "codemirror": "^5.65.21",
     "codemirror-editor-vue3": "^2.8.0",
     "echarts": "^6.1.0",
@@ -73,7 +77,9 @@
     "vue-draggable-plus": "^0.6.1",
     "vue-i18n": "^11.4.8",
     "vue-router": "^5.2.0",
-    "vxe-table": "~4.6.25"
+    "vxe-pc-ui": "^4.18.9",
+    "vxe-table": "^4.21.10",
+    "xe-utils": "^4.0.13"
   },
   "devDependencies": {
     "@commitlint/cli": "^21.2.1",