public/ruoyi-plus-vben5
1
0
Fork 0
mirror of https://gitee.com/dapppp/ruoyi-plus-vben5.git synced 2026-03-17 00:32:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

Browse Source
This commit is contained in:
dap
2025-07-03 20:24:50 +08:00
parent 4d94046cc1 1f63aed64c
commit 1e4824fe27
13 changed files with 207 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/effects/common-ui/src/components/icon-picker/icon-picker.vue
View File

@@ -81,7 +81,7 @@ watch(keywordDebounce, () => {
currentPage.value = 1;
setCurrentPage(1);
});
watchDebounced(
() => props.prefix,
async (prefix) => {

2
packages/effects/common-ui/src/components/page/page.vue
View File

@@ -25,7 +25,7 @@ const footerRef = useTemplateRef<HTMLDivElement>('footerRef');
const contentStyle = computed<StyleValue>(() => {
if (autoContentHeight) {
return {
height: `calc(var(${CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT}) - ${headerHeight.value}px - ${typeof heightOffset === 'number' ? `${heightOffset}px` : heightOffset})`,
height: `calc(var(${CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT}) - ${headerHeight.value}px - ${typeof heightOffset === 'number' ? `${heightOffset}px` : heightOffset}) - ${footerHeight.value}px`,
overflowY: shouldAutoHeight.value ? 'auto' : 'unset',
};
}