Merge pull request #167 from fantasticit/fix/ui

This commit is contained in:
fantasticit 2022-08-16 10:45:36 +08:00 committed by GitHub
commit a20e588453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 9 deletions

View File

@ -79,7 +79,7 @@ export const DocumentActions: React.FC<IProps> = ({
visible={popoverVisible} visible={popoverVisible}
onVisibleChange={wrapOnVisibleChange} onVisibleChange={wrapOnVisibleChange}
content={ content={
<Dropdown.Menu style={{ width: 112 }}> <Dropdown.Menu style={{ minWidth: 112 }}>
{showCreateDocument && ( {showCreateDocument && (
<Dropdown.Item onClick={create}> <Dropdown.Item onClick={create}>
<Text> <Text>

View File

@ -19,6 +19,7 @@ export const EditUser: React.FC<IProps> = ({ userWithAuth, updateUser, children
return ( return (
<Popconfirm <Popconfirm
showArrow showArrow
position="bottomRight"
zIndex={1070} zIndex={1070}
title={`修改用户${userWithAuth && userWithAuth.user.name}权限`} title={`修改用户${userWithAuth && userWithAuth.user.name}权限`}
content={ content={

View File

@ -94,6 +94,7 @@ export const Members: React.FC<IProps> = ({ id, hook, descriptions }) => {
</EditUser> </EditUser>
<Popconfirm <Popconfirm
showArrow showArrow
position="bottomRight"
zIndex={1070} zIndex={1070}
title="确认删除该成员?" title="确认删除该成员?"
onConfirm={() => deleteUser({ userName: data.user.name, userAuth: data.auth.auth })} onConfirm={() => deleteUser({ userName: data.user.name, userAuth: data.auth.auth })}

View File

@ -1,8 +1,6 @@
import { TabPane, Tabs } from '@douyinfe/semi-ui'; import { TabPane, Tabs } from '@douyinfe/semi-ui';
import { IOrganization, IWiki } from '@think/domains'; import { IOrganization } from '@think/domains';
import { Seo } from 'components/seo'; import { Seo } from 'components/seo';
import { WikiTocsManager } from 'components/wiki/tocs/manager';
import { useWikiDetail } from 'data/wiki';
import React from 'react'; import React from 'react';
import { Base } from './base'; import { Base } from './base';
@ -22,8 +20,6 @@ const TitleMap = {
}; };
export const OrganizationSetting: React.FC<IProps> = ({ organizationId, tab, onNavigate }) => { export const OrganizationSetting: React.FC<IProps> = ({ organizationId, tab, onNavigate }) => {
// const { data, update } = useWikiDetail(wikiId);
return ( return (
<> <>
<Seo title={TitleMap[tab]} /> <Seo title={TitleMap[tab]} />

View File

@ -73,7 +73,12 @@ export const TemplateEditor: React.FC<IProps> = ({ templateId }) => {
<Tooltip position="bottom" content={isPublic ? '公开模板' : '个人模板'}> <Tooltip position="bottom" content={isPublic ? '公开模板' : '个人模板'}>
<Switch checked={isPublic} onChange={(v) => updateTemplate({ isPublic: v })}></Switch> <Switch checked={isPublic} onChange={(v) => updateTemplate({ isPublic: v })}></Switch>
</Tooltip> </Tooltip>
<Popconfirm title="删除模板" content="模板删除后不可恢复,谨慎操作!" onConfirm={handleDelte}> <Popconfirm
style={{ width: 320 }}
title="删除模板"
content="模板删除后不可恢复,谨慎操作!"
onConfirm={handleDelte}
>
<Button type="danger"></Button> <Button type="danger"></Button>
</Popconfirm> </Popconfirm>
<Theme /> <Theme />

View File

@ -25,7 +25,7 @@ export const Theme = () => {
trigger="click" trigger="click"
showTick showTick
render={ render={
<Dropdown.Menu> <Dropdown.Menu style={{ width: 100 }}>
<Dropdown.Item active={userPrefer === ThemeEnum.light} onClick={setLight}> <Dropdown.Item active={userPrefer === ThemeEnum.light} onClick={setLight}>
<IconSun /> <IconSun />

View File

@ -33,7 +33,7 @@ const Page: NextPage = () => {
return ( return (
<SingleColumnLayout> <SingleColumnLayout>
<Seo title="模板" /> <Seo key={tab} title="模板" />
<div className="container"> <div className="container">
<div className={styles.titleWrap}> <div className={styles.titleWrap}>
<Title heading={3} style={{ margin: '8px 0' }}> <Title heading={3} style={{ margin: '8px 0' }}>