chore(release): release 10.0.0 (#71)

Co-authored-by: huaweidevcloud <[email protected]>
DevCloudFE · Nov 10, 2020 · d310bad · d310bad
1 parent e78ae0d
commit d310bad
Show file tree

Hide file tree

Showing 411 changed files with 4,905 additions and 1,964 deletions.
diff --git a/browserslist → .browserslistrc b/browserslist → .browserslistrc
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ To see more in [devui.design](https://devui.design/home).
 
 ## Angular Support
 
-Now supports Angular <font color=red>`^9.0.0`</font>
+Now supports Angular <font color=red>`^10.0.0`</font>
 
 ## Getting Started
 

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -23,7 +23,7 @@ DevUI Design设计系统包含了DevUI规则、设计语言和最佳实践的资
 
 ## Angular版本
 
-当前支持的angular版本<font color=red>`^9.0.0`</font>
+当前支持的angular版本<font color=red>`^10.0.0`</font>
 
 ## 快速开始
 

diff --git a/devui/accordion/demo/accordion-demo.moudule.ts b/devui/accordion/demo/accordion-demo.moudule.ts
@@ -45,8 +45,7 @@ import { DDemoNavModule } from 'src/app/component/d-demo-nav.module';
     ChangeKeyComponent,
   ],
   providers: [],
-  entryComponents: [
-  ]
+
 })
 export class AccordionDemoModule {
 }
diff --git a/devui/accordion/demo/template/template.component.scss b/devui/accordion/demo/template/template.component.scss
@@ -9,7 +9,7 @@
   width: 16px;
   height: 16px;
   border-radius: 8px;
-  font-size: 12px;
+  font-size: $devui-font-size;
   line-height: 12px;
   padding: 2px;
   color: $devui-light-text;

diff --git a/devui/alert/alert.component.scss b/devui/alert/alert.component.scss
@@ -1,14 +1,15 @@
 @import '../style/mixins/index';
 @import '../style/theme/color';
 @import '../style/theme/shadow';
+@import '../style/core/_font';
 
 :host {
   display: block;
 }
 
 .devui-alert {
   color: $devui-text;
-  font-size: 12px;
+  font-size: $devui-font-size;
   border: 1px solid transparent;
   padding: 10px;
   line-height: 20px;
@@ -26,7 +27,7 @@
 
     span {
       color: $devui-text;
-      font-size: 12px;
+      font-size: $devui-font-size;
       font-weight: bold;
     }
   }

diff --git a/devui/alert/demo/alert-demo.module.ts b/devui/alert/demo/alert-demo.module.ts
@@ -34,9 +34,7 @@ import { DDemoNavModule } from 'src/app/component/d-demo-nav.module';
     BasicComponent,
     CloseComponent,
   ],
-  entryComponents: [
-    AlertDemoComponent,
-  ],
+
 })
 export class AlertDemoModule {
 }

diff --git a/devui/anchor/demo/anchor-demo.module.ts b/devui/anchor/demo/anchor-demo.module.ts
@@ -45,9 +45,7 @@ import { ScrollTargetComponent } from './scroll-target/scroll-target.component';
     HashComponent,
     ScrollTargetComponent
   ],
-  entryComponents: [
-    AnchorDemoComponent,
-  ],
+
 })
 export class AnchorDemoModule {
 }

diff --git a/devui/anchor/demo/async/async.component.scss b/devui/anchor/demo/async/async.component.scss
@@ -13,7 +13,7 @@
   cursor: pointer;
   height: 30px;
   line-height: 1.5;
-  font-size: 12px;
+  font-size: $devui-font-size;
   color: $devui-text-weak;
   position: relative;
   display: flex;

diff --git a/devui/anchor/demo/basic/basic.component.scss b/devui/anchor/demo/basic/basic.component.scss
@@ -1,6 +1,5 @@
 @import '~ng-devui/styles-var/devui-var.scss';
 
-
 /* 序号 */
 .step-nav {
   padding-top: 10px;
@@ -14,7 +13,7 @@
   cursor: pointer;
   height: 30px;
   line-height: 1.5;
-  font-size: 12px;
+  font-size: $devui-font-size;
   color: $devui-text-weak;
   position: relative;
   display: flex;

diff --git a/devui/anchor/demo/hash/hash.component.scss b/devui/anchor/demo/hash/hash.component.scss
@@ -12,7 +12,7 @@
   cursor: pointer;
   height: 30px;
   line-height: 1.5;
-  font-size: 12px;
+  font-size: $devui-font-size;
   color: $devui-text-weak;
   position: relative;
   display: flex;

diff --git a/devui/anchor/demo/scroll-target/scroll-target.component.scss b/devui/anchor/demo/scroll-target/scroll-target.component.scss
@@ -13,7 +13,7 @@
   cursor: pointer;
   height: 30px;
   line-height: 1.5;
-  font-size: 12px;
+  font-size: $devui-font-size;
   color: $devui-text-weak;
   position: relative;
   display: flex;

diff --git a/devui/auto-complete/auto-complete.directive.ts b/devui/auto-complete/auto-complete.directive.ts
@@ -181,7 +181,7 @@ export class AutoCompleteDirective implements OnInit, OnDestroy, OnChanges, Cont
     let tempSource = [];
     if (this.latestSource && this.latestSource.length > 0) {
       this.searchFn('').subscribe(source => {
-        const t = this.latestSource.slice(-5); // 最近输入只支持最多5个，截取后5项
+        const t = this.latestSource;
         tempSource = t.filter(data => {
           if (!data.label) {
             return source.find(item => item === data);

diff --git a/devui/auto-complete/auto-complete.module.ts b/devui/auto-complete/auto-complete.module.ts
@@ -3,19 +3,17 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { OverlayModule } from '@angular/cdk/overlay';
 import { PositioningModule } from 'ng-devui/position';
-import { LazyLoadModule } from 'ng-devui/utils';
+import { HighlightModule, LazyLoadModule } from 'ng-devui/utils';
 import { LoadingModule } from 'ng-devui/loading';
-
 import { AutoCompleteConfig } from './auto-complete-config';
 import { AutoCompleteDirective } from './auto-complete.directive';
 import { AutoCompletePopupComponent } from './auto-complete-popup.component';
-import { HighlightComponent } from './highlight.component';
 
 @NgModule({
-  imports: [CommonModule, FormsModule, OverlayModule, LazyLoadModule, LoadingModule, PositioningModule],
-  exports: [AutoCompleteDirective, AutoCompletePopupComponent, HighlightComponent],
-  declarations: [AutoCompleteDirective, AutoCompletePopupComponent, HighlightComponent],
+  imports: [CommonModule, FormsModule, OverlayModule, LazyLoadModule, LoadingModule, PositioningModule, HighlightModule],
+  exports: [AutoCompleteDirective, AutoCompletePopupComponent],
+  declarations: [AutoCompleteDirective, AutoCompletePopupComponent],
   providers: [AutoCompleteConfig],
-  entryComponents: [AutoCompletePopupComponent]
+
 })
 export class AutoCompleteModule { }
diff --git a/devui/auto-complete/highlight.component.ts b/devui/auto-complete/highlight.component.ts
diff --git a/devui/auto-complete/public-api.ts b/devui/auto-complete/public-api.ts
@@ -1,4 +1,3 @@
-export * from './highlight.component';
 export * from './auto-complete.directive';
 export * from './auto-complete.module';
 export * from './auto-complete-popup.component';

diff --git a/devui/badge/badge.component.html b/devui/badge/badge.component.html
@@ -1,12 +1,18 @@
 <span #contentProjection><ng-content></ng-content></span>
-<span class="devui-badge-count devui-badge-count-{{ status }}" *ngIf="!showDot && !hasContent">
+<span
+  class="devui-badge-count devui-badge-count-{{ status }}"
+  *ngIf="!showDot && !hasContent"
+  [style.background]="bgColor"
+  [style.color]="textColor"
+>
   {{ count }}
 </span>
 <span class="devui-badge-status devui-badge-status-{{ status }}" *ngIf="showDot && !hasContent"></span>
 <span
   class="devui-badge-content devui-badge-content-{{ status }} devui-badge-content-{{ badgePos }}"
   *ngIf="hasContent"
   [style.background]="bgColor"
+  [style.color]="textColor"
   [style.right.px]="offsetXY && offsetXY[0] ? -offsetXY[0] : null"
   [style.top.px]="offsetXY && offsetXY[1] ? offsetXY[1] : null"
   [ngClass]="{ 'devui-badge-content-count': !showDot, 'devui-badge-content-dot': showDot }"

diff --git a/devui/badge/badge.component.scss b/devui/badge/badge.component.scss
@@ -1,4 +1,5 @@
 @import '../style/theme/color';
+@import '../style/core/_font';
 
 @mixin status-color {
   &-danger {
@@ -33,13 +34,14 @@
   z-index: auto;
 
   &-count {
-    background: $devui-placeholder;
+    background: $devui-brand;
     color: $devui-light-text;
     min-width: 16px;
     height: 16px;
-    line-height: 16px;
+    font-size: $devui-font-size;
+    line-height: 12px;
     text-align: center;
-    padding: 0 4px;
+    padding: 2px 4px;
     border-radius: 8px;
   }
 
@@ -79,13 +81,14 @@
 .devui-badge-count {
   position: relative;
   right: 0;
-  background: $devui-placeholder;
+  background: $devui-brand;
   color: $devui-light-text;
   min-width: 16px;
   height: 16px;
-  line-height: 16px;
+  font-size: $devui-font-size;
+  line-height: 12px;
   text-align: center;
-  padding: 2px 8px;
+  padding: 2px 4px;
   border-radius: 8px;
   @include status-color;
 }

diff --git a/devui/badge/badge.component.ts b/devui/badge/badge.component.ts
@@ -25,6 +25,7 @@ export class BadgeComponent implements AfterViewInit {
   @Input() badgePos: BadgePositionType = 'top-right';
   @Input() offsetXY: [number, number];
   @Input() bgColor: string;
+  @Input() textColor: string;
 
   hasContentProjection() {
     const nodes = this.contentProjection?.nativeElement;

diff --git a/devui/badge/demo/basic/basic.component.html b/devui/badge/demo/basic/basic.component.html
@@ -1,4 +1,5 @@
 <section>
+  <h4>标准徽章，通过count参数设置徽章展示的数目，通过status参数可设置徽章状态色</h4>
   <div class="badge-group">
     <d-badge count="6" status="success">
       <div class="demo-card">未读消息</div>
@@ -12,19 +13,19 @@
     <d-badge count="14" status="warning">
       <div class="demo-card">未读消息</div>
     </d-badge>
-    <h5>标准徽章，通过count参数设置徽章展示的数目，通过status参数可设置徽章状态色</h5>
   </div>
 
+  <h4>可通过maxCount参数设置徽章展示的数目最大值，默认为99</h4>
   <div class="badge-group">
     <d-badge count="114">
       <div class="demo-card">未读消息</div>
     </d-badge>
     <d-badge count="114" maxCount="10">
       <div class="demo-card">未读消息</div>
     </d-badge>
-    <h5>可通过maxCount参数设置徽章展示的数目最大值，默认为99</h5>
   </div>
 
+  <h4>通过bgColor参数设置徽章展示状态色，通过offsetXY参数可设置徽章偏移量</h4>
   <div class="badge-group">
     <d-badge count="8" bgColor="#678">
       <i class="demo icon icon-helping"></i>
@@ -33,9 +34,9 @@ <h5>可通过maxCount参数设置徽章展示的数目最大值，默认为99</h
     <d-badge count="8" [offsetXY]="[0, 0]">
       <i class="demo icon icon-comment"></i>
     </d-badge>
-    <h5>通过bgColor参数设置徽章展示状态色，通过offsetXY参数可设置徽章偏移量</h5>
   </div>
 
+  <h4>通过badgePos参数设置徽章位置</h4>
   <div class="badge-group">
     <d-badge count="8" badgePos="top-left">
       <i class="demo icon icon-infomation"></i>
@@ -44,6 +45,5 @@ <h5>通过bgColor参数设置徽章展示状态色，通过offsetXY参数可设
     <d-badge count="8" badgePos="top-right">
       <i class="demo icon icon-desk-notice"></i>
     </d-badge>
-    <h5>通过badgePos参数设置徽章位置</h5>
   </div>
 </section>
diff --git a/devui/badge/demo/basic/basic.component.scss b/devui/badge/demo/basic/basic.component.scss
@@ -10,15 +10,15 @@
 
 .demo {
   vertical-align: middle;
-  font-size: 20px;
+  font-size: $devui-font-size-page-title;
 
   &-card {
     width: 90px;
     height: 42px;
     line-height: 42px;
     border-radius: 4px;
     background: $devui-global-bg;
-    font-size: 14px;
+    font-size: $devui-font-size-card-title;
     text-align: center;
     display: inline-block;
   }

diff --git a/devui/badge/demo/count/count.component.html b/devui/badge/demo/count/count.component.html
@@ -16,4 +16,10 @@
       </li>
     </ul>
   </div>
+
+  <div>
+    <h4>通过textColor、bgColor自定义文字、背景颜色</h4>
+    <strong><span>代码</span></strong>
+    <d-badge class="span-space" count="2.3k" bgColor="#F2F2F3" textColor="#7A7E87"> </d-badge>
+  </div>
 </section>
diff --git a/devui/badge/demo/count/count.component.scss b/devui/badge/demo/count/count.component.scss
@@ -1,7 +1,7 @@
 @import '~ng-devui/styles-var/devui-var.scss';
 
 .title {
-  font-size: 14px;
+  font-size: $devui-font-size-card-title;
   margin-bottom: 10px;
   font-weight: bold;
 }
@@ -24,7 +24,7 @@
 
       .item-title {
         color: $devui-text;
-        font-size: 14px;
+        font-size: $devui-font-size-card-title;
       }
     }
 
@@ -37,3 +37,7 @@
     }
   }
 }
+
+.span-space {
+  left: 5px;
+}
diff --git a/devui/badge/demo/dot/dot.component.scss b/devui/badge/demo/dot/dot.component.scss
@@ -1,5 +1,7 @@
+@import '~ng-devui/styles-var/devui-var.scss';
+
 :host {
-  font-size: 16px;
+  font-size: $devui-font-size-icon;
 }
 
 .badge-group d-badge {

diff --git a/devui/badge/doc/api.md b/devui/badge/doc/api.md
@@ -1,6 +1,6 @@
 ### d-badge 参数
 
-|    参数     |      类型      |  默认   | 说明                                                                           | 跳转Demo                           |
+|    参数     |      类型      |  默认   | 说明                                                                           | 跳转 Demo                                            |
 | :---------: | :------------:  | :-----: | :---------------------------------------------------------------------------  |  :---------------------------     |
 |     count      |    `number`     |   --    | 可选，设置基本徽章和计数徽章中显示的数目 | [基本徽章](/components/badge/demo#badge-basic) |
 |    maxCount     | `number`   | 99  | 可选，设置基本徽章和计数徽章最大可显示数目，当 count > maxCount 时显示maxCount+  | [基本徽章](/components/badge/demo#badge-basic)     |
@@ -9,4 +9,4 @@
 |   badgePos    | `BadgeStatusType`   |  'top-right'   | 可选，徽标位置 'top-left' \| 'top-rihgt' \| 'bottpm-left' \| ''bottom-right''   | [基本徽章](/components/badge/demo#badge-basic)      |
 |  offsetXY   |   `[number, number]`     |  --  | 可选，有包裹时徽标位置偏移量，格式为[x,y]，单位为px。x为相对right偏移量(right: -x px)，y为相对top偏移量(top: y px)               |   [状态徽章](/components/badge/demo#badge-status)   |
 |    bgColor     |    `string`     |   --    | 可选， 可自定义徽标色 |  [基本徽章](/components/badge/demo#badge-basic)      |
-
+|    textColor     |    `string`     |   --    | 可选， 可自定义徽标文字颜色 |  [计数徽章](/components/badge/demo#badge-count)      |