From 1b3f005fad327de3bd8ac61d8574e9fedc655806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enis=20Necipo=C4=9Flu?= Date: Wed, 9 Jun 2021 08:58:44 +0300 Subject: [PATCH] CmsKit - Fix ContextMenu for MenuItems --- .../Pages/CmsKit/Menus/MenuItems/Index.cshtml | 17 +++++ .../Pages/CmsKit/Menus/MenuItems/index.css | 1 + .../Pages/CmsKit/Menus/MenuItems/index.js | 74 +++++++++---------- 3 files changed, 54 insertions(+), 38 deletions(-) create mode 100644 modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.css diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/Index.cshtml index 2ee4ce2d0c..9292a0d31a 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/Index.cshtml @@ -20,6 +20,7 @@ @section styles { + } @@ -34,12 +35,28 @@ @await Component.InvokeAsync(typeof(AbpPageToolbarViewComponent), new { pageName = typeof(IndexModel).FullName }) } +
+ + +
+ +
+
@L["MenuItems"] +
@L["NoMenuItems"]
 diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.css b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.css new file mode 100644 index 0000000000..96d353478b --- /dev/null +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.css @@ -0,0 +1 @@ +.vakata-context { z-index:10052 !important; } \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js index f60be61e49..bd7916b605 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Menus/MenuItems/index.js @@ -94,7 +94,7 @@ $(function () { edit: { label: l('Edit'), icon: 'fa fa-pencil', - _disabled: abp.auth.isGranted('CmsKit.Menus.Items.Update'), + _disabled: !abp.auth.isGranted('CmsKit.Menus.Items.Update'), action: function (data) { var instance = $.jstree.reference(data.reference); @@ -108,7 +108,7 @@ $(function () { addSubMenuItem: { label: l('AddSubMenuItem'), icon: 'fa fa-plus', - _disabled: abp.auth.isGranted('CmsKit.Menus.Items.Create'), + _disabled: !abp.auth.isGranted('CmsKit.Menus.Items.Create'), action: function () { menuTree.addItem(node.id); } @@ -117,7 +117,7 @@ $(function () { 'delete': { label: l('Delete'), icon: 'fa fa-remove', - _disabled: abp.auth.isGranted('CmsKit.Menus.Items.Delete'), + _disabled: !abp.auth.isGranted('CmsKit.Menus.Items.Delete'), action: function (data) { var instance = $.jstree.reference(data.reference); @@ -146,7 +146,7 @@ $(function () { return items; }, - addItem: function (parentId) { + addItem: function () { var instance = $.jstree.reference(menuTree.$tree); createModal.open({ @@ -262,34 +262,34 @@ $(function () { multiple: false, check_callback: function (operation, node, node_parent, node_position, more) { return true; - }, - - contextmenu: { - items: menuTree.contextMenu, - 'select_node': false - }, - - //sort: function (node1, node2) { - // if (this.get_node(node2).original.displayName < this.get_node(node1).original.displayName) { - // return 1; - // } - - // return -1; - //}, - - plugins: [ - 'types', - 'contextmenu', - 'wholerow', - 'sort', - 'dnd' - ] - } + } + }, + + contextmenu: { + items: menuTree.contextMenu, + 'select_node': false + }, + + sort: function (node1, node2) { + if (this.get_node(node2).original.displayName < this.get_node(node1).original.displayName) { + return 1; + } + + return -1; + }, + + plugins: [ + 'types', + 'contextmenu', + 'wholerow', + 'sort', + 'dnd' + ] }); $('button[name=CreateMenuItem]').click(function (e) { e.preventDefault(); - createModal.open({ menuId: menuId }); + createModal.open({menuId: menuId}); }); createModal.onResult(function () { @@ -300,15 +300,13 @@ $(function () { menuTree.reload(); }); - //menuTree.$tree.on('click', '.ou-text .fa-caret-down', function (e) { - // e.preventDefault(); - // debugger; - // var id = $(this).closest('.ou-text').attr('data-menuitem-id'); - // setTimeout(function () { - // debugger; - // menuTree.$tree.jstree('show_contextmenu', id); - // }, 100); - //}); + menuTree.$tree.on('click', '.ou-text .fa-caret-down', function (e) { + e.preventDefault(); + var id = $(this).closest('.ou-text').attr('data-menuitem-id'); + setTimeout(function () { + menuTree.$tree.jstree('show_contextmenu', id); + }, 100); + }); }); }, @@ -371,7 +369,7 @@ $(function () { $('table>tbody>').find('input[type="checkbox"]').prop("checked", true); let selectedItems = $(`input[name="${selectedCheckboxNames}"]:checked`); selectedIds = []; - for (var i = 0; typeof (selectedItems[i]) != 'undefined'; selectedIds.push(selectedItems[i++].getAttribute('id'))); + for (var i = 0; typeof (selectedItems[i]) != 'undefined'; selectedIds.push(selectedItems[i++].getAttribute('id'))) ; }; const uncheckAndRemoveAll = function () {