@yuku123/z-frontend-common 0.2.2 → 0.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuku123/z-frontend-common",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "private": false,
   "description": "z-opc 共享前端组件库 - AppLayout / StatusTag / LoginPage / ErrorBoundary + 统一 createRequest 工厂",
   "keywords": [

package/src/components/Ctc/Layout.jsx

@@ -1,5 +1,5 @@
 import React, {useEffect, useRef, useState} from 'react'
-import {Outlet, useLocation, useNavigate} from 'react-router-dom'
+import {useLocation, useNavigate} from 'react-router-dom'
 import {Avatar, Cascader, Divider, Dropdown, Layout as AntLayout, Menu, Space, Typography,} from 'antd'
 import {
     AppstoreOutlined,
@@ -25,7 +25,7 @@ import {getCurrentUser} from '../../services/api'
 const {Header, Sider, Content} = AntLayout
 const {Text} = Typography
 
-const Layout = ({compact = false} = {}) => {
+const Layout = ({compact = false, children} = {}) => {
     const location = useLocation()
     const navigate = useNavigate()
     const [collapsed, setCollapsed] = useState(false)
@@ -174,11 +174,15 @@ const Layout = ({compact = false} = {}) => {
         navigate(`/ctc/${key}`)
     }
 
+    // compact=true: 由主壳 App.jsx 提供 Layout, 这里只渲染 children (passthrough)
+    // compact=false: 独立运行时, 自己提供完整 Layout (Header + Sider + Content)
+    if (compact) {
+        return <>{children}</>
+    }
+
     return (
         <AntLayout className={styles.layout}>
-            {compact ? null : (
-            /* 顶部导航栏 (compact 模式: 由主壳 App.jsx 提供) */
-            <>
+            {/* 顶部导航栏 */}
             <Header className={styles.header}>
                 <div className={styles.logo}>
                     <span className={styles.logoText}>Z-CTC 统一用户中心</span>
@@ -288,8 +292,6 @@ const Layout = ({compact = false} = {}) => {
                     </Space>
                 </div>
             </Header>
-            </>
-            )}
 
             <AntLayout className={styles.mainLayout}>
                 {/* 侧边菜单 */}
@@ -318,7 +320,7 @@ const Layout = ({compact = false} = {}) => {
 
                 {/* 主内容区 */}
                 <Content className={styles.content}>
-                    <Outlet/>
+                    {children}
                 </Content>
             </AntLayout>
         </AntLayout>

package/src/index.js

@@ -40,4 +40,3 @@ export {default as MockTemplateHelper} from './components/MockPlatform/MockTempl
 export {default as CurlImportModal} from './components/MockPlatform/CurlImportModal'
 export {default as OpenApiImportModal} from './components/MockPlatform/OpenApiImportModal'
 
-export default common