diff --git a/.gitignore b/.gitignore
index 3399f39..33fd085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,5 @@ vite.config.ts.*
*.sw?
.history
.cursor
+.vscode
+.trae
diff --git a/.trae/rules/project_rules.md b/.trae/rules/project_rules.md
index ac75e4d..9993f7a 100644
--- a/.trae/rules/project_rules.md
+++ b/.trae/rules/project_rules.md
@@ -1,2 +1,3 @@
1. 这是一个企业级项目，结构复杂，你需要深度检测代码后才能理解其业务逻辑，不能简单的只根据当前文件的代码来理解。
-2. 代码修改完成后，需检查文件内引用是否正确
+2. 代码修改完成后，必须检查文件内引用是否正确
+3. 修改后，必须获取项目的诊断信息，了解是否有错误或警告，然后根据诊断信息进行修复。
diff --git a/apps/finance/index.html b/apps/finance/index.html
index 480eb84..459c5d2 100644
--- a/apps/finance/index.html
+++ b/apps/finance/index.html
@@ -16,16 +16,16 @@
diff --git a/apps/finance/src/app.vue b/apps/finance/src/app.vue
index bbaccce..e3e9dd1 100644
--- a/apps/finance/src/app.vue
+++ b/apps/finance/src/app.vue
@@ -14,9 +14,7 @@ const { isDark } = usePreferences();
const { tokens } = useAntdDesignTokens();
const tokenTheme = computed(() => {
- const algorithm = isDark.value
- ? [theme.darkAlgorithm]
- : [theme.defaultAlgorithm];
+ const algorithm = isDark.value ? [theme.darkAlgorithm] : [theme.defaultAlgorithm];
// antd 紧凑模式算法
if (preferences.app.compact) {
diff --git a/apps/finance/src/views/posting/reconciliate/modules/Manual.vue b/apps/finance/src/views/posting/reconciliate/modules/Manual.vue
index 29a0e6c..1818554 100644
--- a/apps/finance/src/views/posting/reconciliate/modules/Manual.vue
+++ b/apps/finance/src/views/posting/reconciliate/modules/Manual.vue
@@ -325,7 +325,8 @@ function onCompleteCheckCreated() {
width: 100%;
:deep(.ant-card-body) {
padding: 1px !important;
- height: calc(100% - 46px); // 减去标签页头部高度
+ height: calc(100% - 41px); // 减去标签页头部高度
+ overflow: hidden;
// background-color: #f1f3f6;
}
}
diff --git a/packages/@core/composables/src/use-layout-style.ts b/packages/@core/composables/src/use-layout-style.ts
index 395e9e5..e465f6c 100644
--- a/packages/@core/composables/src/use-layout-style.ts
+++ b/packages/@core/composables/src/use-layout-style.ts
@@ -36,14 +36,11 @@ export function useLayoutContentStyle() {
};
});
- const debouncedCalcHeight = useDebounceFn(
- (_entries: ResizeObserverEntry[]) => {
- visibleDomRect.value = getElementVisibleRect(contentElement.value);
- contentHeight.value = `${visibleDomRect.value.height}px`;
- contentWidth.value = `${visibleDomRect.value.width}px`;
- },
- 16,
- );
+ const debouncedCalcHeight = useDebounceFn((_entries: ResizeObserverEntry[]) => {
+ visibleDomRect.value = getElementVisibleRect(contentElement.value);
+ contentHeight.value = `${visibleDomRect.value.height}px`;
+ contentWidth.value = `${visibleDomRect.value.width}px`;
+ }, 16);
onMounted(() => {
if (contentElement.value && !resizeObserver) {
diff --git a/packages/@core/composables/src/use-priority-value.ts b/packages/@core/composables/src/use-priority-value.ts
index 74b5b5b..3b0d511 100644
--- a/packages/@core/composables/src/use-priority-value.ts
+++ b/packages/@core/composables/src/use-priority-value.ts
@@ -2,10 +2,7 @@ import type { ComputedRef, Ref } from 'vue';
import { computed, getCurrentInstance, unref, useAttrs, useSlots } from 'vue';
-import {
- getFirstNonNullOrUndefined,
- kebabToCamelCase,
-} from '@vben-core/shared/utils';
+import { getFirstNonNullOrUndefined, kebabToCamelCase } from '@vben-core/shared/utils';
/**
* 依次从插槽、attrs、props、state 中获取值
@@ -32,8 +29,7 @@ export function usePriorityValue<
for (const [key, value] of Object.entries(rawProps)) {
standardRawProps[kebabToCamelCase(key) as K] = value;
}
- const propsKey =
- standardRawProps?.[key] === undefined ? undefined : props[key];
+ const propsKey = standardRawProps?.[key] === undefined ? undefined : props[key];
// slot可以关闭
return getFirstNonNullOrUndefined(
@@ -77,11 +73,7 @@ export function useForwardPriorityValues<
const computedResult: { [K in keyof T]: ComputedRef } = {} as never;
(Object.keys(props) as (keyof T)[]).forEach((key) => {
- computedResult[key] = usePriorityValue(
- key as keyof typeof props,
- props,
- state,
- );
+ computedResult[key] = usePriorityValue(key as keyof typeof props, props, state);
});
return computed(() => {
diff --git a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
index 497933b..f598812 100644
--- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
+++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -184,7 +184,7 @@ const options = computed(() => {
pageSize: 20,
background: true,
pageSizes: [10, 20, 30, 50, 100, 200],
- className: 'mt-2 w-full',
+ className: 'mt-1 w-full',
layouts: isMobile.value ? mobileLayouts : layouts,
size: 'mini' as const,
});
@@ -362,8 +362,8 @@ onUnmounted(() => {
v-show="showSearchForm !== false"
:class="
cn(
- 'relative rounded py-3',
- isCompactForm ? (isSeparator ? 'pb-8' : 'pb-4') : isSeparator ? 'pb-4' : 'pb-0',
+ 'relative rounded py-2',
+ isCompactForm ? (isSeparator ? 'pb-4' : 'pb-2') : isSeparator ? 'pb-2' : 'pb-0',
)
"
>
@@ -395,9 +395,10 @@ onUnmounted(() => {
:style="{
...(separatorBg ? { backgroundColor: separatorBg } : undefined),
}"
- class="bg-background-deep z-100 absolute -left-2 bottom-1 h-2 w-[calc(100%+1rem)] overflow-hidden md:bottom-2 md:h-3"
+ class="bg-background-deep z-100 absolute -left-2 bottom-0 h-1 w-[calc(100%+1rem)] overflow-hidden md:bottom-0 md:h-2"
>
+