Merge branch 'PCAssist'

EBook.Web/Common/tasklib_book.js

@@ -85,7 +85,7 @@ var GetPadVal = function (THandel) {
         return parseFloat(PadValArr[0]) * 2;
     }
 };
-// 获取最大字符长度的字符串(起决定宽度的字符串/将字符去除HTML标签)(使用)
+// 获取最大字符长度的字符串(起决定宽度的字符串/将字符去除HTML标签)
 var removeHtmlFunc = function (htmlStr, TdWidthVal) {
     var ReArr = {
         TextStr: "",
@@ -177,74 +177,9 @@ var removeHtmlFunc = function (htmlStr, TdWidthVal) {
             }
         }
     }
-    // 旧处理
-    //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];
-    //        while (pattStr.test(NewhtmlStr)) {
-    //            var TmatchesArr = NewhtmlStr.match(pattStr);
-    //            if (TmatchesArr.length > 0) {
-    //                // 存在P标签
-    //                NewhtmlStr = NewhtmlStr.replace(TmatchesArr[1], "").replace(TmatchesArr[3], "");
-    //            }
-    //        }
-    //        if (i == 0 || (htmlStr.length < NewhtmlStr.length)) {
-    //            htmlStr = NewhtmlStr;
-    //        }
-    //    }
-    //}
-    //else {
-    //    pattStr = new RegExp(/(<(b|span|u){1}.*?>).*?(<\/\2>)/i);
-    //    if (pattStr.test(htmlStr)) {
-    //        while (pattStr.test(htmlStr)) {
-    //            var matchesArr = htmlStr.match(pattStr);
-    //            if (matchesArr.length > 0) {
-    //                htmlStr = htmlStr.replace(matchesArr[1], "").replace(matchesArr[3], "");
-    //            }
-    //        }
-    //    }
-    //}
     ReArr.TextStr = htmlStr;
     return ReArr;
 };
-// 获取最大字符长度的字符串(起决定宽度的字符串/将字符去除HTML标签)(替换，不用)
-var dealTdTextFunc = function (htmlStr) {
-    var ReStr = "";
-    var ReNumber = 0;
-    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;
-};
 // 动态获取表格最小宽度设置(最小宽度165px)
 var GetMinTableVal = function (TSWidth) {
     if (TSWidth > 320) {
@@ -281,10 +216,8 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
         return;
     }
     // 添加宽度处理
-    var ScreenWidth = $(document.body).width();
-    ScreenWidth = ScreenWidth > sWidthVal ? ScreenWidth : sWidthVal;
+    var ScreenWidth = sWidthVal;
     var TempMinWidth = GetMinTableVal(ScreenWidth);
-    //$(document.body).css("width", "999999px");
     $(document.body).append('<span id="pContrainId"></span>');
     $("table").find(".yaoshi").addClass("nextpic");
     $.each($("table"), function (index, item) {
@@ -325,7 +258,6 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
                 DealImageWFunc(trItem, WidthVal);
                 $("#pContrainId").text(RemoveHtmlArr.TextStr);
                 var tdWidthVal = $("#pContrainId").width() + parseFloat(RemoveHtmlArr.WidthVal);  // 获取文字宽度
-                tdWidthVal += GetPadVal(tdItem);
                 if (!RemoveHtmlArr.ImgFlag && (tdWidthVal > ScreenWidth)) {
                     tdWidthVal = ScreenWidth;
                 }
@@ -367,8 +299,8 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
         });
         // 判断表格是否只有一行
         if ($(item).find("tr").length == 1 && $(item).find("td").length == 1) {
-            $(item).find("tr").eq(0).find("td").eq(0).css("width", (ScreenWidth - 14 - GetPadVal(document.body)) + "px");
-            $(item).css("width", (ScreenWidth - 4 - GetPadVal(document.body)) + "px");
+            $(item).find("tr").eq(0).find("td").eq(0).css("width", ScreenWidth + "px");
+            $(item).css("width", ScreenWidth + "px");
         }
         else {
             if (TotalMaxLen < ScreenWidth) {
@@ -427,7 +359,6 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
         var JqStr = ".TContain_" + index;
         $(JqStr).append(ChildhtmlStr);
     });
-    $(document.body).css("width", ScreenWidth + "px");
     var BodyWidth = isNaN(parseFloat(ScreenWidth)) ? 0 : parseFloat(ScreenWidth);  // 界面宽度
     $.each($("table"), function (index, item) {
         var TableWidth = isNaN(parseFloat($(item).width())) ? 0 : parseFloat($(item).width());  // 表格宽度
@@ -455,7 +386,6 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
         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(document.body)));  // 界面宽度
         var HiddenRate = BodyWidth / TableWidth;  // 滚动条比率
         var SLeftWdith = isNaN(parseFloat($(this)[0].scrollLeft)) ? 0 : parseFloat($(this)[0].scrollLeft);
         SLeftWdith *= HiddenRate;
@@ -471,7 +401,6 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
         }
         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(document.body)));  // 界面宽度
         var HiddenRate = BodyWidth / TableWidth;  // 滚动条比率
         var SLeftWdith = isNaN(parseFloat($(ClsName)[0].scrollLeft)) ? 0 : parseFloat($(ClsName)[0].scrollLeft);
         SLeftWdith *= HiddenRate;
@@ -483,13 +412,20 @@ var AdjustTableFunc = function (sWidthVal, isAStatus) {
     $("#pContrainId").remove();
 };
 // #endregion
-
+// 测试专用(移动端不需要引用)
+function AddTestTextFunc(DataStr4) {
+    var DataStr1 = 0, DataStr2 = 0, DataStr3 = 0;
+    DataStr1 = $(document.body).css("width");
+    DataStr2 = GetPadVal(document.body);
+    DataStr3 = DataStr4;
+    var HtmlStr = '<div id="ShowTStr" style="width:100px;height:auto;background-color:yellow;color:#000;position:fixed;left:10px;top:100px;">DataStr1=》' + DataStr1 + '<br />DataStr2=》' + DataStr2 + '<br />DataStr3=》' + DataStr3 + '</div>';
+    $(document.body).append(HtmlStr)
+}
 //#region 听力音频处理
 var LimitPreFlag = false;  // 限制点击过宽
 var AddListenDiv = function (NodeHandle, NIndex, sWidthVal) {
     var UrlStr = $(NodeHandle).attr("alt");
-    sWidthVal = sWidthVal > $(document.body).width() ? sWidthVal : $(document.body).width();
-    var ListenDivWidth = (sWidthVal - GetPadVal(document.body));
+    var ListenDivWidth = sWidthVal;
     ListenDivWidth = (ListenDivWidth > 414 ? 414 : ListenDivWidth);
     if (UrlStr != null && UrlStr.indexOf("|") > -1) {
         var UrlArr = UrlStr.split("|");

EBook.Web/EBook.Web.csproj

@@ -199,6 +199,8 @@
     <Content Include="Test\Test.aspx" />
     <Content Include="TxtStr\01.txt" />
     <Content Include="TxtStr\02.txt" />
+    <Content Include="TxtStr\bug24248.txt" />
+    <Content Include="TxtStr\paper.txt" />
     <Content Include="Web.config" />
   </ItemGroup>
   <ItemGroup>