Ver Fonte

💄 (dashboard-v6): 阅读页右边栏吸顶时贴着顶部工具栏

原来吸顶偏移 = 工具栏 56px + 内容区上内边距 12px,滚动后正文会从工具栏与右边栏
之间的 12px 空隙里滑过,看起来两者不齐。现在吸顶在 56px;未吸顶时仍在 68px,
高度按是否吸顶分别计算(SplitLayout 新增 restTop),底部不超出视口。
WORKSPACE_STICKY_TOP 改名 WORKSPACE_CONTENT_TOP。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
visuddhinanda há 11 horas atrás
pai
commit
2087216227

+ 0 - 0
api-test/cases/11_tipitaka_chapters.php → api-test/cases/11_tipitaka_titles.php


+ 0 - 0
api-v13/app/Http/Controllers/V3/TipitakaChapterController.php → api-v13/app/Http/Controllers/V3/TipitakaTitleController.php


+ 0 - 0
api-v13/app/Http/Requests/V3/IndexTipitakaChapterRequest.php → api-v13/app/Http/Requests/V3/IndexTipitakaTitleRequest.php


+ 0 - 0
api-v13/app/Http/Resources/V3/TipitakaChapterResource.php → api-v13/app/Http/Resources/V3/TipitakaTitleResource.php


+ 0 - 0
api-v13/app/Services/V3/TipitakaChapterService.php → api-v13/app/Services/V3/TipitakaTitleService.php


+ 0 - 0
api-v13/tests/Feature/TipitakaChapterV3Test.php → api-v13/tests/Feature/TipitakaTitleV3Test.php


+ 6 - 2
dashboard-v6/src/components/editor/Editor.tsx

@@ -18,7 +18,10 @@ import type { IChannel } from "../../api/channel";
 import { useAppSelector } from "../../hooks";
 import { openPanel, rightPanel } from "../../reducers/right-panel";
 import store from "../../store";
-import { WORKSPACE_STICKY_TOP } from "../../layouts/workspace/constants";
+import {
+  WORKSPACE_CONTENT_TOP,
+  WORKSPACE_HEADER_HEIGHT,
+} from "../../layouts/workspace/constants";
 
 /**
  * redux openPanel 面板名 → 右边栏 tab key。
@@ -175,7 +178,8 @@ export default function Editor({
       sidebar={sidebar}
       rightTabs={rightTabs}
       openRequest={openRequest}
-      stickyTop={WORKSPACE_STICKY_TOP}
+      stickyTop={WORKSPACE_HEADER_HEIGHT}
+      restTop={WORKSPACE_CONTENT_TOP}
     >
       {({ expandButton }) => children({ expandButton })}
     </SplitLayout>

+ 1 - 1
dashboard-v6/src/components/general/SplitLayout/RightToolbar.tsx

@@ -29,7 +29,7 @@ interface RightToolbarProps {
   activeKey: string | null;
   onTabClick: (key: string) => void;
   onClose: () => void;
-  /** 吸顶时距视口顶部的距离(px),面板高度相应减去它 */
+  /** 当前距视口顶部的距离(px),面板高度 = 100vh 减去它 */
   stickyTop?: number;
 }
 

+ 15 - 2
dashboard-v6/src/components/general/SplitLayout/SplitLayout.tsx

@@ -90,6 +90,12 @@ export interface SplitLayoutProps {
    * 外层布局有吸顶的顶部工具栏时传它的高度,右边栏停在工具栏下面。
    */
   stickyTop?: number;
+
+  /**
+   * 右边栏未吸顶时(页面刚打开、还没滚到吸顶位置)距视口顶部的距离(px),默认等于 stickyTop。
+   * 外层内容区有上内边距时它比 stickyTop 大;右边栏未吸顶时按它算高度,底部不会超出视口。
+   */
+  restTop?: number;
 }
 
 // ─────────────────────────────────────────────
@@ -107,6 +113,7 @@ export default function SplitLayout({
   maxRightSize = 800,
   contentMaxWidth = 1000,
   stickyTop = 0,
+  restTop = stickyTop,
 }: SplitLayoutProps) {
   // ── 左侧收起状态(持久化)──
   const [collapsed, setCollapsed] = useState<boolean>(() => {
@@ -160,6 +167,9 @@ export default function SplitLayout({
 
   const closeRightPanel = useCallback(() => setRightActiveKey(null), []);
 
+  // 右边栏是否已吸顶:吸顶时顶边在 stickyTop,未吸顶时在 restTop,高度随之不同
+  const [affixed, setAffixed] = useState(false);
+
   // ── 外部打开请求(去重后打开对应 tab)──
   // 采用 React 官方推荐的「render 阶段调整 state」方式,避免 effect 内同步 setState。
   const [handledOpenSeq, setHandledOpenSeq] = useState<number | null>(null);
@@ -277,9 +287,12 @@ export default function SplitLayout({
                 resizable={rightOpen}
                 className={styles.rightAreaPanel}
               >
-                <Affix offsetTop={stickyTop}>
+                <Affix
+                  offsetTop={stickyTop}
+                  onChange={(value) => setAffixed(!!value)}
+                >
                   <RightToolbar
-                    stickyTop={stickyTop}
+                    stickyTop={affixed ? stickyTop : restTop}
                     tabs={rightTabs!}
                     activeKey={rightActiveKey}
                     onTabClick={onRightTabClick}

+ 3 - 2
dashboard-v6/src/layouts/workspace/constants.ts

@@ -6,7 +6,8 @@ export const WORKSPACE_CONTENT_PADDING = 12;
 
 /**
  * 内容区顶部到视口顶部的距离(px):工具栏 + 内容区上内边距。
- * 吸顶元素(如右边栏)用它做偏移,吸顶位置与初始位置一致,滚动时不会跳动。
+ * 吸顶元素(如右边栏)未吸顶时就在这个位置;吸顶时贴着工具栏(WORKSPACE_HEADER_HEIGHT),
+ * 不留这 12px,否则正文会从工具栏与吸顶元素之间的空隙里滚过去。
  */
-export const WORKSPACE_STICKY_TOP =
+export const WORKSPACE_CONTENT_TOP =
   WORKSPACE_HEADER_HEIGHT + WORKSPACE_CONTENT_PADDING;