From c4de2d125ad6f804a5b5a7eeb85402a822cc7b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=A5=81?= <593401899@qq.com>
Date: Sun, 5 Jun 2022 09:27:11 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E9=A1=B5=E9=9D=A2=20wangEditor=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=87=BA=E6=9D=A5=E5=B9=B6=E4=B8=94=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96config=E4=B8=BAundefind=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/assets/js/zhyd.core.js   | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/blog-admin/src/main/resources/static/assets/js/zhyd.core.js b/blog-admin/src/main/resources/static/assets/js/zhyd.core.js
index 7c5c7ec..12f8f29 100644
--- a/blog-admin/src/main/resources/static/assets/js/zhyd.core.js
+++ b/blog-admin/src/main/resources/static/assets/js/zhyd.core.js
@@ -167,14 +167,15 @@ var zhyd = window.zhyd || {
             editor = new E(config.container);
             // 配置编辑器 start
             // 关闭粘贴样式的过滤
-            editor.config.pasteFilterStyle = false;
-            editor.config.zIndex = 100;
-            editor.config.withCredentials = true;
+            var cfg = editor.customConfig ? editor.customConfig : editor.config
+            cfg.pasteFilterStyle = false;
+            cfg.zIndex = 100;
+            cfg.withCredentials = true;
             if (config.textareaName) {
                 $('<textarea class="wangeditor-textarea" id="' + config.textareaName + '" name="' + config.textareaName + '" style="display: none" required="required"></textarea>').insertAfter($(config.container));
             }
             var $contentBox = $('textarea[name=' + config.textareaName + ']');
-            editor.config.onchange = function (html) {
+            cfg.onchange = function (html) {
                 // 监控变化，同步更新到 textarea
                 $contentBox.val(html);
             };
@@ -209,22 +210,23 @@ var zhyd = window.zhyd || {
             registerUpload: function (editor, uploadUrl, uploadFileName, uploadType, callback) {
                 if (uploadUrl) {
                     // 上传图片到服务器
-                    editor.config.uploadImgServer = uploadUrl;
-                    editor.config.uploadFileName = uploadFileName;
+                    var cfg = editor.customConfig ? editor.customConfig : editor.config
+                    cfg.uploadImgServer = uploadUrl;
+                    cfg.uploadFileName = uploadFileName;
                     // 将图片大小限制为 50M
-                    editor.config.uploadImgMaxSize = 50 * 1024 * 1024;
+                    cfg.uploadImgMaxSize = 50 * 1024 * 1024;
                     // 超时时间
-                    editor.config.uploadImgTimeout = 10000;
+                    cfg.uploadImgTimeout = 10000;
                     // 自定义上传参数
-                    editor.config.uploadImgParams = {
+                    cfg.uploadImgParams = {
                         // 如果版本 <=v3.1.0 ，属性值会自动进行 encode ，此处无需 encode
                         // 如果版本 >=v3.1.1 ，属性值不会自动 encode ，如有需要自己手动 encode
                         uploadType: uploadType
                     };
-                    editor.config.customAlert = function (msg) {
+                    cfg.customAlert = function (msg) {
                         $.alert.error(msg);
                     };
-                    editor.config.uploadImgHooks = {
+                    cfg.uploadImgHooks = {
                         error: function (xhr, editor) {
                             $.alert.error("图片上传出错");
                         },
-- 
Gitee