From 310ca10e3046988e08a7dd31c58f0fc7a3e04db2 Mon Sep 17 00:00:00 2001
From: zmister <zmister@qq.com>
Date: Fri, 23 Jul 2021 17:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=A0=BC=E5=BC=8F=E5=A4=84=E7=90=86=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Esvg=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGES.md                                | 1 +
 MrDoc/settings.py                         | 2 +-
 app_doc/util_upload_img.py                | 6 ++++--
 static/mrdoc/mrdoc.editor.js              | 2 +-
 template/app_doc/manage/manage_image.html | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 93430d1..2d433f2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@
 - [优化]后台图片管理图片预览功能；
 - [优化]文档历史记录对比接口；
 - [优化]403页面；
+- [优化]图片上传格式处理；
 
 ### v0.6.8 2021-06-27
 
diff --git a/MrDoc/settings.py b/MrDoc/settings.py
index e846862..364dde5 100644
--- a/MrDoc/settings.py
+++ b/MrDoc/settings.py
@@ -195,7 +195,7 @@ MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR,'media')
 
 # 允许上传的图片后缀
-ALLOWED_IMG = ["jpg", "jpeg", "gif", "png", "bmp", "webp"]
+ALLOWED_IMG = ["jpg", "jpeg", "gif", "png", "bmp", "webp","svg"]
 
 
 REST_FRAMEWORK = {
diff --git a/app_doc/util_upload_img.py b/app_doc/util_upload_img.py
index 5b03917..c277469 100644
--- a/app_doc/util_upload_img.py
+++ b/app_doc/util_upload_img.py
@@ -51,7 +51,8 @@ def ice_save_file(file_obj,user):
     # 默认保留支持ice单文件上传功能，可以iceEditor中开启
     file_suffix = str(file_obj).split(".")[-1] # 提取图片格式
     # 允许上传文件类型，ice粘贴上传为blob
-    allow_suffix =["jpg", "jpeg", "gif", "png", "bmp", "webp","blob"]
+    # allow_suffix =["jpg", "jpeg", "gif", "png", "bmp", "webp","blob"]
+    allow_suffix = settings.ALLOWED_IMG
     # 判断附件格式
     is_images = ["jpg", "jpeg", "gif", "png", "bmp", "webp"]
     if file_suffix.lower() not in allow_suffix:         
@@ -185,7 +186,8 @@ def upload_generation_dir(dir_name=''):
 # 普通图片上传
 def img_upload(files, dir_name, user, group_id=None):
     # 允许上传文件类型
-    allow_suffix =["jpg", "jpeg", "gif", "png", "bmp", "webp"]
+    # allow_suffix =["jpg", "jpeg", "gif", "png", "bmp", "webp","blob"]
+    allow_suffix = settings.ALLOWED_IMG
     file_suffix = files.name.split(".")[-1] # 提取图片格式
     # 判断图片格式
     if file_suffix.lower() not in allow_suffix:
diff --git a/static/mrdoc/mrdoc.editor.js b/static/mrdoc/mrdoc.editor.js
index e2ddc39..4ca1971 100644
--- a/static/mrdoc/mrdoc.editor.js
+++ b/static/mrdoc/mrdoc.editor.js
@@ -493,7 +493,7 @@ upload.render({
         layer.closeAll('loading'); //关闭loading
         layer.msg("系统异常，请稍后再试！")
     },
-    accept: 'images', //允许上传的文件类型
+    accept: 'file', //允许上传的文件类型
     acceptMime:'image/*',
     field:'manage_upload',
 });
diff --git a/template/app_doc/manage/manage_image.html b/template/app_doc/manage/manage_image.html
index b325c1f..eff6ed3 100644
--- a/template/app_doc/manage/manage_image.html
+++ b/template/app_doc/manage/manage_image.html
@@ -235,7 +235,7 @@
                 layer.closeAll('loading'); //关闭loading
                 layer.msg("系统异常，请稍后再试！")
             },
-            accept: 'images', //允许上传的文件类型
+            accept: 'file', //允许上传的文件类型
             acceptMime:'image/*',
             field:'manage_upload',