github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-12 08:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 升级office插件

Browse Source
This commit is contained in:
kuaifan 2022-06-08 11:22:49 +08:00
parent c4faa0a316
commit ddb7d1a6db
12 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Http/Controllers/IndexController.php
View File

@ -69,28 +69,28 @@ class IndexController extends InvokeController
}
$array = [
"office/web-apps/apps/api/documents/api.js?hash=" . Base::getVersion(),
"office/7.1.0-215/web-apps/vendor/requirejs/require.js",
"office/7.1.0-215/web-apps/apps/api/documents/api.js",
"office/7.1.0-215/sdkjs/common/AllFonts.js",
"office/7.1.0-215/web-apps/vendor/xregexp/xregexp-all-min.js",
"office/7.1.0-215/web-apps/vendor/sockjs/sockjs.min.js",
"office/7.1.0-215/web-apps/vendor/jszip/jszip.min.js",
"office/7.1.0-215/web-apps/vendor/jszip-utils/jszip-utils.min.js",
"office/7.1.0-215/sdkjs/common/libfont/wasm/fonts.js",
"office/7.1.0-215/sdkjs/common/Charts/ChartStyles.js",
"office/7.1.0-215/sdkjs/slide/themes//themes.js",
"office/7.1.1-23/web-apps/vendor/requirejs/require.js",
"office/7.1.1-23/web-apps/apps/api/documents/api.js",
"office/7.1.1-23/sdkjs/common/AllFonts.js",
"office/7.1.1-23/web-apps/vendor/xregexp/xregexp-all-min.js",
"office/7.1.1-23/web-apps/vendor/sockjs/sockjs.min.js",
"office/7.1.1-23/web-apps/vendor/jszip/jszip.min.js",
"office/7.1.1-23/web-apps/vendor/jszip-utils/jszip-utils.min.js",
"office/7.1.1-23/sdkjs/common/libfont/wasm/fonts.js",
"office/7.1.1-23/sdkjs/common/Charts/ChartStyles.js",
"office/7.1.1-23/sdkjs/slide/themes//themes.js",
"office/7.1.0-215/web-apps/apps/presentationeditor/main/app.js",
"office/7.1.0-215/sdkjs/slide/sdk-all-min.js",
"office/7.1.0-215/sdkjs/slide/sdk-all.js",
"office/7.1.1-23/web-apps/apps/presentationeditor/main/app.js",
"office/7.1.1-23/sdkjs/slide/sdk-all-min.js",
"office/7.1.1-23/sdkjs/slide/sdk-all.js",
"office/7.1.0-215/web-apps/apps/documenteditor/main/app.js",
"office/7.1.0-215/sdkjs/word/sdk-all-min.js",
"office/7.1.0-215/sdkjs/word/sdk-all.js",
"office/7.1.1-23/web-apps/apps/documenteditor/main/app.js",
"office/7.1.1-23/sdkjs/word/sdk-all-min.js",
"office/7.1.1-23/sdkjs/word/sdk-all.js",
"office/7.1.0-215/web-apps/apps/spreadsheeteditor/main/app.js",
"office/7.1.0-215/sdkjs/cell/sdk-all-min.js",
"office/7.1.0-215/sdkjs/cell/sdk-all.js",
"office/7.1.1-23/web-apps/apps/spreadsheeteditor/main/app.js",
"office/7.1.1-23/sdkjs/cell/sdk-all-min.js",
"office/7.1.1-23/sdkjs/cell/sdk-all.js",
];
foreach ($array as &$item) {
$item = url($item);

2
docker-compose.yml
View File

@ -82,7 +82,7 @@ services:
office:
container_name: "dootask-office-${APP_ID}"
image: "onlyoffice/documentserver:7.1.0.215"
image: "onlyoffice/documentserver:7.1.1.23"
volumes:
- ./docker/office/logs:/var/log/onlyoffice
- ./docker/office/data:/var/www/onlyoffice/Data

8
docker/nginx/default.conf
View File

@ -55,8 +55,8 @@ server {
proxy_set_header Server-Port $server_port;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 600s;
proxy_send_timeout 600s;
proxy_read_timeout 3600s;
proxy_send_timeout 3600s;
proxy_pass http://service;
}
@ -109,8 +109,8 @@ server {
proxy_set_header Server-Port $server_port;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_read_timeout 600s;
proxy_send_timeout 600s;
proxy_read_timeout 3600s;
proxy_send_timeout 3600s;
proxy_pass http://office/;
}

6
docker/office/resources/api/documents/api.js vendored
View File

@ -3,7 +3,7 @@
*
* http://www.onlyoffice.com
*
* Version: 7.1.0 (build:215)
* Version: 7.1.1 (build:23)
*/
;(function(window) {
@ -792,7 +792,7 @@
};
DocsAPI.DocEditor.version = function() {
return '7.1.0';
return '7.1.1';
};
MessageDispatcher = function(fn, scope) {
@ -930,7 +930,7 @@
}
function getAppParameters(config) {
var params = "?_dc=7.1.0-215";
var params = "?_dc=7.1.1-23";
if (config.editorConfig && config.editorConfig.lang)
params += "&lang=" + config.editorConfig.lang;

5
docker/office/resources/documenteditor/mobile/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

5
docker/office/resources/presentationeditor/mobile/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

5
docker/office/resources/spreadsheeteditor/mobile/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
resources/assets/js/components/OnlyOffice.vue
View File

@ -184,7 +184,7 @@ export default {
//
let codeId = this.code || this.value.id;
let fileName = $A.strExists(this.fileName, '.') ? this.fileName : (this.fileName + '.' + this.fileType);
let fileKey = `${this.fileType}-${fileKey}-${keyAppend}`;
let fileKey = `${this.fileType}-${keyAppend||codeId}`;
let fileUrl = `http://nginx/api/file/content/?id=${codeId}&token=${this.userToken}`;
if (this.historyId > 0) {
fileKey += `-${this.historyId}`

2
resources/assets/js/pages/manage/components/FileContent.vue
View File

@ -468,7 +468,7 @@ export default {
only_update_at: 'yes'
},
}).then(({data}) => {
resolve($A.Date(data.update_at, true))
resolve(`${data.id}-${$A.Time(data.update_at)}`)
}).catch(() => {
resolve(0)
});

2
resources/assets/js/pages/manage/components/FilePreview.vue
View File

@ -158,7 +158,7 @@ export default {
only_update_at: 'yes'
},
}).then(({data}) => {
resolve($A.Date(data.update_at, true))
resolve(`${data.id}-${$A.Time(data.update_at)}`)
}).catch(() => {
resolve(0)
});

2
resources/assets/js/pages/single/fileMsg.vue
View File

@ -159,7 +159,7 @@ export default {
only_update_at: 'yes'
},
}).then(({data}) => {
resolve($A.Date(data.update_at, true))
resolve(`${data.id}-${$A.Time(data.update_at)}`)
}).catch(() => {
resolve(0)
});

2
resources/assets/js/pages/single/fileTask.vue
View File

@ -159,7 +159,7 @@ export default {
only_update_at: 'yes'
},
}).then(({data}) => {
resolve($A.Date(data.update_at, true))
resolve(`${data.id}-${$A.Time(data.update_at)}`)
}).catch(() => {
resolve(0)
});