github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-17 06:32:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

style：调整代码格式，未修改代码逻辑

Browse Source
This commit is contained in:
weifashi 2023-06-30 16:15:05 +08:00
parent 41c2dabe26
commit 287e3e378d
5 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/ProjectTask.php
View File

@ -1413,10 +1413,8 @@ class ProjectTask extends AbstractModel
$userids = []; $userids = [];
if ($userid === null) { if ($userid === null) {
$userids = $this->project->relationUserids(); $userids = $this->project->relationUserids();
} elseif (!is_array($userid)) { } else {
$userids = [$userid]; $userids = is_array($userid) ? $userid : [$userid];
} elseif (is_array($userid)) {
$userids = $userid;
} }
// //
$array = []; $array = [];

6
resources/assets/js/pages/manage/components/TaskAdd.vue
View File

@ -96,7 +96,7 @@
<FormItem> <FormItem>
<div class="item-label" slot="label"> <div class="item-label" slot="label">
<EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible"> <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
<span cclass="dashed-text">{{$L('可见性')}} <span class="visibility-text">{{$L('可见性')}}
<i class="taskfont">&#xe740;</i> <i class="taskfont">&#xe740;</i>
</span> </span>
<EDropdownMenu slot="dropdown"> <EDropdownMenu slot="dropdown">
@ -125,8 +125,8 @@
</EDropdown> </EDropdown>
</div> </div>
<div class="item-content user ivu-input ivu-input-default ivu-input-with-suffix" v-if="addData.visibility_appoint < 3" @click="showCisibleDropdown"> <div class="item-content user ivu-input ivu-input-default ivu-input-with-suffix" v-if="addData.visibility_appoint < 3" @click="showCisibleDropdown">
<span v-if="addData.visibility_appoint == 1" class="dashed-text">{{$L('项目人员可见')}}</span> <span v-if="addData.visibility_appoint == 1">{{$L('项目人员可见')}}</span>
<span v-else-if="addData.visibility_appoint == 2" class="dashed-text">{{$L('任务人员可见')}}</span> <span v-else-if="addData.visibility_appoint == 2">{{$L('任务人员可见')}}</span>
</div> </div>
<UserSelect v-else <UserSelect v-else
ref="visibleUserSelectRef" ref="visibleUserSelectRef"

6
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -205,7 +205,7 @@
<div class="item-label" slot="label"> <div class="item-label" slot="label">
<i class="taskfont">&#xe77b;</i> <i class="taskfont">&#xe77b;</i>
<EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible"> <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
<span class="dashed-text color">{{$L('可见性')}} <span class="visibility-text color">{{$L('可见性')}}
<i class="taskfont">&#xe740;</i> <i class="taskfont">&#xe740;</i>
</span> </span>
<EDropdownMenu slot="dropdown"> <EDropdownMenu slot="dropdown">
@ -234,8 +234,8 @@
</EDropdown> </EDropdown>
</div> </div>
<div class="item-content user"> <div class="item-content user">
<span @click="showCisibleDropdown" v-if="taskDetail.is_all_visible == 1" class="dashed-text">{{$L('项目人员可见')}}</span> <span @click="showCisibleDropdown" v-if="taskDetail.is_all_visible == 1" class="visibility-text">{{$L('项目人员可见')}}</span>
<span @click="showCisibleDropdown" v-else-if="taskDetail.is_all_visible == 2" class="dashed-text">{{$L('任务人员可见')}}</span> <span @click="showCisibleDropdown" v-else-if="taskDetail.is_all_visible == 2" class="visibility-text">{{$L('任务人员可见')}}</span>
<UserSelect v-else <UserSelect v-else
ref="visibleUserSelectRef" ref="visibleUserSelectRef"
v-model="taskDetail.visibility_appointor" v-model="taskDetail.visibility_appointor"

20
resources/assets/sass/pages/components/task-add.scss vendored
View File

@ -152,6 +152,16 @@
} }
} }
} }
.visibility-text{
cursor: pointer;
&.color{
color: #bbbbbb;
}
.taskfont{
font-size: 10px;
margin-right: 0;
}
}
} }
.task-add-advanced { .task-add-advanced {
margin: -16px 0 0; margin: -16px 0 0;
@ -226,6 +236,16 @@ body.window-portrait {
margin-left: 4px; margin-left: 4px;
} }
} }
.visibility-text{
cursor: pointer;
&.color{
color: #bbbbbb;
}
.taskfont{
font-size: 10px;
margin-right: 0;
}
}
} }
} }
} }

11
resources/assets/sass/pages/components/task-detail.scss vendored
View File

@ -429,16 +429,15 @@
} }
} }
} }
.dashed-text{ .visibility-text{
cursor: pointer; cursor: pointer;
border-bottom: 1px dashed #acacac;
&.color{ &.color{
color: #bbbbbb; color: #bbbbbb;
} }
} .taskfont{
.dashed-text .taskfont{ font-size: 10px;
font-size: 10px; margin-right: 0;
margin-right: 0; }
} }
} }
.add { .add {