Merge branch 'master'

EBook.Web/Common/tasklib_book.css

@@ -375,6 +375,34 @@ table tr td:last-child{
 .LDFTimerS[data-mtype='2'][data-fsFlag='140'] span{
     font-size: 12px;
 }
+/* 缩小表格里面的数据 */
+.TableContainer[data-mtype='1'][data-fsFlag='80'] td,.TableContainer[data-mtype='1'][data-fsFlag='80'] p{
+    font-size: 18px !important;
+}
+.TableContainer[data-mtype='1'][data-fsFlag='100'] td,.TableContainer[data-mtype='1'][data-fsFlag='100'] p{
+    font-size: 16px !important;
+}
+.TableContainer[data-mtype='1'][data-fsFlag='120'] td,.TableContainer[data-mtype='1'][data-fsFlag='120'] p{
+    font-size: 14px !important;
+}
+.TableContainer[data-mtype='1'][data-fsFlag='140'] td,.TableContainer[data-mtype='1'][data-fsFlag='140'] p{
+    font-size: 12px !important;
+}
+.TableContainer[data-mtype='1'][data-fsFlag='160'] td,.TableContainer[data-mtype='1'][data-fsFlag='160'] p{
+    font-size: 10px !important;
+}
+.TableContainer[data-mtype='2'][data-fsFlag='80'] td,.TableContainer[data-mtype='2'][data-fsFlag='80'] p{
+    font-size: 18px !important;
+}
+.TableContainer[data-mtype='2'][data-fsFlag='100'] td,.TableContainer[data-mtype='2'][data-fsFlag='100'] p{
+    font-size: 16px !important;
+}
+.TableContainer[data-mtype='2'][data-fsFlag='120'] td,.TableContainer[data-mtype='2'][data-fsFlag='120'] p{
+    font-size: 14px !important;
+}
+.TableContainer[data-mtype='2'][data-fsFlag='140'] td,.TableContainer[data-mtype='2'][data-fsFlag='140'] p{
+    font-size: 12px !important;
+}
 /*#endregion音频插件*/
 img.cAStauts[showflag='0']{
     opacity:0;

EBook.Web/Common/tasklib_book.js

@@ -405,7 +405,7 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
         }
         // 替换HTML
         var ChildhtmlStr = $(item).prop("outerHTML");
-        var htmlStr = "<div class='TableContainer TContain_" + index + "' data-isaflag='" + NewAStatus + "' data-allcb='" + (CheckBoxFlag ? 1 : 0) + "'></div>";
+        var htmlStr = "<div class='TableContainer TContain_" + index + "' data-isaflag='" + NewAStatus + "' data-allcb='" + (CheckBoxFlag ? 1 : 0) + "' data-mtype='" + cTTypeFunc + "' data-fsFlag='100'></div>";
         $(item).after(htmlStr);
         $(item).remove();
         var JqStr = ".TContain_" + index;
@@ -1834,6 +1834,7 @@ function getAllAnswer() {
         }
         //mytext = mytext == "" ? "&nbsp;&nbsp;&nbsp;" : mytext;
         if (!isanswer) {
+            mytext = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
             $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text no-answer' style='display:inline-block;'>" + mytext + "</buttom></div>");
         }
         else {
@@ -2059,6 +2060,7 @@ function backupAllAnswer(answerJson, statusType) {
                 }
                 //mytext = mytext == "" ? "&nbsp;&nbsp;&nbsp;" : mytext;
                 if (!isanswer) {
+                    mytext = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
                     $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='" + statusType + "' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text no-answer' style='display:inline-block;'>" + mytext + "</buttom></div>");
                 }
                 else {
@@ -2375,7 +2377,11 @@ function StopAllCss() {
 };
 // 控制字体大小
 function adjustFontSize(FontSize) {
+    if (FontSize==null || FontSize < 80) {
+        return;
+    }
     $(".LDFTimerS").attr("data-fsFlag", FontSize);
+    $(".TableContainer").attr("data-fsFlag", FontSize);
 }
 // 音频进度条按下回调
 function mobileTSFunc(ID) {

EBook.Web/EBook.Web.csproj

@@ -83,6 +83,9 @@
     <Content Include="AnsText\bug25890视听说主体课文.txt" />
     <Content Include="AnsText\bug25890高亮json.txt" />
     <Content Include="AnsText\bug26010.txt" />
+    <Content Include="AnsText\bug27015Answer.txt" />
+    <Content Include="AnsText\bug27015json.txt" />
+    <Content Include="AnsText\bug27015.txt" />
     <Content Include="AnsText\data202141.txt" />
     <Content Include="AnsText\data2021411高亮.txt" />
     <Content Include="AnsText\data20214121828.txt" />