From 56abed5252990488b0bae06f39dd1f84c6aae195 Mon Sep 17 00:00:00 2001 From: Catouse Date: Mon, 25 Jun 2018 10:33:21 +0800 Subject: [PATCH] * fix table header in assigntome block. --- module/block/js/dashboard.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index 8408ed0612..3ea4d0f10f 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -98,10 +98,20 @@ function refreshBlock($panel, afterRefresh) */ function initTableHeader($wrapper) { - ($wrapper || $('#dashboard')).find('.panel-body > .table-fixed-head').each(function() + ($wrapper || $('#dashboard')).find('.panel-body > table.table-fixed-head').each(function() { var $table = $(this); - var $panel = $table.closest('.panel'); + var $tabPane = $table.closest('.tab-pane'); + if ($tabPane.length && !$tabPane.hasClass('active')) + { + $('[data-tab][href="#' + $tabPane.attr('id') + '"]').one('shown.zui.tab', function() + { + initTableHeader($tabPane); + }); + return; + } + + var $panel = $tabPane.length ? $tabPane : $table.closest('.panel'); if(!$table.length || !$table.children('thead').length || ($panel.find('#assigntomeBlock').length && $panel.find('#assigntomeBlock > div').length > 1)) return; var isFixed = $panel.find('.panel-body').height() < $table.outerHeight(); @@ -121,7 +131,7 @@ function initTableHeader($wrapper) }; if(!$header.length) { - $header = $('
').css('right', 0); + $header = $('
').css('right', $panel.width() - tableWidth - 20); $oldTableHead.find('th').each(function(idx) { $(this).attr('data-idx', idx);