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

YunaiV · YunaiV · commit 18880c71dbbd · 2024-09-02T22:31:00.000+08:00
diff --git a/src/layout/components/TagsView/src/TagsView.vue b/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>
diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue
@@ -1,10 +1,8 @@
 <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">
-      <IFrame :src="src" />
-    </ContentWrap>
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
+    <IFrame :src="src" />
   </ContentWrap>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue
@@ -1,10 +1,8 @@
 <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">
-      <IFrame :src="src" />
-    </ContentWrap>
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
+    <IFrame :src="src" />
   </ContentWrap>
 </template>
 <script lang="ts" setup>

Original file line number	Diff line number	Diff line change
`@@ -623,6 +623,12 @@ $prefix-cls: #{$namespace}-tags-view;`
`623`	`623`	`}`
`624`	`624`	`}`
`625`	`625`	`}`
	`626`	`+`
	`627`	`+ &__item--immerse:not(.is-active) {`
	`628`	`+ &:hover {`
	`629`	`+ color: var(--el-color-white);`
	`630`	`+ }`
	`631`	`+ }`
`626`	`632`	`}`
`627`	`633`	`}`
`628`	`634`	`</style>`