diff --git a/.travis.yml b/.travis.yml index 6a101c812..6406e44bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ jobs: - env: "MODE=site" - env: "DEPLOY_MODE=build" - env: "DEPLOY_MODE=build_artifacts" + if: branch = master matrix: allow_failures: - env: "DEPLOY_MODE=build_artifacts" diff --git a/angular.json b/angular.json index 605a72cb8..98a6cea7d 100644 --- a/angular.json +++ b/angular.json @@ -16,7 +16,9 @@ "main": "src/main.ts", "tsConfig": "src/tsconfig.json", "polyfills": "src/polyfills.ts", - "assets": ["src/assets"], + "assets": [ + "src/assets" + ], "styles": [ "node_modules/ngx-simplemde/src/index.css", "src/styles.less" @@ -28,7 +30,10 @@ "node_modules/@antv/data-set/dist/data-set.min.js", "node_modules/@antv/g2-plugin-slider/dist/g2-plugin-slider.min.js", "node_modules/ajv/dist/ajv.bundle.js", - "node_modules/qrious/dist/qrious.min.js" + "node_modules/qrious/dist/qrious.min.js", + "node_modules/ace-builds/src-min/ace.js", + "node_modules/ace-builds/src-min/theme-github.js", + "node_modules/ace-builds/src-min/mode-json.js" ] }, "configurations": { diff --git a/package.json b/package.json index 1c8bb7617..754719ad0 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "file-saver": "^1.3.8", "marked": "^0.3.19", "ng-github-button": "^1.0.0", - "ng-zorro-antd": "^1.6.0", + "ng-zorro-antd": "^1.7.0", "ng2-ace-editor": "^0.3.8", "ngx-color": "^1.3.1", "ngx-countdown": "^3.0.0", diff --git a/packages/abc/edit/edit.component.html b/packages/abc/edit/edit.component.html index 5a563c73e..7266f4de5 100644 --- a/packages/abc/edit/edit.component.html +++ b/packages/abc/edit/edit.component.html @@ -5,7 +5,7 @@ {{ optional }} - + diff --git a/packages/abc/error-collect/error-collect.component.ts b/packages/abc/error-collect/error-collect.component.ts index 34d411715..ad7387265 100644 --- a/packages/abc/error-collect/error-collect.component.ts +++ b/packages/abc/error-collect/error-collect.component.ts @@ -22,7 +22,7 @@ import { ErrorCollectConfig } from './error-collect.config'; @Component({ selector: 'error-collect, [error-collect]', template: ` - + {{count}}`, host: { '[class.error-collect]': 'true' }, changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/packages/abc/global-footer/demo/basic.md b/packages/abc/global-footer/demo/basic.md index 9709c3087..89ee1c5b6 100644 --- a/packages/abc/global-footer/demo/basic.md +++ b/packages/abc/global-footer/demo/basic.md @@ -15,7 +15,7 @@ import { Component } from '@angular/core';
- Copyright 2018卡色出品 + Copyright2018卡色出品
`, diff --git a/packages/abc/global-footer/demo/custom.md b/packages/abc/global-footer/demo/custom.md index bca202e77..dd22f7908 100644 --- a/packages/abc/global-footer/demo/custom.md +++ b/packages/abc/global-footer/demo/custom.md @@ -17,10 +17,10 @@ import { Component } from '@angular/core'; 帮助 - + 预览 - Copyright 2018卡色出品 + Copyright2018卡色出品 `, diff --git a/packages/abc/notice-icon/notice-icon.component.ts b/packages/abc/notice-icon/notice-icon.component.ts index 1b9a2cce6..1d00a51b2 100644 --- a/packages/abc/notice-icon/notice-icon.component.ts +++ b/packages/abc/notice-icon/notice-icon.component.ts @@ -15,7 +15,7 @@ import { NoticeItem, NoticeIconSelect } from './notice-icon.types'; selector: 'notice-icon', template: ` - +
- +
diff --git a/packages/abc/page-header/demo/standard.md b/packages/abc/page-header/demo/standard.md index baac503ee..2d397d1cf 100644 --- a/packages/abc/page-header/demo/standard.md +++ b/packages/abc/page-header/demo/standard.md @@ -25,19 +25,19 @@ import { Component } from '@angular/core'; - - - - - - -
    -
  • 选项一
    • -
  • 选项二
    • -
  • 选项三
    • -
- - + + + + + + +
    +
  • 选项一
    • +
  • 选项二
    • +
  • 选项三
    • +
+ + diff --git a/packages/abc/qr/demo/design.md b/packages/abc/qr/demo/design.md index ee17973c0..c9a3111fb 100644 --- a/packages/abc/qr/demo/design.md +++ b/packages/abc/qr/demo/design.md @@ -102,9 +102,9 @@ import { Component } from '@angular/core'; }) export class DemoComponent { value = 'https://ng-alain.com/'; - background = 'white'; + background = '#fff'; backgroundAlpha = 1.0; - foreground = 'black'; + foreground = '#000'; foregroundAlpha = 1.0; level = 'L'; mime = 'image/png'; diff --git a/packages/abc/quick-menu/index.md b/packages/abc/quick-menu/index.md index 0de064342..379ee0926 100644 --- a/packages/abc/quick-menu/index.md +++ b/packages/abc/quick-menu/index.md @@ -12,7 +12,7 @@ module: QuickMenuModule 参数 | 说明 | 类型 | 默认值 ----|------|-----|------ -`[icon]` | 图标 | `string` | `anticon anticon-question-circle-o` +`[icon]` | 图标 | `string | TemplateRef` | `question-circle` `[top]` | 距离顶部 | `number` | `120` `[width]` | 打开后宽度 | `number` | `200` `[bgColor]` | 背景 | `string` | `#fff` diff --git a/packages/abc/quick-menu/quick-menu.component.html b/packages/abc/quick-menu/quick-menu.component.html new file mode 100644 index 000000000..fe3a87e0e --- /dev/null +++ b/packages/abc/quick-menu/quick-menu.component.html @@ -0,0 +1,10 @@ +
+
+
+ + + +
+
+ +
diff --git a/packages/abc/quick-menu/quick-menu.component.ts b/packages/abc/quick-menu/quick-menu.component.ts index a795a196c..74f956468 100644 --- a/packages/abc/quick-menu/quick-menu.component.ts +++ b/packages/abc/quick-menu/quick-menu.component.ts @@ -8,20 +8,14 @@ import { ChangeDetectorRef, Renderer2, ElementRef, + TemplateRef, } from '@angular/core'; import { InputNumber } from '@delon/util'; @Component({ selector: 'quick-menu', - template: ` -
-
- -
- -
- `, + templateUrl: './quick-menu.component.html', host: { '[class.quick-menu]': 'true' }, preserveWhitespaces: false, changeDetection: ChangeDetectionStrategy.OnPush, @@ -29,11 +23,17 @@ import { InputNumber } from '@delon/util'; export class QuickMenuComponent implements OnInit, OnChanges { // #region fields + _icon = 'question-circle'; + _iconTpl: TemplateRef; @Input() - icon: - | string - | string[] - | { [key: string]: string } = 'anticon anticon-question-circle-o'; + set icon(value: string | TemplateRef) { + if (value instanceof TemplateRef) { + this._icon = null; + this._iconTpl = value; + } else { + this._icon = value; + } + } @Input() @InputNumber() top = 120; diff --git a/packages/abc/quick-menu/quick-menu.module.ts b/packages/abc/quick-menu/quick-menu.module.ts index b67b5fe7e..b2105fdd0 100644 --- a/packages/abc/quick-menu/quick-menu.module.ts +++ b/packages/abc/quick-menu/quick-menu.module.ts @@ -1,5 +1,6 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgZorroAntdModule } from 'ng-zorro-antd'; import { DelonUtilModule } from '@delon/util'; import { QuickMenuComponent } from './quick-menu.component'; @@ -7,7 +8,7 @@ import { QuickMenuComponent } from './quick-menu.component'; const COMPONENTS = [QuickMenuComponent]; @NgModule({ - imports: [CommonModule, DelonUtilModule], + imports: [CommonModule, NgZorroAntdModule, DelonUtilModule], declarations: [...COMPONENTS], exports: [...COMPONENTS], }) diff --git a/packages/abc/result/demo/classic.md b/packages/abc/result/demo/classic.md index 8f2366583..8d3c96f1d 100644 --- a/packages/abc/result/demo/classic.md +++ b/packages/abc/result/demo/classic.md @@ -37,7 +37,7 @@ import { NzMessageService } from 'ng-zorro-antd';
- 曲丽丽 + 曲丽丽
2016-12-12 12:32
@@ -47,7 +47,7 @@ import { NzMessageService } from 'ng-zorro-antd';
- 周毛毛 + 周毛毛
催一下 diff --git a/packages/abc/result/demo/fail.md b/packages/abc/result/demo/fail.md index 85353f3af..63918b400 100644 --- a/packages/abc/result/demo/fail.md +++ b/packages/abc/result/demo/fail.md @@ -19,12 +19,12 @@ import { Component } from '@angular/core';
您提交的内容有如下错误：
- 您的账户已被冻结 - 立即解冻 + 您的账户已被冻结 + 立即解冻
- 您的账户还不具备申请资格 - 立即升级 + 您的账户还不具备申请资格 + 立即升级
diff --git a/packages/abc/result/result.component.ts b/packages/abc/result/result.component.ts index 61f11ee9b..8762166a3 100644 --- a/packages/abc/result/result.component.ts +++ b/packages/abc/result/result.component.ts @@ -3,7 +3,7 @@ import { Component, Input, TemplateRef } from '@angular/core'; @Component({ selector: 'result', template: ` -
+
{{_title}}
{{_description}}
diff --git a/packages/abc/result/result.module.ts b/packages/abc/result/result.module.ts index 10f48a08c..c1ec4b5db 100644 --- a/packages/abc/result/result.module.ts +++ b/packages/abc/result/result.module.ts @@ -1,12 +1,13 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgZorroAntdModule } from 'ng-zorro-antd'; import { ResultComponent } from './result.component'; const COMPONENTS = [ResultComponent]; @NgModule({ - imports: [CommonModule], + imports: [CommonModule, NgZorroAntdModule], declarations: [...COMPONENTS], exports: [...COMPONENTS], }) diff --git a/packages/abc/result/result.spec.ts b/packages/abc/result/result.spec.ts index c594702f1..30ad17a2d 100644 --- a/packages/abc/result/result.spec.ts +++ b/packages/abc/result/result.spec.ts @@ -6,88 +6,90 @@ import { ResultModule } from './result.module'; import { ResultComponent } from './result.component'; describe('abc: result', () => { - let fixture: ComponentFixture; - let dl: DebugElement; - let context: TestComponent; + let fixture: ComponentFixture; + let dl: DebugElement; + let context: TestComponent; - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ ResultModule.forRoot() ], - declarations: [ TestComponent ] - }); - fixture = TestBed.createComponent(TestComponent); - dl = fixture.debugElement; - context = fixture.componentInstance; - fixture.detectChanges(); + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ResultModule.forRoot()], + declarations: [TestComponent], }); + fixture = TestBed.createComponent(TestComponent); + dl = fixture.debugElement; + context = fixture.componentInstance; + fixture.detectChanges(); + }); - function isText(cls: string, value: any) { - const el = dl.query(By.css(cls)).nativeElement as HTMLElement; - if (el) return el.innerText.trim(); - return ''; - } + function isText(cls: string, value: any) { + const el = dl.query(By.css(cls)).nativeElement as HTMLElement; + if (el) return el.innerText.trim(); + return ''; + } - function isExists(cls: string, stauts: boolean = true) { - if (stauts) - expect(dl.query(By.css(cls))).not.toBeNull(); - else - expect(dl.query(By.css(cls))).toBeNull(); + function isExists(cls: string, stauts: boolean = true) { + const res = dl.query(By.css(cls)); + if (stauts) { + expect(res).not.toBeNull(); + } else { + expect(res).toBeNull(); } + } - describe('#type', () => { - it('width success', () => { - context.type = 'success'; - fixture.detectChanges(); - isExists('.anticon-check-circle'); - }); - it('width error', () => { - context.type = 'error'; - fixture.detectChanges(); - isExists('.anticon-close-circle'); - }); - it('width custom', () => { - context.type = 'custom'; - fixture.detectChanges(); - isExists('.anticon-custom'); - }); + describe('#type', () => { + it('width success', () => { + context.type = 'success'; + fixture.detectChanges(); + isExists('.anticon-check-circle'); + }); + it('width error', () => { + context.type = 'error'; + fixture.detectChanges(); + isExists('.anticon-close-circle'); + }); + it('width custom', () => { + context.type = 'custom'; + fixture.detectChanges(); + isExists('.anticon-custom'); }); + }); - describe('#title', () => { - it('with string', () => { - isText('.result__title', context.title); - }); - it('with template', () => { - context.title = context.titleTpl; - fixture.detectChanges(); - isExists('#titleTpl'); - }); + describe('#title', () => { + it('with string', () => { + isText('.result__title', context.title); }); + it('with template', () => { + context.title = context.titleTpl; + fixture.detectChanges(); + isExists('#titleTpl'); + }); + }); - describe('#description', () => { - it('with string', () => { - isText('.result__desc', context.description); - }); - it('with template', () => { - context.description = context.descriptionTpl; - fixture.detectChanges(); - isExists('#descriptionTpl'); - }); + describe('#description', () => { + it('with string', () => { + isText('.result__desc', context.description); + }); + it('with template', () => { + context.description = context.descriptionTpl; + fixture.detectChanges(); + isExists('#descriptionTpl'); }); + }); - describe('#extra', () => { - it('with string', () => { - isText('.result__extra', context.extra); - }); - it('with template', () => { - context.extra = context.extraTpl; - fixture.detectChanges(); - isExists('#extraTpl'); - }); + describe('#extra', () => { + it('with string', () => { + isText('.result__extra', context.extra); + }); + it('with template', () => { + context.extra = context.extraTpl; + fixture.detectChanges(); + isExists('#extraTpl'); }); + }); }); @Component({ - template: ` + template: ` {

titleTpl

descriptionTpl

extraTpl

 - ` + `, }) class TestComponent { - @ViewChild('comp') comp: ResultComponent; - type = 'custom'; - @ViewChild('titleTpl') titleTpl: TemplateRef; - @ViewChild('descriptionTpl') descriptionTpl: TemplateRef; - @ViewChild('extraTpl') extraTpl: TemplateRef; - title: string | TemplateRef = 'title'; - description: string | TemplateRef = 'description'; - extra: string | TemplateRef = 'extra'; + @ViewChild('comp') + comp: ResultComponent; + type = 'custom'; + @ViewChild('titleTpl') + titleTpl: TemplateRef; + @ViewChild('descriptionTpl') + descriptionTpl: TemplateRef; + @ViewChild('extraTpl') + extraTpl: TemplateRef; + title: string | TemplateRef = 'title'; + description: string | TemplateRef = 'description'; + extra: string | TemplateRef = 'extra'; } diff --git a/packages/abc/reuse-tab/reuse-tab.component.html b/packages/abc/reuse-tab/reuse-tab.component.html index c93b947f9..e1564af1f 100644 --- a/packages/abc/reuse-tab/reuse-tab.component.html +++ b/packages/abc/reuse-tab/reuse-tab.component.html @@ -2,7 +2,7 @@ {{i.title}} - + diff --git a/packages/abc/reuse-tab/reuse-tab.component.spec.ts b/packages/abc/reuse-tab/reuse-tab.component.spec.ts index 3ecff7696..e469c2be6 100644 --- a/packages/abc/reuse-tab/reuse-tab.component.spec.ts +++ b/packages/abc/reuse-tab/reuse-tab.component.spec.ts @@ -280,17 +280,17 @@ describe('abc: reuse-tab', () => { layoutComp.allowClose = true; fixture.detectChanges(); page.to('#b'); - expect(dl.queryAll(By.css('.op')).length).toBe(2); + expect(dl.queryAll(By.css('.reuse-tab__op')).length).toBe(2); page.to('#c'); - expect(dl.queryAll(By.css('.op')).length).toBe(3); + expect(dl.queryAll(By.css('.reuse-tab__op')).length).toBe(3); })); it('with false', fakeAsync(() => { layoutComp.allowClose = false; fixture.detectChanges(); page.to('#b'); - expect(dl.queryAll(By.css('.op')).length).toBe(0); + expect(dl.queryAll(By.css('.reuse-tab__op')).length).toBe(0); page.to('#c'); - expect(dl.queryAll(By.css('.op')).length).toBe(0); + expect(dl.queryAll(By.css('.reuse-tab__op')).length).toBe(0); })); }); }); diff --git a/packages/abc/reuse-tab/style/index.less b/packages/abc/reuse-tab/style/index.less index ac70a4f13..a30b86cab 100644 --- a/packages/abc/reuse-tab/style/index.less +++ b/packages/abc/reuse-tab/style/index.less @@ -23,7 +23,7 @@ display: inline-block; padding: 8px 20px; } - .op { + @{reuse-tab-prefix}__op { display: none; position: absolute; top: 14px; @@ -32,7 +32,7 @@ font-size: 12px; } &:hover { - .op { + @{reuse-tab-prefix}__op { display: block; } } diff --git a/packages/abc/sidebar-nav/sidebar-nav.component.html b/packages/abc/sidebar-nav/sidebar-nav.component.html index b027e433b..38caa7771 100644 --- a/packages/abc/sidebar-nav/sidebar-nav.component.html +++ b/packages/abc/sidebar-nav/sidebar-nav.component.html @@ -1,86 +1,94 @@ + + + + + + +
    - +
  • {{ group.text }}
    • -
  • +
  • - - + + + + - + - {{ child1.text }} + {{ child1.text }} - - + + + + - + - {{ child1.text }} + {{ child1.text }} - - - {{ child1.text }} + + + {{ child1.text }} +
    + [class.badge-dot]="child1.badgeDot"> {{child1.badge}}
    diff --git a/packages/abc/sidebar-nav/sidebar-nav.spec.ts b/packages/abc/sidebar-nav/sidebar-nav.spec.ts index f800efc8c..856cec1ce 100644 --- a/packages/abc/sidebar-nav/sidebar-nav.spec.ts +++ b/packages/abc/sidebar-nav/sidebar-nav.spec.ts @@ -105,7 +105,7 @@ describe('abc: sidebar-nav', () => { const data = deepCopy(MOCKMENUS); menuSrv.add(data); expect(data[0].children[0]._open).toBeUndefined(); - const subTitleEl = page.getEl('.sidebar-nav__sub-title'); + const subTitleEl = page.getEl('.sidebar-nav__item-link'); subTitleEl.click(); fixture.detectChanges(); expect(data[0].children[0]._open).toBe(true); @@ -370,7 +370,7 @@ describe('abc: sidebar-nav', () => { showSubMenu(resultExpectShow = true) { let conEl = this.getEl(floatingShowCls, true); expect(conEl).toBeNull(); - const subTitleEl = this.getEl('.sidebar-nav__sub-title'); + const subTitleEl = this.getEl('.sidebar-nav__item-link'); subTitleEl.dispatchEvent(new Event('mouseenter')); fixture.detectChanges(); conEl = this.getEl(floatingShowCls, true); diff --git a/packages/abc/table/demo/buttons.md b/packages/abc/table/demo/buttons.md index a34ee985c..efbda8b14 100644 --- a/packages/abc/table/demo/buttons.md +++ b/packages/abc/table/demo/buttons.md @@ -89,7 +89,7 @@ export class DemoComponent { click: (record: any) => this.message.error(`过期【${record.name}】`), format: (record: any) => - ` 过期`, + `过期`, }, { text: `重新开始`, diff --git a/packages/abc/table/demo/render.md b/packages/abc/table/demo/render.md index 0441caa0b..cd9652b6e 100644 --- a/packages/abc/table/demo/render.md +++ b/packages/abc/table/demo/render.md @@ -28,7 +28,7 @@ import { STColumn } from '@delon/abc'; {{ c.title }} - +
    diff --git a/packages/abc/table/index.en-US.md b/packages/abc/table/index.en-US.md index 98ffae6bb..f1ab0d5f4 100644 --- a/packages/abc/table/index.en-US.md +++ b/packages/abc/table/index.en-US.md @@ -238,7 +238,7 @@ Property | Description | Type | Default `[menus]` | Filter menu config | `STColumnFilterMenu[]` | - `[fn]` | Filter function for local data | `(filter: STColumnFilterMenu, record: any) => boolean` | - `[default]` | Whether the `data` is filtered | `boolean` | - -`[icon]` | Customized filter icon | `string` | `anticon anticon-filter` +`[icon]` | Customized filter icon | `string` | `filter` `[multiple]` | Whether multiple filters can be selected | `boolean` | `true` `[confirmText]` | Text of the confirm button | `string` | `确认` `[clearText]` | Text of the clear button | `string` | `重置` diff --git a/packages/abc/table/index.zh-CN.md b/packages/abc/table/index.zh-CN.md index 4aab5bb06..ffdb35d19 100644 --- a/packages/abc/table/index.zh-CN.md +++ b/packages/abc/table/index.zh-CN.md @@ -238,7 +238,7 @@ class TestComponent { `[menus]` | 表头的筛选菜单项，至少一项才会生效 | `STColumnFilterMenu[]` | - `[fn]` | 本地数据的筛选函数 | `(filter: STColumnFilterMenu, record: any) => boolean` | - `[default]` | 标识数据是否经过过滤，筛选图标会高亮 | `boolean` | - -`[icon]` | 自定义 fiter 图标 | `string` | `anticon anticon-filter` +`[icon]` | 自定义 fiter 图标 | `string` | `filter` `[multiple]` | 是否多选 | `boolean` | `true` `[confirmText]` | filter 确认按钮文本 | `string` | `确认` `[clearText]` | filter 清除按钮文本 | `string` | `重置` diff --git a/packages/abc/table/table-column-source.ts b/packages/abc/table/table-column-source.ts index 713ae2e91..e9ec902e5 100644 --- a/packages/abc/table/table-column-source.ts +++ b/packages/abc/table/table-column-source.ts @@ -193,7 +193,7 @@ export class STColumnSource { res.clearText = this.cog.filterClearText; } if (!res.icon) { - res.icon = `anticon anticon-filter`; + res.icon = `filter`; } if (!res.key) { res.key = item.indexKey; diff --git a/packages/abc/table/table.component.html b/packages/abc/table/table.component.html index fa6d1e43e..b6655b7da 100644 --- a/packages/abc/table/table.component.html +++ b/packages/abc/table/table.component.html @@ -27,7 +27,7 @@ - +
    • @@ -106,7 +106,7 @@ - +
        diff --git a/packages/abc/table/table.interfaces.ts b/packages/abc/table/table.interfaces.ts index 3c44efa11..29b60a976 100644 --- a/packages/abc/table/table.interfaces.ts +++ b/packages/abc/table/table.interfaces.ts @@ -296,7 +296,7 @@ export interface STColumnFilter { */ default?: boolean; /** - * 自定义 filter 图标，默认 `anticon anticon-filter` + * 自定义 filter 图标，默认 `filter` */ icon?: string; /** @@ -500,14 +500,14 @@ export interface STColumnButtonDrawerConfig { paramsName?: string; /** * 大小；例如：lg、600，默认：`md` - * + * * | 类型 | 默认大小 | * | --- | ------ | * | `sm` | `300` | * | `md` | `600` | * | `lg` | `900` | * | `xl` | `1200` | - * + * * > 以上值，可通过覆盖相应的LESS参数自行调整 */ size?: 'sm' | 'md' | 'lg' | 'xl' | number; diff --git a/packages/abc/table/test/table-column-source.spec.ts b/packages/abc/table/test/table-column-source.spec.ts index bf6a16dd4..ac66dbe8f 100644 --- a/packages/abc/table/test/table-column-source.spec.ts +++ b/packages/abc/table/test/table-column-source.spec.ts @@ -357,11 +357,11 @@ describe('abc: table: column-souce', () => { }); }); describe('#icon', () => { - it('should be default to [anticon anticon-filter] when is null', () => { + it('should be default to [filter] when is null', () => { const res = srv.process([ { title: '', filter: { menus: [{ text: '' }] } }, ])[0].filter; - expect(res.icon).toBe('anticon anticon-filter'); + expect(res.icon).toBe('filter'); }); it('should be specify value', () => { const res = srv.process([ diff --git a/packages/abc/table/test/table.spec.ts b/packages/abc/table/test/table.spec.ts index 9923dc434..4d0c8f66f 100644 --- a/packages/abc/table/test/table.spec.ts +++ b/packages/abc/table/test/table.spec.ts @@ -1384,7 +1384,7 @@ describe('abc: table', () => { ], confirmText: 'ok', clearText: 'reset', - icon: 'anticon anticon-aa', + icon: 'aa', fn: () => true, }, }, diff --git a/packages/abc/tag-select/tag-select.component.ts b/packages/abc/tag-select/tag-select.component.ts index d04dcbefc..c25724640 100644 --- a/packages/abc/tag-select/tag-select.component.ts +++ b/packages/abc/tag-select/tag-select.component.ts @@ -16,7 +16,7 @@ import { DelonLocaleService } from '@delon/theme'; template: ` - {{expand ? locale.collapse : locale.expand}} + {{expand ? locale.collapse : locale.expand}} `, host: { '[class.tag-select]': 'true' }, preserveWhitespaces: false, diff --git a/packages/abc/tag-select/tag-select.module.ts b/packages/abc/tag-select/tag-select.module.ts index 66e6bb451..57add47a2 100644 --- a/packages/abc/tag-select/tag-select.module.ts +++ b/packages/abc/tag-select/tag-select.module.ts @@ -1,5 +1,6 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgZorroAntdModule } from 'ng-zorro-antd'; import { DelonLocaleModule } from '@delon/theme'; import { DelonUtilModule } from '@delon/util'; @@ -8,7 +9,7 @@ import { TagSelectComponent } from './tag-select.component'; const COMPONENTS = [TagSelectComponent]; @NgModule({ - imports: [CommonModule, DelonLocaleModule, DelonUtilModule], + imports: [CommonModule, NgZorroAntdModule, DelonLocaleModule, DelonUtilModule], declarations: [...COMPONENTS], exports: [...COMPONENTS], }) diff --git a/packages/abc/tag-select/tag-select.spec.ts b/packages/abc/tag-select/tag-select.spec.ts index 80f0984f7..f21eb34a2 100644 --- a/packages/abc/tag-select/tag-select.spec.ts +++ b/packages/abc/tag-select/tag-select.spec.ts @@ -48,13 +48,13 @@ describe('abc: tag-select', () => { .nativeElement as HTMLElement; expect(context.change).not.toHaveBeenCalled(); expect(triEl.innerHTML).toContain('展开'); - expect(triEl.querySelector('.anticon-up')).toBeNull(); - expect(triEl.querySelector('.anticon-down')).not.toBeNull(); + // expect(triEl.querySelector('.anticon-up')).toBeNull(); + // expect(triEl.querySelector('.anticon-down')).not.toBeNull(); triEl.click(); fixture.detectChanges(); expect(triEl.innerHTML).toContain('收起'); - expect(triEl.querySelector('.anticon-up')).not.toBeNull(); - expect(triEl.querySelector('.anticon-down')).toBeNull(); + // expect(triEl.querySelector('.anticon-up')).not.toBeNull(); + // expect(triEl.querySelector('.anticon-down')).toBeNull(); expect(context.change).toHaveBeenCalled(); }); it('#i18n', () => { diff --git a/packages/chart/card/demo/style1.md b/packages/chart/card/demo/style1.md index 9183b4328..1d4d5834c 100644 --- a/packages/chart/card/demo/style1.md +++ b/packages/chart/card/demo/style1.md @@ -17,7 +17,7 @@ import { yuan } from '@delon/util'; - + 周同比12% diff --git a/packages/chart/card/demo/style2.md b/packages/chart/card/demo/style2.md index 7d4171bc6..73f46b6e0 100644 --- a/packages/chart/card/demo/style2.md +++ b/packages/chart/card/demo/style2.md @@ -19,7 +19,7 @@ import { yuan } from '@delon/util'; - + diff --git a/packages/chart/card/demo/style3.md b/packages/chart/card/demo/style3.md index 655e16496..2e77ae1d7 100644 --- a/packages/chart/card/demo/style3.md +++ b/packages/chart/card/demo/style3.md @@ -19,7 +19,7 @@ import { yuan } from '@delon/util'; - + diff --git a/packages/chart/number-info/number-info.component.ts b/packages/chart/number-info/number-info.component.ts index 3c26cfc27..bc99c37cd 100644 --- a/packages/chart/number-info/number-info.component.ts +++ b/packages/chart/number-info/number-info.component.ts @@ -19,7 +19,7 @@ import { toNumber, updateHostClass } from '@delon/util'; {{_total}}{{suffix}} {{_subTotal}} - +
    `, diff --git a/packages/chart/number-info/number-info.module.ts b/packages/chart/number-info/number-info.module.ts index 875eb882c..7e99b9f87 100644 --- a/packages/chart/number-info/number-info.module.ts +++ b/packages/chart/number-info/number-info.module.ts @@ -1,5 +1,6 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgZorroAntdModule } from 'ng-zorro-antd'; import { DelonUtilModule } from '@delon/util'; import { NumberInfoComponent } from './number-info.component'; @@ -7,7 +8,7 @@ import { NumberInfoComponent } from './number-info.component'; const COMPONENTS = [NumberInfoComponent]; @NgModule({ - imports: [CommonModule, DelonUtilModule], + imports: [CommonModule, NgZorroAntdModule, DelonUtilModule], declarations: [...COMPONENTS], exports: [...COMPONENTS], }) diff --git a/packages/chart/trend/trend.component.ts b/packages/chart/trend/trend.component.ts index a9de14b99..c9beabfc5 100644 --- a/packages/chart/trend/trend.component.ts +++ b/packages/chart/trend/trend.component.ts @@ -5,7 +5,7 @@ import { toBoolean } from '@delon/util'; selector: 'trend', template: ` - + `, host: { '[class.trend]': 'true', diff --git a/packages/chart/trend/trend.module.ts b/packages/chart/trend/trend.module.ts index 520c43059..0ed723a6f 100644 --- a/packages/chart/trend/trend.module.ts +++ b/packages/chart/trend/trend.module.ts @@ -1,4 +1,5 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; +import { NgZorroAntdModule } from 'ng-zorro-antd'; import { CommonModule } from '@angular/common'; import { DelonUtilModule } from '@delon/util'; @@ -7,7 +8,7 @@ import { TrendComponent } from './trend.component'; const COMPONENTS = [TrendComponent]; @NgModule({ - imports: [CommonModule, DelonUtilModule], + imports: [CommonModule, NgZorroAntdModule, DelonUtilModule], declarations: [...COMPONENTS], exports: [...COMPONENTS], }) diff --git a/packages/form/src/sf-item-wrap.component.ts b/packages/form/src/sf-item-wrap.component.ts index 139fa3b7e..085fd8deb 100644 --- a/packages/form/src/sf-item-wrap.component.ts +++ b/packages/form/src/sf-item-wrap.component.ts @@ -12,7 +12,7 @@ import { SFUISchemaItem } from './schema/ui'; {{ ui.optional }} - + diff --git a/packages/form/src/widgets/array/array.widget.ts b/packages/form/src/widgets/array/array.widget.ts index 8cf6a741d..7af46fb60 100644 --- a/packages/form/src/widgets/array/array.widget.ts +++ b/packages/form/src/widgets/array/array.widget.ts @@ -11,7 +11,7 @@ import { ArrayLayoutWidget } from '../../widget'; {{ ui.optional }} - + @@ -28,7 +28,7 @@ import { ArrayLayoutWidget } from '../../widget'; - + diff --git a/packages/form/src/widgets/checkbox/checkbox.widget.html b/packages/form/src/widgets/checkbox/checkbox.widget.html index a7564ff4b..87f32b586 100644 --- a/packages/form/src/widgets/checkbox/checkbox.widget.html +++ b/packages/form/src/widgets/checkbox/checkbox.widget.html @@ -10,7 +10,7 @@ {{ ui.optional }} - + diff --git a/packages/form/src/widgets/string/demo/simple.md b/packages/form/src/widgets/string/demo/simple.md index 8bba836fc..1d1c0b553 100644 --- a/packages/form/src/widgets/string/demo/simple.md +++ b/packages/form/src/widgets/string/demo/simple.md @@ -32,7 +32,6 @@ export class DemoComponent { addOnAfter: 'RMB', placeholder: 'RMB结算', }, - format: 'mobile', }, mobile: { type: 'string', diff --git a/packages/form/src/widgets/string/string.widget.ts b/packages/form/src/widgets/string/string.widget.ts index 5922c3a1a..0cb1ecc88 100644 --- a/packages/form/src/widgets/string/string.widget.ts +++ b/packages/form/src/widgets/string/string.widget.ts @@ -51,4 +51,10 @@ export class StringWidget extends ControlWidget implements OnInit { ? 'addon' : ''; } + + reset(value: any) { + if (this.schema.format === 'color' && !value) { + this.setValue('#000000'); + } + } } diff --git a/packages/form/src/widgets/tree-select/tree-select.widget.ts b/packages/form/src/widgets/tree-select/tree-select.widget.ts index 7ab6e6326..cc7465f76 100644 --- a/packages/form/src/widgets/tree-select/tree-select.widget.ts +++ b/packages/form/src/widgets/tree-select/tree-select.widget.ts @@ -25,7 +25,7 @@ import { deepCopy } from '@delon/util'; [nzAsyncData]="i.asyncData" [nzNodes]="data" [nzDefaultExpandAll]="i.defaultExpandAll" - [nzDefaultExpandedKeys]="ui.defaultExpandedKeys" + [nzDefaultExpandedKeys]="i.defaultExpandedKeys" [nzDisplayWith]="i.displayWith" [ngModel]="value" (ngModelChange)="change($event)" @@ -42,12 +42,8 @@ export class TreeSelectWidget extends ControlWidget implements OnInit { private dc() { // Muse wait `nz-tree-select` write values - return new Promise(resolve => { - setTimeout(() => { - this.detectChanges(); - resolve(); - }, 101); - }); + // https://github.com/NG-ZORRO/ng-zorro-antd/issues/2316 + setTimeout(() => this.detectChanges(), 1000); } private tranData(list: SFSchemaEnum[]) { @@ -66,6 +62,7 @@ export class TreeSelectWidget extends ControlWidget implements OnInit { showLine: toBool(ui.showLine, false), asyncData: typeof ui.expandChange === 'function', defaultExpandAll: toBool(ui.defaultExpandAll, false), + defaultExpandedKeys: ui.defaultExpandedKeys || [], displayWith: ui.displayWith || ((node: NzTreeNode) => node.title), }; } diff --git a/packages/form/src/widgets/upload/upload.widget.ts b/packages/form/src/widgets/upload/upload.widget.ts index 653ea22ed..b3e2da279 100644 --- a/packages/form/src/widgets/upload/upload.widget.ts +++ b/packages/form/src/widgets/upload/upload.widget.ts @@ -30,17 +30,17 @@ import { getData, toBool } from '../../utils'; (nzChange)="change($event)"> - +
    -

    +

    diff --git a/packages/schematics/application/files/src/app/core/startup/startup.service.ts b/packages/schematics/application/files/src/app/core/startup/startup.service.ts index 8537e92d5..b8a9a71c2 100644 --- a/packages/schematics/application/files/src/app/core/startup/startup.service.ts +++ b/packages/schematics/application/files/src/app/core/startup/startup.service.ts @@ -9,6 +9,16 @@ import { ACLService } from '@delon/acl';<% if (i18n) { %> import { TranslateService } from '@ngx-translate/core'; import { I18NService } from '../i18n/i18n.service';<% } %> +// #region static loading icons +// @see http://ng.ant.design/components/icon/zh#%E9%9D%99%E6%80%81%E5%8A%A0%E8%BD%BD%E4%B8%8E%E5%8A%A8%E6%80%81%E5%8A%A0%E8%BD%BD + +import { NzIconService } from 'ng-zorro-antd'; +import {} from '@ant-design/icons-angular/icons'; + +const ICONS = []; + +// #endregion + /** * 用于应用启动时 * 一般用来获取应用所需要的基础数据等 @@ -16,6 +26,7 @@ import { I18NService } from '../i18n/i18n.service';<% } %> @Injectable() export class StartupService { constructor( + iconSrv: NzIconService, private menuService: MenuService,<% if (i18n) { %> private translate: TranslateService, @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,<% } %> @@ -25,7 +36,9 @@ export class StartupService { @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService, private httpClient: HttpClient, private injector: Injector - ) { } + ) { + iconSrv.addIcon(...ICONS); + } private viaHttp(resolve: any, reject: any) { zip(<% if (i18n) { %> @@ -105,11 +118,11 @@ export class StartupService { { text: '仪表盘', link: '/dashboard', - icon: 'anticon anticon-appstore-o' + icon: { type: 'icon', value: 'appstore' } }, { text: '快捷菜单', - icon: 'anticon anticon-rocket', + icon: { type: 'icon', value: 'rocket' }, shortcutRoot: true } ] diff --git a/packages/schematics/application/files/src/app/layout/default/header/components/fullscreen.component.ts b/packages/schematics/application/files/src/app/layout/default/header/components/fullscreen.component.ts index cfa5effdc..b01a1e825 100644 --- a/packages/schematics/application/files/src/app/layout/default/header/components/fullscreen.component.ts +++ b/packages/schematics/application/files/src/app/layout/default/header/components/fullscreen.component.ts @@ -4,7 +4,7 @@ import * as screenfull from 'screenfull'; @Component({ selector: 'header-fullscreen', template: ` - + <% if (!i18n) { %>{{ status ? '退出全屏' : '全屏' }}<% } %><% if (i18n) { %>{{(status ? 'menu.fullscreen.exit' : 'menu.fullscreen') | translate }}<% } %> ` }) diff --git a/packages/schematics/application/files/src/app/layout/default/header/components/storage.component.ts b/packages/schematics/application/files/src/app/layout/default/header/components/storage.component.ts index 5c44a83ce..0eab3f5e5 100644 --- a/packages/schematics/application/files/src/app/layout/default/header/components/storage.component.ts +++ b/packages/schematics/application/files/src/app/layout/default/header/components/storage.component.ts @@ -4,7 +4,7 @@ import { NzModalService, NzMessageService } from 'ng-zorro-antd'; @Component({ selector: 'header-storage', template: ` - + <% if (!i18n) { %>清除本地缓存<% } %><% if (i18n) { %>{{ 'menu.clear.local.storage' | translate}}<% } %> ` }) diff --git a/packages/schematics/application/files/src/app/layout/default/header/header.component.html b/packages/schematics/application/files/src/app/layout/default/header/header.component.html index 6f7b23d6e..8e3ba1192 100644 --- a/packages/schematics/application/files/src/app/layout/default/header/header.component.html +++ b/packages/schematics/application/files/src/app/layout/default/header/header.component.html @@ -9,25 +9,25 @@
  • - +
  • - +
  • - +
    • -
  • +
  • - +
@@ -49,7 +49,7 @@
  • - +
    diff --git a/packages/schematics/ng-update/test-cases/v2/MOCK_LAYOUT.ts b/packages/schematics/ng-update/test-cases/v2/MOCK_LAYOUT.ts index c67f20f43..9825d5442 100644 --- a/packages/schematics/ng-update/test-cases/v2/MOCK_LAYOUT.ts +++ b/packages/schematics/ng-update/test-cases/v2/MOCK_LAYOUT.ts @@ -97,25 +97,25 @@ export class LayoutDefaultComponent {
  • - +
  • - +
  • - +
    • @@ -137,7 +137,7 @@ export class LayoutDefaultComponent {