manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

暂时去掉simpleupload因为ie下有问题。

Browse Source
This commit is contained in:
thinkgem
2021-11-29 12:44:04 +08:00
parent 3c769e17e1
commit a9fccbb40f
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/resources/static/ueditor/1.4/third-party/webuploader/webuploader.js vendored
View File

@@ -2971,7 +2971,7 @@
method: 'POST', method: 'POST',
// 跨域时，是否允许携带cookie, 只有html5 runtime才有效 // 跨域时，是否允许携带cookie, 只有html5 runtime才有效
withCredentials: false, withCredentials: true,
fileVal: 'file', fileVal: 'file',
timeout: 2 * 60 * 1000, // 2分钟 timeout: 2 * 60 * 1000, // 2分钟
formData: {}, formData: {},

20
modules/core/src/main/resources/static/ueditor/1.4/ueditor.all.js
View File

@@ -24467,7 +24467,7 @@ UE.plugin.register('simpleupload', function (){
var w = containerBtn.offsetWidth || 20, var w = containerBtn.offsetWidth || 20,
h = containerBtn.offsetHeight || 20, h = containerBtn.offsetHeight || 20,
btnIframe = document.createElement('iframe'), btnIframe = document.createElement('iframe'),
btnIframe2 = document.createElement('iframe'), // ThinkGem btnIframe2 = document.createElement('div'), // ThinkGem
btnStyle = 'display:block;width:' + w + 'px;height:' + h + 'px;overflow:hidden;border:0;margin:0;padding:0;position:absolute;top:0;left:0;filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity: 0;opacity: 0;cursor:pointer;'; btnStyle = 'display:block;width:' + w + 'px;height:' + h + 'px;overflow:hidden;border:0;margin:0;padding:0;position:absolute;top:0;left:0;filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity: 0;opacity: 0;cursor:pointer;';
domUtils.on(btnIframe, 'load', function(){ domUtils.on(btnIframe, 'load', function(){
@@ -24487,10 +24487,6 @@ UE.plugin.register('simpleupload', function (){
'style="' + btnStyle + '">' + 'style="' + btnStyle + '">' +
'</form>';// + '</form>';// +
//'<iframe id="edui_iframe_' + timestrap + '" name="edui_iframe_' + timestrap + '" style="display:none;width:0;height:0;border:0;margin:0;padding:0;position:absolute;"></iframe>'; //'<iframe id="edui_iframe_' + timestrap + '" name="edui_iframe_' + timestrap + '" style="display:none;width:0;height:0;border:0;margin:0;padding:0;position:absolute;"></iframe>';
// 解决因 iframe 嵌套问题 session 丢失 ThinkGem
btnIframe2.id = 'edui_iframe_' + timestrap;
btnIframe2.name = 'edui_iframe_' + timestrap;
wrapper.className = 'edui-' + me.options.theme; wrapper.className = 'edui-' + me.options.theme;
wrapper.id = me.ui.id + '_iframeupload'; wrapper.id = me.ui.id + '_iframeupload';
@@ -24506,7 +24502,19 @@ UE.plugin.register('simpleupload', function (){
var form = btnIframeDoc.getElementById('edui_form_' + timestrap); var form = btnIframeDoc.getElementById('edui_form_' + timestrap);
var input = btnIframeDoc.getElementById('edui_input_' + timestrap); var input = btnIframeDoc.getElementById('edui_input_' + timestrap);
var iframe = btnIframe2;//btnIframeDoc.getElementById('edui_iframe_' + timestrap); var iframe;// = btnIframeDoc.getElementById('edui_iframe_' + timestrap);
// 解决因 iframe 嵌套问题 session 丢失 ThinkGem
try{
iframe = document.createElement('<iframe id="edui_iframe_' + timestrap
+ '" name="edui_iframe_' + timestrap + '"></iframe>');
}catch(e){
iframe = document.createElement('iframe');
iframe.id = 'edui_iframe_' + timestrap;
iframe.name = 'edui_iframe_' + timestrap;
}
// btnIframeBody.appendChild(iframe);
btnIframe2.appendChild(iframe);
domUtils.on(input, 'change', function(){ domUtils.on(input, 'change', function(){
if(!input.value) return; if(!input.value) return;

2
modules/core/src/main/resources/static/ueditor/1.4/ueditor.config.js
View File

@@ -42,7 +42,7 @@
'paragraph', 'fontfamily', 'fontsize', 'customstyle', 'insertcode', '|', 'paragraph', 'fontfamily', 'fontsize', 'customstyle', 'insertcode', '|',
'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|', 'justifyleft', 'justifycenter', 'justifyright', 'justifyjustify', '|', 'touppercase', 'tolowercase', '|',
'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|', 'link', 'unlink', 'anchor', '|', 'imagenone', 'imageleft', 'imageright', 'imagecenter', '|',
'simpleupload', 'insertimage', 'emotion', 'scrawl', 'insertvideo', 'music', 'attachment', 'map',/* 'gmap', 'insertframe', 'insertcode', 'webapp', 'pagebreak', */'template', 'background', '|', 'insertimage', 'emotion', 'scrawl', 'insertvideo', 'music', 'attachment', 'map',/* 'gmap', 'insertframe', 'insertcode', 'webapp', 'pagebreak', */'template', 'background', '|',
'horizontal', 'date', 'time', 'spechars', /*'snapscreen', */'wordimage', '|', 'horizontal', 'date', 'time', 'spechars', /*'snapscreen', */'wordimage', '|',
'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|', 'inserttable', 'deletetable', 'insertparagraphbeforetable', 'insertrow', 'deleterow', 'insertcol', 'deletecol', 'mergecells', 'mergeright', 'mergedown', 'splittocells', 'splittorows', 'splittocols', 'charts', '|',
'print', 'preview', 'searchreplace', 'drafts', 'help' 'print', 'preview', 'searchreplace', 'drafts', 'help'