Skip to content

Let's use AI to Earn!

默认选择空间的各种逻辑

daoyianc6cf75ea714e
diff --git a/@types/resources.d.ts b/@types/resources.d.ts
index e373f845..dfda7ce0 100644
--- a/@types/resources.d.ts
+++ b/@types/resources.d.ts
@@ -91,6 +91,10 @@ interface Resources {
"account": "账号",
"platform": "平台",
"space": "所属列表"
+ },
+ "addAccountModal": {
+ "currentSpace": "当前空间",
+ "pleaseChooseSpaceFirst": "请先选择空间"
}
},
"cgmaterial": {
diff --git a/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.module.scss b/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.module.scss
index da1ab0b8..91f1af61 100644
--- a/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.module.scss
+++ b/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.module.scss
@@ -169,7 +169,6 @@
}
.ant-collapse {
- overflow: auto;
border: none;
background: transparent;
.ant-collapse-content-box {
diff --git a/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx b/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx
index 51da708c..7cc6b5d1 100644
--- a/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx
+++ b/src/app/[lng]/accounts/components/AccountSidebar/AccountSidebar.tsx
@@ -175,9 +175,6 @@ const AccountSidebar = memo(
// 添加账号相关状态
const [isAddAccountOpen, setIsAddAccountOpen] = useState(false);
- const [targetGroupIdForModal, setTargetGroupIdForModal] = useState<string | undefined>(undefined);
- const [chooseGroupOpen, setChooseGroupOpen] = useState(false);
- const [chosenGroupId, setChosenGroupId] = useState<string | undefined>(undefined);
const preAccountIds = useRef<Set<string>>(new Set());
const pendingGroupIdRef = useRef<string | null>(null);
const isAssigningRef = useRef(false);
@@ -220,24 +217,15 @@ const AccountSidebar = memo(
return;
}
- // 如果有多个空间,让用户选择
- if (accountGroupList.length > 1) {
- setChosenGroupId(accountGroupList[0]?.id);
- setChooseGroupOpen(true);
- } else {
- // 只有一个空间,直接使用
- const currentGroupId = accountGroupList[0]?.id;
- pendingGroupIdRef.current = currentGroupId;
- setTargetGroupIdForModal(currentGroupId);
- if ((useAccountStore.getState().accountList || []).length === 0) {
- await getAccountList();
- }
- preAccountIds.current = new Set(
- (useAccountStore.getState().accountList || []).map((v) => v.id),
- );
- snapshotReadyRef.current = true;
- setIsAddAccountOpen(true);
+ // 直接打开AddAccountModal,让用户选择空间
+ if ((useAccountStore.getState().accountList || []).length === 0) {
+ await getAccountList();
}
+ preAccountIds.current = new Set(
+ (useAccountStore.getState().accountList || []).map((v) => v.id),
+ );
+ snapshotReadyRef.current = true;
+ setIsAddAccountOpen(true);
};
// 监听账号列表变化,自动分配新账号到当前空间
@@ -286,7 +274,6 @@ const AccountSidebar = memo(
open={isAddAccountOpen}
onClose={async () => {
setIsAddAccountOpen(false);
- setTargetGroupIdForModal(undefined);
}}
onAddSuccess={async (acc) => {
try {
@@ -299,38 +286,10 @@ const AccountSidebar = memo(
await getAccountList();
}
}}
- targetGroupId={targetGroupIdForModal}
+ showSpaceSelector={true}
/>
- {/* 选择空间Modal */}
- <Modal
- open={chooseGroupOpen}
- title={t("chooseSpace")}
- onCancel={() => setChooseGroupOpen(false)}
- onOk={async () => {
- if (!chosenGroupId) return message.warning(t("pleaseChooseSpace"));
- pendingGroupIdRef.current = chosenGroupId;
- setTargetGroupIdForModal(chosenGroupId);
- if ((useAccountStore.getState().accountList || []).length === 0) {
- await getAccountList();
- }
- preAccountIds.current = new Set(
- (useAccountStore.getState().accountList || []).map((v) => v.id),
- );
- snapshotReadyRef.current = true;
- setChooseGroupOpen(false);
- setIsAddAccountOpen(true);
- }}
- width={420}
- >
- <Select
- style={{ width: "100%" }}
- placeholder={t("pleaseChooseSpace")}
- value={chosenGroupId}
- onChange={setChosenGroupId}
- options={accountGroupList.map((g) => ({ value: g.id, label: g.name }))}
- />
- </Modal>
+
{/* 新建空间Modal */}
<Modal
diff --git a/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx b/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx
index ddfd45d9..57fc324e 100644
--- a/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx
+++ b/src/app/[lng]/accounts/components/AccountSidebar/UserManageModal.tsx
@@ -256,8 +256,6 @@ const UserManageModal = memo(
const [cutLoading, setCutLoading] = useState(false);
const [isAddAccountOpen, setIsAddAccountOpen] = useState(false);
const [targetGroupIdForModal, setTargetGroupIdForModal] = useState<string | undefined>(undefined);
- const [chooseGroupOpen, setChooseGroupOpen] = useState(false);
- const [chosenGroupId, setChosenGroupId] = useState<string | undefined>(undefined);
const preAccountIds = useRef<Set<string>>(new Set());
const pendingGroupIdRef = useRef<string | null>(null);
const isAssigningRef = useRef(false);
@@ -414,9 +412,10 @@ const UserManageModal = memo(
const currentGroupId = activeGroup;
close();
if (currentGroupId === allUser.current) {
- setChosenGroupId(accountGroupList[0]?.id);
- setChooseGroupOpen(true);
+ // 如果选择的是"全部账号",需要用户选择空间
+ setIsAddAccountOpen(true);
} else {
+ // 如果选择的是具体空间,直接使用该空间
pendingGroupIdRef.current = currentGroupId;
setTargetGroupIdForModal(currentGroupId);
if ((useAccountStore.getState().accountList || []).length === 0) {
@@ -586,34 +585,7 @@ const UserManageModal = memo(
</div>
</Spin>
</Modal>
- <Modal
- open={chooseGroupOpen}
- title={t("chooseSpace" as any)}
- onCancel={() => setChooseGroupOpen(false)}
- onOk={async () => {
- if (!chosenGroupId) return message.warning(t("pleaseChooseSpace" as any));
- pendingGroupIdRef.current = chosenGroupId;
- setTargetGroupIdForModal(chosenGroupId);
- if ((useAccountStore.getState().accountList || []).length === 0) {
- await getAccountList();
- }
- preAccountIds.current = new Set(
- (useAccountStore.getState().accountList || []).map((v) => v.id),
- );
- snapshotReadyRef.current = true;
- setChooseGroupOpen(false);
- setIsAddAccountOpen(true);
- }}
- width={420}
- >
- <Select
- style={{ width: "100%" }}
- placeholder={t("pleaseChooseSpace" as any)}
- value={chosenGroupId}
- onChange={setChosenGroupId}
- options={accountGroupList.map((g) => ({ value: g.id, label: g.name }))}
- />
- </Modal>
+
<AddAccountModal
open={isAddAccountOpen}
@@ -633,6 +605,7 @@ const UserManageModal = memo(
}
}}
targetGroupId={targetGroupIdForModal}
+ showSpaceSelector={activeGroup === allUser.current}
/>
</>
);
diff --git a/src/app/[lng]/accounts/components/AddAccountModal/index.tsx b/src/app/[lng]/accounts/components/AddAccountModal/index.tsx
index 9b139a28..1cbde93a 100644
--- a/src/app/[lng]/accounts/components/AddAccountModal/index.tsx
+++ b/src/app/[lng]/accounts/components/AddAccountModal/index.tsx
@@ -1,6 +1,6 @@
import { ForwardedRef, forwardRef, memo, useEffect, useMemo, useState } from "react";
import styles from "./AddAccountModal.module.scss";
-import { Button, Modal, Tooltip } from "antd";
+import { Button, Modal, Tooltip, Select, Space, Typography } from "antd";
import { AccountPlatInfoArr, PlatType } from "@/app/config/platConfig";
import { SocialAccount } from "@/api/types/account.type";
import { useTransClient } from "@/app/i18n/client";
@@ -15,8 +15,12 @@ import { threadsSkip } from "../../plat/ThreadsLogin";
import { wxGzhSkip } from "../../plat/WxGzh";
import { pinterestSkip } from "../../plat/PinterestLogin";
import { useAccountStore } from "@/store/account";
+import { useShallow } from "zustand/react/shallow";
import { getIpLocation, IpLocationInfo } from "@/utils/ipLocation";
import DownloadAppModal from "@/components/common/DownloadAppModal";
+import { updateAccountApi } from "@/api/account";
+
+const { Text } = Typography;
export interface IAddAccountModalRef {}
@@ -26,21 +30,32 @@ export interface IAddAccountModalProps {
onAddSuccess: (accountInfo: SocialAccount) => void;
// 目标空间ID,用于根据空间属地(CN)过滤可添加平台
targetGroupId?: string;
+ // 是否显示空间选择器(当从AccountSidebar的"添加账号"按钮打开时显示)
+ showSpaceSelector?: boolean;
}
const AddAccountModal = memo(
forwardRef(
(
- { open, onClose, onAddSuccess, targetGroupId }: IAddAccountModalProps,
+ { open, onClose, onAddSuccess, targetGroupId, showSpaceSelector = false }: IAddAccountModalProps,
ref: ForwardedRef<IAddAccountModalRef>,
) => {
const { t } = useTransClient('account');
const [showFacebookPagesModal, setShowFacebookPagesModal] = useState(false);
- const accountGroupList = useAccountStore((state) => state.accountGroupList);
+ const { accountGroupList, getAccountList } = useAccountStore(
+ useShallow((state) => ({
+ accountGroupList: state.accountGroupList,
+ getAccountList: state.getAccountList,
+ }))
+ );
const [downloadVisible, setDownloadVisible] = useState(false);
const [downloadPlatform, setDownloadPlatform] = useState<string>("");
const aitoearnDownloadUrl = process.env.NEXT_PUBLIC_AITOEARN_APP_DOWNLOAD_URL || "";
+ // 空间选择相关状态
+ const [selectedSpaceId, setSelectedSpaceId] = useState<string | undefined>(targetGroupId);
+ const [spaceSelectionRequired, setSpaceSelectionRequired] = useState(false);
+
// 判断location是否属于中国(CN)
const isLocationCN = (location?: string | null): boolean => {
if (!location) return false;
@@ -52,16 +67,40 @@ const AddAccountModal = memo(
const [isCnSpace, setIsCnSpace] = useState<boolean | null>(null);
const [isLocLoading, setIsLocLoading] = useState(false);
+ // 初始化空间选择 - 简化版本
useEffect(() => {
-
+ if (!open) {
+ setSpaceSelectionRequired(false);
+ setSelectedSpaceId(undefined);
+ return;
+ }
- if (!open || !targetGroupId) {
+ if (showSpaceSelector) {
+ setSpaceSelectionRequired(true);
+ } else {
+ setSpaceSelectionRequired(false);
+ if (targetGroupId) {
+ setSelectedSpaceId(targetGroupId);
+ }
+ }
+ }, [open, showSpaceSelector, targetGroupId]);
+
+ // 设置默认空间选择 - 只有当没有指定targetGroupId时才自动选择第一个空间
+ useEffect(() => {
+ if (open && showSpaceSelector && accountGroupList.length > 0 && !selectedSpaceId && !targetGroupId) {
+ // 不自动选择第一个空间,让用户手动选择
+ // setSelectedSpaceId(accountGroupList[0]?.id);
+ }
+ }, [open, showSpaceSelector, accountGroupList, selectedSpaceId, targetGroupId]);
+
+ useEffect(() => {
+ if (!open || !selectedSpaceId) {
setIsCnSpace(null);
setIsLocLoading(false);
return;
}
- const currentSpace = (accountGroupList || []).find((g: any) => g.id === targetGroupId);
+ const currentSpace = (accountGroupList || []).find((g: any) => g.id === selectedSpaceId);
if (!currentSpace) {
setIsCnSpace(null);
return;
@@ -90,37 +129,35 @@ const AddAccountModal = memo(
return () => {
cancelled = true;
};
- }, [open, targetGroupId, accountGroupList]);
-
- // 判断平台是否在当前属地可用
- const isPlatformAvailable = (platType: PlatType): boolean => {
- // TODO: 暂时屏蔽国内平台 @@.@@
- // return true;
- if (isCnSpace === null) return true; // 未确定属地时显示所有平台
-
- const cnOnlyPlatforms = new Set<PlatType>([
- PlatType.Douyin,
- PlatType.KWAI,
- PlatType.WxGzh,
- PlatType.WxSph,
- PlatType.BILIBILI,
- ]);
-
- // 小红书是全球平台,不受IP限制
- if (platType === PlatType.Xhs) {
- return true;
- }
-
- if (isCnSpace === true) {
- // 中国属地:仅国内平台可用
- return cnOnlyPlatforms.has(platType);
- } else {
- // 非中国属地:国内平台不可用
- return !cnOnlyPlatforms.has(platType);
- }
- };
-
+ }, [open, selectedSpaceId]);
+ // 判断平台是否在当前属地可用
+ const isPlatformAvailable = (platType: PlatType): boolean => {
+ // TODO: 暂时屏蔽国内平台 @@.@@
+ // return true;
+ if (isCnSpace === null) return true; // 未确定属地时显示所有平台
+
+ const cnOnlyPlatforms = new Set<PlatType>([
+ PlatType.Douyin,
+ PlatType.KWAI,
+ PlatType.WxGzh,
+ PlatType.WxSph,
+ PlatType.BILIBILI,
+ ]);
+
+ // 小红书是全球平台,不受IP限制
+ if (platType === PlatType.Xhs) {
+ return true;
+ }
+
+ if (isCnSpace === true) {
+ // 中国属地:仅国内平台可用
+ return cnOnlyPlatforms.has(platType);
+ } else {
+ // 非中国属地:国内平台不可用
+ return !cnOnlyPlatforms.has(platType);
+ }
+ };
const handleOk = () => {
onClose();
@@ -142,6 +179,127 @@ const AddAccountModal = memo(
// 可以在这里添加成功提示或其他逻辑
};
+ // 处理平台点击
+ const handlePlatformClick = async (key: PlatType, value: any) => {
+ // 如果需要选择空间但未选择,提示用户
+ if (spaceSelectionRequired && !selectedSpaceId) {
+ return;
+ }
+
+ // 如果平台在当前属地不可用,则提示
+ if (!isPlatformAvailable(key)) {
+ return;
+ }
+
+ // 如果该平台在PC端不可用,则提示下载Aitoearn App
+ if (value.pcNoThis) {
+ setDownloadPlatform(value.name);
+ setDownloadVisible(true);
+ return;
+ }
+
+ // 记录授权前的账号数量,用于后续识别新账号
+ const beforeAuthCount = accountGroupList.reduce((total, group) => total + group.children.length, 0);
+
+ switch (key) {
+ case PlatType.KWAI:
+ await kwaiSkip(key);
+ break;
+ case PlatType.BILIBILI:
+ await bilibiliSkip(key);
+ break;
+ case PlatType.YouTube:
+ await youtubeSkip(key);
+ break;
+ case PlatType.Twitter:
+ await twitterSkip(key);
+ break;
+ case PlatType.Tiktok:
+ await tiktokSkip(key);
+ break;
+ case PlatType.Facebook:
+ try {
+ await facebookSkip(key);
+ // Facebook授权成功后显示页面选择弹窗
+ handleFacebookAuthSuccess();
+ } catch (error) {
+ console.error('Facebook授权失败:', error);
+ }
+ break;
+ case PlatType.Instagram:
+ await instagramSkip(key);
+ break;
+ case PlatType.Threads:
+ await threadsSkip(key);
+ break;
+ case PlatType.WxGzh:
+ await wxGzhSkip(key);
+ break;
+ case PlatType.Pinterest:
+ await pinterestSkip(key);
+ break;
+ }
+
+ // 如果指定了目标空间,等待授权完成后移动新账号
+ if (selectedSpaceId) {
+ // 检查选中的空间是否是默认空间
+ const targetGroup = accountGroupList.find(group => group.id === selectedSpaceId);
+ const isDefaultSpace = targetGroup?.isDefault;
+
+ console.log('移动空间调试信息:', {
+ selectedSpaceId,
+ targetGroupName: targetGroup?.name,
+ isDefaultSpace,
+ showSpaceSelector,
+ spaceSelectionRequired
+ });
+
+ // 只有当选择了非默认空间时才移动账号
+ if (!isDefaultSpace) {
+ console.log('准备移动账号到空间:', targetGroup?.name);
+ setTimeout(async () => {
+ try {
+ // 刷新账号列表
+ await getAccountList();
+
+ // 获取最新的账号组列表
+ const currentState = useAccountStore.getState();
+ const defaultGroup = currentState.accountGroupList.find(group => group.isDefault);
+
+ if (defaultGroup) {
+ // 找到相同平台类型的最后一个账号(最新添加的)
+ const sameTypeAccounts = defaultGroup.children.filter(account => account.type === key);
+ const latestAccount = sameTypeAccounts[sameTypeAccounts.length - 1];
+
+ if (latestAccount) {
+ console.log('找到最新账号:', latestAccount.account, '平台:', key);
+
+ // 将新账号移动到指定空间
+ console.log('移动账号:', latestAccount.account, '到空间:', targetGroup?.name);
+ await updateAccountApi({
+ id: latestAccount.id,
+ groupId: selectedSpaceId
+ });
+ } else {
+ console.log('未找到相同平台类型的账号');
+ }
+
+ // 再次刷新账号列表以更新UI
+ await getAccountList();
+ console.log('账号移动完成');
+ }
+ } catch (error) {
+ console.error('移动账号到指定空间失败:', error);
+ }
+ }, 3000); // 等待3秒让授权完成
+ } else {
+ console.log('选择的是默认空间,无需移动账号');
+ }
+ } else {
+ console.log('未选择空间,不移动账号');
+ }
+ };
+
return (
<>
<Modal
@@ -154,82 +312,65 @@ const AddAccountModal = memo(
>
<div className={styles.addAccountModal}>
<h1>{t('addAccountModal.subtitle')}</h1>
+
+ {/* 空间选择器 */}
+ {spaceSelectionRequired && (
+ <div style={{
+ marginBottom: '20px',
+ padding: '16px',
+ backgroundColor: 'var(--grayColor1)',
+ borderRadius: '8px',
+ border: '1px solid var(--grayColor3)'
+ }}>
+ <Space direction="vertical" size="small" style={{ width: '100%' }}>
+ <Text strong style={{ fontSize: '14px' }}>{t('chooseSpace')}</Text>
+ <Select
+ style={{ width: '100%' }}
+ placeholder={t('pleaseChooseSpace')}
+ value={selectedSpaceId}
+ onChange={setSelectedSpaceId}
+ options={accountGroupList.map((g) => ({ value: g.id, label: g.name }))}
+ />
+ </Space>
+ </div>
+ )}
+
+ {/* 当前选择的空间信息 */}
+ {selectedSpaceId && !spaceSelectionRequired && (
+ <div style={{
+ marginBottom: '20px',
+ padding: '12px',
+ backgroundColor: 'var(--grayColor1)',
+ borderRadius: '6px',
+ border: '1px solid var(--grayColor3)',
+ fontSize: 'var(--fs-xs)',
+ color: 'var(--grayColor6)'
+ }}>
+ <Text>当前空间: {accountGroupList.find(g => g.id === selectedSpaceId)?.name}</Text>
+ </div>
+ )}
+
<div className="addAccountModal_plats">
{AccountPlatInfoArr.map(([key, value]) => {
const isAvailable = isPlatformAvailable(key as PlatType);
return (
- // !value.pcNoThis &&
<Tooltip title={value.tips?.account} key={key}>
-
<Button
type="text"
className={`addAccountModal_plats-item ${!isAvailable ? 'disabled' : ''}`}
- disabled={!isAvailable}
- onClick={async () => {
- // 如果平台在当前属地不可用,则提示
- if (!isAvailable) {
- return;
- }
- // 如果该平台在PC端不可用,则提示下载Aitoearn App
- if (value.pcNoThis) {
- setDownloadPlatform(value.name);
- setDownloadVisible(true);
- return;
- }
- switch (key) {
- case PlatType.KWAI:
- await kwaiSkip(key);
- break;
- case PlatType.BILIBILI:
- await bilibiliSkip(key);
- break;
- case PlatType.YouTube:
- await youtubeSkip(key);
- break;
- case PlatType.Twitter:
- await twitterSkip(key);
- break;
- case PlatType.Tiktok:
- await tiktokSkip(key);
- break;
- case PlatType.Facebook:
- try {
- await facebookSkip(key);
- // Facebook授权成功后显示页面选择弹窗
- handleFacebookAuthSuccess();
- } catch (error) {
- console.error('Facebook授权失败:', error);
- }
- break;
- case PlatType.Instagram:
- await instagramSkip(key);
- break;
- case PlatType.Threads:
- await threadsSkip(key);
- break;
- case PlatType.WxGzh:
- await wxGzhSkip(key);
- break;
- case PlatType.Pinterest:
- await pinterestSkip(key);
- break;
- }
- }}
+ disabled={!isAvailable || (spaceSelectionRequired && !selectedSpaceId)}
+ onClick={() => handlePlatformClick(key as PlatType, value)}
>
-
<div className="addAccountModal_plats-item-con">
- {/*<LoadingOutlined style={{ fontSize: '20px' }} />*/}
<img src={value.icon} style={{ opacity: isAvailable ? 1 : 0.5 }} />
<span style={{ opacity: isAvailable ? 1 : 0.5 }}>{value.name}</span>
</div>
-
-
</Button>
-
</Tooltip>
);
})}
</div>
+
{/* 属地限制提示 */}
{isCnSpace !== null && (
<div style={{
@@ -247,6 +388,21 @@ const AddAccountModal = memo(
}
</div>
)}
+
+ {/* 空间选择提示 */}
+ {spaceSelectionRequired && !selectedSpaceId && (
+ <div style={{
+ marginTop: '16px',
+ padding: '12px',
+ backgroundColor: 'var(--warningColor1)',
+ borderRadius: '6px',
+ fontSize: 'var(--fs-xs)',
+ color: 'var(--warningColor)',
+ textAlign: 'center'
+ }}>
+ 请先选择空间
+ </div>
+ )}
</div>
</Modal>
diff --git a/src/app/i18n/locales/en/account.json b/src/app/i18n/locales/en/account.json
index 4cccc990..f62b332a 100644
--- a/src/app/i18n/locales/en/account.json
+++ b/src/app/i18n/locales/en/account.json
@@ -90,5 +90,9 @@
"account": "Account",
"platform": "Platform",
"space": "Space"
+ },
+ "addAccountModal": {
+ "currentSpace": "Current Space",
+ "pleaseChooseSpaceFirst": "Please choose a space first"
}
}
\ No newline at end of file
diff --git a/src/app/i18n/locales/zh-CN/account.json b/src/app/i18n/locales/zh-CN/account.json
index caaa84b0..695d1b0d 100644
--- a/src/app/i18n/locales/zh-CN/account.json
+++ b/src/app/i18n/locales/zh-CN/account.json
@@ -90,5 +90,9 @@
"account": "账号",
"platform": "平台",
"space": "所属列表"
+ },
+ "addAccountModal": {
+ "currentSpace": "当前空间",
+ "pleaseChooseSpaceFirst": "请先选择空间"
}
}
\ No newline at end of file
diff --git a/src/components/common/DownloadAppModal.tsx b/src/components/common/DownloadAppModal.tsx
index 5af72fb6..8c8c794c 100644
--- a/src/components/common/DownloadAppModal.tsx
+++ b/src/components/common/DownloadAppModal.tsx
@@ -73,7 +73,7 @@ const DownloadAppModal: React.FC<DownloadAppModalProps> = ({
]}
width={520}
centered
- destroyOnClose
+ destroyOnHidden
>
<div style={{ textAlign: 'center', padding: '20px 0' }}>
{/* App Logo */}