提交补充图片处理

EBook.Web/Common/tasklib_book.js

@@ -69,11 +69,19 @@ var GetPadVal = function (THandel) {
 };
 // 获取最大字符长度的字符串(起决定宽度的字符串/将字符去除HTML标签)(使用)
 var removeHtmlFunc = function (HtmlStr) {
+    var ReArr = {
+        TextStr: "",
+        WidthVal: 0
+    };
     // 清除非长度标签
     var pattStr = new RegExp(/<(img){1}.*?>/ig);
     var matchesArr = HtmlStr.match(pattStr);
     if (matchesArr != null && (matchesArr != undefined && matchesArr.length > 0)) {
         for (var i = 0; i < matchesArr.length; i++) {
+            var pattWStr = new RegExp(/width\s?:\s?[0-9]+px;/ig);
+            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;
             HtmlStr = HtmlStr.replace(matchesArr[i], "");
         }
     }
@@ -119,7 +127,8 @@ var removeHtmlFunc = function (HtmlStr) {
             }
         }
     }
-    return HtmlStr;
+    ReArr.TextStr = HtmlStr;
+    return ReArr;
 };
 // 获取最大字符长度的字符串(起决定宽度的字符串/将字符去除HTML标签)(替换，不用)
 var dealTdTextFunc = function (HtmlStr) {
@@ -157,13 +166,13 @@ var AdjustTableFunc = function () {
         var RuleFlag = true;
         $.each($(item).find("tr"), function (trIndex, trItem) {
             $.each($(trItem).find("td"), function (tdIndex, tdItem) {
-                var tdtext = removeHtmlFunc($(tdItem).html());
-                $("#pContrainId").text(tdtext);
-                var tdWidthVal = $("#pContrainId").width();  // 获取文字宽度
+                var RemoveHtmlArr = removeHtmlFunc($(tdItem).html());
+                $("#pContrainId").text(RemoveHtmlArr.TextStr);
+                var tdWidthVal = $("#pContrainId").width() + parseFloat(RemoveHtmlArr.WidthVal);  // 获取文字宽度
                 tdWidthVal += GetPadVal(tdItem);
-                if (tdWidthVal > (ScreenWidth / 2)) {
-                    tdWidthVal = (ScreenWidth / 2);
-                }
+                //if (tdWidthVal > (ScreenWidth / 2)) {
+                //    tdWidthVal = (ScreenWidth / 2);
+                //}
                 if (tdWidthVal < 135) {
                     tdWidthVal = 135;
                 }