From 692b347ece212078f964f33eefd4aef6cbf7ea71 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 10 Oct 2021 22:43:01 +0800 Subject: [PATCH] tiny --- .../plugins/o2uploadimage/plugin.js | 2 +- .../plugins/o2uploadremoteimage/plugin.js | 2 +- .../plugins/o2image/plugin.min.js | 45 ++++++++++++++++--- .../plugins/o2imagetools/plugin.js | 2 +- .../plugins/o2imagetools/plugin.min.js | 2 +- .../tinymce_5.9.2/plugins/o2upimgs/plugin.js | 4 +- .../plugins/o2upimgs/plugin.min.js | 14 +++--- .../TinyMCEEditor.js | 2 +- 8 files changed, 54 insertions(+), 19 deletions(-) diff --git a/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadimage/plugin.js b/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadimage/plugin.js index 6eff597481..880d6cfef4 100644 --- a/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadimage/plugin.js +++ b/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadimage/plugin.js @@ -253,7 +253,7 @@ if(upload.fileName){ imgString += 'alt="' + upload.fileName + '" '; } - imgString += editor.config.enablePreview ? 'data-prv="true" ' : 'data-prv="false" '; + imgString += 'data-prv="true" '; //editor.config.enablePreview ? 'data-prv="true" ' : 'data-prv="false" '; imgString += '/>'; // Set width and height to prevent blinking. diff --git a/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadremoteimage/plugin.js b/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadremoteimage/plugin.js index 8820d40c82..4dd6b926fb 100644 --- a/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadremoteimage/plugin.js +++ b/o2web/source/o2_lib/htmleditor/ckeditor4161/plugins/o2uploadremoteimage/plugin.js @@ -170,7 +170,7 @@ imgString += 'style="max-width:100%; width:' + width + 'px" '; imgString += 'onerror="MWF.xDesktop.setImageSrc()" '; imgString += 'alt="' + (alt || fileName) + '" '; - imgString += editor.config.enablePreview ? 'data-prv="true" ' : 'data-prv="false" '; + imgString += 'data-prv="true" '; //editor.config.enablePreview ? 'data-prv="true" ' : 'data-prv="false" '; imgString += '">'; var newImg = CKEDITOR.dom.element.createFromHtml( imgString ); diff --git a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2image/plugin.min.js b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2image/plugin.min.js index 919c587606..7171550220 100644 --- a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2image/plugin.min.js +++ b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2image/plugin.min.js @@ -327,6 +327,12 @@ var isAutomaticUploadsEnabled = function (editor) { return editor.getParam('automatic_uploads', true, 'boolean'); }; + var isBase64Enable = function (editor) { + return editor.getParam('base64Encode', false, 'boolean'); + }; + var isPreviewEnable = function (editor) { + return (editor || tinymce.activeEditor).getParam('enablePreview', true, 'boolean'); + }; var parseIntAndGetMax = function (val1, val2) { return Math.max(parseInt(val1, 10), parseInt(val2, 10)); @@ -600,7 +606,7 @@ "data-width": '', "data-height": '', "onerror": '', - "data-prv": '' + "data-prv": true }; }; @@ -636,6 +642,7 @@ } }; var read = function (normalizeCss, image) { + var prv = getAttrib(image, 'data-prv'); return { src: getAttrib(image, 'src'), alt: getAlt(image), @@ -655,7 +662,7 @@ "data-width": getAttrib(image, 'data-width'), "data-height": getAttrib(image, 'data-height'), "onerror": getAttrib(image, 'onerror'), - "data-prv": getAttrib(image, 'data-prv'), + "data-prv": (prv !== false && prv !== "false") }; }; var updateProp = function (image, oldData, newData, name, set) { @@ -1049,6 +1056,8 @@ var prependURL = Optional.some(getPrependUrl(editor)).filter(function (preUrl) { return isString(preUrl) && preUrl.length > 0; }); + var isBase64Enable$1 = isBase64Enable(editor); + var isPreviewEnable$1 = isPreviewEnable(editor); return futureImageList.then(function (imageList) { return { image: image, @@ -1064,7 +1073,9 @@ hasImageCaption: hasImageCaption$1, prependURL: prependURL, hasAccessibilityOptions: hasAccessibilityOptions, - automaticUploads: automaticUploads + automaticUploads: automaticUploads, + isBase64Enable: isBase64Enable$1, + isPreviewEnable: isPreviewEnable$1 }; }); }; @@ -1125,6 +1136,26 @@ label: 'Show caption' }] }; + + var preview = { + type: 'label', + label: '', + items: [{ + type: 'checkbox', + name: 'data-prv', + label: '允许浏览原图' + }] + }; + + var enableBase64 = { + type: 'label', + label: '', + items: [{ + type: 'checkbox', + name: 'base64enable', + label: '存为Base64编码' + }] + }; var getDialogContainerType = function (useColumns) { return useColumns ? { type: 'grid', @@ -1133,6 +1164,8 @@ }; return flatten([ [imageUrl], + info.isPreviewEnable ? [preview] : [], + info.isBase64Enable ? [enableBase64] : [], imageList.toArray(), info.hasAccessibilityOptions && info.hasDescription ? [isDecorative] : [], info.hasDescription ? [imageDescription] : [], @@ -1205,7 +1238,8 @@ "data-width": image["data-width"], "data-height": image["data-height"], "onerror": image["onerror"], - "data-prv": image["data-prv"] + "data-prv": image["data-prv"] !== false && image["data-prv"] !== "false", + "base64enable": (image.src||'').substring( 0, 5 ) === 'data:' }; }; var toImageData = function (data, removeEmptyAlt) { @@ -1314,7 +1348,7 @@ data["onerror"] = meta["onerror"]; } if (isString(meta["data-prv"])) { - data["data-prv"] = meta["data-prv"]; + data["data-prv"] = meta["data-prv"] !== false && meta["data-prv"] !== "false"; } }; @@ -1590,6 +1624,7 @@ data["data-height"] = data.dimensions.height; data.dimensions.height = ""; } + data["data-prv"] = (data["data-prv"] !== false && data["data-prv"] !== "false") ? "true" : "false"; editor.execCommand('mceUpdateImage', false, toImageData(data, info.hasAccessibilityOptions)); editor.editorUpload.uploadImagesAuto(); diff --git a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.js b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.js index d624883c8d..f7ebdf76ef 100644 --- a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.js +++ b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.js @@ -1229,7 +1229,7 @@ debugger; - var enablePreview = editor.getParam('enablePreview', true); + //var enablePreview = editor.getParam('enablePreview', true); var localImageMaxWidth = editor.getParam('localImageMaxWidth', 2000); var reference = editor.getParam('reference'); var referenceType = editor.getParam('referenceType'); diff --git a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.min.js b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.min.js index d624883c8d..f7ebdf76ef 100644 --- a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.min.js +++ b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2imagetools/plugin.min.js @@ -1229,7 +1229,7 @@ debugger; - var enablePreview = editor.getParam('enablePreview', true); + //var enablePreview = editor.getParam('enablePreview', true); var localImageMaxWidth = editor.getParam('localImageMaxWidth', 2000); var reference = editor.getParam('reference'); var referenceType = editor.getParam('referenceType'); diff --git a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.js b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.js index 5a79104002..17bffc635f 100644 --- a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.js +++ b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.js @@ -9,7 +9,7 @@ tinymce.PluginManager.add('o2upimgs', function(editor, url) { var images_upload_handler = editor.getParam('images_upload_handler', undefined, 'function'); if( !images_upload_handler ){ - var enablePreview = editor.getParam('enablePreview', true); + //var enablePreview = editor.getParam('enablePreview', true); var localImageMaxWidth = editor.getParam('localImageMaxWidth', 2000); var reference = editor.getParam('reference'); var referenceType = editor.getParam('referenceType'); @@ -42,7 +42,7 @@ tinymce.PluginManager.add('o2upimgs', function(editor, url) { "style": 'max-width:100%; width:' + width + 'px', "onerror": 'MWF.xDesktop.setImageSrc()', "alt": file.name || '', - "data-prv": enablePreview ? 'true' : 'false' + "data-prv": 'true' //enablePreview ? 'true' : 'false' }; if(success)success(src, attributes); diff --git a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.min.js b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.min.js index 407ca1bcbd..50adc63bc7 100644 --- a/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.min.js +++ b/o2web/source/o2_lib/tinymce/tinymce_5.9.2/plugins/o2upimgs/plugin.min.js @@ -7,9 +7,9 @@ tinymce.PluginManager.add('o2upimgs', function(editor, url) { var iframe1 = baseURL+'/plugins/o2upimgs/upfiles.html'; var base64Encode = editor.getParam('base64Encode', false); - var images_upload_handler = editor.getParam('images_upload_handler', undefined, 'function'); - if( !images_upload_handler ){ - var enablePreview = editor.getParam('enablePreview', true); + var images_upload_handler = editor.getParam('images_upload_handler', undefined, 'function'); + if( !images_upload_handler ){ + //var enablePreview = editor.getParam('enablePreview', true); var localImageMaxWidth = editor.getParam('localImageMaxWidth', 2000); var reference = editor.getParam('reference'); var referenceType = editor.getParam('referenceType'); @@ -42,7 +42,7 @@ tinymce.PluginManager.add('o2upimgs', function(editor, url) { "style": 'max-width:100%; width:' + width + 'px', "onerror": 'MWF.xDesktop.setImageSrc()', "alt": file.name || '', - "data-prv": enablePreview ? 'true' : 'false' + "data-prv": 'true' //enablePreview ? 'true' : 'false' }; if(success)success(src, attributes); @@ -54,8 +54,8 @@ tinymce.PluginManager.add('o2upimgs', function(editor, url) { } o2upimgs.images_upload_handler = images_upload_handler; - o2upimgs.images_upload_base_path = editor.getParam('images_upload_base_path', '', 'string'); - o2upimgs.o2upimgs_filetype = editor.getParam('o2upimgs_filetype', '.png,.gif,.jpg,.jpeg', 'string'); + o2upimgs.images_upload_base_path = editor.getParam('images_upload_base_path', '', 'string'); + o2upimgs.o2upimgs_filetype = editor.getParam('o2upimgs_filetype', '.png,.gif,.jpg,.jpeg', 'string'); o2upimgs.res=[]; var openDialog = function() { return editor.windowManager.openUrl({ @@ -109,7 +109,7 @@ tinymce.PluginManager.add('o2upimgs', function(editor, url) { editor.ui.registry.addButton('o2upimgs', { icon: 'o2upimgs', - tooltip: pluginName, + tooltip: pluginName, onAction: function() { openDialog(); } diff --git a/o2web/source/x_component_process_Xform/TinyMCEEditor.js b/o2web/source/x_component_process_Xform/TinyMCEEditor.js index 747888c5d3..0185a5518b 100644 --- a/o2web/source/x_component_process_Xform/TinyMCEEditor.js +++ b/o2web/source/x_component_process_Xform/TinyMCEEditor.js @@ -188,7 +188,7 @@ MWF.xApplication.process.Xform.TinyMCEEditor = MWF.APPTinyMCEEditor = new Class( "style": 'max-width:100%; width:' + width + 'px', "onerror": 'MWF.xDesktop.setImageSrc()', "alt": file.name || '', - "data-prv": enablePreview ? 'true' : 'false' + "data-prv": 'true' //enablePreview ? 'true' : 'false' }; callback( src, attributes ) }} -- GitLab