修改整个图片处理

EBook.Web/Common/tasklib_book.js

@@ -71,7 +71,8 @@ var GetPadVal = function (THandel) {
 var removeHtmlFunc = function (HtmlStr) {
     var ReArr = {
         TextStr: "",
-        WidthVal: 0
+        WidthVal: 0,
+        ImgFlag: false,
     };
     // 清除非长度标签
     var pattStr = new RegExp(/<(img){1}.*?>/ig);
@@ -82,6 +83,9 @@ var removeHtmlFunc = function (HtmlStr) {
             var matchesWArr = matchesArr[i].match(pattWStr);
             var TempWidthVal=parseFloat(matchesWArr[0].replace(/\s/g, "").replace("width:", "").replace("px", ""));
             ReArr.WidthVal = TempWidthVal > ReArr.WidthVal ? TempWidthVal : ReArr.WidthVal;
+            if (ReArr.WidthVal != 0) {
+                ReArr.ImgFlag = true;
+            }
             HtmlStr = HtmlStr.replace(matchesArr[i], "");
         }
     }
@@ -170,9 +174,9 @@ var AdjustTableFunc = function () {
                 $("#pContrainId").text(RemoveHtmlArr.TextStr);
                 var tdWidthVal = $("#pContrainId").width() + parseFloat(RemoveHtmlArr.WidthVal);  // 获取文字宽度
                 tdWidthVal += GetPadVal(tdItem);
-                //if (tdWidthVal > (ScreenWidth / 2)) {
-                //    tdWidthVal = (ScreenWidth / 2);
-                //}
+                if (!RemoveHtmlArr.ImgFlag && (tdWidthVal > ScreenWidth)) {
+                    tdWidthVal = ScreenWidth;
+                }
                 if (tdWidthVal < 135) {
                     tdWidthVal = 135;
                 }