diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/applicationset/applicationset.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/applicationset/applicationset.tsx index d1d730e..169cb5d 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/applicationset/applicationset.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/applicationset/applicationset.tsx @@ -6,7 +6,7 @@ import {Anchor, Button, Card, Image} from "antd"; import {RightCircleOutlined, LikeFilled, WechatFilled, HomeFilled, DribbbleSquareFilled, CopyFilled, MedicineBoxFilled, IeCircleFilled, IdcardFilled, HourglassFilled, InsuranceFilled} from "@ant-design/icons"; // import Link from "next/link"; import request from '@/app/request'; -import Title from "@/app/(main)/discover/components/Title"; +import Title from "../discover/components/Title"; const stList = [ { diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/Card.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/Card.tsx index 46b1294..1ef9207 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/Card.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/Card.tsx @@ -154,19 +154,9 @@ const AssistantCard = memo( } return ( - - {!isCompact && ( -
{ - router.push(href); - }} - > - -
- )} + + {!isCompact && } - - ( {description} - - - - {showCategory && categoryItem ? ( - + +
{e.stopPropagation()}} style={{width: '85%'}}> + {showCategory && categoryItem ? ( {categoryItem.label} - - ) : ( - tags - .slice(0, 4) - .filter(Boolean) - .map((tag: string, index) => { - // const url = qs.stringifyUrl({ - // query: { q: tag, type: 'assistants' }, - // url: '/discover/search', - // }); - return ( - {startCase(tag).trim()} - // - // - // {startCase(tag).trim()} - // - ); - }) - )} + ) : ( + tags + .slice(0, 4) + .filter(Boolean) + .map((tag: string, index) => { + // const url = qs.stringifyUrl({ + // query: { q: tag, type: 'assistants' }, + // url: '/discover/search', + // }); + return ( + {startCase(tag).trim()} + // + // + // {startCase(tag).trim()} + // + ); + }) + )} +
diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/List.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/List.tsx index 0f86636..b557a83 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/List.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/assistants/features/List.tsx @@ -38,46 +38,46 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) }; }, [stData, mobile]); - // useEffect(() => { - // const fetchData = async() => { - // if(category === "collect") { - // const res = await request({ - // method: "get", - // params: { - // userid: userId - // }, - // url: "/flxai/api/robot/appaiassistant/getAllAiAssistant" - // }) - // setStData(res?.data.map((item)=> { - // item.classify = 'collect'; - // return item - // })) - // } else { - // const res = await request({ - // method: "get", - // params: { - // userid: userId - // }, - // url: "/flxai/api/robot/appaiassistant/getAllAiAssistant" - // }) - // const array2Object = {}; - // res?.data?.forEach((item) => { - // array2Object[item.identifier] = item; - // }); - // setStData(stData?.map((item)=> { - // const matchingItem = array2Object[item.identifier]; - // if (matchingItem) { - // matchingItem.status = '1'; - // return matchingItem - // } else { - // item.status = '0'; - // return item - // } - // })) - // } - // }; - // fetchData(); - // }, []); // 空数组[]意味着仅在组件挂载时调用一次 + useEffect(() => { + const fetchData = async() => { + if(category === "collect") { + const res = await request({ + method: "get", + params: { + userid: userId + }, + url: "/flxai/api/robot/appaiassistant/getAllAiAssistant" + }) + setStData(res?.data.map((item)=> { + item.classify = 'collect'; + return item + })) + } else { + const res = await request({ + method: "get", + params: { + userid: userId + }, + url: "/flxai/api/robot/appaiassistant/getAllAiAssistant" + }) + const array2Object = {}; + res?.data?.forEach((item) => { + array2Object[item.identifier] = item; + }); + setStData(stData?.map((item)=> { + const matchingItem = array2Object[item.identifier]; + if (matchingItem) { + matchingItem.status = '1'; + return matchingItem + } else { + item.status = '0'; + return item + } + })) + } + }; + fetchData(); + }, []); // 空数组[]意味着仅在组件挂载时调用一次 const handleClickCard = (item) => { console.log(item) @@ -93,13 +93,15 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) data={all} initialItemCount={24} itemContent={(_, item) => ( - +
handleClickCard(item)} key={item.identifier}> + +
)} style={{ minHeight: '75vh', @@ -117,7 +119,11 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) {all?.map((item) => ( // - handleClickCard(item)} showCategory={!category} {...item} /> + +
handleClickCard(item)} key={item.identifier}> + +
+ // handleClickCard(item)} showCategory={!category} {...item} /> // ))}
@@ -127,12 +133,14 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) {t('assistants.recentSubmits')} {recent.map((item) => ( - +
handleClickCard(item)} key={item.identifier}> + +
))}
{last && last?.length > 0 && ( @@ -142,13 +150,15 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) data={last} initialItemCount={12} itemContent={(_, item) => ( - +
handleClickCard(item)} key={item.identifier}> + +
)} style={{ minHeight: '75vh', diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/models/features/Card.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/models/features/Card.tsx index 2668e16..4f75b85 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/models/features/Card.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/models/features/Card.tsx @@ -143,8 +143,11 @@ const ModelCard = memo(({ className,socialData, meta, identifier return; } }; + const handleClickCard = (item) => { + console.log(item) + } return ( - + (({ category, searchKeywords, items = [] }) => { const userId = getUserId(useUserStore.getState()) const [stData, setStData] = useState(items) - // useEffect(() => { - // const fetchData = async() => { - // if(category === "collect") { - // const res = await request({ - // method: "get", - // params: { - // userid: userId - // }, - // url: "/flxai/api/robot/appaimodel/getAllAiModel", - // }) - // setStData(res?.data.map((item)=> { - // item.classify = 'collect'; - // return item - // })) - // // items = res.data; - // // items = items.map((item)=> { - // // item.classify = 'collect'; - // // return item - // // }) - // } else { - // const res = await request({ - // method: "get", - // params: { - // userid: userId - // }, - // url: "/flxai/api/robot/appaimodel/getAllAiModel", - // }) - // const array2Object = {}; - // res?.data?.forEach(item => { - // array2Object[item.identifier] = item; - // }); - // setStData(stData.map((item)=> { - // const matchingItem = array2Object[item.identifier]; - // if (matchingItem) { - // matchingItem.status = '1'; - // return matchingItem - // } else { - // item.status = '0'; - // return item - // } - // })) - // } - // }; - // fetchData(); - // }, []); // 空数组[]意味着仅在组件挂载时调用一次 + useEffect(() => { + const fetchData = async() => { + if(category === "collect") { + const res = await request({ + method: "get", + params: { + userid: userId + }, + url: "/flxai/api/robot/appaimodel/getAllAiModel", + }) + setStData(res?.data.map((item)=> { + item.classify = 'collect'; + return item + })) + // items = res.data; + // items = items.map((item)=> { + // item.classify = 'collect'; + // return item + // }) + } else { + const res = await request({ + method: "get", + params: { + userid: userId + }, + url: "/flxai/api/robot/appaimodel/getAllAiModel", + }) + const array2Object = {}; + res?.data?.forEach(item => { + array2Object[item.identifier] = item; + }); + setStData(stData.map((item)=> { + const matchingItem = array2Object[item.identifier]; + if (matchingItem) { + matchingItem.status = '1'; + return matchingItem + } else { + item.status = '0'; + return item + } + })) + } + }; + fetchData(); + }, []); // 空数组[]意味着仅在组件挂载时调用一次 const handleClickCard = (item) => { console.log(item) + // console.log(router) router.push(urlJoin('/discover/model/', item.identifier)) } + if (searchKeywords) { if (!stData || stData?.length === 0) return ; return ( @@ -87,7 +89,10 @@ const List = memo(({ category, searchKeywords, items = [] }) => { data={stData} initialItemCount={24} itemContent={(_, item) => ( - handleClickCard(item)} showCategory {...item} /> + // +
handleClickCard(item)} key={item.identifier}> + +
)} style={{ minHeight: '75vh', @@ -105,7 +110,10 @@ const List = memo(({ category, searchKeywords, items = [] }) => { {stData.map((item) => ( // - handleClickCard(item)} showCategory={!category} {...item} /> + // handleClickCard(item)} showCategory={!category} {...item} /> +
handleClickCard(item)} key={item.identifier}> + +
// ))}
@@ -118,7 +126,10 @@ const List = memo(({ category, searchKeywords, items = [] }) => { initialItemCount={24} itemContent={(_, item) => ( // - handleClickCard(item)} showCategory={!category} {...item} /> + // handleClickCard(item)} key={item.identifier} showCategory={!category} {...item} /> +
handleClickCard(item)} key={item.identifier}> + +
// )} style={{ diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/plugins/features/List.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/plugins/features/List.tsx index 7fdd09f..6f942a0 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/plugins/features/List.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/(list)/plugins/features/List.tsx @@ -35,47 +35,47 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) }; }, [stData, mobile]); - // useEffect(() => { - // const fetchData = async() => { - // if(category === "collect") { - // const res = await request({ - // method: "get", - // params: { - // userid: userId - // }, - // url: "/flxai/api/robot/appaiplugin/getAllAiPlugin", - // }) - // setStData(res?.data.map((item)=> { - // item.classify = 'collect'; - // return item - // })) - // } else { - // const res = await request({ - // method: "get", - // params: { - // userid: userId - // }, - // url: "/flxai/api/robot/appaiplugin/getAllAiPlugin", - // }) - // const array2Object = {}; - // res?.data?.forEach((item) => { - // array2Object[item.identifier] = item; - // }); - // // console.log('chajian22222222222222222222222222222--------------') - // setStData(stData.map((item)=> { - // const matchingItem = array2Object[item.identifier]; - // if (matchingItem) { - // matchingItem.status = '1'; - // return matchingItem - // } else { - // item.status = '0'; - // return item - // } - // })) - // } - // }; - // fetchData(); - // }, []); // 空数组[]意味着仅在组件挂载时调用一次 + useEffect(() => { + const fetchData = async() => { + if(category === "collect") { + const res = await request({ + method: "get", + params: { + userid: userId + }, + url: "/flxai/api/robot/appaiplugin/getAllAiPlugin", + }) + setStData(res?.data.map((item)=> { + item.classify = 'collect'; + return item + })) + } else { + const res = await request({ + method: "get", + params: { + userid: userId + }, + url: "/flxai/api/robot/appaiplugin/getAllAiPlugin", + }) + const array2Object = {}; + res?.data?.forEach((item) => { + array2Object[item.identifier] = item; + }); + // console.log('chajian22222222222222222222222222222--------------') + setStData(stData.map((item)=> { + const matchingItem = array2Object[item.identifier]; + if (matchingItem) { + matchingItem.status = '1'; + return matchingItem + } else { + item.status = '0'; + return item + } + })) + } + }; + fetchData(); + }, []); // 空数组[]意味着仅在组件挂载时调用一次 // console.log('chajian999999999999999--------------',stData) @@ -92,13 +92,14 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) data={all} initialItemCount={24} itemContent={(_, item) => ( - +
handleClickCard(item)} key={item.identifier}> + +
)} style={{ minHeight: '75vh', @@ -114,10 +115,11 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) <> 收藏列表 - {all?.map((item) => ( - // - handleClickCard(item)} showCategory={!category} {...item} /> - // + {all?.map((item,index) => ( + //
handleClickCard(item)}>测试接口
+
handleClickCard(item)} key={item.identifier}> + +
))}
@@ -126,7 +128,10 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) {t('plugins.recentSubmits')} {recent?.map((item) => ( - handleClickCard(item)} showCategory={!category} {...item} /> + // handleClickCard(item)} showCategory={!category} {...item} /> +
handleClickCard(item)} key={item.identifier}> + +
))}
{last && last?.length > 0 && ( @@ -136,7 +141,10 @@ const List = memo(({ category, mobile, searchKeywords, items = [] }) data={last} initialItemCount={12} itemContent={(_, item) => ( - handleClickCard(item)} showCategory={!category} variant={'compact'} {...item} /> + // handleClickCard(item)} showCategory={!category} variant={'compact'} {...item} /> +
handleClickCard(item)} key={item.identifier}> + +
)} style={{ minHeight: '75vh', diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/features/StoreSearchBar.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/features/StoreSearchBar.tsx index 8c20b6d..121f685 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/features/StoreSearchBar.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/features/StoreSearchBar.tsx @@ -45,7 +45,7 @@ const StoreSearchBar = memo(({ mobile, onBlur, onFocus, ... const activeType = activeKey === DiscoverTab.Home ? DiscoverTab.Assistants : activeKey; const userId = getUserId(useUserStore.getState()) - + console.log(userId,'storeSearch3333333333333----') useEffect(() => { if (!pathname.includes('/discover/search')) return; // 使用 useQueryState 时,当 handleSearch 为空时无法回跳 diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/_layout/Desktop.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/_layout/Desktop.tsx index 0459746..5a6d10b 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/_layout/Desktop.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/_layout/Desktop.tsx @@ -23,9 +23,6 @@ const Layout = async ({ children }: PropsWithChildren) => { width={'100%'} > - - - {children} diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/features/AssistantsResult.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/features/AssistantsResult.tsx index 0685125..3bb0f22 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/features/AssistantsResult.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/features/AssistantsResult.tsx @@ -16,6 +16,7 @@ const AssistantsResult = async ({ q: string; userid: string; }) => { + console.log(userid,'222222') const res = await request({ method: "get", params: { diff --git a/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/page.tsx b/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/page.tsx index abd938d..2683bd9 100644 --- a/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/page.tsx +++ b/DigitalHumanWeb/src/app/[variants]/(main)/discover/search/page.tsx @@ -25,7 +25,7 @@ type Props = PageProps< const getSharedProps = async (props: Props) => { const searchParams = await props.searchParams; - const { q, type = 'assistants' } = searchParams; + const { q, type = 'assistants',userid } = searchParams; const { isMobile, locale: hl } = await RouteVariants.getVariantsFromProps(props); const { t, locale } = await translation('metadata', searchParams?.hl || hl); return { @@ -34,6 +34,7 @@ const getSharedProps = async (props: Props) => { q, t, type, + userid, }; }; @@ -51,6 +52,7 @@ export const generateMetadata = async (props: Props) => { const Page = async (props: Props) => { const { locale, t, q, type, isMobile,userid } = await getSharedProps(props); + console.log(userid,'search88888888888888----') if (!q) redirect(urlJoin(`/discover`, type)); const keywords = decodeURIComponent(q); diff --git a/DigitalHumanWeb/src/middleware.ts b/DigitalHumanWeb/src/middleware.ts index cb2dd41..dc30dfe 100644 --- a/DigitalHumanWeb/src/middleware.ts +++ b/DigitalHumanWeb/src/middleware.ts @@ -25,6 +25,7 @@ export const config = { '/discover(.*)', '/chat', '/chat(.*)', + '/applicationset(.*)', '/changelog(.*)', '/settings(.*)', '/files',