Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
逻辑相当复杂的空间授权
daoyian3a9c49c5a916
diff --git a/@types/resources.d.ts b/@types/resources.d.tsindex dfda7ce0..30cc0040 100644--- a/@types/resources.d.ts+++ b/@types/resources.d.ts@@ -26,7 +26,10 @@ interface Resources {"unknownAccount": "未知账户","addAccountModal": {"title": "账号添加",- "subtitle": "选择平台添加账号"+ "subtitle": "选择平台添加账号",+ "currentSpace": "当前空间",+ "pleaseChooseSpaceFirst": "请先选择空间",+ "addTo": "添加到:"},"facebookPages": {"title": "选择Facebook页面",@@ -92,10 +95,7 @@ interface Resources {"platform": "平台","space": "所属列表"},- "addAccountModal": {- "currentSpace": "当前空间",- "pleaseChooseSpaceFirst": "请先选择空间"- }+},"cgmaterial": {"header": {diff --git a/src/app/[lng]/accounts/components/AddAccountModal/AddAccountModal.module.scss b/src/app/[lng]/accounts/components/AddAccountModal/AddAccountModal.module.scssindex 98980748..2446d580 100644--- a/src/app/[lng]/accounts/components/AddAccountModal/AddAccountModal.module.scss+++ b/src/app/[lng]/accounts/components/AddAccountModal/AddAccountModal.module.scss@@ -6,26 +6,34 @@}.addAccountModal_plats {display: grid;- grid-template-columns: repeat(8, 1fr);+ grid-template-columns: repeat(6, 1fr);+ gap: 12px;max-height: 400px;overflow-y: auto;+ margin-bottom: 20px;&-item {- padding: 13px 0;+ padding: 8px;border-radius: 8px;- height: auto;+ height: 90px;white-space: nowrap;+ display: flex;+ flex-direction: column;+ align-items: center;+ justify-content: center;&-con {display: flex;flex-direction: column;align-items: center;+ gap: 8px;width: 100%;img {- width: 35px;- margin-bottom: 4px;+ width: 40px;+ height: 40px;}}span {- font-size: var(--fs-xs);+ font-size: 12px;+ text-align: center;}}}diff --git a/src/app/[lng]/accounts/components/AddAccountModal/index.tsx b/src/app/[lng]/accounts/components/AddAccountModal/index.tsxindex 1cbde93a..1938dd49 100644--- a/src/app/[lng]/accounts/components/AddAccountModal/index.tsx+++ b/src/app/[lng]/accounts/components/AddAccountModal/index.tsx@@ -77,21 +77,20 @@ const AddAccountModal = memo(if (showSpaceSelector) {setSpaceSelectionRequired(true);+ // 默认选择第一个默认空间+ const defaultSpace = accountGroupList.find(group => group.isDefault);+ if (defaultSpace && !selectedSpaceId) {+ setSelectedSpaceId(defaultSpace.id);+ }} else {setSpaceSelectionRequired(false);if (targetGroupId) {setSelectedSpaceId(targetGroupId);}}- }, [open, showSpaceSelector, targetGroupId]);+ }, [open, showSpaceSelector, targetGroupId, accountGroupList, selectedSpaceId]);+- // 设置默认空间选择 - 只有当没有指定targetGroupId时才自动选择第一个空间- useEffect(() => {- if (open && showSpaceSelector && accountGroupList.length > 0 && !selectedSpaceId && !targetGroupId) {- // 不自动选择第一个空间,让用户手动选择- // setSelectedSpaceId(accountGroupList[0]?.id);- }- }, [open, showSpaceSelector, accountGroupList, selectedSpaceId, targetGroupId]);useEffect(() => {if (!open || !selectedSpaceId) {@@ -317,20 +316,18 @@ const AddAccountModal = memo({spaceSelectionRequired && (<div style={{marginBottom: '20px',- padding: '16px',- backgroundColor: 'var(--grayColor1)',- borderRadius: '8px',- border: '1px solid var(--grayColor3)'+ paddingBottom: '16px',+ borderBottom: '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 align="center" style={{ width: '100%' }}>+ <Text strong style={{ fontSize: '14px', minWidth: '80px' }}>{t('addAccountModal.addTo')}</Text>+ <Select+ style={{ width: '200px' }}+ placeholder={t('pleaseChooseSpace')}+ value={selectedSpaceId}+ onChange={setSelectedSpaceId}+ options={accountGroupList.map((g) => ({ value: g.id, label: g.name }))}+ /></Space></div>)}@@ -346,7 +343,7 @@ const AddAccountModal = memo(fontSize: 'var(--fs-xs)',color: 'var(--grayColor6)'}}>- <Text>当前空间: {accountGroupList.find(g => g.id === selectedSpaceId)?.name}</Text>+ <Text>{t('addAccountModal.currentSpace')}: {accountGroupList.find(g => g.id === selectedSpaceId)?.name}</Text></div>)}@@ -360,9 +357,13 @@ const AddAccountModal = memo(className={`addAccountModal_plats-item ${!isAvailable ? 'disabled' : ''}`}disabled={!isAvailable || (spaceSelectionRequired && !selectedSpaceId)}onClick={() => handlePlatformClick(key as PlatType, value)}+><div className="addAccountModal_plats-item-con">- <img src={value.icon} style={{ opacity: isAvailable ? 1 : 0.5 }} />+ <img+ src={value.icon}+ style={{ opacity: isAvailable ? 1 : 0.5 }}+ /><span style={{ opacity: isAvailable ? 1 : 0.5 }}>{value.name}</span></div></Button>@@ -400,7 +401,7 @@ const AddAccountModal = memo(color: 'var(--warningColor)',textAlign: 'center'}}>- 请先选择空间+ {t('addAccountModal.pleaseChooseSpaceFirst')}</div>)}</div>diff --git a/src/app/i18n/locales/en/account.json b/src/app/i18n/locales/en/account.jsonindex f62b332a..5017b7dc 100644--- a/src/app/i18n/locales/en/account.json+++ b/src/app/i18n/locales/en/account.json@@ -25,7 +25,10 @@"unknownAccount": "Unknown Account","addAccountModal": {"title": "Add Account",- "subtitle": "Select Platform"+ "subtitle": "Select Platform",+ "currentSpace": "Current Space",+ "pleaseChooseSpaceFirst": "Please choose a space first",+ "addTo": "Add to:"},"facebookPages": {"title": "Select Facebook Pages",@@ -90,9 +93,5 @@"account": "Account","platform": "Platform","space": "Space"- },- "addAccountModal": {- "currentSpace": "Current Space",- "pleaseChooseSpaceFirst": "Please choose a space first"}}\ No newline at end of filediff --git a/src/app/i18n/locales/zh-CN/account.json b/src/app/i18n/locales/zh-CN/account.jsonindex 695d1b0d..46ab2ec0 100644--- a/src/app/i18n/locales/zh-CN/account.json+++ b/src/app/i18n/locales/zh-CN/account.json@@ -25,7 +25,10 @@"unknownAccount": "未知账户","addAccountModal": {"title": "账号添加",- "subtitle": "选择平台添加账号"+ "subtitle": "选择平台添加账号",+ "currentSpace": "当前空间",+ "pleaseChooseSpaceFirst": "请先选择空间",+ "addTo": "添加到:"},"facebookPages": {"title": "选择Facebook页面",@@ -90,9 +93,5 @@"account": "账号","platform": "平台","space": "所属列表"- },- "addAccountModal": {- "currentSpace": "当前空间",- "pleaseChooseSpaceFirst": "请先选择空间"}}\ No newline at end of file