From 306b7ab03973bb9a4f33b5a65fd463cc0ab4f88b Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 7 Apr 2026 17:16:14 +0800 Subject: [PATCH 1/5] fix: move border from leftMenu to right content in account/settings - Remove borderRight from leftMenu - Add borderInlineStart to right content area - This resolves the 2px border overlap issue Co-Authored-By: Claude Opus 4.6 --- src/pages/account/settings/style.style.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/account/settings/style.style.ts b/src/pages/account/settings/style.style.ts index 8ff05765..4fd9639a 100644 --- a/src/pages/account/settings/style.style.ts +++ b/src/pages/account/settings/style.style.ts @@ -19,19 +19,19 @@ const useStyles = createStyles(({ token }) => { }, leftMenu: { width: '224px', - borderRight: `${token.lineWidth}px solid ${token.colorSplit}`, '.ant-menu-inline': { border: 'none' }, '.ant-menu-horizontal': { fontWeight: 'bold' }, [`@media screen and (max-width: ${token.screenMD}px)`]: { width: '100%', - border: 'none', }, }, right: { flex: '1', padding: '8px 40px', + borderInlineStart: `${token.lineWidth}px solid ${token.colorSplit}`, [`@media screen and (max-width: ${token.screenMD}px)`]: { padding: '40px', + border: 'none', }, }, title: { From 2a453032d7f641b86e82c0cf1ec803d1de2b6ca8 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 7 Apr 2026 17:17:53 +0800 Subject: [PATCH 2/5] fix: add marginInlineStart to right content in account/settings Co-Authored-By: Claude Opus 4.6 --- src/pages/account/settings/style.style.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/account/settings/style.style.ts b/src/pages/account/settings/style.style.ts index 4fd9639a..178075c5 100644 --- a/src/pages/account/settings/style.style.ts +++ b/src/pages/account/settings/style.style.ts @@ -27,6 +27,7 @@ const useStyles = createStyles(({ token }) => { }, right: { flex: '1', + marginInlineStart: -1, padding: '8px 40px', borderInlineStart: `${token.lineWidth}px solid ${token.colorSplit}`, [`@media screen and (max-width: ${token.screenMD}px)`]: { From 4893fb113be18b0451f6bf10285a2e75b3bdd8d9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 7 Apr 2026 17:18:09 +0800 Subject: [PATCH 3/5] fix: type children as React.ReactElement for ModalForm trigger Change children prop type from React.ReactNode to React.ReactElement to match ModalForm's trigger prop type requirement. Co-Authored-By: Claude Opus 4.6 --- src/pages/list/basic-list/components/OperationModal.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/list/basic-list/components/OperationModal.tsx b/src/pages/list/basic-list/components/OperationModal.tsx index ebb2e082..2fd5663c 100644 --- a/src/pages/list/basic-list/components/OperationModal.tsx +++ b/src/pages/list/basic-list/components/OperationModal.tsx @@ -16,7 +16,7 @@ type OperationModalProps = { current: Partial | undefined; onDone: () => void; onSubmit: (values: BasicListItemDataType) => void; - children?: React.ReactNode; + children?: React.ReactElement; }; const OperationModal: FC = (props) => { const { styles } = useStyles(); From fa28d7b90f1f55f4843e90570d78725efbca58bc Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 7 Apr 2026 17:27:11 +0800 Subject: [PATCH 4/5] fix: remove marginInlineStart from right content Co-Authored-By: Claude Opus 4.6 --- src/pages/account/settings/style.style.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/account/settings/style.style.ts b/src/pages/account/settings/style.style.ts index 178075c5..4fd9639a 100644 --- a/src/pages/account/settings/style.style.ts +++ b/src/pages/account/settings/style.style.ts @@ -27,7 +27,6 @@ const useStyles = createStyles(({ token }) => { }, right: { flex: '1', - marginInlineStart: -1, padding: '8px 40px', borderInlineStart: `${token.lineWidth}px solid ${token.colorSplit}`, [`@media screen and (max-width: ${token.screenMD}px)`]: { From 6317bd1f7bcd2fc256e395032f3ec85ebda3402b Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 7 Apr 2026 20:51:49 +0800 Subject: [PATCH 5/5] fix: increase CSS specificity for menu border override Co-Authored-By: Claude Opus 4.6 --- src/pages/account/settings/style.style.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/account/settings/style.style.ts b/src/pages/account/settings/style.style.ts index 4fd9639a..082d4874 100644 --- a/src/pages/account/settings/style.style.ts +++ b/src/pages/account/settings/style.style.ts @@ -19,19 +19,19 @@ const useStyles = createStyles(({ token }) => { }, leftMenu: { width: '224px', - '.ant-menu-inline': { border: 'none' }, + borderRight: `${token.lineWidth}px solid ${token.colorSplit}`, + '.ant-menu-inline': { border: 'none !important' }, '.ant-menu-horizontal': { fontWeight: 'bold' }, [`@media screen and (max-width: ${token.screenMD}px)`]: { width: '100%', + border: 'none', }, }, right: { flex: '1', padding: '8px 40px', - borderInlineStart: `${token.lineWidth}px solid ${token.colorSplit}`, [`@media screen and (max-width: ${token.screenMD}px)`]: { padding: '40px', - border: 'none', }, }, title: {