fix:merge

README.md

-<<<<<<< HEAD
 # NgDemo
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.12.
@@ -26,6 +25,4 @@ Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protrac
 ## Further help
 
 To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.
-=======
 
->>>>>>> b03a763330ae547c24ec4e6666e76ae37de3c84d

src/app/app-routing.module.ts

@@ -2,12 +2,12 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 
 import { LoginComponent } from './components/login/login.component';
-import { ProductsComponent } from './components/products/products.component';
+import { HomeComponent } from './components/home/home.component';
 
 const routes: Routes = [
   {path: 'login', component: LoginComponent},
   {path: '', redirectTo: '/login', pathMatch: 'full'},
-  {path: 'products', component: ProductsComponent},
+  {path: 'home', component: HomeComponent},
 ];
 
 @NgModule({

src/app/components/home/home.component.html

 <div class="container">
-  products
+  home
 </div>
 

src/app/components/home/home.component.ts

@@ -4,11 +4,11 @@ import { Component } from '@angular/core';
 
 
 @Component({
-  templateUrl: './products.component.html',
-  styleUrls: ['./products.component.scss']
+  templateUrl: './home.component.html',
+  styleUrls: ['./home.component.scss']
 })
-export class ProductsComponent {
+export class HomeComponent {
   public title = {
-    msg : 'products-component'
+    msg : 'home-component'
   };
 }

src/app/components/login/login.component.html

@@ -4,55 +4,31 @@
       <div id="loginui" class="login-layout">
         <h3 class="login-title">登录中心</h3>
 
-        <form nz-form>
+        <form name="form" nz-form>
           <nz-form-item>
             <nz-form-label [nzSpan]="4">用户名</nz-form-label>
             <nz-form-control nzHasFeedback [nzSpan]="20">
-              <input nz-input name="required" required />
+              <input nz-input name="username" required />
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
             <nz-form-label [nzSpan]="4">密&nbsp;&nbsp;&nbsp;&nbsp;码</nz-form-label>
             <nz-form-control nzHasFeedback [nzSpan]="20">
-              <input nz-input name="maxlength" required />
+              <input nz-input name="password" required />
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
             <nz-form-control [nzSpan]="20" [nzOffset]="4">
-              <button nz-button nzType="primary">登录</button>
+              <button 
+                nz-button 
+                nzType="primary"
+                ng-disabled="form.$invalid"
+                (click)="onSave('this')"
+              >登录</button>
             </nz-form-control>
           </nz-form-item>
         </form>
 
-        
-        <!-- <form name="form" class="row" novalidate>
-          <div class="col-md-12">
-            <label for="validationCustomUsername" class="form-label">Username</label>
-            <div class="input-group has-validation">
-              <input 
-                type="text" 
-                class="form-control" 
-                id="validationCustomUsername" 
-                ng-model="entity.username"
-                required 
-              />
-              <div class="invalid-feedback">
-                请输入用户名
-              </div>
-            </div>
-          </div>
-          <div class="col-12">
-            <button 
-              class="btn btn-primary" 
-              type="button" 
-              ng-disabled="form.$invalid"
-              (click)="onSave('this')"
-            >登录</button>
-          </div>
-        </form> -->
-
-        
-
         <!-- <ul>
           <li *ngFor="let product of products; index as productId">
             <a [title]="product.name" (click)="jump(product.id)">
@@ -66,57 +42,3 @@
   </div>
 </div>
 
-<!-- <div class="toolbar" role="banner">
-  <form (submit)="onSubmit(this)">
-    <div class="form-row">
-      <div class="form-group col-md-6">
-        <label for="inputEmail4">Email</label>
-        <input type="email" class="form-control" id="inputEmail4">
-      </div>
-      <div class="form-group col-md-6">
-        <label for="inputPassword4">Password</label>
-        <input type="password" class="form-control" id="inputPassword4">
-      </div>
-    </div>
-    <div class="form-group">
-      <label for="inputAddress">Address</label>
-      <input type="text" class="form-control" id="inputAddress" placeholder="1234 Main St">
-    </div>
-    <div class="form-group">
-      <label for="inputAddress2">Address 2</label>
-      <input type="text" class="form-control" id="inputAddress2" placeholder="Apartment, studio, or floor">
-    </div>
-    <div class="form-row">
-      <div class="form-group col-md-6">
-        <label for="inputCity">City</label>
-        <input type="text" class="form-control" id="inputCity">
-      </div>
-      <div class="form-group col-md-4">
-        <label for="inputState">State</label>
-        <select id="inputState" class="form-control">
-          <option selected>Choose...</option>
-          <option>...</option>
-        </select>
-      </div>
-      <div class="form-group col-md-2">
-        <label for="inputZip">Zip</label>
-        <input type="text" class="form-control" id="inputZip">
-      </div>
-    </div>
-    <div class="form-group">
-      <div class="form-check">
-        <input class="form-check-input" type="checkbox" id="gridCheck">
-        <label class="form-check-label" for="gridCheck">
-          Check me out
-        </label>
-      </div>
-    </div>
-    <button type="submit" class="btn btn-primary">Sign in</button>
-  </form>
-</div>
-
-<div class="content" role="main">
-  {{JSON.stringify(title)}}--
-  <button (click)="onSave('save1')" type="button" class="btn btn-primary">test log</button>
-
-</div> -->