Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

src/layout/components/TagsView/src/TagsView.vue

@@ -623,6 +623,12 @@ $prefix-cls: #{$namespace}-tags-view;
         }
         }
       }
       }
     }
     }
+
+    &__item--immerse:not(.is-active) {
+      &:hover {
+        color: var(--el-color-white);
+      }
+    }
   }
   }
 }
 }
 </style>
 </style>

src/views/report/goview/index.vue

 <template>
 <template>
-  <ContentWrap>
   <doc-alert title="大屏设计器" url="https://doc.iocoder.cn/report/screen/" />
   <doc-alert title="大屏设计器" url="https://doc.iocoder.cn/report/screen/" />
 
 
   <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
   <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
     <IFrame :src="src" />
     <IFrame :src="src" />
   </ContentWrap>
   </ContentWrap>
-  </ContentWrap>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
 defineOptions({ name: 'GoView' })
 defineOptions({ name: 'GoView' })

src/views/report/jmreport/index.vue

 <template>
 <template>
-  <ContentWrap>
   <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" />
   <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" />
 
 
   <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
   <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
     <IFrame :src="src" />
     <IFrame :src="src" />
   </ContentWrap>
   </ContentWrap>
-  </ContentWrap>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { getAccessToken } from '@/utils/auth'
 import { getAccessToken } from '@/utils/auth'