From c3fa3d9f5740609eb32c8373f2e7572285a868cf Mon Sep 17 00:00:00 2001
From: kely <kely@jwitsec.com>
Date: Mon, 27 Nov 2023 17:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standard-setting.component.html               | 10 +++++-----
 .../standard-setting.component.ts                 | 15 ++++++++++++---
 .../app/pages/dashboard/dashboard.component.html  | 13 +++----------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html b/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html
index 304ac9f..808e816 100644
--- a/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html
+++ b/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.html
@@ -206,7 +206,7 @@
                     计算单位：
                 </div>
                 <div *nzSpaceItem>
-                    <nz-radio-group [(ngModel)]="calcType">
+                    <nz-radio-group [(ngModel)]="calcType" (ngModelChange)="calcTypeChange()">
                         <label nz-radio [nzValue]="item.key"
                                *ngFor="let item of globalEnum.measurementType">
                             {{item.value}}
@@ -229,7 +229,7 @@
                         <div *ngIf="foodCategoryDay.length > 0">
                             <div class="">
                                 <div nz-row [nzGutter]="[48,12]">
-                                    <div nz-col nzSpan="24" *ngFor="let d of foodCategoryDay">
+                                    <div nz-col nzSpan="24" *ngFor="let d of foodCategoryDay;let i = index">
                                         <div class="flex items-center">
                                             <div class="w-50">
                                                 <input nz-input [(ngModel)]="d.name" placeholder="请输入自定义规则名称" />
@@ -261,7 +261,7 @@
                                                 {{calcTypeText}}
                                             </div>
                                             <div>
-                                                <button nz-button nzType="link" (click)="removeFoodType('day',d.type)">
+                                                <button nz-button nzType="link" (click)="removeFoodType('day',i)">
                                                     <i nz-icon nzType="delete"></i>
                                                 </button>
                                             </div>
@@ -284,7 +284,7 @@
                         <div *ngIf="foodCategoryWeek.length > 0">
                             <div class="">
                                 <div nz-row [nzGutter]="[48,12]">
-                                    <div nz-col nzSpan="24" *ngFor="let w of foodCategoryWeek">
+                                    <div nz-col nzSpan="24" *ngFor="let w of foodCategoryWeek;let i = index">
                                         <div class="flex items-center">
                                             <div class="w-50">
                                                 <input nz-input [(ngModel)]="w.name" placeholder="请输入自定义规则名称" />
@@ -316,7 +316,7 @@
                                                 {{calcTypeText}}
                                             </div>
                                             <div>
-                                                <button nz-button nzType="link" (click)="removeFoodType('week',w.type)">
+                                                <button nz-button nzType="link" (click)="removeFoodType('week',i)">
                                                     <i nz-icon nzType="delete"></i>
                                                 </button>
                                             </div>
diff --git a/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.ts b/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.ts
index 38b0a6c..d442999 100644
--- a/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.ts
+++ b/projects/admin/src/app/pages/standard/standard-setting/standard-setting.component.ts
@@ -96,6 +96,9 @@ export class StandardSettingComponent {
 		if (!data) {
 			return [];
 		}
+		if (Array.isArray(data) && data.length > 0) {
+			this.calcType = data[0]?.type;
+		}
 		return data;
 	}
 
@@ -151,11 +154,11 @@ export class StandardSettingComponent {
 		});
 	}
 
-	removeFoodType(type: string, foodType: string) {
+	removeFoodType(type: string, idx: number) {
 		if (type === "day") {
-			this.foodCategoryDay = this.foodCategoryDay.filter((f) => f.type !== foodType);
+			this.foodCategoryDay = this.foodCategoryDay.filter((f, i) => idx !== i);
 		} else {
-			this.foodCategoryWeek = this.foodCategoryWeek.filter((f) => f.type !== foodType);
+			this.foodCategoryWeek = this.foodCategoryWeek.filter((f, i) => idx !== i);
 		}
 	}
 
@@ -170,6 +173,12 @@ export class StandardSettingComponent {
 		this.ingredient = this.ingredient.filter((_, i) => i !== idx);
 	}
 
+	calcTypeChange() {
+		console.log("this.calcType", this.calcType);
+		this.foodCategoryDay = this.foodCategoryDay.map((i) => ({ ...i, type: this.calcType }));
+		this.foodCategoryWeek = this.foodCategoryWeek.map((i) => ({ ...i, type: this.calcType }));
+	}
+
 	addNutrition(idx: number) {
 		const current = this.ingredient[idx];
 		const withoutSelectNutritions = this.globalEnum.nutrient.find(
diff --git a/projects/client/src/app/pages/dashboard/dashboard.component.html b/projects/client/src/app/pages/dashboard/dashboard.component.html
index 9e92c70..dac4891 100644
--- a/projects/client/src/app/pages/dashboard/dashboard.component.html
+++ b/projects/client/src/app/pages/dashboard/dashboard.component.html
@@ -114,28 +114,21 @@
     <nz-card class="mb-4">
         <div class="flex items-center">
             <div class="flow-title">
-                食谱审核及发布
+                食谱发布
             </div>
             <div nz-row [nzGutter]="[12,12]">
                 <div nz-col nzSpan="8">
                     <div class="card flex items-center">
                         <div class="icon">8</div>
                         <div class="flex-1">
-                            在食谱列表中找到食谱，发起审核
+                            在食谱列表中找到食谱，进行发布
                         </div>
                     </div>
                 </div>
+
                 <div nz-col nzSpan="8">
                     <div class="card flex items-center">
                         <div class="icon">9</div>
-                        <div class="flex-1">
-                            等待审核通过后返回食谱列表查看进行发布
-                        </div>
-                    </div>
-                </div>
-                <div nz-col nzSpan="8">
-                    <div class="card flex items-center">
-                        <div class="icon">10</div>
                         <div class="flex-1">
                             填写发布时间等信息确认发布
                         </div>