Merge branch 'pro' into pro

2025-12-12 03:01:12 +00:00 · 2023-06-30 21:09:38 +08:00 · 2023-06-30 21:09:38 +08:00 · cde9c819d1
commit cde9c819d1
parent 14195a2647 a35f1505e3
7 changed files with 63 additions and 50 deletions
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@ -911,7 +911,7 @@ class ProjectController extends AbstractController
        $sorts = is_array($sorts) ? $sorts : [];

        // 任务可见性
-        $visibility_task_ids =  ProjectTask::getVisibleUserids($userid, $project_id);
+        $visibility_task_ids = ProjectTask::getVisibleUserids($userid, $project_id);

        $builder = ProjectTask::with(['taskUser', 'taskTag']);
        $builder->whereIn("project_tasks.id", $visibility_task_ids);
@ -1367,7 +1367,7 @@ class ProjectController extends AbstractController
        $data = $task->toArray();
        $data['project_name'] = $task->project?->name;
        $data['column_name'] = $task->projectColumn?->name;
-        $data['visibility_appointor'] = $task->is_all_visible==1 ? [0] : ProjectTaskUser::whereTaskId($task_id)->whereOwner(2)->pluck('userid');
+        $data['visibility_appointor'] = $task->is_all_visible == 1 ? [0] : ProjectTaskUser::whereTaskId($task_id)->whereOwner(2)->pluck('userid');
        return Base::retSuccess('success', $data);
    }

@ -1673,7 +1673,7 @@ class ProjectController extends AbstractController
        $data = ProjectTask::oneTask($task->id);
        $projectUserid = Project::whereId($data->project_id)->value('userid');
        $pushUserIds = ProjectTaskUser::whereTaskId($task->id)->pluck('userid')->toArray();
-        $pushUserIds[] =  $projectUserid;
+        $pushUserIds[] = $projectUserid;
        foreach ($pushUserIds as $userId) {
            $task->pushMsg('add', $data, $userId);
        }
@ -1730,14 +1730,14 @@ class ProjectController extends AbstractController
        $data['visibility_appointor'] = $data['is_all_visible'] == 1 ? [] : ProjectTaskUser::whereTaskId($task->id)->whereOwner(2)->pluck('userid');
        $task->pushMsg('update', $data);
        // 可见性推送
-        if($task->parent_id == 0){
+        if ($task->parent_id == 0) {
            $subUserids = ProjectTaskUser::whereTaskPid($data['id'])->pluck('userid')->toArray();
            if (Arr::exists($param, 'is_all_visible') || Arr::exists($param, 'visibility_appointor')) {
                if ($data['is_all_visible'] == 1) {
                    $task->pushMsgVisibleAdd($data);
                }
                if ($param['visibility_appointor']) {
-                    $oldVisibleUserIds = $taskUser->where('owner', 2)->pluck('userid')->toArray()??[];
+                    $oldVisibleUserIds = $taskUser->where('owner', 2)->pluck('userid')->toArray() ?? [];
                    $newVisibleUserIds = $param['visibility_appointor'] ?? [];
                    $deleteUserIds = array_diff($oldVisibleUserIds, $newVisibleUserIds, $subUserids);
                    $addUserIds = array_diff($newVisibleUserIds, $oldVisibleUserIds);
@ -1759,15 +1759,15 @@ class ProjectController extends AbstractController
                    $task->pushMsgVisibleRemove($diff);
                }
            }
-        }else{
-            if(Arr::exists($param, 'owner') ){
-                $diff = array_diff($owners, $param['owner']  ?: [] );
+        } else {
+            if (Arr::exists($param, 'owner')) {
+                $diff = array_diff($owners, $param['owner'] ?: []);
                if ($diff) {
                    $task->pushMsgVisibleRemove($diff);
                }
                $parentTask = ProjectTask::whereId($task->parent_id)->first();
                $subUserids = ProjectTaskUser::whereTaskPid($task->parent_id)->pluck('userid')->toArray();
-                if ( $parentTask && $parentTask->is_all_visible != 1 && empty($subUserids) ) {
+                if ($parentTask && $parentTask->is_all_visible != 1 && empty($subUserids)) {
                    $diff = array_diff($owners, $param['owner'] ?: [], $subUserids);
                    if ($diff) {
                        $parentTask->pushMsgVisibleRemove($diff);
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@ -465,7 +465,7 @@ class ProjectTask extends AbstractModel
            }
        }
        //
-        return AbstractModel::transaction(function() use ($assist, $times, $subtasks, $content, $owner, $task, $visibility_userids) {
+        return AbstractModel::transaction(function () use ($assist, $times, $subtasks, $content, $owner, $task, $visibility_userids) {
            $task->save();
            $owner = array_values(array_unique($owner));
            foreach ($owner as $uid) {
@ -676,11 +676,11 @@ class ProjectTask extends AbstractModel
                foreach ($owner as $uid) {
                    if (intval($uid) == 0) continue;
                    if (!$this->project->useridInTheProject($uid)) continue;
-                    $row = ProjectTaskUser::where("task_id",$this->id)
-                        ->where("userid",$uid)
-                        ->where("owner",'!=', 2)
+                    $row = ProjectTaskUser::where("task_id", $this->id)
+                        ->where("userid", $uid)
+                        ->where("owner", '!=', 2)
                        ->first();
-                    if(empty($row)){
+                    if (empty($row)) {
                        ProjectTaskUser::createInstance([
                            'task_id' => $this->id,
                            'userid' => $uid,
@ -688,7 +688,7 @@ class ProjectTask extends AbstractModel
                            'task_pid' => $this->parent_id ?: $this->id,
                            'owner' => 1,
                        ])->save();
-                    }else{
+                    } else {
                        $row->project_id = $this->project_id;
                        $row->task_pid = $this->parent_id ?: $this->id;
                        $row->owner = 1;
@ -716,13 +716,13 @@ class ProjectTask extends AbstractModel
            }
            // 可见性
            if (Arr::exists($data, 'is_all_visible') || Arr::exists($data, 'visibility_appointor')) {
-                if(Arr::exists($data, 'is_all_visible')){
+                if (Arr::exists($data, 'is_all_visible')) {
                    ProjectTask::whereId($data['task_id'])->update(['is_all_visible' => $data["is_all_visible"]]);
                }
                ProjectTaskUser::whereTaskId($data['task_id'])->whereOwner(2)->delete();
-                if(Arr::exists($data, 'visibility_appointor')){
+                if (Arr::exists($data, 'visibility_appointor')) {
                    foreach ($data['visibility_appointor'] as $uid) {
-                        if($uid){
+                        if ($uid) {
                            ProjectTaskUser::createInstance([
                                'project_id' => $this->project_id,
                                'task_id' => $this->id,
@ -1410,12 +1410,11 @@ class ProjectTask extends AbstractModel
            $data = $data->toArray();
        }
        //
-        $userids = [];
        if ($userid === null) {
            $userids = $this->project->relationUserids();
        } else {
            $userids = is_array($userid) ? $userid : [$userid];
-        } 
+        }
        //
        $array = [];
        if (empty($data['parent_id'])) {
@ -1482,7 +1481,7 @@ class ProjectTask extends AbstractModel

    /**
     * 添加可见性任务 推送
-     * @param array|self $data      发送内容，默认为[id, parent_id, project_id, column_id, dialog_id]
+     * @param array|self $data 发送内容，默认为[id, parent_id, project_id, column_id, dialog_id]
     */
    public function pushMsgVisibleAdd($data = null, array $pushUserIds = [])
    {
@ -1504,8 +1503,8 @@ class ProjectTask extends AbstractModel
        $array = [];
        if ($pushUserIds) {
            $userids = $pushUserIds;
-        }elseif ($this->is_all_visible != 1) {
-            $userids = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($this->id)->orWhere('task_pid' , '=', $this->id)->pluck('userid')->toArray();
+        } elseif ($this->is_all_visible != 1) {
+            $userids = ProjectTaskUser::select(['userid', 'owner'])->whereTaskId($this->id)->orWhere('task_pid', '=', $this->id)->pluck('userid')->toArray();
        } else {
            $userids = ProjectUser::whereProjectId($this->project_id)->pluck('userid')->toArray();  // 项目成员
        }
@ -1555,7 +1554,7 @@ class ProjectTask extends AbstractModel
            $projectOwner = Project::whereId($this->project_id)->pluck('userid')->toArray();  // 项目负责人
            $taskOwnerAndAssists = ProjectTaskUser::select(['userid', 'owner'])->whereIn('owner', [0, 1])->whereTaskId($this->id)->pluck('userid')->toArray();
            $subUserids = ProjectTaskUser::whereTaskPid($this->id)->pluck('userid')->toArray();
-            $userids = array_diff($projectUserids, $projectOwner, $taskOwnerAndAssists,$subUserids);
+            $userids = array_diff($projectUserids, $projectOwner, $taskOwnerAndAssists, $subUserids);
        }
        //
        $array[] = [
@ -1580,7 +1579,7 @@ class ProjectTask extends AbstractModel

    /**
     * 更新可见性任务 推送
-     * @param array|self $data      发送内容，默认为[id, parent_id, project_id, column_id, dialog_id]
+     * @param array|self $data 发送内容，默认为[id, parent_id, project_id, column_id, dialog_id]
     */
    public function pushMsgVisibleUpdate($data, array $deleteUserIds = [], array $addUserIds = [])
    {
@ -1736,7 +1735,7 @@ class ProjectTask extends AbstractModel
            ->when($project_id, function ($q) use ($project_id) {
                $q->where('pt.project_id', '=', $project_id);   // 负责人项目ids
            })
-            ->where(function ($q) use ($userid){
+            ->where(function ($q) use ($userid) {
                $q->where("pt.is_all_visible", '=', 1);
                $q->OrWhere("p.userid", '=', $userid);
                $q->OrWhere("b.userid", '=', $userid);
--- a/resources/assets/js/components/UserSelect.vue
+++ b/resources/assets/js/components/UserSelect.vue
@ -1,7 +1,7 @@
 <template>
    <div class="common-user-select" :class="warpClass">
        <ul v-if="!module" @click="onSelection">
-            <li v-for="userid in values"  v-if="userid" >
+            <li v-for="userid in values" v-if="userid">
                <UserAvatar :userid="userid" :size="avatarSize" :show-icon="avatarIcon" :show-name="avatarName" tooltip-disabled/>
            </li>
            <li v-if="addIcon || values.length === 0" class="add-icon" :style="addStyle" @click.stop="onSelection"></li>
@ -312,7 +312,7 @@ export default {
            } else {
                this.searchKey = ""
            }
-            this.$emit("showUpdate",value)
+            this.$emit("onShowChange",value)
        },

        searchKey() {
@ -669,7 +669,7 @@ export default {
            const clone = $A.cloneJSON(this.values)
            this.values = $A.cloneJSON(this.selects)
            this.$emit('input', this.values)
-            this.$emit('submit', this.values)
+            this.$emit('onSubmit', this.values)

            if (!this.beforeSubmit) {
                this.showModal = false
--- a/resources/assets/js/pages/manage/components/TaskAdd.vue
+++ b/resources/assets/js/pages/manage/components/TaskAdd.vue
@ -94,7 +94,7 @@
                </div>
            </FormItem>
            <FormItem>
-                <div class="item-label" slot="label">
+                <div slot="label">
                    <EDropdown ref="eDropdownRef" trigger="click" placement="bottom" @command="dropVisible">
                        <span class="visibility-text">{{$L('可见性')}}
                            <i class="taskfont">&#xe740;</i>
@ -124,7 +124,7 @@
                        </EDropdownMenu>
                    </EDropdown>
                </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-else-if="addData.visibility_appoint == 2">{{$L('任务人员可见')}}</span>
                </div>
@ -134,7 +134,7 @@
                    :avatar-size="24"
                    :title="$L('选择指定人员')"
                    :project-id="addData.project_id"
-                    @showUpdate="visibleUserSelectShowUpdate"
+                    @on-show-change="visibleUserSelectShowChange"
                    border
                />
            </FormItem>
@ -561,7 +561,7 @@ export default {
            this.$refs.eDropdownRef.show()
        },

-        visibleUserSelectShowUpdate(isShow){
+        visibleUserSelectShowChange(isShow){
            if(!isShow && (this.addData.visibility_appointor.length == 0 || !this.addData.visibility_appointor[0])){
                let old = this.addData.old_visibility_appoint;
                this.addData.visibility_appoint = old > 2 ? 1 : (old || 1);
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@ -236,14 +236,15 @@
                        <div class="item-content user">
                            <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
+                            <UserSelect
+                                v-else
                                ref="visibleUserSelectRef"
                                v-model="taskDetail.visibility_appointor"
                                :avatar-size="28"
                                :title="$L('选择指定人员')"
                                :project-id="taskDetail.project_id"
-                                @showUpdate="visibleUserSelectShowUpdate"
-                            />
+                                :add-icon="false"
+                                @on-show-change="visibleUserSelectShowChange"/>
                        </div>
                    </FormItem>
                    <FormItem v-if="taskDetail.end_at || timeForce">
@ -1550,7 +1551,7 @@ export default {
            this.$refs.eDropdownRef.show()
        },

-        visibleUserSelectShowUpdate(isShow){
+        visibleUserSelectShowChange(isShow){
            if(!isShow && (this.taskDetail.visibility_appointor.length == 0 || !this.taskDetail.visibility_appointor[0])){
                let old = this.taskDetail.old_is_all_visible;
                this.taskDetail.is_all_visible = old > 2 ? 1 : (old || 1);
--- a/resources/assets/sass/pages/components/task-add.scss
+++ b/resources/assets/sass/pages/components/task-add.scss
@ -152,16 +152,25 @@
                }
            }
        }
-        .visibility-text{
-            cursor: pointer; 
-            &.color{
+
+        .visibility-text {
+            cursor: pointer;
+
+            &.color {
                color: #bbbbbb;
            }
-            .taskfont{
+            .taskfont {
+                display: inline-block;
+                transform: scale(0.9);
                font-size: 12px;
                margin-right: 0;
            }
        }
+
+        .task-add-visibility {
+            cursor: pointer;
+            color: rgba($primary-desc-color, 0.7);
+        }
    }
    .task-add-advanced {
        margin: -16px 0 0;
--- a/resources/assets/sass/pages/components/task-detail.scss
+++ b/resources/assets/sass/pages/components/task-detail.scss
@ -429,12 +429,16 @@
                        }
                    }
                }
-                .visibility-text{
-                    cursor: pointer; 
-                    &.color{
+
+                .visibility-text {
+                    cursor: pointer;
+
+                    &.color {
                        color: #bbbbbb;
                    }
-                    .taskfont{
+                    .taskfont {
+                        display: inline-block;
+                        transform: scale(0.9);
                        font-size: 12px;
                        margin-right: 0;
                    }
@ -514,7 +518,7 @@
            &:before {
                content: "";
                position: absolute;
-                left: 36px;
+                left: 0;
                right: 0;
                bottom: 0;
                height: 1px;
@ -594,11 +598,11 @@
            .no-tip {
                flex: 1;
                display: none;
-                margin-left: 36px;
+                margin-left: 0;
            }
            .no-input {
                position: relative;
-                margin: 22px 0 0 36px;
+                margin: 22px 0 0 0;
                background-color: #F4F5F7;
                padding: 10px 4px 10px 6px;
                border-radius: 10px;
@ -634,7 +638,7 @@
                    content: "";
                    position: absolute;
                    top: 0;
-                    left: 36px;
+                    left: 0;
                    right: 0;
                    bottom: 0;
                    border: 2px dashed #7b7b7b;
@ -648,7 +652,7 @@
            }
        }
        .project-log {
-            margin-left: 36px;
+            margin-left: 0;
            .logs-activity {
                padding: 22px 0 0;
                > li {