Merge branch 'sprint/179_zhengrunyu_46146' into 'master'

*card name warp.

See merge request easycorp/zentaopms!1063
This commit is contained in:
孙广明
2021-12-22 02:53:20 +00:00
2 changed files with 2 additions and 3 deletions
+1 -2
View File
@@ -83,8 +83,7 @@ body {background-color: #fff}
.region .kanban-item .has-color .info > .label-pri {border-color: #FFFFFF;}
.region .kanban-item .item-more {position: absolute; right: 6px; top: 0px;}
.kanban-card {height: 60px !important}
.kanban-card > .title {display: block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis}
.kanban-card {height: auto !important}
.kanban-card > .info {position: relative; margin-top: 5px}
.kanban-card > .info > .info + .info {margin-left: 8px}
.kanban-card:hover > .actions {opacity: 1;}
+1 -1
View File
@@ -394,7 +394,7 @@ class kanbanModel extends model
return false;
}
if($this->post->begin > $this->post->end)
if($this->post->end && $this->post->begin > $this->post->end)
{
dao::$errors[] = $this->lang->kanbancard->error->endSmall;
return false;