Edit menu search box to show its category and Popup to show its category on the title

minjk-bl · minjk-bl · commit ff99abe0ff8f · 2023-02-28T17:00:51.000+09:00
diff --git a/visualpython/js/MainFrame.js b/visualpython/js/MainFrame.js
@@ -478,10 +478,10 @@ define([
                     let parentBlock = null;
                     let prevBlock = null;
                     loadStateList.forEach(obj => {
-                        let { blockType, menuId, menuState, menuConfig, argIdx, position, afterAction } = obj;
+                        let { file, blockType, menuId, menuState, menuConfig, argIdx, position, afterAction } = obj;
                         // get OptionComponent Object
                         // LAB: relative path needed
-                        let OptionComponent = require('./' + menuConfig.file);
+                        let OptionComponent = require('./' + file);
                         if (OptionComponent) {
                             let taskState = menuState.taskState;
                             let blockState = menuState.blockState;
diff --git a/visualpython/js/com/component/PopupComponent.js b/visualpython/js/com/component/PopupComponent.js
@@ -92,6 +92,7 @@ define([
             this.id = this.state.config.id;
             this.name = this.state.config.name;
             this.path = this.state.config.path;
+            this.category = this.state.config.category;
             
 
             this.config = {
@@ -530,7 +531,8 @@ define([
         template() { 
             this.$pageDom = $(popupComponentHtml.replaceAll('${vp_base}', com_Const.BASE_PATH));
             // set title
-            this.$pageDom.find('.vp-popup-title').text(this.name);
+            // this.$pageDom.find('.vp-popup-title').text(this.category + ' > ' + this.name);
+            this.$pageDom.find('.vp-popup-title').html(`<span style="color: var(--gray-color);font-size: 12px;">${this.category} > </span><span>${this.name}</span>`);
             // set body
             let bodyTemplate = this.templateForBody();
             // CHROME: check url keyword and replace it
diff --git a/visualpython/js/menu/MenuFrame.js b/visualpython/js/menu/MenuFrame.js
@@ -199,19 +199,19 @@ define([
             return {};
         }
         
-        getMenuLibrary(menuId, libraries=this.menuLibraries) {
+        getMenuLibrary(menuId, libraries=this.menuLibrariesFlatten) {
             for (var i=0; i < libraries.length; i++) {
                 var item = libraries[i];
                 if (item) {
                     if (item.id === menuId) {
                         return item;
                     }
-                    if (item.type === 'package') {
-                        var result = this.getMenuLibrary(menuId, item.item);
-                        if (result) {
-                            return result;
-                        }
-                    }
+                    // if (item.type === 'package') {
+                    //     var result = this.getMenuLibrary(menuId, item.item);
+                    //     if (result) {
+                    //         return result;
+                    //     }
+                    // }
                 }
             }
             return null;
@@ -243,7 +243,12 @@ define([
             var that = this;
             var body = group.getBody();
             var item = group.getItem();
+            var state = group.getState();
             item && item.forEach(child => {
+                // remember parent to navigate its parent menu
+                var category = state.category?(state.category + ' > ' + state.name):state.name;
+                child['category'] = category;
+
                 if (child.type == 'package') {
                     // packages : MenuGroup
                     var menuGroup = new MenuGroup($(body), child);
@@ -289,7 +294,7 @@ define([
             });
 
             let functionList = this.menuLibrariesFlatten.map(menu => {
-                return { label: menu.name, value: menu.name, ...menu }
+                return { label: menu.name, value: menu.name, dtype: menu.category, ...menu }
             });
             // render searchbox
             let searchBox = new SuggestInput();
