合并冲突

This commit is contained in:
chris
2025-04-29 15:36:03 +08:00
parent 44b005ffdd
commit db547fb378
@@ -1,14 +1,14 @@
import styles from "./pluginCard.module.css" import styles from "./pluginCard.module.css";
import { PluginCardVO } from "@/app/home/plugins/plugin-installed/PluginCardVO"; import { PluginCardVO } from "@/app/home/plugins/plugin-installed/PluginCardVO";
import { GithubOutlined, LinkOutlined, ToolOutlined } from '@ant-design/icons'; import { GithubOutlined, LinkOutlined, ToolOutlined } from "@ant-design/icons";
import { Switch, Tag } from 'antd' import { Switch, Tag } from "antd";
import { useState } from "react"; import { useState } from "react";
import { httpClient } from "@/app/infra/http/HttpClient"; import { httpClient } from "@/app/infra/http/HttpClient";
export default function PluginCardComponent({ export default function PluginCardComponent({
cardVO cardVO
}: { }: {
cardVO: PluginCardVO cardVO: PluginCardVO;
}) { }) {
const [initialized, setInitialized] = useState(cardVO.isInitialized); const [initialized, setInitialized] = useState(cardVO.isInitialized);
const [switchEnable, setSwitchEnable] = useState(true); const [switchEnable, setSwitchEnable] = useState(true);
@@ -27,7 +27,6 @@ export default function PluginCardComponent({
setSwitchEnable(true); setSwitchEnable(true);
}); });
} }
return ( return (
<div className={`${styles.cardContainer}`}> <div className={`${styles.cardContainer}`}>
{/* header */} {/* header */}
@@ -36,10 +35,7 @@ export default function PluginCardComponent({
<div className={`${styles.fontGray}`}>{cardVO.author}</div> <div className={`${styles.fontGray}`}>{cardVO.author}</div>
{/* right icon & version */} {/* right icon & version */}
<div className={`${styles.iconVersionContainer}`}> <div className={`${styles.iconVersionContainer}`}>
<GithubOutlined <GithubOutlined style={{ fontSize: "26px" }} type="setting" />
style={{ fontSize: '26px' }}
type="setting"
/>
<Tag color="#108ee9">v{cardVO.version}</Tag> <Tag color="#108ee9">v{cardVO.version}</Tag>
</div> </div>
</div> </div>
@@ -52,15 +48,17 @@ export default function PluginCardComponent({
<div className={`${styles.cardFooter}`}> <div className={`${styles.cardFooter}`}>
<div className={`${styles.linkSettingContainer}`}> <div className={`${styles.linkSettingContainer}`}>
<div className={`${styles.link}`}> <div className={`${styles.link}`}>
<LinkOutlined <LinkOutlined style={{ fontSize: "22px" }} />
style={{ fontSize: '22px' }}
/>
<span>1</span> <span>1</span>
</div> </div>
<ToolOutlined <ToolOutlined style={{ fontSize: "22px" }} />
style={{ fontSize: '22px' }}
/>
</div> </div>
<Switch
value={initialized}
onClick={handleEnable}
disabled={!switchEnable}
/>
</div> </div>
</div> </div>
); );