Merge branch 'dev' into vite

# Conflicts: # examples/App.vue # examples/router/autoRoutes.js # examples/utils/index.js # package.json # packages/wechat/AppProjectActivities/components/Event.vue # project/dv/apps/AppHomesteadDV.vue # vue.config.js
2022-05-10 20:06:15 +08:00
parent d0e18eb2f6 036ee91533
commit e91d1f73dc
332 changed files with 710 additions and 8708 deletions
--- a/examples/views/appEntry.vue
+++ b/examples/views/appEntry.vue
@@ -28,6 +28,7 @@ export default {
  flex: 1;
  min-width: 0;
  min-height: 0;
+  height: 100%;

  & > * {
    height: 100%;