diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 0ce8de294..9b9d77235 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -1413,11 +1413,9 @@ class ProjectTask extends AbstractModel $userids = []; if ($userid === null) { $userids = $this->project->relationUserids(); - } elseif (!is_array($userid)) { - $userids = [$userid]; - } elseif (is_array($userid)) { - $userids = $userid; - } + } else { + $userids = is_array($userid) ? $userid : [$userid]; + } // $array = []; if (empty($data['parent_id'])) { diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue index ca979d144..3b784c7d7 100644 --- a/resources/assets/js/pages/manage/components/TaskAdd.vue +++ b/resources/assets/js/pages/manage/components/TaskAdd.vue @@ -96,8 +96,8 @@
- {{$L('可见性')}} - + {{$L('可见性')}} + @@ -125,8 +125,8 @@
- {{$L('项目人员可见')}} - {{$L('任务人员可见')}} + {{$L('项目人员可见')}} + {{$L('任务人员可见')}}
{{taskDetail.flow_item_name}}
- - {{$L('可见性')}} - + {{$L('可见性')}} + @@ -234,8 +234,8 @@
- {{$L('项目人员可见')}} - {{$L('任务人员可见')}} + {{$L('项目人员可见')}} + {{$L('任务人员可见')}}
    -
  • +
  • - diff --git a/resources/assets/sass/pages/components/task-add.scss b/resources/assets/sass/pages/components/task-add.scss index 85f6f707c..207ab2da7 100644 --- a/resources/assets/sass/pages/components/task-add.scss +++ b/resources/assets/sass/pages/components/task-add.scss @@ -152,6 +152,16 @@ } } } + .visibility-text{ + cursor: pointer; + &.color{ + color: #bbbbbb; + } + .taskfont{ + font-size: 10px; + margin-right: 0; + } + } } .task-add-advanced { margin: -16px 0 0; @@ -226,6 +236,16 @@ body.window-portrait { margin-left: 4px; } } + .visibility-text{ + cursor: pointer; + &.color{ + color: #bbbbbb; + } + .taskfont{ + font-size: 10px; + margin-right: 0; + } + } } } } diff --git a/resources/assets/sass/pages/components/task-detail.scss b/resources/assets/sass/pages/components/task-detail.scss index 9a1c277d6..2f3331a99 100644 --- a/resources/assets/sass/pages/components/task-detail.scss +++ b/resources/assets/sass/pages/components/task-detail.scss @@ -376,6 +376,7 @@ margin-right: 8px; display: flex; .ivu-input { + min-width: 80px; margin: -2px 0; padding: 4px 0; resize: none; @@ -428,6 +429,16 @@ } } } + .visibility-text{ + cursor: pointer; + &.color{ + color: #bbbbbb; + } + .taskfont{ + font-size: 10px; + margin-right: 0; + } + } } .add { margin-top: 12px;