cfel-base-components 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "cfel-base-components",
   "main": "/src/index.tsx",
   "types": "src/index.d.ts",

package/src/components/layout/index.scss

@@ -68,8 +68,8 @@ body {
         .app-list {
             .app-list-current {
                 font-size: 12px;
-                height: 24px;
-                line-height: 24px;
+                height: 32px;
+                line-height: 32px;
                 padding: 0 12px;
                 border-radius: 6px;
                 font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
@@ -79,6 +79,11 @@ body {
                 transition: all 0.3s;
                 color: rgba(0, 0, 0, 0.88);
                 font-weight: 400;
+                display: flex;
+                img{
+                    max-width: 32px;
+                    margin-right: 4px;
+                }
             }
 
             .app-list-current:hover {

package/src/components/layout/index.tsx

@@ -1,10 +1,10 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { Layout, Menu, MenuProps, Popover } from 'antd';
 import { SwapOutlined, } from '@ant-design/icons';
 import "./index.scss"
 
 export interface LiosLayoutlProps {
-  appName: string;
+  appName?: string;
   productCode: string;
   children: any;
   menuList: any;
@@ -25,7 +25,6 @@ export interface LiosLayoutlProps {
 
 export default function LiosLayout(props: LiosLayoutlProps) {
   const {
-    appName,
     productCode,
     menuList,
     onMenuClick,
@@ -45,6 +44,12 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     role,
   } = user || {}
   const [openKeys, setOpenKeys] = useState<any>(defaultOpenKeys || []);
+  const [currentProduct, setCurrentProduct] = useState<any>({});
+
+  useEffect(() => {
+    let cp = productList?.filter((i: any) => i.productCode == productCode)[0]
+    setCurrentProduct(cp)
+  }, [productList])
 
   const onOpenChange: MenuProps['onOpenChange'] = (keys) => {
     setOpenKeys(keys);
@@ -90,7 +95,7 @@ export default function LiosLayout(props: LiosLayoutlProps) {
     </div >
   }
 
-  const ProductList = () => {
+  const ProductListFunc = () => {
     return <div className='app-list-other'>
       {productList?.map((item) => {
         return <div
@@ -121,11 +126,23 @@ export default function LiosLayout(props: LiosLayoutlProps) {
         </div>
         <div className="interval" />
         <div className="app-list">
-          <Popover placement="bottom" content={<ProductList />} arrow={false} trigger="click">
-            <div className="app-list-current">
-              {appName}
-            </div>
-          </Popover>
+          {
+            productList ?
+              <Popover placement="bottom" content={<ProductListFunc />} arrow={false} trigger="click">
+                <div className="app-list-current">
+                  {currentProduct?.logoUrl && <img src={currentProduct?.logoUrl || ""} alt="" />}
+                  <div>
+                    {currentProduct?.productName || "请选择应用"}
+                  </div>
+                </div>
+              </Popover> :
+              <div className="app-list-current">
+                {currentProduct?.logoUrl && <img src={currentProduct?.logoUrl || ""} alt="" />}
+                <div>
+                  {currentProduct?.productName}
+                </div>
+              </div>
+          }
         </div>
       </strong>
       <div className='lios-header-fill' />

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "typescript.tsdk": "node_modules/typescript/lib"
-}

package/src/.umi/core/helmet.ts

@@ -1,10 +0,0 @@
-// @ts-nocheck
-// This file is generated by Umi automatically
-// DO NOT CHANGE IT MANUALLY!
-import React from 'react';
-import { HelmetProvider } from '/Users/wujingang/Desktop/workspace/base-components/node_modules/@umijs/renderer-react';
-import { context } from './helmetContext';
-
-export const innerProvider = (container) => {
-  return React.createElement(HelmetProvider, { context }, container);
-}

package/src/.umi/core/helmetContext.ts

@@ -1,4 +0,0 @@
-// @ts-nocheck
-// This file is generated by Umi automatically
-// DO NOT CHANGE IT MANUALLY!
-export const context = {};