From 0ad6ded8af67d1259045402a8a3f0586e6bc7d68 Mon Sep 17 00:00:00 2001
From: liuhanqing <447067298@qq.com>
Date: Sun, 17 Jan 2021 14:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90notice=E3=80=91=E5=AF=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8tinymce=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: liuhanqing <447067298@qq.com>
---
 .../assets/modular/system/notice/notice_add.js      | 11 ++++++-----
 .../assets/modular/system/notice/notice_edit.js     | 13 ++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/assets/modular/system/notice/notice_add.js b/src/main/webapp/assets/modular/system/notice/notice_add.js
index 612f8410..9156590d 100644
--- a/src/main/webapp/assets/modular/system/notice/notice_add.js
+++ b/src/main/webapp/assets/modular/system/notice/notice_add.js
@@ -40,11 +40,12 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], func
         plugins: 'code print preview fullscreen paste searchreplace save autosave link autolink image imagetools media table codesample lists advlist hr charmap emoticons anchor directionality pagebreak quickbars nonbreaking visualblocks visualchars wordcount',
         toolbar: 'fullscreen preview code | undo redo | forecolor backcolor | bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | outdent indent | numlist bullist | formatselect fontselect fontsizeselect | link image media emoticons charmap anchor pagebreak codesample | ltr rtl',
         toolbar_drawer: 'sliding',
-        images_upload_url: '../../../json/tinymce-upload-ok.json',
-        file_picker_types: 'media',
-        file_picker_callback: function (callback, value, meta) {
-            layer.msg('演示环境不允许上传', {anim: 6});
-        },
+        images_upload_url: Feng.ctxPath + '/sysFileInfo/tinymceUpload',
+        images_upload_base_path: Feng.ctxPath,
+        file_picker_types: 'file image media',
+        // file_picker_callback: function (callback, value, meta) {
+        //     layer.msg('演示环境不允许上传', {anim: 6});
+        // },
         init_instance_callback: function (editor) {
             console.log(editor);
         }
diff --git a/src/main/webapp/assets/modular/system/notice/notice_edit.js b/src/main/webapp/assets/modular/system/notice/notice_edit.js
index c1fa3642..5fa3d0a9 100644
--- a/src/main/webapp/assets/modular/system/notice/notice_edit.js
+++ b/src/main/webapp/assets/modular/system/notice/notice_edit.js
@@ -19,11 +19,12 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], func
             plugins: 'code print preview fullscreen paste searchreplace save autosave link autolink image imagetools media table codesample lists advlist hr charmap emoticons anchor directionality pagebreak quickbars nonbreaking visualblocks visualchars wordcount',
             toolbar: 'fullscreen preview code | undo redo | forecolor backcolor | bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | outdent indent | numlist bullist | formatselect fontselect fontsizeselect | link image media emoticons charmap anchor pagebreak codesample | ltr rtl',
             toolbar_drawer: 'sliding',
-            images_upload_url: '../../../json/tinymce-upload-ok.json',
-            file_picker_types: 'media',
-            file_picker_callback: function (callback, value, meta) {
-                layer.msg('演示环境不允许上传', {anim: 6});
-            },
+            images_upload_url: Feng.ctxPath + '/sysFileInfo/tinymceUpload',
+            images_upload_base_path: Feng.ctxPath,
+            file_picker_types: 'file image media',
+            // file_picker_callback: function (callback, value, meta) {
+            //     layer.msg('演示环境不允许上传', {anim: 6});
+            // },
             init_instance_callback: function (editor) {
                 tinymce.get('noticeContent').setContent(data.noticeContent);
             }
@@ -128,9 +129,11 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], func
             Feng.error("修改失败！" + data.message);
         });
         data.field.noticeContent = tinymce.get('noticeContent').getContent();
+        console.log(data.field.noticeContent)
         if (data.field.noticeScope !== "all") {
             data.field.noticeScope = userSelect.getValue('valueStr');
         }
+        // request.setContentType("multipart/form-data");
         request.set(data.field);
         request.start(true);
         //添加 return false 可成功跳转页面