From 7a6c648da8f0cfc8fb5c6217453f4f37b29d7b8b Mon Sep 17 00:00:00 2001 From: Park Byung Eun Date: Fri, 30 Sep 2022 06:34:26 +0000 Subject: [PATCH] bug fix --- .../beteran/component/home.component.ts | 1 + .../compose/comp-compose.component.html | 2 +- .../compose/compose/comp-compose.component.ts | 18 +++++++++++------- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/app/modules/beteran/component/home.component.ts b/src/app/modules/beteran/component/home.component.ts index 0f3b887..525b749 100644 --- a/src/app/modules/beteran/component/home.component.ts +++ b/src/app/modules/beteran/component/home.component.ts @@ -200,6 +200,7 @@ export class HomeComponent implements OnInit { selectType = NoticeComposeComponent; break; case ComposeMenuType.comp: + data = { member: this.member }; selectType = CompComposeComponent; break; case ComposeMenuType.customer: diff --git a/src/app/modules/beteran/compose/compose/comp-compose.component.html b/src/app/modules/beteran/compose/compose/comp-compose.component.html index 8ee40c9..50136d6 100644 --- a/src/app/modules/beteran/compose/compose/comp-compose.component.html +++ b/src/app/modules/beteran/compose/compose/comp-compose.component.html @@ -30,7 +30,7 @@ 닉네임 - + diff --git a/src/app/modules/beteran/compose/compose/comp-compose.component.ts b/src/app/modules/beteran/compose/compose/comp-compose.component.ts index 0525fe7..c9229c5 100644 --- a/src/app/modules/beteran/compose/compose/comp-compose.component.ts +++ b/src/app/modules/beteran/compose/compose/comp-compose.component.ts @@ -1,7 +1,13 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { MatDialogRef } from '@angular/material/dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { FuseAlertType } from '@fuse/components/alert'; +import { MemberModel } from 'app/modules/proto/models/member_pb'; + +export interface CompComposeComposeData { + member: MemberModel; +} +export interface CompComposeComposeResult {} @Component({ selector: 'comp-compose', @@ -21,6 +27,7 @@ export class CompComposeComponent implements OnInit { */ constructor( public matDialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: CompComposeComposeData, private _formBuilder: FormBuilder ) {} @@ -34,11 +41,8 @@ export class CompComposeComponent implements OnInit { ngOnInit(): void { // Create the form this.composeForm = this._formBuilder.group({ - to: ['', [Validators.required, Validators.email]], - cc: ['', [Validators.email]], - bcc: ['', [Validators.email]], - subject: [''], - body: ['', [Validators.required]], + nickname: [{ value: this.data.member.getNickname(), disabled: true }], + amount: [{ value: 0, disabled: true }], }); }