gio
/
think
mirror of https://github.com/fantasticit/think.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195 from fantasticit/fix/0915

This commit is contained in:
fantasticit 2022-09-15 23:31:47 +08:00 committed by GitHub
parent b71195780f 16eaaee364
commit d967fc72f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/components/document/editor/index.tsx
View File

@ -62,7 +62,7 @@ export const DocumentEditor: React.FC<IProps> = ({ documentId }) => {
{document && ( {document && (
<DocumentActions organizationId={document.organizationId} wikiId={document.wikiId} documentId={documentId} /> <DocumentActions organizationId={document.organizationId} wikiId={document.wikiId} documentId={documentId} />
)} )}
<DocumentVersion documentId={documentId} onSelect={triggerUseDocumentVersion} /> <DocumentVersion key={'edit'} documentId={documentId} onSelect={triggerUseDocumentVersion} />
</Space> </Space>
), ),
[documentId, document, authority] [documentId, document, authority]

1
packages/client/src/components/document/version/index.module.scss
View File

@ -25,7 +25,6 @@
main { main {
padding: 24px; padding: 24px;
overflow: auto; overflow: auto;
background-color: var(--semi-color-bg-0);
flex: 1; flex: 1;
&.isMobile { &.isMobile {

8
packages/client/src/components/document/version/index.tsx
View File

@ -126,8 +126,8 @@ export const DocumentVersion: React.FC<Partial<IProps>> = ({ documentId, onSelec
</Select> </Select>
<div style={{ paddingLeft: '8px' }}>对比</div> <div style={{ paddingLeft: '8px' }}>对比</div>
<Space style={{ marginLeft: 12 }}> <Space style={{ marginLeft: 12 }}>
<Tag style={{ backgroundColor: '#e9ffe9' }}>增加的内容</Tag> <Tag style={{ backgroundColor: '#e9ffe9', color: '#333' }}>增加的内容</Tag>
<Tag style={{ backgroundColor: '#ffeaea' }}>删除的内容</Tag> <Tag style={{ backgroundColor: '#ffeaea', color: '#333' }}>删除的内容</Tag>
</Space> </Space>
</div> </div>
)} )}
@ -156,8 +156,8 @@ export const DocumentVersion: React.FC<Partial<IProps>> = ({ documentId, onSelec
empty={!loading && !data.length} empty={!loading && !data.length}
normalContent={() => ( normalContent={() => (
<div className={styles.contentWrap}> <div className={styles.contentWrap}>
<main className={cls('container', isMobile && styles.isMobile)}> <main className={cls(isMobile && styles.isMobile)}>
<div> <div className="container">
{diffVersion ? ( {diffVersion ? (
<div id="diff-visual" className="ProseMirror"></div> <div id="diff-visual" className="ProseMirror"></div>
) : ( ) : (

6
packages/client/src/tiptap/core/index.tsx
View File

@ -26,7 +26,9 @@ export const useEditor = (options: Partial<EditorOptions> = {}, deps: Dependency
options.editorProps = options.editorProps || {}; options.editorProps = options.editorProps || {};
if (options.editable) { if (options.editable) {
options.editorProps.attributes = options.editorProps.attributes || {}; options.editorProps.attributes = options.editorProps.attributes || {
spellcheck: 'false',
};
// @ts-ignore // @ts-ignore
options.editorProps.attributes.class = options.editorProps.attributes.class || ''; options.editorProps.attributes.class = options.editorProps.attributes.class || '';
// @ts-ignore // @ts-ignore
@ -41,7 +43,7 @@ export const useEditor = (options: Partial<EditorOptions> = {}, deps: Dependency
instance.on( instance.on(
'update', 'update',
throttle(() => { throttle(() => {
instance.chain().focus().scrollIntoView().run(); // instance.chain().focus().scrollIntoView().run();
}, 200) }, 200)
); );
} }