From 0f04e25ed246eabef4a5d0f9e69e07044bf8a71a Mon Sep 17 00:00:00 2001
From: kkerwin <kkerwin@yeah.net>
Date: Tue, 28 Nov 2023 08:17:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standard-form.component.html              |  9 +++-
 .../standard-form.component.less              |  7 +++
 .../standard-form/standard-form.component.ts  | 48 ++++++++++++-------
 projects/cdk/src/services/api.service.ts      |  1 +
 .../org-select/org-select.component.html      |  9 ++--
 .../org-select/org-select.component.ts        | 24 ++++------
 6 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/projects/admin/src/app/pages/standard/standard-form/standard-form.component.html b/projects/admin/src/app/pages/standard/standard-form/standard-form.component.html
index 480f85d..942b68a 100644
--- a/projects/admin/src/app/pages/standard/standard-form/standard-form.component.html
+++ b/projects/admin/src/app/pages/standard/standard-form/standard-form.component.html
@@ -46,7 +46,12 @@
                     </div>
                 </nz-form-label>
                 <nz-form-control [nzErrorTip]="formControlErrorTpl" nzSpan="12">
-                    <nz-select
+                    <nz-checkbox-group class="org-list"
+                                       [(ngModel)]="listOfOption"
+                                       [ngModelOptions]="{standalone: true}">
+
+                    </nz-checkbox-group>
+                    <!-- <nz-select
                                [nzMode]="'multiple'"
                                nzShowSearch
                                nzServerSearch
@@ -57,7 +62,7 @@
                                (nzOnSearch)="searchOrg($event)">
                         <nz-option *ngFor="let o of listOfOption" [nzLabel]="o.text"
                                    [nzValue]="o.value"></nz-option>
-                    </nz-select>
+                    </nz-select> -->
                     <!-- <div>
                         <nz-tag class="px-3 py-1" *ngFor="let v of vendors">
                             <span>{{v.label}}</span>
diff --git a/projects/admin/src/app/pages/standard/standard-form/standard-form.component.less b/projects/admin/src/app/pages/standard/standard-form/standard-form.component.less
index e69de29..c1eabea 100644
--- a/projects/admin/src/app/pages/standard/standard-form/standard-form.component.less
+++ b/projects/admin/src/app/pages/standard/standard-form/standard-form.component.less
@@ -0,0 +1,7 @@
+.org-list {
+    ::ng-deep {
+        .ant-checkbox-group-item {
+            margin-bottom: 6px;
+        }
+    }
+}
\ No newline at end of file
diff --git a/projects/admin/src/app/pages/standard/standard-form/standard-form.component.ts b/projects/admin/src/app/pages/standard/standard-form/standard-form.component.ts
index de56002..5d667f7 100644
--- a/projects/admin/src/app/pages/standard/standard-form/standard-form.component.ts
+++ b/projects/admin/src/app/pages/standard/standard-form/standard-form.component.ts
@@ -9,6 +9,12 @@ import { FormValidators } from "@cdk/validators";
 import { NzMessageService } from "ng-zorro-antd/message";
 import { Subject, debounceTime, distinctUntilChanged, filter, finalize, map, switchMap } from "rxjs";
 
+interface CheckboxItem {
+	value: number | string;
+	label: string;
+	checked?: boolean;
+}
+
 @Component({
 	selector: "app-standard-form",
 	templateUrl: "./standard-form.component.html",
@@ -43,11 +49,11 @@ export class StandardFormComponent {
 
 	state: any;
 
-	// nzPopoverVisible = false;
+	vendors: OrgDTO[] = [];
 
-	// vendors: OptionItemInterface[] = [];
+	// nzPopoverVisible = false;
 
-	listOfOption: Array<{ value: number | string; text: string }> = [];
+	listOfOption: (OrgDTO & CheckboxItem)[] = [];
 
 	nzFilterOption = (): boolean => true;
 
@@ -55,27 +61,32 @@ export class StandardFormComponent {
 		this.formGroup = this.fb.group({
 			id: this.fb.control("", []),
 			name: this.fb.control("", [FormValidators.required()]),
-			vendors: this.fb.control([], [FormValidators.required()]),
+			// vendors: this.fb.control([], [FormValidators.required()]),
 			overflow: this.fb.control("0", [FormValidators.required()]),
 		});
 		if (this.state) {
 			this.formGroup.patchValue(this.state);
-			if (Array.isArray(this.state.vendors)) {
-				this.api.getOrgList({ vendors: this.state.vendors }).subscribe((data) => {
-					const listOfOption: Array<{ value: number; text: string }> = [];
-					data.forEach((item) => {
-						listOfOption.push({
-							value: item.id,
-							text: item.name,
-						});
-					});
-					this.listOfOption = listOfOption;
-					this.formGroup.patchValue(this.state);
-				});
-			}
+			// if (Array.isArray(this.state.vendors)) {
+			// 	this.api.getOrgList({ vendors: this.state.vendors }).subscribe((data) => {
+			// 		const listOfOption: Array<{ value: number; label: string }> = [];
+			// 		data.forEach((item) => {
+			// 			listOfOption.push({
+			// 				value: item.id,
+			// 				label: item.name,
+			// 			});
+			// 		});
+			// 		this.listOfOption = listOfOption;
+			// 		this.formGroup.patchValue(this.state);
+			// 	});
+			// }
 		}
 		this.api.getOrgList().subscribe((res) => {
-			this.listOfOption = res;
+			this.listOfOption = res as unknown as (OrgDTO & CheckboxItem)[];
+			if (Array.isArray(this.state?.vendors)) {
+				this.listOfOption = this.listOfOption.map((i) => {
+					return { ...i, checked: this.state.vendors.includes(i.id) };
+				});
+			}
 		});
 		// this.orgSearch$
 		// 	.pipe(
@@ -124,6 +135,7 @@ export class StandardFormComponent {
 					foodCategoryWeek: this.state?.foodCategoryWeek,
 					ingredient: this.state?.ingredient,
 					...this.formGroup.value,
+					vendors: this.listOfOption.filter((f) => f.checked).map((i) => i.id),
 				})
 				.pipe(
 					finalize(() => {
diff --git a/projects/cdk/src/services/api.service.ts b/projects/cdk/src/services/api.service.ts
index 12365dc..16d8c0d 100644
--- a/projects/cdk/src/services/api.service.ts
+++ b/projects/cdk/src/services/api.service.ts
@@ -202,6 +202,7 @@ export class ApiService {
 					...i,
 					value: i.id.toString(),
 					text: i.name,
+					label: i.name,
 				}));
 			}),
 			tap((r) => {
diff --git a/projects/cdk/src/shared/components/org-select/org-select.component.html b/projects/cdk/src/shared/components/org-select/org-select.component.html
index 69bb7f0..62207a9 100644
--- a/projects/cdk/src/shared/components/org-select/org-select.component.html
+++ b/projects/cdk/src/shared/components/org-select/org-select.component.html
@@ -1,12 +1,9 @@
 <nz-select
-           nzShowSearch
-           nzServerSearch
+
            nzPlaceHolder="请选择单位"
-           [nzShowArrow]="false"
-           [nzFilterOption]="nzFilterOption"
+
            [(ngModel)]="value"
-           (ngModelChange)="onSelectChange($event)"
-           (nzOnSearch)="searchOrg($event)">
+           (ngModelChange)="onSelectChange($event)">
     <nz-option *ngFor="let o of listOfOption" [nzLabel]="o.label"
                [nzValue]="o.value">
     </nz-option>
diff --git a/projects/cdk/src/shared/components/org-select/org-select.component.ts b/projects/cdk/src/shared/components/org-select/org-select.component.ts
index f01ef3c..2033c14 100644
--- a/projects/cdk/src/shared/components/org-select/org-select.component.ts
+++ b/projects/cdk/src/shared/components/org-select/org-select.component.ts
@@ -30,24 +30,16 @@ export class OrgSelectComponent implements OnInit, ControlValueAccessor {
 	listOfOption: OptionItemInterface[] = [];
 
 	ngOnInit(): void {
-		this.orgSearch$
-			.pipe(
-				filter((f) => !!f),
-				debounceTime(500),
-				distinctUntilChanged(),
-				takeUntil(this.destroy$),
-				switchMap((term: string) => this.api.getOrgList({ keyword: term }))
-			)
-			.subscribe((data) => {
-				const listOfOption: Array<OptionItemInterface> = [];
-				data.forEach((item) => {
-					listOfOption.push({
-						value: String(item.id),
-						label: item.name,
-					});
+		this.api.getOrgList().subscribe((data) => {
+			const listOfOption: Array<OptionItemInterface> = [];
+			data.forEach((item) => {
+				listOfOption.push({
+					value: String(item.id),
+					label: item.name,
 				});
-				this.listOfOption = listOfOption;
 			});
+			this.listOfOption = listOfOption;
+		});
 	}
 
 	ngOnDestroy(): void {