|
|
@@ -237,8 +237,22 @@ var AdjustTableFunc = function (sWidthVal) {
|
|
|
var TableWidth = 0;
|
|
|
var TotalMaxLen = 0;
|
|
|
var RuleFlag = true;
|
|
|
+ var HasIndex = 0;
|
|
|
+ RSArrs = [];
|
|
|
$.each($(item).find("tr"), function (trIndex, trItem) {
|
|
|
$.each($(trItem).find("td"), function (tdIndex, tdItem) {
|
|
|
+ var RowSpanNum = parseInt($(tdItem).attr("rowspan"));
|
|
|
+ RowSpanNum = (RowSpanNum == 0 || isNaN(RowSpanNum)) ? 1 : RowSpanNum;
|
|
|
+ if (RowSpanNum > 1) {
|
|
|
+ var RSArr = {
|
|
|
+ RSIndex: HasIndex,
|
|
|
+ RSNumber: RowSpanNum,
|
|
|
+ RSXIndex: tdIndex,
|
|
|
+ RSYIndex: trIndex
|
|
|
+ };
|
|
|
+ HasIndex += 1;
|
|
|
+ RSArrs.push(RSArr);
|
|
|
+ }
|
|
|
var WidthVal = $(tdItem).css("width").replace("px", "");
|
|
|
var RemoveHtmlArr = removeHtmlFunc($(tdItem).html(), WidthVal);
|
|
|
// 附加处理图片宽度
|
|
|
@@ -262,11 +276,31 @@ var AdjustTableFunc = function (sWidthVal) {
|
|
|
}
|
|
|
ArrMaxLen.push(0);
|
|
|
}
|
|
|
- if (ArrMaxLen[tdIndex] < tdWidthVal) {
|
|
|
- TotalMaxLen += tdWidthVal - ArrMaxLen[tdIndex];
|
|
|
- ArrMaxLen[tdIndex] = tdWidthVal;
|
|
|
+ if (RSArrs.length > 0) {
|
|
|
+ for (var i = 0; i < RSArrs.length; i++) {
|
|
|
+ if (RSArrs[i].RSNumber > 1 && RSArrs[i].RSYIndex == trIndex) {
|
|
|
+ if (ArrMaxLen[tdIndex] < tdWidthVal) {
|
|
|
+ TotalMaxLen += tdWidthVal - ArrMaxLen[tdIndex];
|
|
|
+ ArrMaxLen[tdIndex] = tdWidthVal;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ if (ArrMaxLen[tdIndex] < tdWidthVal) {
|
|
|
+ TotalMaxLen += tdWidthVal - ArrMaxLen[tdIndex];
|
|
|
+ ArrMaxLen[tdIndex] = tdWidthVal;
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
+ for (var i = 0; i < RSArrs.length; i++) {
|
|
|
+ if (RSArrs[i].RSNumber > 1) {
|
|
|
+ RSArrs[i].RSNumber -= 1;
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ RSArrs.splice(i);
|
|
|
+ }
|
|
|
+ }
|
|
|
});
|
|
|
// 判断表格是否只有一行
|
|
|
if ($(item).find("tr").length == 1 && $(item).find("tr").eq(0).find("td").length == 1) {
|
