This commit is contained in:
tzhangchi
2023-01-06 01:20:51 +08:00
parent fb292b5423
commit 67ef5099dd
2 changed files with 11 additions and 12 deletions
@@ -109,7 +109,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
top: '20px', top: '20px',
}} }}
> >
{item.name || 'untitled'} {item.name || 'AFFiNE'}
</span> </span>
</span> </span>
<span <span
@@ -118,11 +118,10 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
top: '20px', top: '20px',
}} }}
> >
{(item.workspaceType === 'local' || {(item.type === 'local' || !item.type) && (
!item.workspaceType) && (
<CloudUnsyncedIcon fontSize={24} /> <CloudUnsyncedIcon fontSize={24} />
)} )}
{item.workspaceType === 'cloud' && ( {item.type === 'cloud' && (
<CloudInsyncIcon fontSize={24} /> <CloudInsyncIcon fontSize={24} />
)} )}
{item.isPublish && <UsersIcon fontSize={24} />} {item.isPublish && <UsersIcon fontSize={24} />}
@@ -133,6 +132,9 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
})} })}
<li> <li>
<Button <Button
style={{
marginTop: '20px',
}}
type="primary" type="primary"
onClick={() => { onClick={() => {
setCreateWorkspaceOpen(true); setCreateWorkspaceOpen(true);
@@ -141,7 +143,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
<AddIcon <AddIcon
style={{ style={{
fontSize: '20px', fontSize: '20px',
top: '4px', top: '5px',
position: 'relative', position: 'relative',
marginRight: '10px', marginRight: '10px',
}} }}
@@ -194,7 +196,7 @@ export const WorkspaceModal = ({ open, onClose }: LoginModalProps) => {
workspaceId && workspaceId &&
setTimeout(() => { setTimeout(() => {
updateWorkspaceMeta(workspaceId as string, { updateWorkspaceMeta(workspaceId as string, {
workspaceType: 'cloud', type: 'cloud',
}); });
}, 1000); }, 1000);
} else { } else {
+3 -6
View File
@@ -6,7 +6,6 @@ export interface Workspace {
isPublish?: boolean; // 是否公开 isPublish?: boolean; // 是否公开
isLocal?: boolean; // 是否全部数据都在本地 isLocal?: boolean; // 是否全部数据都在本地
avatar?: string; // 封面 avatar?: string; // 封面
workspaceType: 'local' | 'cloud' | 'join'; // cloud: 云端(本次暂不支持),local: 本地,join : 加入别人的
type: 'local' | 'cloud' | 'join'; // cloud: 云端(本次暂不支持),local: 本地,join : 加入别人的 type: 'local' | 'cloud' | 'join'; // cloud: 云端(本次暂不支持),local: 本地,join : 加入别人的
workspaceOwner?: User; // 本地工作空间的拥有者 workspaceOwner?: User; // 本地工作空间的拥有者
} }
@@ -23,7 +22,7 @@ export function updateWorkspaceMeta(
workspaceData: { workspaceData: {
name?: string; name?: string;
avatar?: string; avatar?: string;
workspaceType?: 'local' | 'cloud' | 'join'; type?: 'local' | 'cloud' | 'join';
} }
) { ) {
const workspacesMeta = getWorkspaces(); const workspacesMeta = getWorkspaces();
@@ -31,8 +30,7 @@ export function updateWorkspaceMeta(
if (workspace.id === workspaceId) { if (workspace.id === workspaceId) {
workspaceData.name && (workspace.name = workspaceData.name); workspaceData.name && (workspace.name = workspaceData.name);
workspaceData.avatar && (workspace.avatar = workspaceData.avatar); workspaceData.avatar && (workspace.avatar = workspaceData.avatar);
workspaceData.workspaceType && workspaceData.type && (workspace.type = workspaceData.type);
(workspace.type = workspaceData.workspaceType);
return workspaceData; return workspaceData;
} }
return workspace; return workspace;
@@ -42,8 +40,7 @@ export function updateWorkspaceMeta(
workspaceData.name && (activeWorkspace.name = workspaceData.name); workspaceData.name && (activeWorkspace.name = workspaceData.name);
workspaceData.avatar && (activeWorkspace.avatar = workspaceData.avatar); workspaceData.avatar && (activeWorkspace.avatar = workspaceData.avatar);
workspaceData.workspaceType && workspaceData.type && (activeWorkspace.type = workspaceData.type);
(activeWorkspace.type = workspaceData.workspaceType);
setActiveWorkspace(activeWorkspace); setActiveWorkspace(activeWorkspace);
} }
export function createWorkspace(workspaceName: string) { export function createWorkspace(workspaceName: string) {