Browse Source

修改表格问题的合并

lujianhong 4 years ago
parent
commit
7ab3feddc6
1 changed files with 16 additions and 2 deletions
  1. 16 2
      EBook.Web/Common/tasklib_book.js

+ 16 - 2
EBook.Web/Common/tasklib_book.js

@@ -61,12 +61,16 @@ var AdjustTableFunc = function () {
         var ArrMaxLen =[];
         var TableWidth = 0;
         var TotalMaxLen = 0;
+        var RuleFlag = true;
         $.each($(item).find("tr"), function (trIndex, trItem) {
             $.each($(trItem).find("td"), function (tdIndex, tdItem) {
                 var tdtext = dealTdTextFunc($(tdItem).html());
                 $("#pContrainId").text(tdtext);
                 var tdWidthVal = $("#pContrainId").width();
-                if (ArrMaxLen.length < tdIndex +1) {
+                if (ArrMaxLen.length < tdIndex + 1) {
+                    if (trIndex != 0) {
+                        RuleFlag = false;
+                    }
                     ArrMaxLen.push(0);
                 }
                 if (ArrMaxLen[tdIndex]< tdWidthVal) {
@@ -90,10 +94,20 @@ var AdjustTableFunc = function () {
             }
             var OneFlag = false;
             for (var i = 0; i < ArrMaxLen.length; i++) {
-                if (ArrMaxLen[i]!= undefined && $(item).find("tr").eq(0).find("td").length > 1) {
+                if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length > 1 && RuleFlag) {
                     $(item).find("tr").eq(0).find("td").eq(i).css("width", ArrMaxLen[i]+ "px");
                     TableWidth += ArrMaxLen[i];
                 }
+                else if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length > 1 && !RuleFlag) {
+                    TableWidth += ArrMaxLen[i];
+                    var NotRuleWidth = 0;
+                    if (i == ArrMaxLen.length - 1) {
+                        NotRuleWidth = TableWidth / $(item).find("tr").eq(0).find("td").length;
+                    }
+                    $.each($(item).find("tr").eq(0).find("td"), function (tdIndex, tdItem) {
+                        $(tdItem).css("width", NotRuleWidth + "px");
+                    });
+                }
                 else if (ArrMaxLen[i]!= undefined && $(item).find("tr").eq(0).find("td").length == 1) {
                     OneFlag = true;
                     TableWidth += ArrMaxLen[i];