fix: concat cached options and selected values

NG-ZORRO · May 22, 2019 · 0437cb1 · 0437cb1
1 parent e8f9598
commit 0437cb1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/components/select/nz-select.service.spec.ts b/components/select/nz-select.service.spec.ts
@@ -75,12 +75,13 @@ describe('SelectService', () => {
     it('should updateListOfTagOption work', () => {
       service.listOfCachedSelectedOption = [
         { nzValue: `option_value_0`, nzLabel: `option_label_0` },
-        { nzValue: `option_value_1`, nzLabel: `option_label_1` },
         { nzValue: `option_value_miss`, nzLabel: `option_label_miss` }
         // tslint:disable-next-line: no-any
       ] as any;
+      service.listOfSelectedValue = [`option_value_1`];
       service.listOfTemplateOption = createListOfOption(3);
       service.updateListOfTagOption();
+      console.log(service.listOfTagOption);
       expect(service.listOfTagOption.length).toEqual(1);
       expect(service.listOfTagOption[0].nzValue).toEqual('option_value_miss');
       expect(service.listOfTagOption[0].nzLabel).toEqual('option_label_miss');

diff --git a/components/select/nz-select.service.ts b/components/select/nz-select.service.ts
@@ -179,8 +179,26 @@ export class NzSelectService {
 
   updateListOfTagOption(): void {
     if (this.isTagsMode) {
-      this.listOfTagOption = this.listOfCachedSelectedOption.filter(
-        comp => !this.listOfTemplateOption.find(o => this.compareWith(o.nzValue, comp.nzValue))
+      // https://github.com/NG-ZORRO/ng-zorro-antd/issues/3424
+      this.listOfTagOption = [...this.listOfCachedSelectedOption, ...this.listOfSelectedValue].reduce(
+        (options: NzOptionComponent[], componentOrValue) => {
+          if (
+            typeof componentOrValue === 'string' &&
+            !this.listOfTemplateOption.find(o => this.compareWith(o.nzValue, componentOrValue))
+          ) {
+            const nzOptionComponent = new NzOptionComponent();
+            nzOptionComponent.nzValue = componentOrValue;
+            nzOptionComponent.nzLabel = componentOrValue;
+            options.push(nzOptionComponent);
+          } else if (
+            typeof componentOrValue.nzValue === 'string' &&
+            !this.listOfTemplateOption.find(o => this.compareWith(o.nzValue, componentOrValue.nzValue))
+          ) {
+            options.push(componentOrValue);
+          }
+          return options;
+        },
+        []
       );
       this.listOfTagAndTemplateOption = [...this.listOfTemplateOption.concat(this.listOfTagOption)];
     } else {