Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(menu): 修复构建报错，指令、标签、host规范化 #336

Merged
merged 2 commits into from
Nov 7, 2023
Merged

fix(menu): 修复构建报错，指令、标签、host规范化 #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d42e509
fix(emnu): fix build error
Simplelegant Nov 5, 2023
e63d68e
fix(menu): 指令、标签、host规范化
Simplelegant Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions devui/menu/demo/auto-expand/auto-expand.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div class="demo-menu" style="width: 256px">
<div d-menu>
<div dMenu>
<ng-container *ngFor="let m of menus; trackBy: trackByMenu">
<div
d-sub-menu
dSubMenu
[title]="m.name"
[icon]="m.icon"
[open]="openKeys.includes(m.key)"
(openChange)="openChange($event, m.key)"
*ngIf="m.children?.length; else leafTpl"
>
<div
d-menu-item
dMenuItem
(itemClick)="itemClick(item.key)"
[active]="item.key === activeKey"
*ngFor="let item of m.children; trackBy: trackByMenu"
Expand All @@ -20,7 +20,7 @@
</div>
</div>
<ng-template #leafTpl>
<div d-menu-item (itemClick)="itemClick(m.key)" [active]="m.key === activeKey">
<div dMenuItem (itemClick)="itemClick(m.key)" [active]="m.key === activeKey">
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name over-flow-ellipsis">{{ m.name }}</span>
</div>
Expand Down
8 changes: 4 additions & 4 deletions devui/menu/demo/basic/basic.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="demo-menu" style="width: 256px">
<div d-menu (menuItemClick)="menuItemClick($event)">
<div dMenu (menuItemClick)="menuItemClick($event)">
<ng-container *ngFor="let m of menus; trackBy: trackByMenu">
<div
d-sub-menu
dSubMenu
[title]="m.name"
[icon]="m.icon"
[disabled]="disabledKeys.includes(m.key)"
Expand All @@ -11,7 +11,7 @@
*ngIf="m.children?.length; else leafTpl"
>
<div
d-menu-item
dMenuItem
[disabled]="disabledKeys.includes(item.key)"
(itemClick)="itemClick(item.key)"
[active]="item.key === activeKey"
Expand All @@ -22,7 +22,7 @@
</div>
</div>
<ng-template #leafTpl>
<div d-menu-item (itemClick)="itemClick(m.key)" [active]="m.key === activeKey" [disabled]="disabledKeys.includes(m.key)">
<div dMenuItem (itemClick)="itemClick(m.key)" [active]="m.key === activeKey" [disabled]="disabledKeys.includes(m.key)">
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name over-flow-ellipsis">{{ m.name }}</span>
</div>
Expand Down
8 changes: 4 additions & 4 deletions devui/menu/demo/custom-node/custom-node.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="demo-menu" style="width: 256px">
<div d-menu>
<div dMenu>
<ng-container *ngFor="let m of menus; trackBy: trackByMenu">
<!-- [noStyle]="true" 会完全移除预制样式 -->
<div
d-sub-menu
dSubMenu
[title]="titleTpl"
[icon]="m.icon"
[open]="openKeys.includes(m.key)"
Expand All @@ -24,7 +24,7 @@
</div>
-->
<div
d-menu-item
dMenuItem
(itemClick)="itemClick(item.key)"
[active]="item.key === activeKey"
*ngFor="let item of m.children; trackBy: trackByMenu"
Expand All @@ -35,7 +35,7 @@
</div>
<ng-template #leafTpl>
<!-- [noStyle]="true" 会完全移除预制样式 -->
<div d-menu-item (itemClick)="itemClick(m.key)" [active]="m.key === activeKey">
<div dMenuItem (itemClick)="itemClick(m.key)" [active]="m.key === activeKey">
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name over-flow-ellipsis">{{ m.name }}</span>
</div>
Expand Down
8 changes: 4 additions & 4 deletions devui/menu/demo/loop/loop-menu/loop-menu.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { MenuItemClickType, MenuItemType } from 'ng-devui/menu';

@Component({
selector: 'loop-menu',
selector: 'd-loop-menu',
template: `
<div d-menu [collapsed]="collapsed" (menuItemClick)="menuItemClick($event)">
<div dMenu [collapsed]="collapsed" (menuItemClick)="menuItemClick($event)">
<ng-container *ngFor="let item of menus; trackBy: trackByMenu">
<loop-sub-menu
<d-loop-sub-menu
[menu]="item"
[activeKey]="activeKey"
(itemClick)="itemClick($event)"
*ngIf="item.children?.length; else leafTpl" />
<ng-template #leafTpl>
<div
d-menu-item
dMenuItem
[active]="activeKey === item.key"
(itemClick)="itemClick(item.key)"
dTooltip [content]="collapsed ? item.name : ''" position="right">
Expand Down
8 changes: 4 additions & 4 deletions devui/menu/demo/loop/loop-menu/loop-sub-menu.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, OnI
import { MenuItemType } from 'ng-devui/menu';

@Component({
selector: 'loop-sub-menu',
selector: 'd-loop-sub-menu',
template: `
<div
d-sub-menu
dSubMenu
[title]="menu.name"
[icon]="menu.icon">
<ng-container *ngFor="let item of menu.children; trackBy: trackByMenu">
<loop-sub-menu [menu]="item" [activeKey]="activeKey" (itemClick)="onClick($event)" *ngIf="item.children?.length; else leafTpl" />
<d-loop-sub-menu [menu]="item" [activeKey]="activeKey" (itemClick)="onClick($event)" *ngIf="item.children?.length; else leafTpl" />
<ng-template #leafTpl>
<div d-menu-item [active]="activeKey === item.key" (itemClick)="onClick(item.key)">
<div dMenuItem [active]="activeKey === item.key" (itemClick)="onClick(item.key)">
<d-icon class="devui-menu-item-icon" *ngIf="item.icon" [icon]="item.icon" />
<span class="devui-menu-item-name over-flow-ellipsis">{{ item.name }}</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion devui/menu/demo/loop/loop.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="demo-menu" style="width: 256px">
<d-button (btnClick)="collapsed = !collapsed" style="margin-bottom: 10px">{{ collapsed ? 'open' : 'close' }}</d-button>
<loop-menu [menus]="menus" [collapsed]="collapsed" />
<d-loop-menu [menus]="menus" [collapsed]="collapsed" />
</div>
8 changes: 4 additions & 4 deletions devui/menu/demo/open-close/open-close.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div class="demo-menu" style="width: 256px">
<d-button (btnClick)="collapsed = !collapsed" style="margin-bottom: 10px">{{ collapsed ? 'open' : 'close' }}</d-button>
<div d-menu [collapsed]="collapsed">
<div dMenu [collapsed]="collapsed">
<ng-container *ngFor="let m of menus; trackBy: trackByMenu">
<div
d-sub-menu
dSubMenu
[title]="m.name"
[icon]="m.icon"
[open]="openKeys.includes(m.key)"
(openChange)="openChange($event, m.key)"
*ngIf="m.children?.length; else leafTpl"
>
<div
d-menu-item
dMenuItem
(itemClick)="itemClick(item.key)"
[active]="item.key === activeKey"
*ngFor="let item of m.children; trackBy: trackByMenu"
Expand All @@ -22,7 +22,7 @@
</div>
<ng-template #leafTpl>
<div
d-menu-item
dMenuItem
(itemClick)="itemClick(m.key)"
[active]="m.key === activeKey"
dTooltip
Expand Down
8 changes: 4 additions & 4 deletions devui/menu/demo/open-one/open-one.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<div class="demo-menu" style="width: 256px">
<div d-menu>
<div dMenu>
<ng-container *ngFor="let m of menus; trackBy: trackByMenu">
<div
d-sub-menu
dSubMenu
[icon]="m.icon"
[title]="m.name"
[open]="openKey === m.key"
(openChange)="openChange($event, m.key)"
*ngIf="m.children?.length; else leafTpl"
>
<div
d-menu-item
dMenuItem
(itemClick)="itemClick(item.key)"
[active]="item.key === activeKey"
*ngFor="let item of m.children; trackBy: trackByMenu"
Expand All @@ -20,7 +20,7 @@
</div>
</div>
<ng-template #leafTpl>
<div d-menu-item (itemClick)="itemClick(m.key)" [active]="m.key === activeKey">
<div dMenuItem (itemClick)="itemClick(m.key)" [active]="m.key === activeKey">
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name over-flow-ellipsis">{{ m.name }}</span>
</div>
Expand Down
24 changes: 12 additions & 12 deletions devui/menu/doc/api-cn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ import { MenuModule } from 'ng-devui/menu';
在页面中使用:

```html
<div d-menu>
<div d-menu-item>
<div dMenu>
<div dMenuItem>
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name">menu item 1</span>
</div>
<div d-sub-menu title="sub menu" icon="icon-more-func">
<div d-menu-item>
<div dSubMenu title="sub menu" icon="icon-more-func">
<div dMenuItem>
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name">sub menu item 1</span>
</div>
<div d-menu-item>
<div dMenuItem>
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name">sub menu item 2</span>
</div>
</div>
<div d-menu-item>
<div dMenuItem>
<d-icon class="devui-menu-item-icon" icon="icon-op-list" />
<span class="devui-menu-item-name">menu item 3</span>
</div>
Expand All @@ -33,20 +33,20 @@ import { MenuModule } from 'ng-devui/menu';

## Menu

### d-menu 参数
### dMenu 参数

| 参数 | 类型 | 默认 | 说明 | 跳转 Demo |全局配置项|
| :----------------: | :----------------: | :---------------------------------------------------: | :--------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -------------------------------------------------------------- |
| collapsed | `boolean` | false | 是否收起 | [展开收起](demo#open-close) |

### d-menu 事件
### dMenu 事件

| 事件 | 类型 | 说明 | 跳转 Demo |
| :--------------: | :-----------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------: | ---------------------------- |
| menuItemClick | [MenuItemClickType](#menutype定义) | 可选，menu item点击事件，参数是d-menu-item自身的指令和原生MouseEvent | [基本用法](demo#basic-usage) | | [基本用法](demo#basic-usage) |


### d-sub-menu 参数
### dSubMenu 参数

| 参数 | 类型 | 默认 | 说明 | 跳转 Demo |全局配置项|
| :----------------: | :----------------: | :---------------------------------------------------: | :--------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -------------------------------------------------------------- |
Expand All @@ -56,21 +56,21 @@ import { MenuModule } from 'ng-devui/menu';
| disabled | `boolean` | false | 是否禁用 | |
| icon | `string` | '' | 图标 | |

### d-sub-menu 事件
### dSubMenu 事件

| 事件 | 类型 | 说明 | 跳转 Demo |
| :--------------: | :-----------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------: | ---------------------------- |
| openChange | `boolean` | 展开收起事件 | | |

### d-menu-item 参数
### dMenuItem 参数

| 参数 | 类型 | 默认 | 说明 | 跳转 Demo |全局配置项|
| :----------------: | :----------------: | :---------------------------------------------------: | :--------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -------------------------------------------------------------- |
| active | `boolean` | false | 是否选中 | |
| noStyle | `boolean` | false | 是否移除所有预制样式 | |
| disabled | `boolean` | false | 是否禁用 | |

### d-menu-item 事件
### dMenuItem 事件

| 事件 | 类型 | 说明 | 跳转 Demo |
| :--------------: | :-----------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------: | ---------------------------- |
Expand Down
Loading