From f93e2be93dc78da3de0bb0f40a60721733b3c1de Mon Sep 17 00:00:00 2001 From: mertsincan Date: Tue, 18 Apr 2023 13:50:13 +0300 Subject: [PATCH 1/4] Refactor #3832 Refactor #3833 - Update icons --- components/lib/megamenu/MegaMenuSub.vue | 11 ++++++++--- components/lib/menu/Menuitem.vue | 6 ++++-- components/lib/menubar/Menubar.d.ts | 4 ++-- components/lib/menubar/Menubar.vue | 4 ++-- components/lib/menubar/MenubarSub.vue | 11 ++++++++--- .../lib/organizationchart/OrganizationChartNode.vue | 3 ++- components/lib/panelmenu/PanelMenu.vue | 6 ++++-- components/lib/panelmenu/PanelMenuSub.vue | 11 ++++++++--- components/lib/speeddial/SpeedDial.vue | 6 ++++-- components/lib/splitbutton/SplitButton.vue | 8 +++++++- components/lib/tabmenu/TabMenu.vue | 6 ++++-- components/lib/tag/Tag.vue | 3 ++- components/lib/tieredmenu/TieredMenuSub.vue | 11 ++++++++--- components/lib/togglebutton/ToggleButton.vue | 6 ++++-- components/lib/tree/Tree.vue | 3 ++- components/lib/tree/TreeNode.vue | 7 +++++-- components/lib/treetable/BodyCell.vue | 7 +++++-- 17 files changed, 79 insertions(+), 34 deletions(-) diff --git a/components/lib/megamenu/MegaMenuSub.vue b/components/lib/megamenu/MegaMenuSub.vue index 2c7fbc615..143b0a571 100644 --- a/components/lib/megamenu/MegaMenuSub.vue +++ b/components/lib/megamenu/MegaMenuSub.vue @@ -20,14 +20,19 @@ diff --git a/components/lib/menu/Menuitem.vue b/components/lib/menu/Menuitem.vue index 6ab38c739..b6f3cbac9 100644 --- a/components/lib/menu/Menuitem.vue +++ b/components/lib/menu/Menuitem.vue @@ -4,12 +4,14 @@ diff --git a/components/lib/menubar/Menubar.d.ts b/components/lib/menubar/Menubar.d.ts index e2a33e07d..bd1e688c3 100755 --- a/components/lib/menubar/Menubar.d.ts +++ b/components/lib/menubar/Menubar.d.ts @@ -61,9 +61,9 @@ export interface MenubarSlots { item: MenuItem; }): VNode[]; /** - * Custom bar icon template. + * Custom popup icon template on responsive mode. */ - baricon(): VNode[]; + popupicon(): VNode[]; /** * Custom submenu icon template. */ diff --git a/components/lib/menubar/Menubar.vue b/components/lib/menubar/Menubar.vue index d2ac8e8bd..09466c067 100755 --- a/components/lib/menubar/Menubar.vue +++ b/components/lib/menubar/Menubar.vue @@ -17,8 +17,8 @@ @keydown="menuButtonKeydown($event)" v-bind="buttonProps" > - - + + diff --git a/components/lib/organizationchart/OrganizationChartNode.vue b/components/lib/organizationchart/OrganizationChartNode.vue index 0cc1b7fac..b7b1ef0ff 100755 --- a/components/lib/organizationchart/OrganizationChartNode.vue +++ b/components/lib/organizationchart/OrganizationChartNode.vue @@ -6,7 +6,8 @@
- + +
diff --git a/components/lib/panelmenu/PanelMenu.vue b/components/lib/panelmenu/PanelMenu.vue index 547c9ea5a..615fb8ee9 100644 --- a/components/lib/panelmenu/PanelMenu.vue +++ b/components/lib/panelmenu/PanelMenu.vue @@ -18,7 +18,8 @@ diff --git a/components/lib/panelmenu/PanelMenuSub.vue b/components/lib/panelmenu/PanelMenuSub.vue index 277110132..3c84b2bbc 100755 --- a/components/lib/panelmenu/PanelMenuSub.vue +++ b/components/lib/panelmenu/PanelMenuSub.vue @@ -17,13 +17,18 @@ diff --git a/components/lib/speeddial/SpeedDial.vue b/components/lib/speeddial/SpeedDial.vue index a2920299c..8de4d2c1d 100644 --- a/components/lib/speeddial/SpeedDial.vue +++ b/components/lib/speeddial/SpeedDial.vue @@ -14,8 +14,10 @@ :aria-labelledby="ariaLabelledby" >
diff --git a/components/lib/splitbutton/SplitButton.vue b/components/lib/splitbutton/SplitButton.vue index 0e0a8eae3..e01248055 100755 --- a/components/lib/splitbutton/SplitButton.vue +++ b/components/lib/splitbutton/SplitButton.vue @@ -1,7 +1,13 @@ @@ -27,7 +28,8 @@
  • diff --git a/components/lib/tag/Tag.vue b/components/lib/tag/Tag.vue index 39304c312..259288a81 100644 --- a/components/lib/tag/Tag.vue +++ b/components/lib/tag/Tag.vue @@ -1,6 +1,7 @@ @@ -149,7 +151,7 @@ export default { return this.onLabel && this.onLabel.length > 0 && this.offLabel && this.offLabel.length > 0; }, hasIcon() { - return this.onIcon && this.onIcon.length > 0 && this.offIcon && this.offIcon.length > 0; + return this.$slots.icon || (this.onIcon && this.offIcon); }, label() { return this.hasLabel ? (this.modelValue ? this.onLabel : this.offLabel) : ' '; diff --git a/components/lib/tree/Tree.vue b/components/lib/tree/Tree.vue index 74b74823a..5b350a9bb 100755 --- a/components/lib/tree/Tree.vue +++ b/components/lib/tree/Tree.vue @@ -3,7 +3,8 @@ diff --git a/components/lib/tree/TreeNode.vue b/components/lib/tree/TreeNode.vue index 13b71afb8..cc3cf81fc 100755 --- a/components/lib/tree/TreeNode.vue +++ b/components/lib/tree/TreeNode.vue @@ -15,11 +15,14 @@ >
    diff --git a/components/lib/treetable/BodyCell.vue b/components/lib/treetable/BodyCell.vue index 7f14530fd..37292c518 100644 --- a/components/lib/treetable/BodyCell.vue +++ b/components/lib/treetable/BodyCell.vue @@ -1,14 +1,17 @@