Merge branch 'sprint/241_tianshujie_fixbug' into 'master'

Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5491

db/update17.6.1.sql

@@ -0,0 +1 @@
+UPDATE `zt_workflowlabel` SET `label` = '全部' where `buildin` = 0 AND `role` = 'custom' AND `label` = '所有' AND `action` = 'browse';

module/kanban/css/view.css

@@ -173,8 +173,9 @@
 #regionNavTabs > ul > li > a > span {vertical-align: bottom; overflow: hidden; max-width: 6em; white-space: nowrap; display: inline-block;}
 #regionNavTabs > ul > li.active > a > span {color: #2b80ff!important;}
 #regionTabs.affixed {margin-bottom: 5px; position: fixed; top: 0px;}
-#regionTabs.affixed + #kanbanContainer .kanban-board.kanban-affixed > .kanban-header {margin-top: 30px;}
+#regionTabs.affixed + #kanbanContainer .kanban-board.kanban-affixed > .kanban-header {margin-top: 43px;}
 #regionTabs.affixed + #kanbanContainer .kanban-board.kanban-affixed > .kanban-header + .kanban-lane {margin-top: 38px;}
+#regionTabs.affixed ul {margin-bottom: -10px;}
 #regionTabs.affixed ul > li {margin-bottom: 0px !important;}
 #regionTabs .region-actions .dropdown-menu {top: 25px;}
 #region-tab-actions {display: none;}

module/kanban/js/view.js

@@ -1991,6 +1991,7 @@ $('[data-tab]').on('shown.zui.tab', function(e)
             if($(this).hasClass('archivedColumn')) $(this).find('a').attr('href', "javascript:loadMore(\"Column\", " + regionID + ')');
         });
     }
+     window.scrollTo(0, 0);
 
     /* To manually refresh stay under the current tab, save the ID of the current region. */
     var url = createLink('kanban', 'ajaxSaveRegionID', 'regionID=' + regionID);

module/mr/lang/zh-cn.php

@@ -77,7 +77,7 @@ $lang->mr->assignedToMe = '指派给我';
 $lang->mr->createdByMe  = '由我创建';
 
 $lang->mr->statusList = array();
-$lang->mr->statusList['all']    = '所有';
+$lang->mr->statusList['all']    = '全部';
 $lang->mr->statusList['opened'] = '开放中';
 $lang->mr->statusList['merged'] = '已合并';
 $lang->mr->statusList['closed'] = '已关闭';