github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-27 21:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #173 from hitosea/pro

Browse Source 
可见性样式调整
This commit is contained in:
kuaifan 2023-06-30 16:45:30 +08:00 committed by GitHub
commit c444e2d3fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/ProjectTask.php
View File

@ -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'])) {

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

@ -96,8 +96,8 @@
<FormItem>
<div class="item-label" slot="label">
<EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
<span cclass="dashed-text">{{$L('可见性')}}
<i class="taskfont" style="font-size: 10px;margin-right: 0;">&#xe740;</i>
<span class="visibility-text">{{$L('可见性')}}
<i class="taskfont">&#xe740;</i>
</span>
<EDropdownMenu slot="dropdown">
<EDropdownItem :command="1">
@ -125,8 +125,8 @@
</EDropdown>
</div>
<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-else-if="addData.visibility_appoint == 2" class="dashed-text">{{$L('任务人员可见')}}</span>
<span v-if="addData.visibility_appoint == 1">{{$L('项目人员可见')}}</span>
<span v-else-if="addData.visibility_appoint == 2">{{$L('任务人员可见')}}</span>
</div>
<UserSelect v-else
ref="visibleUserSelectRef"

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

@ -13,7 +13,7 @@
<span :class="taskDetail.flow_item_status" @click.stop="openMenu($event, taskDetail)">{{taskDetail.flow_item_name}}</span>
</div>
<div class="subtask-name">
<Input style="min-width: 80px;"
<Input
v-model="taskDetail.name"
ref="name"
type="textarea"
@ -205,8 +205,8 @@
<div class="item-label" slot="label">
<i class="taskfont">&#xe77b;</i>
<EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
<span class="dashed-text" style="color: #bbbbbb; ">{{$L('可见性')}}
<i class="taskfont" style="font-size: 10px;margin-right: 0;">&#xe740;</i>
<span class="visibility-text color">{{$L('可见性')}}
<i class="taskfont">&#xe740;</i>
</span>
<EDropdownMenu slot="dropdown">
<EDropdownItem :command="1">
@ -234,8 +234,8 @@
</EDropdown>
</div>
<div class="item-content user">
<span @click="showCisibleDropdown" v-if="taskDetail.is_all_visible == 1" class="dashed-text">{{$L('项目人员可见')}}</span>
<span @click="showCisibleDropdown" v-else-if="taskDetail.is_all_visible == 2" 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="visibility-text">{{$L('任务人员可见')}}</span>
<UserSelect v-else
ref="visibleUserSelectRef"
v-model="taskDetail.visibility_appointor"
@ -346,7 +346,7 @@
:can-update-blur="canUpdateBlur"/>
</ul>
<ul :class="['item-content', subList.length === 0 ? 'nosub' : '']">
<li style="margin-left: 8px;">
<li>
<Input
v-if="addsubShow"
v-model="addsubName"
@ -1583,19 +1583,3 @@ export default {
}
}
</script>
<style scoped>
::v-deep .ivu-poptip-rel {
display: flex;
}
::v-deep .sub-time {
color: #BBBBBB;
}
.dashed-text{
cursor: pointer;
border-bottom: 1px dashed #acacac;
}
.dashed-text .taskfont{
font-size: 10px;
margin-right: 0;
}
</style>

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 {
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;
}
}
}
}
}

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

@ -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;