Skip to content

Commit e148e6a

Browse files
chore(release): release 9.2.0 (#59)
Co-authored-by: huaweidevcloud <[email protected]>
1 parent 00a022b commit e148e6a

File tree

391 files changed

+7935
-2436
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

391 files changed

+7935
-2436
lines changed

.prettierrc

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@
55
"jsxSingleQuote": true,
66
"bracketSpacing": true,
77
"jsxBracketSameLine": true,
8-
"printWidth":140
8+
"printWidth":140,
9+
"endOfLine": "auto",
10+
"proseWrap": "preserve",
11+
"trailingComma": "es5",
12+
"useTabs": false
913
}

.stylelintrc.json

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"extends": [
3+
"stylelint-config-standard",
4+
"stylelint-config-recommended-scss"
5+
],
6+
"plugins": [
7+
"stylelint-scss"
8+
],
9+
"rules": {
10+
"string-quotes": "single",
11+
"property-no-unknown": true,
12+
"selector-pseudo-class-no-unknown": true,
13+
"at-rule-empty-line-before": ["always",{
14+
"except":["blockless-after-same-name-blockless","first-nested","inside-block"],
15+
"ignore": ["after-comment", "first-nested"]
16+
}],
17+
"rule-empty-line-before":["always",{
18+
"except": [ "after-single-line-comment", "first-nested"]
19+
}],
20+
"block-no-empty": true,
21+
"selector-pseudo-element-no-unknown": [
22+
true,
23+
{
24+
"ignorePseudoElements": [
25+
"ng-deep"
26+
]
27+
}
28+
],
29+
"selector-type-no-unknown": [
30+
true,
31+
{
32+
"ignoreTypes": [
33+
"/^d-/"
34+
]
35+
}
36+
],
37+
"color-hex-length": "long",
38+
"no-descending-specificity": null,
39+
"font-family-no-missing-generic-family-keyword": null,
40+
"no-duplicate-selectors": null,
41+
"declaration-block-no-duplicate-properties": [
42+
true,
43+
{
44+
"ignore": [
45+
"consecutive-duplicates"
46+
]
47+
}
48+
]
49+
}
50+
}

angular.json

+17-8
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111
"schematics": {},
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
14+
"builder": "@angular-builders/custom-webpack:browser",
1515
"options": {
16+
"customWebpackConfig": {
17+
"path": "scripts/extra-webpack.config.js"
18+
},
1619
"outputPath": "dist/components",
1720
"index": "src/index.html",
1821
"main": "src/main.ts",
@@ -23,8 +26,8 @@
2326
"src/assets"
2427
],
2528
"styles": [
26-
"src/styles.scss",
27-
"node_modules/highlight.js/styles/vs.css"
29+
"node_modules/highlight.js/styles/an-old-hope.css",
30+
"src/styles.scss"
2831
],
2932
"scripts": []
3033
},
@@ -48,7 +51,7 @@
4851
"budgets": [
4952
{
5053
"type": "initial",
51-
"maximumWarning": "2mb",
54+
"maximumWarning": "3mb",
5255
"maximumError": "5mb"
5356
}
5457
]
@@ -59,7 +62,7 @@
5962
}
6063
},
6164
"serve": {
62-
"builder": "@angular-devkit/build-angular:dev-server",
65+
"builder": "@angular-builders/custom-webpack:dev-server",
6366
"options": {
6467
"browserTarget": "devui:build"
6568
},
@@ -79,8 +82,11 @@
7982
}
8083
},
8184
"test": {
82-
"builder": "@angular-devkit/build-angular:karma",
85+
"builder": "@angular-builders/custom-webpack:karma",
8386
"options": {
87+
"customWebpackConfig": {
88+
"path": "scripts/extra-webpack.config.js"
89+
},
8490
"main": "src/test.ts",
8591
"polyfills": "src/polyfills.ts",
8692
"tsConfig": "src/tsconfig.spec.json",
@@ -156,8 +162,11 @@
156162
}
157163
},
158164
"test": {
159-
"builder": "@angular-devkit/build-angular:karma",
165+
"builder": "@angular-builders/custom-webpack:karma",
160166
"options": {
167+
"customWebpackConfig": {
168+
"path": "scripts/extra-webpack.config.js"
169+
},
161170
"main": "devui/test.ts",
162171
"tsConfig": "devui/tsconfig.spec.json",
163172
"karmaConfig": "devui/karma.conf.js",
@@ -184,4 +193,4 @@
184193
}
185194
},
186195
"defaultProject": "devui"
187-
}
196+
}

devui/accordion/accordion.component.scss

+18-18
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
/* 菜单底色 */
1717
:host ::ng-deep .devui-accordion-menu {
1818
display: block;
19-
background: $bg-white;
19+
background: $devui-base-bg;
2020
width: 100%;
2121
overflow-y: auto;
2222
border-radius: 2px;
2323
height: 100%;
2424

2525
&.devui-accordion-menu-normal {
26-
box-shadow: 0 2px 4px 0 $dark-1-boxshadow;
26+
box-shadow: 0 2px 4px 0 $devui-shadow;
2727
}
2828

2929
& > .devui-accordion-list {
@@ -38,7 +38,7 @@
3838
}
3939

4040
:host ::ng-deep .devui-accordion-submenu {
41-
background: $bg-white;
41+
background: $devui-base-bg;
4242
width: 100%;
4343
}
4444

@@ -50,32 +50,32 @@
5050
padding: 0 10px 0 20px;
5151
font-weight: 400;
5252
line-height: 40px;
53-
color: $dark-2;
53+
color: $devui-text-weak;
5454
background: transparent;
5555
cursor: pointer;
5656

5757
&.disabled {
58-
color: $disabled-content;
58+
color: $devui-disabled-text;
5959
cursor: not-allowed;
6060

6161
& > a {
62-
color: $disabled-content;
62+
color: $devui-disabled-text;
6363
}
6464
}
6565

6666
&:not(.disabled) {
6767
&:hover {
68-
background: $hover-content;
69-
color: $hover-control;
68+
background: $devui-list-item-hover-bg;
69+
color: $devui-list-item-hover-text;
7070
}
7171

7272
&.devui-router-active,
7373
&.active:not(.open) {
74-
color: $hwc-color-text-active-text-link;
74+
color: $devui-brand-active;
7575
font-weight: bold;
7676

7777
& > a {
78-
color: $hwc-color-text-active-text-link;
78+
color: $devui-brand-active;
7979
}
8080
}
8181
}
@@ -84,7 +84,7 @@
8484
text-decoration: none;
8585
display: block;
8686
width: 100%;
87-
color: $dark-2;
87+
color: $devui-text-weak;
8888

8989
&:hover {
9090
color: inherit;
@@ -126,15 +126,15 @@
126126
height: 16px;
127127

128128
polygon {
129-
fill: $dark-2;
129+
fill: $devui-text-weak;
130130
}
131131
}
132132
}
133133

134134
&:not(.open) {
135135
&.active {
136136
svg polygon {
137-
fill: $hwc-color-icon-hover-active;
137+
fill: $devui-icon-fill-active;
138138
}
139139
}
140140

@@ -145,10 +145,10 @@
145145
}
146146

147147
&.disabled > .devui-accordion-open-icon {
148-
color: $disabled-content;
148+
color: $devui-disabled-text;
149149

150150
svg polygon {
151-
fill: $disabled-content;
151+
fill: $devui-disabled-text;
152152
}
153153
}
154154
}
@@ -158,7 +158,7 @@
158158
padding-right: 30px;
159159

160160
&.active:not(.open) {
161-
color: $hwc-color-text-active-text-link;
161+
color: $devui-brand-active;
162162
background: transparent;
163163
}
164164
}
@@ -177,7 +177,7 @@
177177
left: 10px;
178178
width: 2px;
179179
height: 40px;
180-
background: $gray-2;
180+
background: $devui-dividing-line;
181181
vertical-align: middle;
182182

183183
&.devui-parent-list {
@@ -192,7 +192,7 @@
192192
display: block;
193193
width: 2px;
194194
height: 18px;
195-
background: $hwc-color-border-active;
195+
background: $devui-form-control-line-active;
196196
position: absolute;
197197
top: 11px;
198198
left: 0;

devui/accordion/demo/accordion-demo.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class AccordionDemoComponent {
2020
AccordionDemoTemplate: Array<DevuiSourceData> = [
2121
{title: 'HTML', language: 'xml', code: require('!!raw-loader!./template/template.component.html')},
2222
{title: 'TS', language: 'typescript', code: require('!!raw-loader!./template/template.component.ts')},
23-
{title: 'CSS', language: 'css', code: require('!!raw-loader!./template/template.component.css')}
23+
{title: 'CSS', language: 'css', code: require('!!raw-loader!./template/template.component.scss')}
2424
];
2525

2626
AccordionDemoInnerListTemplate: Array<DevuiSourceData> = [

devui/accordion/demo/template/template.component.css renamed to devui/accordion/demo/template/template.component.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '../../../style/theme/color';
2+
13
.menu {
24
width: 400px;
35
}
@@ -12,7 +14,7 @@
1214
padding: 2px;
1315
color: #ffffff;
1416
text-align: center;
15-
background: #5170ff;
17+
background: $devui-brand;
1618
margin-top: -2px;
1719
font-weight: 400;
1820
}

devui/accordion/demo/template/template.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
33
@Component({
44
selector: 'd-template',
55
templateUrl: './template.component.html',
6-
styleUrls: ['./template.component.css'],
6+
styleUrls: ['./template.component.scss'],
77
})
88
export class TemplateComponent {
99
menu = [{

devui/alert/alert.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
xmlns="http://www.w3.org/2000/svg"
2727
xmlns:xlink="http://www.w3.org/1999/xlink"
2828
class="devui-icon"
29-
[ngClass]="type === 'danger'? 'devui-icon-error': 'devui-icon-' + type"
29+
[ngClass]="type === 'danger' ? 'devui-icon-error' : 'devui-icon-' + type"
3030
>
3131
<g *ngIf="type === 'success'" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
3232
<path fill-rule="nonzero" d="M8,0 C3.6,0 0,3.6 0,8 C0,12.4 3.6,16 8,16 C12.4,16 16,12.4 16,8 C16,3.6 12.4,0 8,0 Z"></path>

0 commit comments

Comments
 (0)