diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index b3a6e40d..293a48ce 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -7,16 +7,12 @@ use App\Models\Project; use App\Models\ProjectColumn; use App\Models\ProjectLog; use App\Models\ProjectTask; -use App\Models\ProjectTaskContent; -use App\Models\ProjectTaskUser; use App\Models\ProjectUser; use App\Models\User; -use App\Models\WebSocketDialogMsg; use App\Module\Base; use Carbon\Carbon; use Illuminate\Support\Arr; use Request; -use function Swoole\Coroutine\Http\get; /** * @apiDefine project diff --git a/app/Models/Project.php b/app/Models/Project.php index f17ca1fb..286bac86 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -144,7 +144,7 @@ class Project extends AbstractModel { if ($value === 0) { $userid = $this->projectUser->pluck('userid')->toArray(); - $dialog = WebSocketDialog::createGroup($this->name, $userid, 'project'); + $dialog = WebSocketDialog::createGroup('', $userid, 'project'); if ($dialog) { $this->dialog_id = $value = $dialog->id; $this->save(); diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php index 00e29fa4..67689fb7 100644 --- a/app/Models/WebSocketDialog.php +++ b/app/Models/WebSocketDialog.php @@ -52,10 +52,17 @@ class WebSocketDialog extends AbstractModel $dialog->people = $builder->count(); // 对方信息 $dialog->dialog_user = null; - if ($dialog->type === 'user') { - $dialog_user = $builder->where('userid', '!=', $userid)->first(); - $dialog->name = User::userid2nickname($dialog_user->userid); - $dialog->dialog_user = $dialog_user; + switch ($dialog->type) { + case "user": + $dialog_user = $builder->where('userid', '!=', $userid)->first(); + $dialog->name = User::userid2nickname($dialog_user->userid); + $dialog->dialog_user = $dialog_user; + break; + case "group": + if ($dialog->group_type === 'project') { + $dialog->name = Project::whereDialogId($dialog->id)->value('name'); + } + break; } return $dialog; } diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js index bddc020c..e90cdbba 100644 --- a/resources/assets/js/store/state.js +++ b/resources/assets/js/store/state.js @@ -32,7 +32,7 @@ const method = { return params; }, - formatDate: function(format, v) { + formatDate(format, v) { if (typeof format === 'undefined' || format === '') { format = 'Y-m-d H:i:s'; } diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index dacd5710..5443833d 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -105,7 +105,6 @@ line-height: 24px; > span { flex: 1; - max-width: 130px; color: #333333; font-size: 14px; white-space: nowrap; @@ -113,12 +112,14 @@ text-overflow: ellipsis; } > i { + flex-shrink: 0; margin-left: 8px; transform: scale(0.9); font-size: 12px; color: #87d068; } > em { + flex-shrink: 0; margin-left: 8px; font-style: normal; color: #999999;