Merge branch '7.0'

2025-09-10 03:11:07 +00:00 · 2019-07-11 16:34:21 +08:00
parent 301eb5aecd 6b01e56f47
commit d75f613c2d
41 changed files with 179 additions and 514 deletions
--- a/frontend/src/history-trash-file-view.js
+++ b/frontend/src/history-trash-file-view.js
@@ -26,7 +26,7 @@ class HistoryTrashFileView extends React.Component {
    let content;
    switch (fileType) {
      case 'Image':
-        content = <Image />;
+        content = <Image tip={<FileViewTip />} />;
        break;
      case 'SVG': 
        content = <SVG />;