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

change ctable to dtable

Browse Source
This commit is contained in:
shanshuirenjia
2019-06-14 16:15:38 +08:00
parent 7a2b0b4e1d
commit f0f7af6a55
8 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/config/webpack.config.dev.js
View File

@@ -222,7 +222,7 @@ module.exports = {
viewDataGrid: [ viewDataGrid: [
// require.resolve('./polyfills'), // require.resolve('./polyfills'),
require.resolve('react-dev-utils/webpackHotDevClient'), require.resolve('react-dev-utils/webpackHotDevClient'),
paths.appSrc + "/view-file-ctable.js", paths.appSrc + "/view-file-dtable.js",
], ],
viewCdoc: [ viewCdoc: [
require.resolve('./polyfills'), require.resolve('./polyfills'),

2
frontend/config/webpack.config.prod.js
View File

@@ -92,7 +92,7 @@ module.exports = {
repoFolderTrash: [require.resolve('./polyfills'), paths.appSrc + "/repo-folder-trash.js"], repoFolderTrash: [require.resolve('./polyfills'), paths.appSrc + "/repo-folder-trash.js"],
orgAdmin: [require.resolve('./polyfills'), paths.appSrc + "/pages/org-admin"], orgAdmin: [require.resolve('./polyfills'), paths.appSrc + "/pages/org-admin"],
sysAdmin: [require.resolve('./polyfills'), paths.appSrc + "/pages/sys-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"], viewCdoc: [require.resolve('./polyfills'), paths.appSrc + "/view-file-cdoc.js"],
search: [require.resolve('./polyfills'), paths.appSrc + "/pages/search"] search: [require.resolve('./polyfills'), paths.appSrc + "/pages/search"]
}, },

3
frontend/src/css/dtable.css Normal file
View File

@@ -0,0 +1,3 @@
.rc-calendar table tbody tr {
height: fit-content;
}

2
frontend/src/view-file-ctable.js → frontend/src/view-file-dtable.js
View File

@@ -3,6 +3,8 @@ import ReactDOM from 'react-dom';
import { seafileAPI } from './utils/seafile-api'; import { seafileAPI } from './utils/seafile-api';
import SeafileTable from '@seafile/dtable/lib'; import SeafileTable from '@seafile/dtable/lib';
import "./css/dtable.css";
class ViewFileSDB extends React.Component { class ViewFileSDB extends React.Component {
render() { render() {

0
seahub/templates/ctable_file_view_react.html → seahub/templates/dtable_file_view_react.html
View File

2
seahub/utils/__init__.py
View File

@@ -136,7 +136,7 @@ PREVIEW_FILEEXT = {
AUDIO: ('mp3', 'oga', 'ogg'), AUDIO: ('mp3', 'oga', 'ogg'),
#'3D': ('stl', 'obj'), #'3D': ('stl', 'obj'),
XMIND: ('xmind',), XMIND: ('xmind',),
CTABLE: ('ctable',), DTABLE: ('dtable',),
CDOC: ('cdoc',), CDOC: ('cdoc',),
} }

2
seahub/utils/file_types.py
View File

@@ -10,5 +10,5 @@ AUDIO = 'Audio'
SPREADSHEET = 'SpreadSheet' SPREADSHEET = 'SpreadSheet'
DRAW = 'Draw' DRAW = 'Draw'
XMIND = 'XMind' XMIND = 'XMind'
CTABLE = 'ctable' DTABLE = 'dtable'
CDOC = 'cdoc' CDOC = 'cdoc'

4
seahub/views/file.py
View File

@@ -63,7 +63,7 @@ from seahub.utils import render_error, is_org_context, \
from seahub.utils.ip import get_remote_ip from seahub.utils.ip import get_remote_ip
from seahub.utils.timeutils import utc_to_local from seahub.utils.timeutils import utc_to_local
from seahub.utils.file_types import (IMAGE, PDF, SVG, 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.star import is_file_starred
from seahub.utils.http import json_response, \ from seahub.utils.http import json_response, \
BadRequestException, RequestForbbiddenException BadRequestException, RequestForbbiddenException
@@ -734,7 +734,7 @@ def view_lib_file(request, repo_id, path):
return render(request, template, return_dict) return render(request, template, return_dict)
elif filetype == CTABLE: elif filetype == DTABLE:
return render(request, template, return_dict) return render(request, template, return_dict)
elif filetype == CDOC: elif filetype == CDOC:
return render(request, template, return_dict) return render(request, template, return_dict)