haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

Optimize sdoc created (#6031)

Browse Source 
* optimize code

* optimize code
This commit is contained in:
杨顺强
2024-04-22 17:39:13 +08:00
committed by GitHub
parent 453899b846
commit 50be4b437c
7 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/dir-view-mode/dir-grid-view.js
View File

@@ -43,6 +43,7 @@ class DirGridView extends React.Component {
path={this.props.path}
isDirentListLoading={this.props.isDirentListLoading}
onAddFile={this.props.onAddFile}
currentRepoInfo={this.props.currentRepoInfo}
/>
);
}

1
frontend/src/components/dir-view-mode/dir-list-view.js
View File

@@ -53,6 +53,7 @@ class DirListView extends React.Component {
path={this.props.path}
isDirentListLoading={this.props.isDirentListLoading}
onAddFile={this.props.onAddFile}
currentRepoInfo={this.props.currentRepoInfo}
/>
);
}

3
frontend/src/components/dirent-grid-view/dirent-grid-view.js
View File

@@ -449,7 +449,8 @@ class DirentGridView extends React.Component {
NEW_POWERPOINT_FILE,
NEW_WORD_FILE
];
if (enableSeadoc) {
const { currentRepoInfo } = this.props;
if (enableSeadoc && !currentRepoInfo.encrypted) {
menuList.push(NEW_SEADOC_FILE);
}
this.handleContextClick(event, id, menuList);

3
frontend/src/components/dirent-list-view/dirent-list-view.js
View File

@@ -340,7 +340,8 @@ class DirentListView extends React.Component {
NEW_POWERPOINT_FILE,
NEW_WORD_FILE
];
if (enableSeadoc) {
const { currentRepoInfo } = this.props;
if (enableSeadoc && !currentRepoInfo.encrypted) {
direntsContainerMenuList.push(NEW_SEADOC_FILE);
}

4
frontend/src/components/dirent-list-view/dirent-none-view.js
View File

@@ -10,6 +10,7 @@ import '../../css/tip-for-new-file.css';
const propTypes = {
path: PropTypes.string.isRequired,
isDirentListLoading: PropTypes.bool.isRequired,
currentRepoInfo: PropTypes.object.isRequired,
onAddFile: PropTypes.func.isRequired
};
@@ -45,6 +46,7 @@ class DirentNodeView extends React.Component {
if (this.props.isDirentListLoading) {
return (<Loading />);
}
const { currentRepoInfo } = this.props;
return (
<Fragment>
@@ -61,7 +63,7 @@ class DirentNodeView extends React.Component {
<button className="big-new-file-button" onClick={this.onCreateNewFile.bind(this, '.xlsx')}>
{'+ Excel'}</button>
<br />
{enableSeadoc && <button className="big-new-file-button" onClick={this.onCreateNewFile.bind(this, '.sdoc')}>
{enableSeadoc && !currentRepoInfo.encrypted && <button className="big-new-file-button" onClick={this.onCreateNewFile.bind(this, '.sdoc')}>
{'+ SeaDoc'}</button>}
</div>
{this.state.isCreateFileDialogShow && (

4
frontend/src/components/toolbar/dir-operation-toolbar.js
View File

@@ -179,7 +179,7 @@ class DirOperationToolbar extends React.Component {
let content = null;
if (Utils.isDesktop()) {
let { showShareBtn } = this.props;
const { showShareBtn, repoEncrypted } = this.props;
content = (
<Fragment>
{canUpload && (
@@ -210,7 +210,7 @@ class DirOperationToolbar extends React.Component {
<button className="dropdown-item" onClick={this.onCreateExcelToggle} role="menuitem">{gettext('New Excel File')}</button>
<button className="dropdown-item" onClick={this.onCreatePPTToggle} role="menuitem">{gettext('New PowerPoint File')}</button>
<button className="dropdown-item" onClick={this.onCreateWordToggle} role="menuitem">{gettext('New Word File')}</button>
{enableSeadoc && <button className="dropdown-item" onClick={this.onCreateSeaDocToggle} role="menuitem">{gettext('New SeaDoc File')} (beta)</button>}
{enableSeadoc && !repoEncrypted && <button className="dropdown-item" onClick={this.onCreateSeaDocToggle} role="menuitem">{gettext('New SeaDoc File')} (beta)</button>}
</div>
)}
</Fragment>

2
frontend/src/utils/utils.js
View File

@@ -612,7 +612,7 @@ export const Utils = {
}
if ((permission == 'rw' || permission == 'cloud-edit') && enableSeadoc) {
if ((permission == 'rw' || permission == 'cloud-edit') && enableSeadoc && !currentRepoInfo.encrypted) {
if (dirent.name.endsWith('.md') || dirent.name.endsWith('.docx')) {
list.push(CONVERT_TO_SDOC);
}