Merge branch 'master'

EBook.Web/Common/tasklib_book.js

@@ -251,9 +251,10 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
     $.each($("table"), function (index, item) {
         // 处理表格总宽度
         var ArrMaxLen = [];
+        var FJArrMaxLen = [];
         var TableWidth = 0;
         var TotalMaxLen = 0;
-        var RuleFlag = true;
+        var RuleFlag = true;  // 表示规则
         var HasIndex = 0;
         RSArrs = [];
         var NewAStatus = (isAStatus == "undefined" || isAStatus == undefined || isAStatus == null) ? 0 : parseInt(isAStatus);
@@ -316,6 +317,20 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
                         TotalMaxLen += tdWidthVal - ArrMaxLen[tdIndex];
                         ArrMaxLen[tdIndex] = tdWidthVal;
                     }
+                    else if (ColSpanNum > 1) {
+                        var AddFlag = true;
+                        for (var i = 0; i < FJArrMaxLen.length; i++) {
+                            if (FJArrMaxLen[i].tdIndex == tdIndex) {
+                                if (FJArrMaxLen[i].WidthVal < tdWidthVal) {
+                                    FJArrMaxLen[i].WidthVal = tdWidthVal;
+                                    AddFlag = false;
+                                }
+                            }
+                        }
+                        if (AddFlag) {
+                            FJArrMaxLen.push({ trIndex: trIndex, tdIndex: tdIndex, WidthVal: tdWidthVal });
+                        }
+                    }
                 }
             });
             for (var i = 0; i < RSArrs.length; i++) {
@@ -327,6 +342,13 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
                 }
             }
         });
+        for (var i = 0; i < FJArrMaxLen.length; i++) {
+            for (var j = 0; j < ArrMaxLen.length; j++) {
+                if (ArrMaxLen[j] == 0 && FJArrMaxLen[i].tdIndex == j) {
+                    ArrMaxLen[j] = FJArrMaxLen[i].WidthVal;
+                }
+            }
+        }
         // 判断表格是否只有一行
         if ($(item).find("tr").length == 1 && $(item).find("td").length == 1) {
             $(item).find("tr").eq(0).find("td").eq(0).css("width", ScreenWidth + "px");
@@ -446,7 +468,7 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
 function AddTestTextFunc(DataStr3) {
     $("#ShowTStr").remove();
     var HtmlStr = '<div id="ShowTStr" style="width:200px;height:auto;background-color:yellow;color:#000;position:fixed;left:10px;top:100px;">DataStr3=》' + DataStr3 + '</div>';
-    $(document.body).append(HtmlStr)
+    $(document.body).append(HtmlStr);
 }
 //#region 听力音频处理
 var LimitPreFlag = false;  // 限制点击过宽
@@ -718,6 +740,9 @@ function dealNSFillFunc() {
             if ($(oItem).find(".answer-point-range").css("display") == "none") {
                 TextVal = TextVal.replace($(oItem).find(".answer-point-range").text(), "");
             }
+            if ($(oItem).find(".no-answer").length > 0 && $(oItem).find(".no-answer").text().indexOf("未作答") > -1){
+                TextVal = TextVal.replace($(oItem).find(".no-answer").text(), "");
+            }
             if (TextVal != undefined && TextVal != null && TextVal != "") {
                 HiddenFlag = false;
             }

EBook.Web/EBook.Web.csproj

@@ -79,6 +79,10 @@
     <Content Include="AnsText\bug25663.txt" />
     <Content Include="AnsText\bug25663高亮json.txt" />
     <Content Include="AnsText\bug25745.txt" />
+    <Content Include="AnsText\bug25890作答json.txt" />
+    <Content Include="AnsText\bug25890视听说主体课文.txt" />
+    <Content Include="AnsText\bug25890高亮json.txt" />
+    <Content Include="AnsText\bug26010.txt" />
     <Content Include="AnsText\data202141.txt" />
     <Content Include="AnsText\data2021411高亮.txt" />
     <Content Include="AnsText\data20214121828.txt" />