diff --git a/app/Models/File.php b/app/Models/File.php index 86c9c4c49..44d703ce8 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -238,13 +238,14 @@ class File extends AbstractModel } } // + $setting = Base::setting('system'); $path = 'uploads/tmp/' . date("Ym") . '/'; $data = Base::upload([ "file" => Request::file('files'), "type" => 'more', "autoThumb" => false, "path" => $path, - "size" => 100 * 1024 + "size" => ($setting['file_upload_limit'] ?: 0) * 1024 ]); if (Base::isError($data)) { throw new ApiException($data['msg']); diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index 3826578e5..1fd288810 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -611,12 +611,13 @@ class WebSocketDialog extends AbstractModel Base::makeDir(public_path($path)); copy($filePath, public_path($path) . basename($filePath)); } else { + $setting = Base::setting('system'); $data = Base::upload([ "file" => $files, "type" => 'more', "path" => $path, "fileName" => $fileName, - "size" => 100 * 1024 + "size" => ($setting['file_upload_limit'] ?: 0) * 1024 ]); } // diff --git a/language/original-web.txt b/language/original-web.txt index 1a0638c3f..e468697f1 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1380,10 +1380,13 @@ APP推送 通义千问 模型 -未设置时间 +未计划 检测到所属的任务列表已被删除,该操作将会还原任务列表,你确定要还原归档吗? 打包下载 你确定要打包下载【(*)】文件吗? 你确定要打包下载(*)等(*)个文件吗? 此文件夹内已有共享文件夹,子文件的共享状态将被取消,是否继续? -文件上传限制 \ No newline at end of file +文件上传限制 +包含消息发送的文件 +特殊设置 +打包列表 \ No newline at end of file diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index bdeb036a1..73c60451b 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -189,6 +189,7 @@ ref="chatUpload" class="chat-upload" :dialog-id="dialogId" + :maxSize="maxSize" @on-progress="chatFile('progress', $event)" @on-success="chatFile('success', $event)" @on-error="chatFile('error', $event)"/> @@ -677,6 +678,7 @@ export default { computed: { ...mapState([ + 'systemConfig', 'userIsAdmin', 'taskId', 'dialogSearchMsgId', @@ -980,6 +982,13 @@ export default { } }) return list + }, + + maxSize() { + if(this.systemConfig?.file_upload_limit){ + return this.systemConfig.file_upload_limit * 1024 + } + return 1024000 } }, diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue index 8ebdbbbef..455681523 100644 --- a/resources/assets/js/pages/manage/components/ProjectPanel.vue +++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue @@ -813,7 +813,7 @@ export default { }]; list.push({ value: -1, - label: `${this.$L('未设置时间')} (${allTask.filter(({start_at}) => {return !start_at}).length})`, + label: `${this.$L('未计划')} (${allTask.filter(({start_at}) => {return !start_at}).length})`, children: [] }); const flows = flowList.map(item1 => { diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 181233665..bd60d8c32 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -503,7 +503,6 @@ export default { uploadList: [], uploadFormat: [], // 不限制上传文件类型 uploadAccept: '', - maxSize: 1024000, contextMenuItem: {}, contextMenuVisible: false, @@ -736,7 +735,7 @@ export default { }, computed: { - ...mapState(['userIsAdmin', 'userInfo', 'fileLists', 'wsOpenNum']), + ...mapState(['systemConfig', 'userIsAdmin', 'userInfo', 'fileLists', 'wsOpenNum']), pid() { const {folderId} = this.$route.params; @@ -852,6 +851,13 @@ export default { compressedSownloadDisabled() { return this.fileList?.find((res)=> res._checked && res.permission < 1) ? true : false + }, + + maxSize() { + if(this.systemConfig?.file_upload_limit){ + return this.systemConfig.file_upload_limit * 1024 + } + return 1024000 } }, diff --git a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue index 66a217e8c..3d493ed1c 100644 --- a/resources/assets/js/pages/manage/setting/components/SystemSetting.vue +++ b/resources/assets/js/pages/manage/setting/components/SystemSetting.vue @@ -158,13 +158,6 @@
{{$L('是否将消息中的网络图片保存到本地服务器。')}}
- - - {{$L('开启')}} - {{$L('关闭')}} - -
{{$L('仅支持网页版。')}}
-
@@ -173,7 +166,19 @@
-
{{$L('包含消息发送文件')}}
+
{{$L('包含消息发送的文件')}}
+
+ + +
+

{{ $L('特殊设置') }}

+
+ + + {{$L('开启')}} + {{$L('关闭')}} + +
{{$L('仅支持网页版。')}}