Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

YunaiV · YunaiV · commit 5676ac125d79 · 2025-01-15T20:31:04.000+08:00
diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx
@@ -197,7 +197,7 @@ export const useRenderLayout = () => {
               `${prefixCls}-content-scrollbar`,
               {
                 '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
-                  fixedHeader.value
+                  fixedHeader.value && tagsView.value
               }
             ]}
           >

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ export const useRenderLayout = () => {`
`197`	`197`	`${prefixCls}-content-scrollbar`,
`198`	`198`	`{`
`199`	`199`	`'!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':`
`200`		`- fixedHeader.value`
	`200`	`+ fixedHeader.value && tagsView.value`
`201`	`201`	`}`
`202`	`202`	`]}`
`203`	`203`	`>`