From abe2cf008c5d6332199d4928ce358d0f4a0329bd Mon Sep 17 00:00:00 2001 From: willh Date: Sun, 12 Jul 2020 06:54:07 +0000 Subject: [PATCH 1/3] GitBook: [master] one page modified --- advanced/declaration-merging.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/advanced/declaration-merging.md b/advanced/declaration-merging.md index 30d66122..c73cafc6 100644 --- a/advanced/declaration-merging.md +++ b/advanced/declaration-merging.md @@ -90,7 +90,9 @@ interface Alarm { ## 類別的合併 -類別的合併與介面的合併規則一致。 +~~類別的合併與介面的合併規則一致。~~ + +同名的類別會發生宣告衝突，無法直接合併。（原文的內容有誤，已發 [Issue](https://github.com/xcatliu/typescript-tutorial/issues/181) 要求更正） ## 參考 From 8dfc216dbffb68b98c503f6c1db1cc671b50a979 Mon Sep 17 00:00:00 2001 From: Sean Date: Tue, 10 May 2022 15:47:15 +0800 Subject: [PATCH 2/3] Fix typo --- basics/primitive-data-types.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basics/primitive-data-types.md b/basics/primitive-data-types.md index 34b9fbb0..638a323c 100644 --- a/basics/primitive-data-types.md +++ b/basics/primitive-data-types.md @@ -13,8 +13,8 @@ JavaScript 的型別分為兩種：原始資料型別（[Primitive data types](h ```typescript let isDone: boolean = false; -// 編譯透過 -// 後面約定，未強調編譯錯誤的程式碼片段，預設為編譯透過 +// 編譯通過 +// 後面約定，未強調編譯錯誤的程式碼片段，預設為編譯通過 ``` 注意：使用建構函式 `Boolean` 建立的物件**不是**布林值： From f821fac61abd8bfd4355a0f6f11b06b980e90624 Mon Sep 17 00:00:00 2001 From: yeeway Date: Sat, 4 Nov 2023 00:26:53 +0800 Subject: [PATCH 3/3] Modify the example of getter and setter in class --- advanced/class.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/advanced/class.md b/advanced/class.md index a2f1596b..fcca9e56 100644 --- a/advanced/class.md +++ b/advanced/class.md @@ -70,20 +70,21 @@ console.log(c.sayHi()); // Meow, My name is Tom ```javascript class Animal { - constructor(name) { - this.name = name; - } - get name() { - return 'Jack'; - } - set name(value) { - console.log('setter: ' + value); - } + constructor(name) { + this._name = name; + } + get name() { + return this._name; + } + set name(value) { + this._name = value + console.log('setter: ' + value); + } } -let a = new Animal('Kitty'); // setter: Kitty +let a = new Animal('Jack'); a.name = 'Tom'; // setter: Tom -console.log(a.name); // Jack +console.log(a.name); // Tom ``` ### 靜態方法