diff --git a/frontend/config/webpack.config.dev.js b/frontend/config/webpack.config.dev.js index ee13de63eb..a248387bb3 100644 --- a/frontend/config/webpack.config.dev.js +++ b/frontend/config/webpack.config.dev.js @@ -222,7 +222,7 @@ module.exports = { viewDataGrid: [ // require.resolve('./polyfills'), require.resolve('react-dev-utils/webpackHotDevClient'), - paths.appSrc + "/view-file-ctable.js", + paths.appSrc + "/view-file-dtable.js", ], viewCdoc: [ require.resolve('./polyfills'), diff --git a/frontend/config/webpack.config.prod.js b/frontend/config/webpack.config.prod.js index e9a5b9d1c9..3468f4f578 100644 --- a/frontend/config/webpack.config.prod.js +++ b/frontend/config/webpack.config.prod.js @@ -92,7 +92,7 @@ module.exports = { repoFolderTrash: [require.resolve('./polyfills'), paths.appSrc + "/repo-folder-trash.js"], orgAdmin: [require.resolve('./polyfills'), paths.appSrc + "/pages/org-admin"], sysAdmin: [require.resolve('./polyfills'), paths.appSrc + "/pages/sys-admin"], - viewDataGrid: [require.resolve('./polyfills'), paths.appSrc + "/view-file-ctable.js"], + viewDataGrid: [require.resolve('./polyfills'), paths.appSrc + "/view-file-dtable.js"], viewCdoc: [require.resolve('./polyfills'), paths.appSrc + "/view-file-cdoc.js"], search: [require.resolve('./polyfills'), paths.appSrc + "/pages/search"] }, diff --git a/frontend/src/css/dtable.css b/frontend/src/css/dtable.css new file mode 100644 index 0000000000..b6b21e0e6b --- /dev/null +++ b/frontend/src/css/dtable.css @@ -0,0 +1,3 @@ +.rc-calendar table tbody tr { + height: fit-content; +} \ No newline at end of file diff --git a/frontend/src/view-file-ctable.js b/frontend/src/view-file-dtable.js similarity index 93% rename from frontend/src/view-file-ctable.js rename to frontend/src/view-file-dtable.js index 9f646f0881..06934a81ec 100644 --- a/frontend/src/view-file-ctable.js +++ b/frontend/src/view-file-dtable.js @@ -3,6 +3,8 @@ import ReactDOM from 'react-dom'; import { seafileAPI } from './utils/seafile-api'; import SeafileTable from '@seafile/dtable/lib'; +import "./css/dtable.css"; + class ViewFileSDB extends React.Component { render() { diff --git a/seahub/templates/ctable_file_view_react.html b/seahub/templates/dtable_file_view_react.html similarity index 100% rename from seahub/templates/ctable_file_view_react.html rename to seahub/templates/dtable_file_view_react.html diff --git a/seahub/utils/__init__.py b/seahub/utils/__init__.py index 435e758cf0..bdab5cc204 100644 --- a/seahub/utils/__init__.py +++ b/seahub/utils/__init__.py @@ -136,7 +136,7 @@ PREVIEW_FILEEXT = { AUDIO: ('mp3', 'oga', 'ogg'), #'3D': ('stl', 'obj'), XMIND: ('xmind',), - CTABLE: ('ctable',), + DTABLE: ('dtable',), CDOC: ('cdoc',), } diff --git a/seahub/utils/file_types.py b/seahub/utils/file_types.py index 5078f99682..4daff025bf 100644 --- a/seahub/utils/file_types.py +++ b/seahub/utils/file_types.py @@ -10,5 +10,5 @@ AUDIO = 'Audio' SPREADSHEET = 'SpreadSheet' DRAW = 'Draw' XMIND = 'XMind' -CTABLE = 'ctable' +DTABLE = 'dtable' CDOC = 'cdoc' diff --git a/seahub/views/file.py b/seahub/views/file.py index 2bbfb4ffac..1ace19cc42 100644 --- a/seahub/views/file.py +++ b/seahub/views/file.py @@ -63,7 +63,7 @@ from seahub.utils import render_error, is_org_context, \ from seahub.utils.ip import get_remote_ip from seahub.utils.timeutils import utc_to_local from seahub.utils.file_types import (IMAGE, PDF, SVG, - DOCUMENT, SPREADSHEET, AUDIO, MARKDOWN, TEXT, VIDEO, DRAW, XMIND, CTABLE, CDOC) + DOCUMENT, SPREADSHEET, AUDIO, MARKDOWN, TEXT, VIDEO, DRAW, XMIND, DTABLE, CDOC) from seahub.utils.star import is_file_starred from seahub.utils.http import json_response, \ BadRequestException, RequestForbbiddenException @@ -734,7 +734,7 @@ def view_lib_file(request, repo_id, path): return render(request, template, return_dict) - elif filetype == CTABLE: + elif filetype == DTABLE: return render(request, template, return_dict) elif filetype == CDOC: return render(request, template, return_dict)