From 6da9c011047a0e96e5b23cfbb9d2592d0bbd188a Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 20 Feb 2023 10:00:43 +0800 Subject: [PATCH 1/4] * Code for add js to module/langItem . --- module/block/view/preference.html.php | 2 +- module/dev/css/langitem.css | 5 +++-- module/dev/js/langitem.js | 18 ++++++++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/module/block/view/preference.html.php b/module/block/view/preference.html.php index 3f93a22484..406ca41e13 100644 --- a/module/block/view/preference.html.php +++ b/module/block/view/preference.html.php @@ -204,4 +204,4 @@ $(function() initPreference(); }) - \ No newline at end of file + diff --git a/module/dev/css/langitem.css b/module/dev/css/langitem.css index 98b680089f..bc9dc7b982 100644 --- a/module/dev/css/langitem.css +++ b/module/dev/css/langitem.css @@ -12,10 +12,11 @@ /* menu-tree */ .menu-tree {flex: 0 0 200px; background: #fff; padding: 10px 10px;} .menu-tree > .tree {padding-top: 20px;} -.menu-tree li {padding: 5px 25px;} +li.has-list > ul > li {padding-left: 10px;} +.tree ul {margin-bottom: 0;} /* side-left */ -.main-content > .side-left {flex: 0 0 160px; margin-left: 64px;} +.main-content > .side-left {flex: 0 0 160px; margin-left: 44px;} .label-list {background: #F8F8F8; padding: 5px 0;} .label-list > .input-label {display: flex; align-items: center; cursor: pointer; padding-left: 40px;} diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js index 4a9c7a3742..190a309766 100644 --- a/module/dev/js/langitem.js +++ b/module/dev/js/langitem.js @@ -48,9 +48,14 @@ $(function() { $('#menuTree').tree( { - data: menuTree + data: menuTree, + itemCreator: function($li, item) + { + $li.append($('', {href: item.url}).text(item.title)); + } }); } + $('.menu-tree .search-input').on('input', function() { var val = $(this).val(); @@ -77,10 +82,19 @@ $(function() } item.children = children; } - updateData.push(item); + if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)) ) + { + updateData.push(item); + } } } $('#menuTree').data('zui.tree').reload(updateData); }) + + $('#menuTree').on('click', 'a', function(e) + { + var clickTarget = e.target; + debugger; + }) } }) From d229986cffee9b09ebaaac72a01373960f281a5b Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 20 Feb 2023 11:14:40 +0800 Subject: [PATCH 2/4] * Code for add js to module dev/langItem . --- module/dev/js/langitem.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js index 190a309766..5995f2a40d 100644 --- a/module/dev/js/langitem.js +++ b/module/dev/js/langitem.js @@ -51,7 +51,7 @@ $(function() data: menuTree, itemCreator: function($li, item) { - $li.append($('', {href: item.url}).text(item.title)); + $li.append($('', {href: item.url}).text(item.title)); } }); } @@ -93,8 +93,12 @@ $(function() $('#menuTree').on('click', 'a', function(e) { - var clickTarget = e.target; - debugger; + var target = $(e.target); + if (target.attr('data-has-children') === 'true') + { + return; + } + self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method')); }) } }) From 684fa3557ccdeff110cab42cba4fdfe33bfeabd9 Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 20 Feb 2023 11:16:41 +0800 Subject: [PATCH 3/4] * Code refactors in preference.html.php . --- module/block/view/preference.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/block/view/preference.html.php b/module/block/view/preference.html.php index 406ca41e13..e55c9bde39 100644 --- a/module/block/view/preference.html.php +++ b/module/block/view/preference.html.php @@ -205,3 +205,4 @@ $(function() }) + From cbf26f0ef1b3cee18f51978d49cb3a5d28ca553b Mon Sep 17 00:00:00 2001 From: guofeilong Date: Mon, 20 Feb 2023 13:46:27 +0800 Subject: [PATCH 4/4] * Code for langItem module refactors . --- module/dev/js/langitem.js | 10 ++++------ module/dev/view/langitem.html.php | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/module/dev/js/langitem.js b/module/dev/js/langitem.js index 5995f2a40d..28d63e0312 100644 --- a/module/dev/js/langitem.js +++ b/module/dev/js/langitem.js @@ -51,7 +51,7 @@ $(function() data: menuTree, itemCreator: function($li, item) { - $li.append($('', {href: item.url}).text(item.title)); + $li.append('' + item.title + ''); } }); } @@ -82,7 +82,7 @@ $(function() } item.children = children; } - if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val)) ) + if (item.children.length || item.title.includes(val) ||(item.key && item.key.includes(val))) { updateData.push(item); } @@ -94,10 +94,8 @@ $(function() $('#menuTree').on('click', 'a', function(e) { var target = $(e.target); - if (target.attr('data-has-children') === 'true') - { - return; - } + if (target.attr('data-has-children') === 'true') return + self.location.href = createLink('dev', 'langItem', 'type=' + type + '&module=' + target.attr('data-module') + '&method=' + target.attr('data-method')); }) } diff --git a/module/dev/view/langitem.html.php b/module/dev/view/langitem.html.php index b9d3fc4d37..f1de76bee7 100644 --- a/module/dev/view/langitem.html.php +++ b/module/dev/view/langitem.html.php @@ -30,7 +30,7 @@ - +