csxiaoyaojianxian
diff --git a/‎18-TypeScript/04-oop/04-修饰符.ts‎
Lines changed: 58 additions & 0 deletions b/‎18-TypeScript/04-oop/04-修饰符.ts‎
Lines changed: 58 additions & 0 deletions
diff --git a/‎18-TypeScript/04-oop/05-泛型.ts‎
Lines changed: 37 additions & 0 deletions b/‎18-TypeScript/04-oop/05-泛型.ts‎
Lines changed: 37 additions & 0 deletions
diff --git a/‎18-TypeScript/04-oop/index.html‎
Lines changed: 1 addition & 1 deletion b/‎18-TypeScript/04-oop/index.html‎
Lines changed: 1 addition & 1 deletion
@@ -0,0 +1,58 @@
+/**
+ * public / private / protected
+ * getter / setter
+ */
+
+(function() {
+
+  class A {
+    protected num: number;
+    // 语法糖，在构造函数中定义属性，public age: number
+    constructor(num: number, public age: number) {
+      this.num = num;
+      this.age = age;
+    }
+  }
+  class B extends A {
+    test() {
+      console.log(this.num);
+    }
+  }
+  const b = new B(777, 18);
+  // b.num = 1;
+
+
+  class Person {
+    // 默认 public
+    public age: number = 30;
+    public readonly name: string = 'csxiaoyao';
+    private _hobby: Array<string>;
+
+    constructor(age: number) {
+      this.age = age;
+      this._hobby = [];
+    }
+
+    // getter / setter
+    /*
+    getHobby() {
+      return this._hobby;
+    }
+    setHobby(hobby: Array<string>) {
+      this._hobby = hobby;
+    }
+    */
+    get hobby() {
+      return this._hobby;
+    }
+    set hobby(hobby: Array<string>) {
+      this._hobby = hobby;
+    }
+  }
+
+  const per = new Person(18);
+  // getter
+  console.log(per.hobby);
+
+
+})();
@@ -0,0 +1,37 @@
+
+/**
+ * 定义函数或类时，不明确的类型可以使用泛型，在执行时确定类型
+ * fn<T> 定义泛型T
+ */
+function fn<T>(a: T): T {
+  return a;
+}
+// 泛型自动推断
+fn(10);
+// 指定泛型
+fn<string>('hello');
+
+// 定义多个泛型
+function fn2<T, K>(a: T, b: K): T {
+  console.log(b);
+  return a;
+}
+fn2<number, string>(123, 'hello');
+
+// 限制泛型范围
+interface Inter {
+  length: number;
+}
+function fn3<T extends Inter>(a: T): number {
+  return a.length;
+}
+fn3({length:10});
+
+// class
+class MyClass<T> {
+  name: T;
+  constructor(name: T) {
+    this.name = name;
+  }
+}
+const mc = new MyClass<string>('csxiaoyao');
@@ -6,6 +6,6 @@
   <title>TS-OOP</title>
 </head>
 <body>
-  <script src="dist/02-abstract.js"></script>
+  <script src="dist/05-泛型.js"></script>
 </body>
 </html>