From 879f46b984cb2bb163fb1b24b6a790e2220de4fe Mon Sep 17 00:00:00 2001
From: xiexiangrui <nno0jcmgt>
Date: Sat, 4 Jul 2020 17:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=20=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/html/add.html.vm    | 29 ++++++++++++++-
 .../src/main/resources/vm/html/edit.html.vm   | 36 ++++++++++++++++---
 2 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/html/add.html.vm b/ruoyi-generator/src/main/resources/vm/html/add.html.vm
index ffffae77e..2a3405e65 100644
--- a/ruoyi-generator/src/main/resources/vm/html/add.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/add.html.vm
@@ -262,7 +262,34 @@
                 onChange: function (contents, $edittable) {
                     // Xss 过滤掉了html 内容 ，所以用base64 保存
                     $("input[name='" + this.id + "']").val(window.btoa(encodeURI(contents)));
-
+                },
+                onImageUpload: function(files) {
+                    var _self = this;
+                    for(var i = 0; i < files.length; i++){
+                        var formData = new FormData();
+                        formData.append('file', files[i]);
+                        var config = {
+                            url: '/common/upload',
+                            type: 'post',
+                            data: formData,
+                            contentType: false,
+                            processData: false,
+                            beforeSend: function () {
+                                $.modal.loading("正在处理中，请稍后...");
+                            },
+                            success: function(result) {
+                                if (result.code == web_status.SUCCESS) {
+                                    $('#'+ _self.id).summernote('insertImage',result.url);
+                                } else if (result.code == web_status.WARNING) {
+                                    $.modal.alertWarning(result.msg)
+                                } else {
+                                    $.modal.alertError(result.msg);
+                                }
+                                $.modal.closeLoading();
+                            }
+                        };
+                        $.ajax(config)
+                    }
                 }
             }
         });
diff --git a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
index 5c3a4255f..1e02fdba4 100644
--- a/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
+++ b/ruoyi-generator/src/main/resources/vm/html/edit.html.vm
@@ -265,18 +265,46 @@
 #if($isSummernote)
     $(function () {
         $('.summernote').each(function (i) {
-            var content = $("input[name='" + this.id + "']").val()
-            content = decodeURI(window.atob(content));
-            this.innerHTML = content;
-            $(this).summernote({
+            $('#'+this.id).summernote({
                 height: 100,
                 lang: 'zh-CN',
                 callbacks: {
                     onChange: function (contents, $edittable) {
                         $("input[name='" + this.id + "']").val(window.btoa(encodeURI(contents)));
+                    },
+                    onImageUpload: function(files) {
+                        var _self = this;
+                        for(var i = 0; i < files.length; i++){
+                            var formData = new FormData();
+                            formData.append('file', files[i]);
+                            var config = {
+                                url: '/common/upload',
+                                type: 'post',
+                                data: formData,
+                                contentType: false,
+                                processData: false,
+                                beforeSend: function () {
+                                    $.modal.loading("正在处理中，请稍后...");
+                                },
+                                success: function(result) {
+                                    if (result.code == web_status.SUCCESS) {
+                                        $('#'+ _self.id).summernote('insertImage',result.url);
+                                    } else if (result.code == web_status.WARNING) {
+                                        $.modal.alertWarning(result.msg)
+                                    } else {
+                                        $.modal.alertError(result.msg);
+                                    }
+                                    $.modal.closeLoading();
+                                }
+                            };
+                            $.ajax(config)
+                        }
                     }
                 }
             });
+            var content = $("input[name='" + this.id + "']").val()
+            content = decodeURI(window.atob(content));
+            $('#'+this.id).summernote('code',content);
         })
     });
 #end