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 7c5c7ecc8e1112ecfdd6d60a7e26943891e9ea67..12f8f293ba85813f7cc322e2eb08e72d3de5db6e 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) { $('').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("图片上传出错"); },