From c30aac483a26a1733d106920b6a4b66cc5e7aa0f Mon Sep 17 00:00:00 2001 From: shanshuirenjia <978987373@qq.com> Date: Thu, 18 Apr 2019 18:02:40 +0800 Subject: [PATCH 1/2] repair bug --- frontend/src/components/tree-view/tree-view.js | 6 ++++++ frontend/src/pages/lib-content-view/lib-content-view.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/tree-view/tree-view.js b/frontend/src/components/tree-view/tree-view.js index f658818789..4e5ad5eed9 100644 --- a/frontend/src/components/tree-view/tree-view.js +++ b/frontend/src/components/tree-view/tree-view.js @@ -144,6 +144,12 @@ class TreeView extends React.Component { return; } + let currentRepoInfo = this.props.currentRepoInfo; + + if (currentRepoInfo.permission === 'cloud-edit' || currentRepoInfo.permission === 'preview') { + return ''; + } + let x = event.clientX || (event.touches && event.touches[0].pageX); let y = event.clientY || (event.touches && event.touches[0].pageY); diff --git a/frontend/src/pages/lib-content-view/lib-content-view.js b/frontend/src/pages/lib-content-view/lib-content-view.js index f745832446..f177c120e8 100644 --- a/frontend/src/pages/lib-content-view/lib-content-view.js +++ b/frontend/src/pages/lib-content-view/lib-content-view.js @@ -352,7 +352,7 @@ class LibContentView extends React.Component { seafileAPI.getFileContent(res.data).then((res) => { this.setState({ content: res.data, - filePermission: permission === 'rw', + filePermission: permission === 'rw' || permission === 'cloud-edit', latestContributor: last_modifier_name, lastModified: moment.unix(mtime).fromNow(), isFileLoading: false, From 14b3257534cd40b1d2af0965f7ad6fe7d7409920 Mon Sep 17 00:00:00 2001 From: shanshuirenjia <978987373@qq.com> Date: Thu, 18 Apr 2019 18:10:34 +0800 Subject: [PATCH 2/2] prveventDefault event --- .../components/wiki-dir-list-view/wiki-dir-list-item.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/wiki-dir-list-view/wiki-dir-list-item.js b/frontend/src/components/wiki-dir-list-view/wiki-dir-list-item.js index 5c936f06f1..30fd208c83 100644 --- a/frontend/src/components/wiki-dir-list-view/wiki-dir-list-item.js +++ b/frontend/src/components/wiki-dir-list-view/wiki-dir-list-item.js @@ -26,6 +26,11 @@ class WikiDirListItem extends React.Component { this.setState({highlight: false}); } + onContextMenu = (event) => { + event.preventDefault(); + event.stopPropagation(); + } + onDirentClick = (e) => { e.preventDefault(); this.props.onDirentClick(this.props.dirent); @@ -37,7 +42,7 @@ class WikiDirListItem extends React.Component { let iconUrl = Utils.getDirentIcon(dirent); return ( -