github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 19:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pro' into pro

Browse Source
This commit is contained in:
kuaifan 2023-06-30 21:09:38 +08:00 committed by GitHub
commit cde9c819d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/ProjectTask.php
View File

@ -1410,7 +1410,6 @@ class ProjectTask extends AbstractModel
$data = $data->toArray(); $data = $data->toArray();
} }
// //
$userids = [];
if ($userid === null) { if ($userid === null) {
$userids = $this->project->relationUserids(); $userids = $this->project->relationUserids();
} else { } else {

4
resources/assets/js/components/UserSelect.vue
View File

@ -312,7 +312,7 @@ export default {
} else { } else {
this.searchKey = "" this.searchKey = ""
} }
this.$emit("showUpdate",value) this.$emit("onShowChange",value)
}, },
searchKey() { searchKey() {
@ -669,7 +669,7 @@ export default {
const clone = $A.cloneJSON(this.values) const clone = $A.cloneJSON(this.values)
this.values = $A.cloneJSON(this.selects) this.values = $A.cloneJSON(this.selects)
this.$emit('input', this.values) this.$emit('input', this.values)
this.$emit('submit', this.values) this.$emit('onSubmit', this.values)
if (!this.beforeSubmit) { if (!this.beforeSubmit) {
this.showModal = false this.showModal = false

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

@ -94,7 +94,7 @@
</div> </div>
</FormItem> </FormItem>
<FormItem> <FormItem>
<div class="item-label" slot="label"> <div slot="label">
<EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible"> <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
<span class="visibility-text">{{$L('可见性')}} <span class="visibility-text">{{$L('可见性')}}
<i class="taskfont">&#xe740;</i> <i class="taskfont">&#xe740;</i>
@ -124,7 +124,7 @@
</EDropdownMenu> </EDropdownMenu>
</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="ivu-input task-add-visibility" v-if="addData.visibility_appoint < 3" @click="showCisibleDropdown">
<span v-if="addData.visibility_appoint == 1">{{$L('项目人员可见')}}</span> <span v-if="addData.visibility_appoint == 1">{{$L('项目人员可见')}}</span>
<span v-else-if="addData.visibility_appoint == 2">{{$L('任务人员可见')}}</span> <span v-else-if="addData.visibility_appoint == 2">{{$L('任务人员可见')}}</span>
</div> </div>
@ -134,7 +134,7 @@
:avatar-size="24" :avatar-size="24"
:title="$L('选择指定人员')" :title="$L('选择指定人员')"
:project-id="addData.project_id" :project-id="addData.project_id"
@showUpdate="visibleUserSelectShowUpdate" @on-show-change="visibleUserSelectShowChange"
border border
/> />
</FormItem> </FormItem>
@ -561,7 +561,7 @@ export default {
this.$refs.eDropdownRef.show() this.$refs.eDropdownRef.show()
}, },
visibleUserSelectShowUpdate(isShow){ visibleUserSelectShowChange(isShow){
if(!isShow && (this.addData.visibility_appointor.length == 0 || !this.addData.visibility_appointor[0])){ if(!isShow && (this.addData.visibility_appointor.length == 0 || !this.addData.visibility_appointor[0])){
let old = this.addData.old_visibility_appoint; let old = this.addData.old_visibility_appoint;
this.addData.visibility_appoint = old > 2 ? 1 : (old || 1); this.addData.visibility_appoint = old > 2 ? 1 : (old || 1);

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

@ -236,14 +236,15 @@
<div class="item-content user"> <div class="item-content user">
<span @click="showCisibleDropdown" v-if="taskDetail.is_all_visible == 1" class="visibility-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> <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"
:avatar-size="28" :avatar-size="28"
:title="$L('选择指定人员')" :title="$L('选择指定人员')"
:project-id="taskDetail.project_id" :project-id="taskDetail.project_id"
@showUpdate="visibleUserSelectShowUpdate" :add-icon="false"
/> @on-show-change="visibleUserSelectShowChange"/>
</div> </div>
</FormItem> </FormItem>
<FormItem v-if="taskDetail.end_at || timeForce"> <FormItem v-if="taskDetail.end_at || timeForce">
@ -1550,7 +1551,7 @@ export default {
this.$refs.eDropdownRef.show() this.$refs.eDropdownRef.show()
}, },
visibleUserSelectShowUpdate(isShow){ visibleUserSelectShowChange(isShow){
if(!isShow && (this.taskDetail.visibility_appointor.length == 0 || !this.taskDetail.visibility_appointor[0])){ if(!isShow && (this.taskDetail.visibility_appointor.length == 0 || !this.taskDetail.visibility_appointor[0])){
let old = this.taskDetail.old_is_all_visible; let old = this.taskDetail.old_is_all_visible;
this.taskDetail.is_all_visible = old > 2 ? 1 : (old || 1); this.taskDetail.is_all_visible = old > 2 ? 1 : (old || 1);

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

@ -152,16 +152,25 @@
} }
} }
} }
.visibility-text { .visibility-text {
cursor: pointer; cursor: pointer;
&.color { &.color {
color: #bbbbbb; color: #bbbbbb;
} }
.taskfont { .taskfont {
display: inline-block;
transform: scale(0.9);
font-size: 12px; font-size: 12px;
margin-right: 0; margin-right: 0;
} }
} }
.task-add-visibility {
cursor: pointer;
color: rgba($primary-desc-color, 0.7);
}
} }
.task-add-advanced { .task-add-advanced {
margin: -16px 0 0; margin: -16px 0 0;

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

@ -429,12 +429,16 @@
} }
} }
} }
.visibility-text { .visibility-text {
cursor: pointer; cursor: pointer;
&.color { &.color {
color: #bbbbbb; color: #bbbbbb;
} }
.taskfont { .taskfont {
display: inline-block;
transform: scale(0.9);
font-size: 12px; font-size: 12px;
margin-right: 0; margin-right: 0;
} }
@ -514,7 +518,7 @@
&:before { &:before {
content: ""; content: "";
position: absolute; position: absolute;
left: 36px; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
height: 1px; height: 1px;
@ -594,11 +598,11 @@
.no-tip { .no-tip {
flex: 1; flex: 1;
display: none; display: none;
margin-left: 36px; margin-left: 0;
} }
.no-input { .no-input {
position: relative; position: relative;
margin: 22px 0 0 36px; margin: 22px 0 0 0;
background-color: #F4F5F7; background-color: #F4F5F7;
padding: 10px 4px 10px 6px; padding: 10px 4px 10px 6px;
border-radius: 10px; border-radius: 10px;
@ -634,7 +638,7 @@
content: ""; content: "";
position: absolute; position: absolute;
top: 0; top: 0;
left: 36px; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
border: 2px dashed #7b7b7b; border: 2px dashed #7b7b7b;
@ -648,7 +652,7 @@
} }
} }
.project-log { .project-log {
margin-left: 36px; margin-left: 0;
.logs-activity { .logs-activity {
padding: 22px 0 0; padding: 22px 0 0;
> li { > li {