合并分支

EBook.Web/Common/tasklib_book.js

@@ -38,16 +38,22 @@ var GetPadVal = function () {
 var dealTdTextFunc = function (HtmlStr) {
     var ReStr = "";
     var ReNumber = 0;
-    var pattStr = new RegExp(/<P.*?<\/P>/i); 
-    while(pattStr.test(HtmlStr)) {
-        var matchesArr = HtmlStr.match(pattStr);
-        $("#pContrainId").html(matchesArr[0]);
-        HtmlStr = HtmlStr.replace(matchesArr[0], "");
-        if (ReNumber <= $("#pContrainId").text().length) {
-            ReNumber = $("#pContrainId").text().length;
-            ReStr = $("#pContrainId").text();
+    var pattStr = new RegExp(/<P.*?<\/P>/i);
+    if (pattStr.test(HtmlStr)) {
+        while (pattStr.test(HtmlStr)) {
+            var matchesArr = HtmlStr.match(pattStr);
+            $("#pContrainId").html(matchesArr[0]);
+            HtmlStr = HtmlStr.replace(matchesArr[0], "");
+            if (ReNumber <= $("#pContrainId").text().length) {
+                ReNumber = $("#pContrainId").text().length;
+                ReStr = $("#pContrainId").text();
+            }
         }
     }
+    else {
+        $("#pContrainId").html(HtmlStr);
+        ReStr = $("#pContrainId").text();
+    }
     return ReStr;
 };
 var AdjustTableFunc = function () {
@@ -58,7 +64,7 @@ var AdjustTableFunc = function () {
     var Index = 0;
     $.each($("table"), function (index, item) {
         // 处理表格总宽度
-        var ArrMaxLen =[];
+        var ArrMaxLen = [];
         var TableWidth = 0;
         var TotalMaxLen = 0;
         var RuleFlag = true;
@@ -73,21 +79,21 @@ var AdjustTableFunc = function () {
                     }
                     ArrMaxLen.push(0);
                 }
-                if (ArrMaxLen[tdIndex]< tdWidthVal) {
-                    TotalMaxLen += tdWidthVal -ArrMaxLen[tdIndex];
+                if (ArrMaxLen[tdIndex] < tdWidthVal) {
+                    TotalMaxLen += tdWidthVal - ArrMaxLen[tdIndex];
                     ArrMaxLen[tdIndex] = tdWidthVal;
                 }
             });
         });
         // 判断表格是否只有一行
-        if($(item).find("tr").length == 1 && $(item).find("tr").eq(0).find("td").length == 1) {
-            $(item).find("tr").eq(0).find("td").eq(0).css("width", (ScreenWidth -4 - GetPadVal()) + "px");
-            $(item).css("width", (ScreenWidth -4 - GetPadVal()) + "px");
+        if ($(item).find("tr").length == 1 && $(item).find("tr").eq(0).find("td").length == 1) {
+            $(item).find("tr").eq(0).find("td").eq(0).css("width", (ScreenWidth - 4 - GetPadVal()) + "px");
+            $(item).css("width", (ScreenWidth - 4 - GetPadVal()) + "px");
         }
         else {
             if (TotalMaxLen < ScreenWidth) {
                 var AddPx = (ScreenWidth - TotalMaxLen) / ArrMaxLen.length;
-                AddPx = AddPx > 2 ? AddPx -2: AddPx;
+                AddPx = AddPx > 2 ? AddPx - 2 : AddPx;
                 for (var i = 0; i < ArrMaxLen.length; i++) {
                     ArrMaxLen[i] += AddPx;
                 }
@@ -95,7 +101,7 @@ var AdjustTableFunc = function () {
             var OneFlag = false;
             for (var i = 0; i < ArrMaxLen.length; i++) {
                 if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length > 1 && RuleFlag) {
-                    $(item).find("tr").eq(0).find("td").eq(i).css("width", ArrMaxLen[i]+ "px");
+                    $(item).find("tr").eq(0).find("td").eq(i).css("width", ArrMaxLen[i] + "px");
                     TableWidth += ArrMaxLen[i];
                 }
                 else if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length > 1 && !RuleFlag) {
@@ -108,7 +114,7 @@ var AdjustTableFunc = function () {
                         $(tdItem).css("width", NotRuleWidth + "px");
                     });
                 }
-                else if (ArrMaxLen[i]!= undefined && $(item).find("tr").eq(0).find("td").length == 1) {
+                else if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length == 1) {
                     OneFlag = true;
                     TableWidth += ArrMaxLen[i];
                 }
@@ -123,24 +129,24 @@ var AdjustTableFunc = function () {
         var HtmlStr = "<div class='TableContainer TContain_" + Index + "'></div>";
         $(item).after(HtmlStr);
         $(item).remove();
-        var JqStr = ".TContain_" +Index;
+        var JqStr = ".TContain_" + Index;
         $(JqStr).append(ChildHtmlStr);
         Index += 1;
     });
     $(document.body).css("width", ScreenWidth + "px");
-    var BodyWidth = isNaN(parseFloat($(document).width())) ? 0: (parseFloat($(document).width()) -GetPadVal());  // 界面宽度
+    var BodyWidth = isNaN(parseFloat($(document).width())) ? 0 : (parseFloat($(document).width()) - GetPadVal());  // 界面宽度
     var Index = 0;
     $.each($("table"), function (index, item) {
-        var TableWidth = isNaN(parseFloat($(item).width())) ? 0: parseFloat($(item).width());  // 表格宽度
+        var TableWidth = isNaN(parseFloat($(item).width())) ? 0 : parseFloat($(item).width());  // 表格宽度
         // 替换HTML
-        var JqStr = ".TContain_" +Index;
+        var JqStr = ".TContain_" + Index;
         $(JqStr).css("width", BodyWidth + "px");
         if (TableWidth > BodyWidth) {
             // 额外显示滚动条
             var SHtmlStr = "<div class='PSBar' style='width: " + BodyWidth + "px;'></div>";
             $(JqStr).after(SHtmlStr);
             var HiddenRate = BodyWidth / TableWidth;  // 滚动条比率
-            var HiddenWidth = BodyWidth -(TableWidth - BodyWidth) * HiddenRate;  // 现滚动条大小
+            var HiddenWidth = BodyWidth - (TableWidth - BodyWidth) * HiddenRate;  // 现滚动条大小
             var CSHtmlStr = "<div class='CSBar' style='width: " + HiddenWidth + "px;'></div>";
             $(JqStr).next().append(CSHtmlStr);
         }
@@ -153,10 +159,10 @@ var AdjustTableFunc = function () {
     $(".TableContainer").on("touchstart", function () {
         pressTableFlag = true;
     }).on("touchmove", function () {
-        var TableWidth = isNaN(parseFloat($(this).find("table").width())) ? 0: parseFloat($(this).find("table").width());  // 表格宽度
-        BodyWidth = isNaN(parseFloat($(document).width())) ? 0: (parseFloat($(document).width() -GetPadVal()));  // 界面宽度
+        var TableWidth = isNaN(parseFloat($(this).find("table").width())) ? 0 : parseFloat($(this).find("table").width());  // 表格宽度
+        BodyWidth = isNaN(parseFloat($(document).width())) ? 0 : (parseFloat($(document).width() - GetPadVal()));  // 界面宽度
         var HiddenRate = BodyWidth / TableWidth;  // 滚动条比率
-        var SLeftWdith = isNaN(parseFloat($(this)[0].scrollLeft)) ? 0: parseFloat($(this)[0].scrollLeft);
+        var SLeftWdith = isNaN(parseFloat($(this)[0].scrollLeft)) ? 0 : parseFloat($(this)[0].scrollLeft);
         SLeftWdith *= HiddenRate;
         var NextClsName = $(this).next().attr("class");
         if (NextClsName == "PSBar") {
@@ -169,10 +175,10 @@ var AdjustTableFunc = function () {
             return;
         }
         ClsName = ClsName.replace("TableContainer ", ".");
-        var TableWidth = isNaN(parseFloat($(ClsName).find("table").width())) ? 0: parseFloat($(ClsName).find("table").width());  // 表格宽度
-        BodyWidth = isNaN(parseFloat($(document).width())) ? 0: (parseFloat($(document).width() -GetPadVal()));  // 界面宽度
+        var TableWidth = isNaN(parseFloat($(ClsName).find("table").width())) ? 0 : parseFloat($(ClsName).find("table").width());  // 表格宽度
+        BodyWidth = isNaN(parseFloat($(document).width())) ? 0 : (parseFloat($(document).width() - GetPadVal()));  // 界面宽度
         var HiddenRate = BodyWidth / TableWidth;  // 滚动条比率
-        var SLeftWdith = isNaN(parseFloat($(ClsName)[0].scrollLeft)) ? 0: parseFloat($(ClsName)[0].scrollLeft);
+        var SLeftWdith = isNaN(parseFloat($(ClsName)[0].scrollLeft)) ? 0 : parseFloat($(ClsName)[0].scrollLeft);
         SLeftWdith *= HiddenRate;
         var NextClsName = $(ClsName).next().attr("class");
         if (NextClsName == "PSBar") {
@@ -251,25 +257,7 @@ function showHideAnswerEx(isShowYX, isShowAS) {
     }
     if (isShowAS) {
         $.each($(".underlineContent"), function (index, item) {
-            var underlineContentText = $(this).text();  // 获取文本内容
-            var widthValue = $(item).css("width");
-            var newClsName = $(item).next().attr("class");
-            if (newClsName != "underlineContentShow") {
-                var addHtml = "";
-                if (hasChineseWorld(underlineContentText)) {
-                    addHtml = "<span class='underlineContentShow' style='width:" + widthValue + ";' data-status='0'>&emsp;</span>";
-                }
-                else {
-                    addHtml = "<span class='underlineContentShow' style='width:" + widthValue + ";' data-status='0'>&nbsp;</span>";
-                }
-                $(item).css("display", "inline-block").after(addHtml);
-            }
-            else {
-                $(item).css("display", "inline-block").next().attr("data-status", "0");
-            }
-            if (underlineContentText.indexOf("√") > -1) {
-                $(this).parent().find(".checkbox").find("input").prop('checked', true);
-            }
+            dealAnswerFunc(item, true);
             //$(item).html($(item).attr("answer-anstext"));
             if (!$(item).hasClass("no-answer")) {
                 $(item).css("color", "#92D050");
@@ -1192,7 +1180,7 @@ function backupAllAnswer(answerJson, statusType) {
                 $(".checkbox").removeClass("select-answer");
                 $(".answer-body").removeClass("select-answer");
                 if (statusType == 2) {
-                    $(".answer-body[parent-anid="+curObj.pId+"]").addClass("select-answer");
+                    $(".answer-body[parent-anid=" + curObj.pId + "]").addClass("select-answer");
                 }
                 else {
                     $(this).addClass("select-answer");
@@ -1362,7 +1350,7 @@ function backupAllReview(answerJson) {
             $(".checkbox").removeClass("select-answer");
             $(".answer-body").removeClass("select-answer");
             //$(this).addClass("select-answer");
-            $(".answer-body[parent-anid="+curObj.pId+"]").addClass("select-answer");
+            $(".answer-body[parent-anid=" + curObj.pId + "]").addClass("select-answer");
             //已作答，弹出作答答案
             if ($(this).data("ans-status") == "1") {
                 //移动端添加外部处理