zhangshu
/
hicity-toolkit
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整

This commit is contained in:
myf 2022-05-07 10:46:11 +08:00
parent 719b5e3a24
commit efcc53866a
4 changed files with 20 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
packages/pancake-uikit/src/widgets/Menu/Menu.tsx
View File

@ -75,118 +75,8 @@ const Menu: React.FC<NavProps> = ({
profile, profile,
children, children,
inviteUrl, inviteUrl,
// outLink, socialLink,
}) => { }) => {
const outLink = [
{
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
name: "11",
list: [
{
name: "淘宝",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "淘宝1",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "淘宝2",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
],
},
{
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
name: "11",
list: [
{
name: "淘宝",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
],
},
{
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
name: "11",
list: [
{
name: "京东1",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
],
},
{
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
name: "11",
list: [
{
name: "京东1",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "京东2",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "京东3",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
],
},
{
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
name: "11",
list: [
{
name: "京东1",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "京东2",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "京东3",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
],
},
{
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
name: "11",
list: [
{
name: "京东1",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "京东2",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
{
name: "京东3",
link: "www.taobao.com",
icon: "http://ra5vgxi1g.hn-bkt.clouddn.com/1651722219486WX20220425-094204@2x.png",
},
],
},
];
console.log("outLink-----:", outLink);
console.log(setLang);
const { isXl } = useMatchBreakpoints(); const { isXl } = useMatchBreakpoints();
const isMobile = isXl === false; const isMobile = isXl === false;
const [isPushed, setIsPushed] = useState(!isMobile); const [isPushed, setIsPushed] = useState(!isMobile);
@ -254,7 +144,7 @@ const Menu: React.FC<NavProps> = ({
cakePriceUsd={cakePriceUsd} cakePriceUsd={cakePriceUsd}
pushNav={setIsPushed} pushNav={setIsPushed}
links={links} links={links}
outLink={outLink} socialLink={socialLink}
/> />
<Inner isPushed={isPushed} showMenu={showMenu}> <Inner isPushed={isPushed} showMenu={showMenu}>
{children} {children}

72
packages/pancake-uikit/src/widgets/Menu/components/PanelFooter.tsx
View File

@ -3,7 +3,7 @@ import styled from "styled-components";
import { CogIcon } from "../../../components/Svg"; import { CogIcon } from "../../../components/Svg";
import IconButton from "../../../components/Button/IconButton"; import IconButton from "../../../components/Button/IconButton";
import { MENU_ENTRY_HEIGHT } from "../config"; import { MENU_ENTRY_HEIGHT } from "../config";
import { PanelProps, PushedProps, OutLink } from "../types"; import { PanelProps, PushedProps, SocialLink } from "../types";
import CakePrice from "./CakePrice"; import CakePrice from "./CakePrice";
import ThemeSwitcher from "./ThemeSwitcher"; import ThemeSwitcher from "./ThemeSwitcher";
import SocialLinks from "./SocialLinks"; import SocialLinks from "./SocialLinks";
@ -126,20 +126,17 @@ const PanelFooter: React.FC<Props> = ({
currentLang, currentLang,
langs, langs,
setLang, setLang,
outLink, socialLink,
}) => { }) => {
console.log("----:", outLink); let defaultList: SocialLink[] | undefined;
let covers: string | undefined; let moreList: SocialLink[] | undefined;
let defaultList: OutLink[] | undefined; if (socialLink && socialLink.length > 2) {
let moreList: OutLink[] | undefined; const list = JSON.parse(JSON.stringify(socialLink));
if (outLink && outLink.length > 2) { const listLink = JSON.parse(JSON.stringify(socialLink));
const list = JSON.parse(JSON.stringify(outLink)); moreList = list.slice(2, socialLink.length);
const listLink = JSON.parse(JSON.stringify(outLink));
moreList = list.slice(2, outLink.length);
defaultList = listLink.splice(0, 2); defaultList = listLink.splice(0, 2);
covers = outLink[0].icon;
} else { } else {
defaultList = outLink; defaultList = socialLink;
} }
if (!isPushed) { if (!isPushed) {
return ( return (
@ -216,59 +213,8 @@ const PanelFooter: React.FC<Props> = ({
</div> </div>
</ImageDiv> </ImageDiv>
) : ( ) : (
// <Dropdown position="top-right" target={<Text>more</Text>}>
// {moreList?.map((item) => {
// return (
// <ImageDiv>
// <Image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Ftupian.qqjay.com%2Fu%2F2016%2F0919%2F1_171052_3.jpg&refer=http%3A%2F%2Ftupian.qqjay.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1654327831&t=b02514c7e57816af454949c6929e4ecb" />
// <div className="content">ee</div>
// </ImageDiv>
// // <Dropdown
// // position="bottom"
// // target={
// // <Image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Ftupian.qqjay.com%2Fu%2F2016%2F0919%2F1_171052_3.jpg&refer=http%3A%2F%2Ftupian.qqjay.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1654327831&t=b02514c7e57816af454949c6929e4ecb" />
// // }
// // >
// // {item.list && item.list.length > 0
// // ? item.list?.map((childItem) => {
// // return (
// // <Link href={childItem.link} color="textSubtle">
// // <Text>{childItem.name}</Text>
// // </Link>
// // );
// // })
// // : ""}
// // </Dropdown>
// );
// })}
// </Dropdown>
"" ""
)} )}
{/* {outLink && outLink.length > 1 ? (
<Dropdown position="top-right" target={<Image src={covers} />}>
{outLink && outLink.length > 0
? outLink?.map((item) => {
return (
<Link href={item.link} color="textSubtle">
<Text>{item.name}</Text>
</Link>
);
})
: ""}
</Dropdown>
) : (
<>
{outLink && outLink.length > 0
? outLink?.map((item) => {
return (
<Link href={item.link} color="textSubtle">
<Image src={covers} />
</Link>
);
})
: ""}
</>
)} */}
</> </>
</SocialEntry> </SocialEntry>
<SettingsEntry> <SettingsEntry>

40
packages/pancake-uikit/src/widgets/Menu/components/SocialLinks.tsx
View File

@ -8,11 +8,11 @@ import Text from "../../../components/Text/Text";
import * as IconModule from "../icons"; import * as IconModule from "../icons";
import { socials } from "../config"; import { socials } from "../config";
import { LinkLabel } from "./MenuEntry"; import { LinkLabel } from "./MenuEntry";
import { OutLink } from "../types"; import { SocialLink } from "../types";
const Icons = IconModule as unknown as { [key: string]: React.FC<SvgProps> }; const Icons = IconModule as unknown as { [key: string]: React.FC<SvgProps> };
interface Props { interface Props {
outLink?: OutLink[]; socialLink?: SocialLink[];
} }
const Image = styled.img` const Image = styled.img`
@ -21,40 +21,8 @@ const Image = styled.img`
border-radius: 50%; border-radius: 50%;
`; `;
const SocialLinks: React.FC<Props> = ({ outLink }) => { const SocialLinks: React.FC<Props> = ({ socialLink }) => {
// let covers = ""; return <></>;
// if (outLink && outLink.length > 0) {
// covers = outLink[0].icon;
// }
return (
<>
{/* {outLink && outLink.length > 1 ? (
<Dropdown position="top-right" target={<Image src={covers} />}>
{outLink && outLink.length > 0
? outLink?.map((item) => {
return (
<Link href={item.link} color="textSubtle">
<Text>{item.name}</Text>
</Link>
);
})
: ""}
</Dropdown>
) : (
<>
{outLink && outLink.length > 0
? outLink?.map((item) => {
return (
<Link href={item.link} color="textSubtle">
<Image src={covers} />
</Link>
);
})
: ""}
</>
)} */}
</>
);
}; };
export default React.memo(SocialLinks, () => true); export default React.memo(SocialLinks, () => true);

10
packages/pancake-uikit/src/widgets/Menu/types.ts
View File

@ -54,7 +54,7 @@ export interface PanelProps {
langs: Language[]; langs: Language[];
setLang: (lang: Language) => void; setLang: (lang: Language) => void;
links: Array<MenuEntry>; links: Array<MenuEntry>;
outLink?: OutLink[]; socialLink?: SocialLink[];
} }
export interface NavProps extends PanelProps { export interface NavProps extends PanelProps {
@ -63,15 +63,15 @@ export interface NavProps extends PanelProps {
login?: Login; login?: Login;
profile?: Profile; profile?: Profile;
logout?: () => void; logout?: () => void;
outLink?: OutLink[]; socialLink?: SocialLink[];
} }
export interface OutLink { export interface SocialLink {
icon?: string; icon?: string;
name?: string; name?: string;
list?: OutList[]; list?: SocialLinkList[];
} }
export interface OutList { export interface SocialLinkList {
name?: string; name?: string;
icon?: string; icon?: string;
link?: string; link?: string;