haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-08 10:22:46 +00:00
Code Issues Releases Wiki Activity

Related Files Dialog Box Interaction Improvement (#3179)

Browse Source 
* Related Files Dialog Box Interaction Improvement

* Modify ralated file dialog and select dialog style

* Add markdow-editor.js
This commit is contained in:
zxj96
2019-03-28 17:34:01 +08:00
committed by Daniel Pan
parent c04c5d2044
commit a13e2a3519
6 changed files with 166 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
frontend/src/markdown-editor.js
View File

@@ -23,6 +23,7 @@ import HistoryList from './components/markdown-view/history-list';
import CommentPanel from './components/file-view/comment-panel';
import OutlineView from './components/markdown-view/outline';
import Loading from './components/loading';
import { Modal } from 'reactstrap';
import { findRange } from '@seafile/slate-react';
import './css/markdown-viewer/markdown-editor.css';
@@ -310,6 +311,7 @@ class MarkdownEditor extends React.Component {
isShowComments: false,
isShowHistory: false,
isShowOutline: true,
isRelatedFileDialogShow: false,
};
if (this.state.collabServer) {
@@ -397,6 +399,7 @@ class MarkdownEditor extends React.Component {
showShareLinkDialog: false,
showCommentDialog: false,
showInsertFileDialog: false,
isRelatedFileDialogShow: false,
});
}
@@ -490,12 +493,14 @@ class MarkdownEditor extends React.Component {
this.setState({
showRelatedFileDialog: true,
showMarkdownEditorDialog: true,
isRelatedFileDialogShow: true,
});
}
else {
this.setState({
showAddRelatedFileDialog: true,
showMarkdownEditorDialog: true,
isRelatedFileDialogShow: true,
});
}
break;
@@ -1100,18 +1105,6 @@ class MarkdownEditor extends React.Component {
{component}
{this.state.showMarkdownEditorDialog && (
<React.Fragment>
{this.state.showRelatedFileDialog &&
<ModalPortal>
<ListRelatedFileDialog
repoID={repoID}
filePath={filePath}
relatedFiles={this.state.relatedFiles}
toggleCancel={this.toggleCancel}
addRelatedFileToggle={this.addRelatedFileToggle}
onRelatedFileChange={this.onRelatedFileChange}
/>
</ModalPortal>
}
{this.state.showEditFileTagDialog &&
<ModalPortal>
<EditFileTagDialog
@@ -1123,17 +1116,32 @@ class MarkdownEditor extends React.Component {
/>
</ModalPortal>
}
{this.state.showAddRelatedFileDialog &&
{this.state.isRelatedFileDialogShow && (
<ModalPortal>
<AddRelatedFileDialog
repoID={repoID}
filePath={filePath}
toggleCancel={this.closeAddRelatedFileDialog}
dirent={this.state.fileInfo}
onRelatedFileChange={this.onRelatedFileChange}
/>
<Modal isOpen={true} toggle={this.toggleCancel} size='lg' style={{width: '650px'}}>
{this.state.showRelatedFileDialog &&
<ListRelatedFileDialog
repoID={repoID}
filePath={filePath}
relatedFiles={this.state.relatedFiles}
toggleCancel={this.toggleCancel}
addRelatedFileToggle={this.addRelatedFileToggle}
onRelatedFileChange={this.onRelatedFileChange}
/>
}
{this.state.showAddRelatedFileDialog &&
<AddRelatedFileDialog
repoID={repoID}
filePath={filePath}
toggleCancel={this.closeAddRelatedFileDialog}
onClose={this.toggleCancel}
dirent={this.state.fileInfo}
onRelatedFileChange={this.onRelatedFileChange}
/>
}
</Modal>
</ModalPortal>
}
)}
{this.state.showInsertFileDialog &&
<ModalPortal>
<InsertFileDialog