Edit Instance app to support more libraries option

minjk-bl · minjk-bl · commit 00ee8e52ee23 · 2023-04-04T16:18:18.000+09:00
diff --git a/visualpython/html/m_apps/instance.html b/visualpython/html/m_apps/instance.html
@@ -21,7 +21,7 @@
             <div class="vp-bold">
                 <span class="vp-instance-preview-title">Instance Preview</span>
             </div>
-            <div class="vp-instance-preview-box vp-grid-border-box">
+            <div class="vp-instance-preview-box vp-grid-border-box vp-scrollbar">
                 <div id="instancePreview" class="vp-instance-preview-content rendered_html vp-center"></div>
             </div>
         </div>
diff --git a/visualpython/js/com/com_generatorV2.js b/visualpython/js/com/com_generatorV2.js
@@ -785,6 +785,13 @@ define([
             if (code.startsWith(' = ')) {
                 code = code.substr(3);
             } 
+            // prevent code: without allocation code (${o0} = code)
+            let outputCodeMatch = code.match(/^\$\{.+\} = /);
+            if (outputCodeMatch) {
+                let matchLength = outputCodeMatch[0].length;
+                let matchStartIdx = outputCodeMatch['index'];
+                code = code.substr(matchStartIdx + matchLength);
+            }
             // show_result 
             // get output variables
             if (_VP_SHOW_RESULT && package.options) {
diff --git a/visualpython/js/com/component/InstanceEditor.js b/visualpython/js/com/component/InstanceEditor.js
@@ -338,6 +338,7 @@ define([
 
                 var varType = varObj.type;
                 var varList = varObj.list;
+                var prevVarType = that.state.type;
 
                 that.state.type = varType;
                 that.state.list = varList;
@@ -437,22 +438,24 @@ define([
                         // get target code
                         var methodName = lastSplit.match(/[a-zA-Z_]+/i)[0];
                         var targetCode = splitList.slice(0, splitList.length - 1).join('.');
-                        if ((varType in instanceLibrary.INSTANCE_MATCHING_LIBRARY) && (methodName in instanceLibrary.INSTANCE_MATCHING_LIBRARY[varType])) {
+                        if ((prevVarType in instanceLibrary.INSTANCE_MATCHING_LIBRARY) && (methodName in instanceLibrary.INSTANCE_MATCHING_LIBRARY[prevVarType])) {
                             // get target library
-                            var targetLib = instanceLibrary.INSTANCE_MATCHING_LIBRARY[varType][methodName];
+                            var targetLib = instanceLibrary.INSTANCE_MATCHING_LIBRARY[prevVarType][methodName];
                             var targetId = targetLib.target;
                             that.optionPopup = new LibraryComponent({ 
                                 [targetId]: targetCode,
                                 config: { 
                                     name: methodName, category: 'Instance',
+                                    id: targetLib.id,
                                     saveOnly: true,
-                                    id: targetLib.id
+                                    noOutput: true
                                 } 
                             },
                             { 
                                 pageThis: that,
                                 useInputVariable: true,
                                 targetSelector: that.pageThis.wrapSelector('#' + that.targetId),
+
                                 finish: function(code) {
                                     // TODO: save state
 
@@ -475,7 +478,7 @@ define([
                             // remove first/last brackets
                             var parameter = lastBracket.substr(1, lastBracket.length - 2);
                             $(that.wrapSelector('.' + VP_INS_PARAMETER)).val(parameter);
-                            $(that.wrapSelector('.' + VP_INS_PARAMETER)).show();
+                            $(that.wrapSelector('.' + VP_INS_PARAMETER)).prop('disabled', false);
                             if (hasOption) {
                                 if ($(that.wrapSelector('.vp-ins-opt-button')).hasClass('disabled')) {
                                     $(that.wrapSelector('.vp-ins-opt-button')).removeClass('disabled');
@@ -487,13 +490,13 @@ define([
                             }
                         } else {
                             $(that.wrapSelector('.' + VP_INS_PARAMETER)).val('');
-                            $(that.wrapSelector('.' + VP_INS_PARAMETER)).hide();
+                            $(that.wrapSelector('.' + VP_INS_PARAMETER)).prop('disabled', true);
                             if (!$(that.wrapSelector('.vp-ins-opt-button')).hasClass('disabled')) {
                                 $(that.wrapSelector('.vp-ins-opt-button')).addClass('disabled');
                             }
                         }
                     } else {
-                        $(that.wrapSelector('.' + VP_INS_PARAMETER)).hide();
+                        $(that.wrapSelector('.' + VP_INS_PARAMETER)).prop('disabled', true);
                         if (!$(that.wrapSelector('.vp-ins-opt-button')).hasClass('disabled')) {
                             $(that.wrapSelector('.vp-ins-opt-button')).addClass('disabled');
                         }
diff --git a/visualpython/js/com/component/LibraryComponent.js b/visualpython/js/com/component/LibraryComponent.js
@@ -132,6 +132,10 @@ define([
 
             // show interface
             // com_generator.vp_showInterfaceOnPage(this.wrapSelector(), this.package);
+            if (this.config.noOutput && this.config.noOutput === true) {
+                // no allocateTo
+                this.package.options = this.package.options.filter(x => x.output != true);
+            }
             com_generatorV2.vp_showInterfaceOnPage(this, this.package, this.state);
 
             // hide required page if no options
