上传逻辑处理

EBook.Web/Common/mtm_temp.js

@@ -72,18 +72,7 @@ function Fill(data) {
                 $(Iitem).attr("showflag", "1");
             }
             if (ClsName != undefined && ClsName.indexOf("underlineContent") > -1) {
-                if ($(Iitem).attr("ulflag") == undefined || $(Iitem).attr("shcode") == undefined || $(Iitem).attr("showflag") == undefined) {
-                    var ClsName = $(Iitem).attr("class");
-                    if ($(Iitem).attr("ulflag") == undefined) {
-                        $(Iitem).attr("ulflag", "1");
-                    }
-                    else if ($(Iitem).attr("shcode") == undefined) {
-                        $(Iitem).attr("shcode", 1);
-                    }
-                    else if ($(Iitem).attr("showflag") == undefined) {
-                        $(Iitem).attr("showflag", "1");
-                    }
-                }
+                $(Iitem).attr("ulflag", "1");
                 $.each($(Iitem).find(".wordStyle,.phraseStyle,.sentenceStyle,u,span,p"), function (index, element) {
                     if ($(element).attr("ulflag") == undefined || $(element).attr("shcode") == undefined || $(element).attr("showflag") == undefined) {
                         if ($(element).attr("ulflag") == undefined) {

EBook.Web/Common/tasklib_book.js

@@ -54,8 +54,20 @@ var removeHtmlFunc = function (HtmlStr) {
     }
     pattStr = new RegExp(/(<(p){1}.*?>).*?(<\/\2>)/ig);
     matchesArr = HtmlStr.match(pattStr);
+    if (matchesArr != undefined && matchesArr.length > 0) {
+        // 清除匹配的P标签
+        for (var i = 0; i < matchesArr.length; i++) {
+            HtmlStr = HtmlStr.replace(matchesArr[i], "");
+        }
+    }
     // 判断是否存在p标签
     if (matchesArr != null || (matchesArr != undefined && matchesArr.length > 0)) {
+        if (HtmlStr != null && HtmlStr != "") {
+            // p标签混排
+            HtmlStr = "<p>" + HtmlStr + "</p>";
+            matchesArr.push(HtmlStr);
+            HtmlStr = null;
+        }
         pattStr = new RegExp(/(<(p|b|span|u){1}.*?>).*?(<\/\2>)/i);
         for (var i = 0; i < matchesArr.length; i++) {
             var NewHtmlStr = matchesArr[i];
@@ -280,11 +292,11 @@ var dealAnswerFunc = function (NodeHandle, OCFlag, ThProFlag) {
                 var ulflag = $(NodeHandle).attr("ulflag");
                 if (ulflag == "1") {
                     if (!ThProFlag || (ThProFlag && showflagS == 1)) {
-                        $(NodeHandle).css("color", "#92D050").attr("shcode", 1).attr("showflag", "1");
+                        $(NodeHandle).css("color", "#92D050").attr("shcode", 0).attr("showflag", "1");
                     }
                 }
                 else {
-                    $(NodeHandle).css("color", "#000000").attr("shcode", 1).attr("showflag", "1");
+                    $(NodeHandle).css("color", "#000000").attr("shcode", 0).attr("showflag", "1");
                 }
             }
         }
@@ -293,7 +305,7 @@ var dealAnswerFunc = function (NodeHandle, OCFlag, ThProFlag) {
                 $(NodeHandle).css("background-color", "#f2db8b").attr("shcode", 1).attr("showflag", "1");
             }
             else if (showflagS == "1") {
-                $(NodeHandle).css("background-color", "#ffffff").attr("shcode", 1).attr("showflag", "1");
+                $(NodeHandle).css("background-color", "#ffffff").attr("shcode", 0).attr("showflag", "1");
             }
         }
         else if ($(NodeHandle).attr("hitstyle") == "sentenceStyle") {

EBook.Web/Test.html

@@ -62,8 +62,9 @@
             //var data = $.ajax({ url: "lghp/jieduan.lghp", async: false }).responseText;
             $("#data").html(data);
             bindEventYS();
-            showHideAnswerEx(true, false);
+            //showHideAnswerEx(true, false);
             Fill(hightcodejson);
+            showHideAnswerEx(true, false);
             //bindCoursewareEvent();
 
             var ResInfo = {