Browse Source

Merge branch 'master' into android

Conflicts:
	EBook.Web/Common/tasklib_book.js
pengmi 4 years ago
parent
commit
016983586d
2 changed files with 48 additions and 25 deletions
  1. 46 25
      EBook.Web/Common/tasklib_book.js
  2. 2 0
      EBook.Web/EBook.Web.csproj

+ 46 - 25
EBook.Web/Common/tasklib_book.js

@@ -164,7 +164,7 @@ var removeHtmlFunc = function (htmlStr, TdWidthVal) {
     while (htmlStr.match(/\s\s/g)) {
         htmlStr = htmlStr.replace(/\s\s/g, " ");
     }
-    while (htmlStr.indexOf("  ")>-1) {
+    while (htmlStr.indexOf("  ") > -1) {
         htmlStr = htmlStr.replace("  ", " ");
     }
 
@@ -183,7 +183,7 @@ var GetMinTableVal = function (TSWidth) {
 // 计算存在padding的表格
 function GetPadVal(THandel) {
     // 判断是否存在border
-    var BorderVal=0;
+    var BorderVal = 0;
     var BorderStr = $(THandel).css("border-right-width");
     if (BorderStr != null && BorderStr != "") {
         BorderVal = parseFloat(BorderStr.replace("px").replace("PX"));
@@ -199,7 +199,7 @@ function GetPadVal(THandel) {
         if (PaddingVal == null || PaddingVal == "") {
             return BorderVal;
         }
-        return BorderVal+PaddingVal;
+        return BorderVal + PaddingVal;
     }
     var PadValArr = PaddingVal.split(" ");
     if (PadValArr.length > 2) {
@@ -713,7 +713,6 @@ function dealNSFillFunc() {
             $(this).attr("data-setstatus", "0");
         }
     });
-    $(".sentenceStyle").append('<div id="STIDStr" style="position:fixed;top:100px;left:10px;width:200px;height:20px;background-color:yellow;"></div>');
 }
 
 // 恢复已禁止显示高亮处理的点击限制处理(主要是答案回显的时候从答题点变成非答题点的调整)
@@ -806,7 +805,7 @@ function dealRecvHSFill(NodeHandle, sHFlag) {
         }
     }
     else {
-        $.each($(".wordStyle"), function (index,item) {
+        $.each($(".wordStyle"), function (index, item) {
             if ($(this).find(".underlineContent").length > 0) {
                 var JQstr = ".underlineContent[asid='" + aSID + "'][showflag='1']";
                 // 判断高亮的内容是否全部都已经隐藏(不是那么准确)
@@ -821,7 +820,7 @@ function dealRecvHSFill(NodeHandle, sHFlag) {
                 }
                 TagValF = TagValF.replace(/\s/g, "");
                 if (TagValF == "") {
-                    $(item).attr("data-setstatus", "0").attr("data-lstatus", "1").attr("data-drhsffunc","1");
+                    $(item).attr("data-setstatus", "0").attr("data-lstatus", "1").attr("data-drhsffunc", "1");
                 }
             }
         });
@@ -901,7 +900,7 @@ function AddStatusFunc(NodeHandle, answerID) {
     if (uLCClsName != undefined && uLCClsName.indexOf("underlineContent") > -1 && uLCClsName.indexOf("noKey") == -1) {
         // 直接等于
         $(NodeHandle).attr("asid", answerID).attr("shcode", "1").attr("ulflag", "1").attr("showflag", "1");
-        $.each($(NodeHandle).find("span,p,u,b"), function (index,element) {
+        $.each($(NodeHandle).find("span,p,u,b"), function (index, element) {
             $(element).attr("asid", answerID).attr("shcode", "1").attr("ulflag", "1").attr("showflag", "1");
         });
     }
@@ -963,7 +962,7 @@ var dealAnswerFunc = function (NodeHandle) {
         // 重新渲染高亮
         dealRecvHSFill($(NodeHandle), false);
     }
-    else if (showFlag == "1"){
+    else if (showFlag == "1") {
         // 由隐藏转换为显示
         $(JQStr).attr("showflag", "1");
         // 重新渲染高亮
@@ -1328,6 +1327,13 @@ function dealSULContentFunc(item, Id, pId) {
         }
         reInfosArr.push(info);
         info = null;
+        if ($(".tag-span[answer-id='" + Id + "']").length == 0) {
+            var uHtml = document.createElement("span");
+            uHtml.className = "tag-span";
+            uHtml.innerText = "_";
+            uHtml.setAttribute("answer-id", Id);
+            $(item).after(uHtml);
+        }
         $(item).remove();
     }
     else if (uLCClsName != undefined && uLCClsName.indexOf("yaoshi") > -1) {
@@ -1356,6 +1362,13 @@ function dealSULContentFunc(item, Id, pId) {
                 }
                 reInfosArr.push(info);
                 info = null;
+                if ($(".tag-span[answer-id='" + Id + "']").length == 0) {
+                    var uHtml = document.createElement("span");
+                    uHtml.className = "tag-span";
+                    uHtml.innerText = "_";
+                    uHtml.setAttribute("answer-id", Id);
+                    $(iItem).after(uHtml);
+                }
             });
             $(item).find(".underlineContent").not(".noKey").remove();
         }
@@ -1557,22 +1570,22 @@ function handleAnswerRange() {
             }
         }
     }
-    // 重新处理全部答题点
-    $.each($(".yaoshi"), function (index, item) {
-        var Id = $(item).attr("answer-id");
-        var prev = $(item).next();
-        if (!$(prev).hasClass("checkbox")) {
-            if (prev.length == 0 || $(prev).attr("class") != "tag-span") {
-                if ($("span[answer-id='" + Id + "']").length == 0) {
-                    var uHtml = document.createElement("span");
-                    uHtml.className = "tag-span";
-                    uHtml.innerText = "_";
-                    uHtml.setAttribute("answer-id", Id);
-                    $(item).after(uHtml);
-                }
-            }
-        }
-    });
+    //// 重新处理全部答题点(废除处理)
+    //$.each($(".yaoshi"), function (index, item) {
+    //    var Id = $(item).attr("answer-id");
+    //    var prev = $(item).next();
+    //    if (!$(prev).hasClass("checkbox")) {
+    //        if (prev.length == 0 || $(prev).attr("class") != "tag-span") {
+    //            if ($("span[answer-id='" + Id + "']").length == 0) {
+    //                var uHtml = document.createElement("span");
+    //                uHtml.className = "tag-span";
+    //                uHtml.innerText = "_";
+    //                uHtml.setAttribute("answer-id", Id);
+    //                $(item).after(uHtml);
+    //            }
+    //        }
+    //    }
+    //});
     //处理口语试题
     $.each($(".oralLanguage").nextUntil(".oralLanguageDone"), function (num, part) {
         if (part.tagName != "p") {
@@ -1951,7 +1964,8 @@ function backupAllAnswer(answerJson, statusType) {
                     else {
                         $(item).children(".answer-text").show();
                         $(item).children(".answer-text").text(mytext);
-                        if (mytext == "") { }
+                        if (mytext == "") {
+                        }
                         $(item).attr("data-errstatus", "0");
                     }
                     $(item).children(".answer-point-range").hide();
@@ -2403,3 +2417,10 @@ function aCTJCFunc(sWidthVal, isAStatus, isMAStatus, isShowYX, isShowAS, data) {
     }
     showHideAnswerEx(isShowYX, isShowAS);
 }
+
+
+// 清除点击样式
+function RemoveCCFunc() {
+    $(".wordStyle[data-nowclick='1'],.phraseStyle[data-nowclick='1'],.sentenceStyle[data-nowclick='1'],.sentImagcs[data-nowclick='1']").attr("data-nowclick", "0");
+}
+

+ 2 - 0
EBook.Web/EBook.Web.csproj

@@ -146,6 +146,8 @@
     <Content Include="Lghp\21836.lghp" />
     <Content Include="Lghp\BGGX.lghp" />
     <Content Include="Lghp\bug25276.txt" />
+    <Content Include="Lghp\data2021513.txt" />
+    <Content Include="Lghp\data202151311.txt" />
     <Content Include="Lghp\duogouxuan.lghp" />
     <Content Include="Lghp\21879.lghp" />
     <Content Include="Lghp\21975.lghp" />