Merge branch 'sprint/183_zhouxin_fix' into 'master'

Fix bugs.

See merge request easycorp/zentaopms!1694

module/kanban/js/view.js

@@ -1128,7 +1128,7 @@ function createCardMenu(options)
         if(!card.color) color = "#fff";
         for(let i = 0 ; i < colorList.length ; i ++ )
         {
-            var attr   = card.color == colorList[i] ? '<i class="icon icon-check" style="margin-left: 10px"></i>' : '';
+            var attr   = card.color == colorList[i] ? '<i class="icon icon-check" style="margin-left: 5px"></i>' : '';
             var border = i == 0 ? 'border:1px solid #b0b0b0;' : '';
             cardColoritems.push({label: "<div class='cardcolor' style='background:" + colorList[i] + ";" + border + "'></div>" + colorListLang[colorList[i]]  + attr ,
                 onClick: function(){setCardColor(card.id, colorList[i], card.kanban, card.region);}, html: true, attrs: {id: 'cardcolormenu'}, className: 'color' + i});

module/kanban/view/performable.html.php

@@ -19,7 +19,7 @@
     <form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
       <table class='table table-form'>
         <tr>
-          <th class='w-90px'><?php echo $lang->kanban->doneFunction;?></th>
+          <th class='w-110px'><?php echo $lang->kanban->doneFunction;?></th>
           <td><?php echo nl2br(html::radio('performable', $lang->kanban->enableFinished, $kanban->performable));?></td>
         </tr>
         <tr>

module/kanban/view/setcolumn.html.php

@@ -21,7 +21,7 @@
     <form class="load-indicator main-form form-ajax" method='post' target='hiddenwin'>
       <table align='center' class='table table-form'>
         <tr>
-          <th><?php echo $lang->kanban->columnName;?></th>
+          <th class='w-110px'><?php echo $lang->kanban->columnName;?></th>
           <td colspan='2'>
             <?php echo html::input('name', $column->name, "class='form-control'");?>
           </td>