kuaifan 5 anos atrás
pai
commit
cee35411b2

+ 1 - 1
app/Http/Controllers/Api/UsersController.php

@@ -135,7 +135,7 @@ class UsersController extends Controller
             ->take(Min(Max(Base::nullShow(Request::input('take'), 10), 1), 100))
             ->get();
         foreach ($lists AS $key => $item) {
-            $lists[$key]['userimg'] = Base::fillUrl($item['userimg']);
+            $lists[$key]['userimg'] = Users::userimg($item['userimg']);
             $lists[$key]['identitys'] = explode(",", trim($item['identity'], ","));
             $lists[$key]['setting'] = Base::string2array($item['setting']);
         }

+ 1 - 1
app/Module/Users.php

@@ -170,7 +170,7 @@ class Users
         }
         //
         $userinfo['setting'] = Base::string2array($userinfo['setting']);
-        $userinfo['userimg'] = $userinfo['userimg'] ? Base::fillUrl($userinfo['userimg']) : url('images/other/avatar.png');
+        $userinfo['userimg'] = self::userimg($userinfo['userimg']);
         $userinfo['identity'] = is_array($userinfo['identity']) ? $userinfo['identity'] : explode(",", trim($userinfo['identity'], ","));
         unset($userinfo['encrypt']);
         unset($userinfo['userpass']);

+ 2 - 0
resources/assets/js/main/components/project/task/add.vue

@@ -220,6 +220,8 @@
                             this.addFocus = false;
                             this.$Message.success(res.msg);
                             this.$emit('on-add-success', res.data);
+                            $A.triggerTaskInfoListener('create', res.data);
+                            $A.triggerTaskInfoChange(res.data.id);
                         } else {
                             this.$Modal.error({title: this.$L('温馨提示'), content: res.msg});
                         }

+ 31 - 46
resources/assets/js/main/pages/todo.vue

@@ -398,6 +398,33 @@
                     });
                 }
                 //
+                let addOrDelete = (isAdd) => {
+                    if (isAdd) {
+                        for (let level in this.taskDatas) {
+                            if (level == detail.level) {
+                                let index = this.taskDatas[level].lists.length;
+                                this.taskDatas[level].lists.some((task, i) => {
+                                    if (detail.userorder > task.userorder || (detail.userorder == task.userorder && detail.id > task.id)) {
+                                        index = i;
+                                        return true;
+                                    }
+                                });
+                                this.taskDatas[level].lists.splice(index, 0, detail);
+                            }
+                        }
+                    } else {
+                        for (let level in this.taskDatas) {
+                            this.taskDatas[level].lists.some((task, i) => {
+                                if (task.id == detail.id) {
+                                    this.taskDatas[level].lists.splice(i, 1);
+                                    return true;
+                                }
+                            });
+                        }
+                    }
+                    this.taskSortData = this.getTaskSort();
+                };
+                //
                 switch (act) {
                     case "title":           // 标题
                     case "desc":            // 描述
@@ -431,60 +458,18 @@
                         this.taskSortData = this.getTaskSort();
                         break;
 
+                    case "create":          // 创建任务
                     case "username":        // 负责人
-                        if (detail.username == $A.getUserName()) {
-                            for (let level in this.taskDatas) {
-                                if (level == detail.level) {
-                                    let index = this.taskDatas[level].lists.length;
-                                    this.taskDatas[level].lists.some((task, i) => {
-                                        if (detail.userorder > task.userorder || (detail.userorder == task.userorder && detail.id > task.id)) {
-                                            index = i;
-                                            return true;
-                                        }
-                                    });
-                                    this.taskDatas[level].lists.splice(index, 0, detail);
-                                }
-                            }
-                        } else {
-                            for (let level in this.taskDatas) {
-                                this.taskDatas[level].lists.some((task, i) => {
-                                    if (task.id == detail.id) {
-                                        this.taskDatas[level].lists.splice(i, 1);
-                                        return true;
-                                    }
-                                });
-                            }
-                        }
-                        this.taskSortData = this.getTaskSort();
+                        addOrDelete(detail.username == $A.getUserName());
                         break;
 
                     case "delete":          // 删除任务
                     case "archived":        // 归档
-                        for (let level in this.taskDatas) {
-                            this.taskDatas[level].lists.some((task, i) => {
-                                if (task.id == detail.id) {
-                                    this.taskDatas[level].lists.splice(i, 1);
-                                    return true;
-                                }
-                            });
-                        }
-                        this.taskSortData = this.getTaskSort();
+                        addOrDelete(false);
                         break;
 
                     case "unarchived":      // 取消归档
-                        for (let level in this.taskDatas) {
-                            if (level == detail.level) {
-                                let index = this.taskDatas[level].lists.length;
-                                this.taskDatas[level].lists.some((task, i) => {
-                                    if (detail.userorder > task.userorder || (detail.userorder == task.userorder && detail.id > task.id)) {
-                                        index = i;
-                                        return true;
-                                    }
-                                });
-                                this.taskDatas[level].lists.splice(index, 0, detail);
-                            }
-                        }
-                        this.taskSortData = this.getTaskSort();
+                        addOrDelete(true);
                         break;
                 }
             }, true);