修复htmleditor组件只读模式下加载的样式会影响全局样式的问题

o2web/source/o2_lib/htmleditor/ckeditor4161/contents.css

@@ -3,8 +3,7 @@ Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 
-body
-{
+body {
 	/* Font */
 	/* Emoji fonts are added to visualise them nicely in Internet Explorer. */
 	font-family: sans-serif, Arial, Verdana, "Trebuchet MS", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
@@ -19,8 +18,7 @@ body
 	margin: 20px;
 }
 
-.cke_editable
-{
+.cke_editable {
 	font-size: 13px;
 	line-height: 1.6;
 
@@ -28,8 +26,7 @@ body
 	word-wrap: break-word;
 }
 
-blockquote
-{
+blockquote {
 	font-style: italic;
 	font-family: Georgia, Times, "Times New Roman", serif;
 	padding: 2px 0;
@@ -38,81 +35,69 @@ blockquote
 	border-width: 0;
 }
 
-.cke_contents_ltr blockquote
-{
+.cke_contents_ltr blockquote {
 	padding-left: 20px;
 	padding-right: 8px;
 	border-left-width: 5px;
 }
 
-.cke_contents_rtl blockquote
-{
+.cke_contents_rtl blockquote {
 	padding-left: 8px;
 	padding-right: 20px;
 	border-right-width: 5px;
 }
 
-a
-{
+a {
 	color: #0782C1;
 }
 
-ol,ul,dl
-{
+ol,ul,dl {
 	/* IE7: reset rtl list margin. (#7334) */
 	*margin-right: 0px;
 	/* Preserved spaces for list items with text direction different than the list. (#6249,#8049)*/
 	padding: 0 40px;
 }
 
-h1,h2,h3,h4,h5,h6
-{
+h1,h2,h3,h4,h5,h6 {
 	font-weight: normal;
 	line-height: 1.2;
 }
 
-hr
-{
+hr {
 	border: 0px;
 	border-top: 1px solid #ccc;
 }
 
-img.right
-{
+img.right {
 	border: 1px solid #ccc;
 	float: right;
 	margin-left: 15px;
 	padding: 5px;
 }
 
-img.left
-{
+img.left {
 	border: 1px solid #ccc;
 	float: left;
 	margin-right: 15px;
 	padding: 5px;
 }
 
-pre
-{
+pre {
 	white-space: pre-wrap; /* CSS 2.1 */
 	word-wrap: break-word; /* IE7 */
 	-moz-tab-size: 4;
 	tab-size: 4;
 }
 
-.marker
-{
+.marker {
 	background-color: Yellow;
 }
 
-span[lang]
-{
+span[lang] {
 	font-style: italic;
 }
 
-figure
-{
+figure {
 	text-align: center;
 	outline: solid 1px #ccc;
 	background: rgba(0,0,0,0.05);
@@ -121,8 +106,7 @@ figure
 	display: inline-block;
 }
 
-figure > figcaption
-{
+figure > figcaption {
 	text-align: center;
 	display: block; /* For IE8 */
 }
@@ -135,73 +119,62 @@ a > img {
 }
 
 /* Widget Styles */
-.code-featured
-{
+.code-featured {
 	border: 5px solid red;
 }
 
-.math-featured
-{
+.math-featured {
 	padding: 20px;
 	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
 	background-color: rgba(255, 0, 0, 0.05);
 	margin: 10px;
 }
 
-.image-clean
-{
+.image-clean {
 	border: 0;
 	background: none;
 	padding: 0;
 }
 
-.image-clean > figcaption
-{
+.image-clean > figcaption {
 	font-size: .9em;
 	text-align: right;
 }
 
-.image-grayscale
-{
+.image-grayscale {
 	background-color: white;
 	color: #666;
 }
 
-.image-grayscale img, img.image-grayscale
-{
+.image-grayscale img, img.image-grayscale {
 	filter: grayscale(100%);
 }
 
-.embed-240p
-{
+.embed-240p {
 	max-width: 426px;
 	max-height: 240px;
 	margin:0 auto;
 }
 
-.embed-360p
-{
+.embed-360p {
 	max-width: 640px;
 	max-height: 360px;
 	margin:0 auto;
 }
 
-.embed-480p
-{
+.embed-480p {
 	max-width: 854px;
 	max-height: 480px;
 	margin:0 auto;
 }
 
-.embed-720p
-{
+.embed-720p {
 	max-width: 1280px;
 	max-height: 720px;
 	margin:0 auto;
 }
 
-.embed-1080p
-{
+.embed-1080p {
 	max-width: 1920px;
 	max-height: 1080px;
 	margin:0 auto;

o2web/source/o2_lib/htmleditor/ckeditor4161/contents_o2.css

+/*
+Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+
+body {
+	/* Font */
+	/* Emoji fonts are added to visualise them nicely in Internet Explorer. */
+	font-family: sans-serif, Arial, Verdana, "Trebuchet MS", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+	font-size: 12px;
+
+	/* Text color */
+	color: #333;
+
+	/* Remove the background color to make it transparent. */
+	background-color: #fff;
+
+	margin: 20px;
+}
+
+.cke_editable {
+	font-size: 13px;
+	line-height: 1.6;
+
+	/* Fix for missing scrollbars with RTL texts. (#10488) */
+	word-wrap: break-word;
+}
+
+blockquote {
+	font-style: italic;
+	font-family: Georgia, Times, "Times New Roman", serif;
+	padding: 2px 0;
+	border-style: solid;
+	border-color: #ccc;
+	border-width: 0;
+}
+
+.cke_contents_ltr blockquote {
+	padding-left: 20px;
+	padding-right: 8px;
+	border-left-width: 5px;
+}
+
+.cke_contents_rtl blockquote {
+	padding-left: 8px;
+	padding-right: 20px;
+	border-right-width: 5px;
+}
+
+a {
+	color: #0782C1;
+}
+
+ol,ul,dl {
+	/* IE7: reset rtl list margin. (#7334) */
+	*margin-right: 0px;
+	/* Preserved spaces for list items with text direction different than the list. (#6249,#8049)*/
+	padding: 0 40px;
+}
+
+h1,h2,h3,h4,h5,h6 {
+	font-weight: normal;
+	line-height: 1.2;
+}
+
+hr {
+	border: 0px;
+	border-top: 1px solid #ccc;
+}
+
+img.right {
+	border: 1px solid #ccc;
+	float: right;
+	margin-left: 15px;
+	padding: 5px;
+}
+
+img.left {
+	border: 1px solid #ccc;
+	float: left;
+	margin-right: 15px;
+	padding: 5px;
+}
+
+pre {
+	white-space: pre-wrap; /* CSS 2.1 */
+	word-wrap: break-word; /* IE7 */
+	-moz-tab-size: 4;
+	tab-size: 4;
+}
+
+.marker {
+	background-color: Yellow;
+}
+
+span[lang] {
+	font-style: italic;
+}
+
+figure {
+	text-align: center;
+	outline: solid 1px #ccc;
+	background: rgba(0,0,0,0.05);
+	padding: 10px;
+	margin: 10px 20px;
+	display: inline-block;
+}
+
+figure > figcaption {
+	text-align: center;
+	display: block; /* For IE8 */
+}
+
+a > img {
+	padding: 1px;
+	margin: 1px;
+	border: none;
+	outline: 1px solid #0782C1;
+}
+
+/* Widget Styles */
+.code-featured {
+	border: 5px solid red;
+}
+
+.math-featured {
+	padding: 20px;
+	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
+	background-color: rgba(255, 0, 0, 0.05);
+	margin: 10px;
+}
+
+.image-clean {
+	border: 0;
+	background: none;
+	padding: 0;
+}
+
+.image-clean > figcaption {
+	font-size: .9em;
+	text-align: right;
+}
+
+.image-grayscale {
+	background-color: white;
+	color: #666;
+}
+
+.image-grayscale img, img.image-grayscale {
+	filter: grayscale(100%);
+}
+
+.embed-240p {
+	max-width: 426px;
+	max-height: 240px;
+	margin:0 auto;
+}
+
+.embed-360p {
+	max-width: 640px;
+	max-height: 360px;
+	margin:0 auto;
+}
+
+.embed-480p {
+	max-width: 854px;
+	max-height: 480px;
+	margin:0 auto;
+}
+
+.embed-720p {
+	max-width: 1280px;
+	max-height: 720px;
+	margin:0 auto;
+}
+
+.embed-1080p {
+	max-width: 1920px;
+	max-height: 1080px;
+	margin:0 auto;
+}

o2web/source/x_component_process_Xform/Htmleditor.js

@@ -84,7 +84,8 @@ MWF.xApplication.process.Xform.Htmleditor = MWF.APPHtmleditor =  new Class(
                     }
                 }.bind(this));
             }
-            this.node.loadCss("../o2_lib/htmleditor/ckeditor4161/contents.css");
+            debugger;
+            this.node.loadCss("../o2_lib/htmleditor/ckeditor4161/contents_o2.css");
         }else{
             var config = Object.clone(this.json.editorProperties);
             if (this.json.config){