nsgm-cli 2.1.12 → 2.1.14

package/client/layout/index.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Layout, Menu, Breadcrumb, Image, Select, Dropdown, Space, Tooltip } from 'antd'
+import { Layout, Menu, Breadcrumb, Image, Dropdown, Space, Tooltip } from 'antd'
 import { Container } from '@/styled/layout'
 import styled from 'styled-components'
 import { useRouter } from 'next/router'
@@ -9,8 +9,20 @@ import { logout } from '@/utils/sso'
 import getConfig from 'next/config'
 import { LogoutOutlined, SettingOutlined, BellOutlined, UserOutlined } from '@ant-design/icons'
 
-const { Option } = Select
-const { SubMenu } = Menu
+interface SubMenuItem {
+  key: string
+  text: string
+  url: string
+}
+
+interface MenuItem {
+  key: string
+  text: string
+  url: string
+  icon?: React.ReactNode
+  subMenus?: SubMenuItem[]
+}
+
 const { Header, Content, Sider } = Layout
 
 const nextConfig = getConfig()
@@ -19,92 +31,92 @@ const { prefix } = publicRuntimeConfig
 
 // styled-components
 const FlexLayout = styled(Layout)`
-    display: flex;
-    flex: 1;
-  `
+  display: flex;
+  flex: 1;
+`
 const StyledSider = styled(Sider)`
-    display: flex;
-    flex-direction: column;
-    box-shadow: 2px 0 8px -4px rgba(0, 0, 0, 0.1);
-    z-index: 5;
-    position: relative;
-  `
+  display: flex;
+  flex-direction: column;
+  box-shadow: 2px 0 8px -4px rgba(0, 0, 0, 0.1);
+  z-index: 5;
+  position: relative;
+`
 
 const SideMenu = styled(Menu)`
-    height: 100%;
-    border-right: 0;
-    padding: 8px 0;
-  `
+  height: 100%;
+  border-right: 0;
+  padding: 8px 0;
+`
 
 const ContentLayout = styled(Layout)`
-    display: flex;
-    flex-direction: column;
-    flex: 1;
-    background: #f5f7fa;
-    position: relative;
-    z-index: 1;
-  `
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  background: #f5f7fa;
+  position: relative;
+  z-index: 1;
+`
 const StyledHeader = styled(Header)`
+  display: flex;
+  align-items: center;
+  padding: 0 24px;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12);
+  z-index: 11;
+
+  .logo {
+    margin-right: 24px;
+  }
+
+  .main-menu {
+    flex: 1;
+  }
+
+  .user-actions {
     display: flex;
     align-items: center;
-    padding: 0 24px;
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.12);
-    z-index: 11;
-    
-    .logo {
-      margin-right: 24px;
-    }
-    
-    .main-menu {
-      flex: 1;
+
+    .action-icon {
+      font-size: 18px;
+      color: rgba(255, 255, 255, 0.85);
+      cursor: pointer;
+      padding: 0 8px;
+      transition: color 0.3s;
+
+      &:hover {
+        color: #fff;
+      }
     }
-    
-    .user-actions {
-      display: flex;
-      align-items: center;
-      
-      .action-icon {
-        font-size: 18px;
+
+    .user-dropdown {
+      cursor: pointer;
+      padding: 0 8px;
+
+      .username {
         color: rgba(255, 255, 255, 0.85);
-        cursor: pointer;
-        padding: 0 8px;
-        transition: color 0.3s;
-        
-        &:hover {
-          color: #fff;
-        }
-      }
-      
-      .user-dropdown {
-        cursor: pointer;
-        padding: 0 8px;
-        
-        .username {
-          color: rgba(255, 255, 255, 0.85);
-          margin-left: 8px;
-        }
+        margin-left: 8px;
       }
     }
-  `
+  }
+`
 const StyledBreadcrumb = styled(Breadcrumb)`
-    margin: 16px 24px;
-    font-size: 14px;
-  `
+  margin: 16px 24px;
+  font-size: 14px;
+`
 const StyledContent = styled(Content)`
-    margin: 0 24px 24px;
-    padding: 24px;
-    background: #fff;
-    border-radius: 4px;
-    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-    min-height: calc(100vh - 180px);
-    position: relative;
-    z-index: 1;
-  `
+  margin: 0 24px 24px;
+  padding: 24px;
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+  min-height: calc(100vh - 180px);
+  position: relative;
+  z-index: 1;
+`
 
 const getLocationKey = () => {
-  let result = {
+  const result = {
     topMenu: '1',
-    slideMenu: '0'
+    slideMenu: '0',
   }
 
   if (typeof window !== 'undefined') {
@@ -123,13 +135,11 @@ const getLocationKey = () => {
           locationStr = locationStr.split(prefix)[1]
         }
 
-        // console.log('locationStr', locationStr)
-
-        _.each(menuConfig, (item, index) => {
+        _.each(menuConfig, (item) => {
           const { key, url, subMenus } = item
 
           if (subMenus) {
-            _.each(subMenus, (subItem, subIndex) => {
+            _.each(subMenus, (subItem: MenuItem) => {
               const { key: subKey, url: subUrl } = subItem
 
               if (locationStr === subUrl.split('?')[0]) {
@@ -142,6 +152,7 @@ const getLocationKey = () => {
 
                 return false
               }
+              return true
             })
           } else {
             if (url && locationStr === url.split('?')[0]) {
@@ -149,16 +160,15 @@ const getLocationKey = () => {
               return false
             }
           }
+          return true
         })
       }
     }
   }
-  // console.log('result', result)
   return result
 }
 
 const routerPush = (router: any, url: string) => {
-  // console.log('routerPush', url)
   if (router && url) {
     if (prefix && url.indexOf(prefix) === -1) {
       url = prefix + url
@@ -173,8 +183,6 @@ const LayoutComponent = ({ user, children }) => {
   const [sliderMenuKey, setSliderMenuKey] = useState('1')
   const [collapsed, setCollapsed] = useState(false)
 
-  // console.log('topMenuKey: ' + topMenuKey, ', sliderMenuKey: ' + sliderMenuKey, user)
-
   useEffect(() => {
     const { topMenu, slideMenu } = getLocationKey()
     setTopMenuKey(topMenu)
@@ -184,10 +192,10 @@ const LayoutComponent = ({ user, children }) => {
   const menuItems: any = []
   const menuItemsVertical: any = []
 
-  _.each(menuConfig, (item, index) => {
+  _.each(menuConfig, (item) => {
     const { key, text, url, icon, subMenus } = item
 
-    if (key) {
+    if (key && text && url) {
       const menuObj = {
         label: text,
         key,
@@ -200,7 +208,7 @@ const LayoutComponent = ({ user, children }) => {
           } else {
             setSliderMenuKey('0')
           }
-        }
+        },
       }
 
       menuItems.push(menuObj)
@@ -209,51 +217,53 @@ const LayoutComponent = ({ user, children }) => {
     if (subMenus) {
       const subMenusChildren: any = []
 
-      _.each(subMenus, (subItem, subIndex) => {
+      _.each(subMenus, (subItem: MenuItem) => {
         const { key: subKey, text: subText, url: subUrl } = subItem
 
-        const subMenusChildrenObj = {
-          key: 'slider_' + subKey,
-          label: subText,
-          onClick: () => {
-            routerPush(router, subUrl)
-
-            const subKeyArr = subKey.split('_')
-            const subKeyArrLen = subKeyArr.length
+        if (subKey && subText && subUrl) {
+          const subMenusChildrenObj = {
+            key: `slider_${subKey}`,
+            label: subText,
+            onClick: () => {
+              routerPush(router, subUrl)
 
-            // console.log(subKeyArr, subKeyArrLen)
+              const subKeyArr = subKey.split('_')
+              const subKeyArrLen = subKeyArr.length
 
-            if (subKeyArrLen >= 1) setTopMenuKey(subKeyArr[0])
-            if (subKeyArrLen >= 2) setSliderMenuKey(subKeyArr[1])
+              if (subKeyArrLen >= 1) setTopMenuKey(subKeyArr[0])
+              if (subKeyArrLen >= 2) setSliderMenuKey(subKeyArr[1])
+            },
           }
-        }
 
-        subMenusChildren.push(subMenusChildrenObj)
+          subMenusChildren.push(subMenusChildrenObj)
+        }
       })
 
-      const subMenuObjVertical = {
-        key: 'slider_' + key,
-        icon,
-        label: text,
-        onTitleClick: () => {
-          setTopMenuKey(key)
-          setSliderMenuKey('1')
-        },
-        children: subMenusChildren
-      }
+      if (key && text && icon) {
+        const subMenuObjVertical = {
+          key: `slider_${key}`,
+          icon,
+          label: text,
+          onTitleClick: () => {
+            setTopMenuKey(key)
+            setSliderMenuKey('1')
+          },
+          children: subMenusChildren,
+        }
 
-      menuItemsVertical.push(subMenuObjVertical)
+        menuItemsVertical.push(subMenuObjVertical)
+      }
     } else {
-      if (key) {
+      if (key && text && url) {
         const menuObjVertical = {
           label: text,
           icon,
-          key: 'slider_' + key + '_0',
+          key: `slider_${key}_0`,
           onClick: () => {
             routerPush(router, url)
             setTopMenuKey(key)
             setSliderMenuKey('0')
-          }
+          },
         }
 
         menuItemsVertical.push(menuObjVertical)
@@ -266,7 +276,7 @@ const LayoutComponent = ({ user, children }) => {
       <Container>
         <StyledHeader>
           <div className="logo">
-            <Image width={120} src={prefix + "/images/zhizuotu_1.png"} preview={false} />
+            <Image width={120} src={`${prefix}/images/zhizuotu_1.png`} preview={false} />
           </div>
           <Menu
             theme="dark"
@@ -329,39 +339,41 @@ const LayoutComponent = ({ user, children }) => {
                 mode="inline"
                 defaultSelectedKeys={['slider_1_0']}
                 defaultOpenKeys={['slider_1']}
-                selectedKeys={['slider_' + topMenuKey + '_' + sliderMenuKey]}
-                openKeys={['slider_' + topMenuKey]}
+                selectedKeys={[`slider_${topMenuKey}_${sliderMenuKey}`]}
+                openKeys={[`slider_${topMenuKey}`]}
                 items={menuItemsVertical}
                 className="side-menu"
               />
             </div>
           </StyledSider>
           <ContentLayout className="content-layout">
-            <StyledBreadcrumb>
-              {_.map(menuConfig, (item, index) => {
-                const { key, text, subMenus } = item
-
-                if (subMenus) {
-                  let subContent: any = []
-                  _.each(subMenus, (subItem, subIndex) => {
-                    const { key: subKey, text: subText } = subItem
-                    if (subKey === topMenuKey + '_' + sliderMenuKey) {
-                      subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex}>{text}</Breadcrumb.Item>)
-                      subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex + '_sub'}>{subText}</Breadcrumb.Item>)
-                      return false
+            <StyledBreadcrumb
+              items={_.compact(
+                _.flatMap(menuConfig, (item, index) => {
+                  const { key, text, subMenus } = item
+
+                  if (subMenus) {
+                    const subItems: any = []
+                    _.each(subMenus, (subItem: MenuItem, subIndex: number) => {
+                      const { key: subKey, text: subText } = subItem
+                      if (subKey === `${topMenuKey}_${sliderMenuKey}`) {
+                        subItems.push({ title: text, key: `breadcrumb${subIndex}` })
+                        subItems.push({ title: subText, key: `breadcrumb${subIndex}_sub` })
+                        return false
+                      }
+                      return true
+                    })
+                    return subItems
+                  } else {
+                    if (key && key === topMenuKey) {
+                      return { title: text, key: `breadcrumb${index}` }
                     }
-                  })
-                  return subContent
-                } else {
-                  if (key && key === topMenuKey) {
-                    return <Breadcrumb.Item key={'breadcrumb' + index}>{text}</Breadcrumb.Item>
                   }
-                }
-              })}
-            </StyledBreadcrumb>
-            <StyledContent>
-              {children}
-            </StyledContent>
+                  return null
+                })
+              )}
+            />
+            <StyledContent>{children}</StyledContent>
           </ContentLayout>
         </FlexLayout>
       </Container>

package/client/redux/reducers.ts

@@ -2,4 +2,4 @@ import { templateManageReducer } from './template/manage/reducers'
 
 export default {
   templateManage: templateManageReducer,
-}
+}

package/client/redux/store.ts

@@ -16,6 +16,7 @@ if (reducersKeysLen > 0) {
 export type RootState = ReturnType<typeof combineReducer>
 
 // 创建一个临时 store 实例来获取正确的 dispatch 类型
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const tempStore = configureStore({
   reducer: combineReducer,
   middleware: (getDefaultMiddleware) =>
@@ -48,7 +49,7 @@ export const initializeStore = (preloadedState?: any): EnhancedStore => {
   if (preloadedState && store) {
     _store = initStore({
       ...store.getState(),
-      ...preloadedState
+      ...preloadedState,
     })
     store = undefined
   }