1、菜单增加隐藏功能

2、调整WebSite模块目录

src/layout/RootLayout.tsx

@@ -26,7 +26,7 @@ const getBreadcrumbData = (menuData: MenuItem[], pathname: string) => {
   const findItem = (menuData: any[], pathname: string) => {
     for (let i = 0; i < menuData.length; i++) {
       if (menuData[i].path === pathname) {
-        menuData[i].label =<span className={'s-title'}>{ menuData[i].name}</span>
+        menuData[i].label = <span className={'s-title'}>{menuData[i].name}</span>
         breadcrumbData.push(menuData[i])
         return true
       }
@@ -56,7 +56,7 @@ export default () => {
 
   const menusFlatten = useRef<MenuItem[]>()
   if (!menusFlatten.current) {
-    menusFlatten.current = flattenTree<MenuItem>(menuData, { key: 'id', title: 'name' })
+    menusFlatten.current = flattenTree<MenuItem>(menuData, { key: 'id', title: 'name' }).filter(item => !item.hidden)
   }
   const [ rootMenuKeys, setRootMenuKeys ] = useState<string[]>(() => {
     const item = menusFlatten.current?.find(item => item.path === location.pathname)
@@ -127,7 +127,7 @@ export default () => {
                           collapsedButtonRender={false}
                           // collapsed={false}
                           postMenuData={() => {
-                            return menuData.map(item => ({
+                            return menuData.filter(item=>!item.hidden).map(item => ({
                               ...item,
                               children: [],
                             })) as any

src/pages/system/menus/index.tsx

@@ -2,7 +2,19 @@ import Glass from '@/components/glass'
 import { useTranslation } from '@/i18n.ts'
 import { PlusOutlined } from '@ant-design/icons'
 import { ProCard } from '@ant-design/pro-components'
-import { Button, Form, Input, Radio, TreeSelect, InputNumber, notification, Alert, InputRef, Divider } from 'antd'
+import {
+  Button,
+  Form,
+  Input,
+  Radio,
+  TreeSelect,
+  InputNumber,
+  notification,
+  Alert,
+  InputRef,
+  Divider,
+  Checkbox
+} from 'antd'
 import { useAtom, useAtomValue } from 'jotai'
 import { defaultMenu, menuDataAtom, saveOrUpdateMenuAtom, selectedMenuAtom } from '@/store/system/menu.ts'
 import IconPicker from '@/components/icon/picker'
@@ -45,7 +57,9 @@ const Menus = () => {
           <TwoColPageLayout
                   className={styles.container}
                   leftPanel={<>
-                    <ProCard title={t('system.menus.title', '菜单')}
+                    <ProCard
+                            className={styles.card}
+                            title={t('system.menus.title', '菜单')}
                              extra={
                                <>
                                  <BatchButton/>
@@ -172,12 +186,23 @@ const Menus = () => {
                     >
                       <Input addonBefore={'pages/'}/>
                     </Form.Item>
+                    <Form.Item label={t('system.menus.form.hidden', '隐藏')}
+                               help={t('system.menus.form.hiddenHelp', '菜单不显示在导航中，但用户依然可以访问，例如详情页')}
+                    >
+                      <Form.Item valuePropName={'checked'} noStyle={true} name={'hidden'}>
+                        <Checkbox>隐藏菜单</Checkbox>
+                      </Form.Item>
+                      <Form.Item valuePropName={'checked'} noStyle={true} name={'hidden_breadcrumb'}>
+                        <Checkbox>隐藏面包屑</Checkbox>
+                      </Form.Item>
+                    </Form.Item>
                     <Form.Item label={' '}>
                       <Button type="primary"
                               htmlType={'submit'}
                               loading={isPending}
                               onClick={() => {
                                 form.validateFields().then((values) => {
+                                  console.log(values)
                                   mutate(values)
                                 })
                               }}

src/pages/system/menus/style.ts

@@ -85,10 +85,16 @@ export const useStyle = createStyles(({ token, css, cx, prefixCls }) => {
     z-index: 10;
     background: ${token.colorBgContainer};
   `
-
+  const card = css`
+    .ant-pro-card-body{
+      height:  calc(100% - 115px)!important;
+      min-height: calc(100% - 115px)!important;
+    }
+  `
   return {
     container: cx(prefix, container),
     box,
+    card,
     emptyForm,
     tree,
     form,

src/pages/websites/ssl/account/index.tsx → src/pages/websites/account/index.tsx

@@ -1,4 +1,4 @@
-import { useTranslation } from '@/i18n.ts'
+import { useTranslation } from '../../../i18n.ts'
 import { Button, Form, Popconfirm, Divider, Space, Tooltip, Badge } from 'antd'
 import { useAtom, useAtomValue } from 'jotai'
 import {

src/pages/websites/ssl/account/style.ts → src/pages/websites/account/style.ts

@@ -1,4 +1,4 @@
-import { createStyles } from '@/theme'
+import { createStyles } from '../../../theme'
 
 export const useStyle = createStyles(({ token, css, cx, prefixCls }, props: any) => {
     const prefix = `${prefixCls}-${token?.proPrefix}-websiteDnsAccount-list-page`

src/pages/websites/ssl/index.tsx

@@ -16,19 +16,19 @@ import { useTranslation } from '@/i18n.ts'
 import { Button, Form, Popconfirm, Space } from 'antd'
 import { PlusOutlined } from '@ant-design/icons'
 import DrawerPicker, { DrawerPickerRef } from '@/components/drawer-picker/DrawerPicker.tsx'
-import AcmeList from './acme/AcmeList.tsx'
+import AcmeList from '../acme/AcmeList.tsx'
 import { acmeListAtom, AcmeType, getAcmeAccountTypeName } from '@/store/websites/acme.ts'
 import { dnsListAtom, getDNSTypeName } from '@/store/websites/dns.ts'
-import DNSList from './dns/DNSList.tsx'
-import CAList from './ca/CAList.tsx'
+import DNSList from '../dns/DNSList.tsx'
+import CAList from '../ca/CAList.tsx'
 import { WebSite } from '@/types'
 import Switch from '@/components/switch'
 import { Else, If, Then } from 'react-if'
 import Action from '@/components/action/Action.tsx'
 import { Status } from '@/components/status'
-import SSLDetail from './components/Detail.tsx'
-import { detailAtom } from './components/store.ts'
-import Upload from './components/Upload.tsx'
+import SSLDetail from '@/pages/websites/ssl/components/Detail.tsx'
+import { detailAtom } from '@/pages/websites/ssl/components/store.ts'
+import Upload from '@/pages/websites/ssl/components/Upload.tsx'
 import { FormInstance } from 'antd/lib'
 import Download from '@/components/download/Download.tsx'
 import { Table as ProTable } from '@/components/table'

src/service/websites.ts

@@ -19,7 +19,7 @@ const websitesServ = {
     ...createCURD<any, WebSite.IAcmeAccount>('/website/acme')
   },
   dns: {
-    ...createCURD<any, WebSite.IDnsAccount>('/website/account'),
+    ...createCURD<any, WebSite.IDnsAccount>('/website/dns_account'),
     sync: async (params: WebSite.IDnsAccount) => {
       return request.post<any, WebSite.IDnsAccount>('/website/dns_account/sync', params)
     }

src/types/system/menus.d.ts

@@ -1,7 +1,6 @@
-
 export interface MenuButton {
-    code: string,
-    label: string
+  code: string,
+  label: string
 }
 
 
@@ -11,27 +10,29 @@ export interface Meta {
 }
 
 export interface IMenu {
-    id: number,
-    key: string,
-    parent_id: number,
-    sort: number,
-    code: string,
-    name: string,
-    parentName: string[],
-    title: string,
-    component: string,
-    icon: string | any,
-    description: string,
-    sequence: number,
-    type: string,
-    path: string,
-    properties: string,
-    status: string,
-    parent_path: string,
-    affix: boolean,
-    redirect: string,
-    button: MenuButton[],
-    meta: Meta,
+  id: number,
+  key: string,
+  parent_id: number,
+  sort: number,
+  code: string,
+  name: string,
+  parentName: string[],
+  title: string,
+  component: string,
+  icon: string | any,
+  description: string,
+  sequence: number,
+  type: string,
+  path: string,
+  properties: string,
+  status: string,
+  parent_path: string,
+  affix: boolean,
+  hidden: boolean,
+  hidden_breadcrumb: boolean,
+  redirect: string,
+  button: MenuButton[],
+  meta: Meta,
 
-    children: IMenu[]
+  children: IMenu[]
 }