bug fix

minjk-bl · minjk-bl · commit a33b8d3fc09b · 2022-02-03T03:39:48.000+09:00
diff --git a/data/m_library/numpyLibrary.js b/data/m_library/numpyLibrary.js
@@ -1864,7 +1864,7 @@ define([
             "name": "equal",
             "library": "numpy",
             "description": "",
-            "code": "${o0} = np.equal(${i0}, ${i1}${dtype})",
+            "code": "${o0} = np.equal(${i0}, ${i1})",
             "options": [
                 {
                     "name": "i0",
@@ -1899,7 +1899,7 @@ define([
             "name": "greater",
             "library": "numpy",
             "description": "",
-            "code": "${o0} = np.greater(${i0}, ${i1}${dtype})",
+            "code": "${o0} = np.greater(${i0}, ${i1})",
             "options": [
                 {
                     "name": "i0",
@@ -1934,7 +1934,7 @@ define([
             "name": "greater_equal",
             "library": "numpy",
             "description": "",
-            "code": "${o0} = np.greater_equal(${i0}, ${i1}${dtype})",
+            "code": "${o0} = np.greater_equal(${i0}, ${i1})",
             "options": [
                 {
                     "name": "i0",
@@ -1969,7 +1969,7 @@ define([
             "name": "less",
             "library": "numpy",
             "description": "",
-            "code": "${o0} = np.less(${i0}, ${i1}${dtype})",
+            "code": "${o0} = np.less(${i0}, ${i1})",
             "options": [
                 {
                     "name": "i0",
@@ -2004,7 +2004,7 @@ define([
             "name": "less_equal",
             "library": "numpy",
             "description": "",
-            "code": "${o0} = np.less_equal(${i0}, ${i1}${dtype})",
+            "code": "${o0} = np.less_equal(${i0}, ${i1})",
             "options": [
                 {
                     "name": "i0",
diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js
@@ -38,6 +38,10 @@ define([
     }
 
     const _VP_NP_DTYPES = [
+        {
+            name: 'Default',
+            value: ''
+        },
         {
             name: 'None',
             value: 'None'
@@ -185,7 +189,7 @@ define([
         }
         // render content
         let contentTag = $('<div class="vp-auto-component-content"></div>');
-        contentTag.append(renderContent(pageThis, componentType, obj, value, state));
+        contentTag.append(renderContent(pageThis, componentType, obj, state));
         tblContent.append(contentTag);
         
         tblRow.append(tblLabel);
@@ -489,7 +493,7 @@ define([
         try {
             package.options && package.options.forEach(function(v, i) {
                 var val = state[v.name];
-                if (val == undefined) {
+                if (val == undefined || val == '') {
                     val = vp_getTagValue(pageThis, v);
                 }
                 var id = '${' + v.name + '}';
@@ -847,15 +851,15 @@ define([
         if (obj.placeholder) {
             placeholder = obj.placeholder;
         }
-        return $(`<input class="vp-input vp-state" placeholder="${placeholder}" value="${state[obj.name]}"/>`);
+        return $(`<input class="vp-input vp-state" id="${obj.name}" placeholder="${placeholder}" value="${state[obj.name]}"/>`);
     }
 
     var renderParam = function(pageThis, obj, defaultValue) {
         let placeholder = 'Input Param';
         if (obj.placeholder) {
             placeholder = obj.placeholder;
         }
-        return $(`<input class="vp-input vp-state" placeholder="${placeholder}" value="${state[obj.name]}"/>`);
+        return $(`<input class="vp-input vp-state" id="${obj.name}" placeholder="${placeholder}" value="${state[obj.name]}"/>`);
     }
 
     var renderDtypeSelector = function(pageThis, obj, defaultValue) {
@@ -889,8 +893,6 @@ define([
             let contentTag = $(this).parent().find('.vp-auto-component-content');
             let newType = $(this).val();
             let obj = $(this).data('obj');
-            // reset state
-            pageThis.setState({ [obj.name]: '' });
             $(contentTag).html(renderContent(pageThis, newType, obj, pageThis.getState()));
         }); 
 
@@ -992,7 +994,10 @@ define([
             let row = $(this).parent().find('.vp-numpy-2darr-set-row').val();
             let col = $(this).parent().find('.vp-numpy-2darr-set-col').val();
             // update state
-            let state = Array(parseInt(row)).fill(Array(parseInt(col)).fill(0));
+            let state = Array(parseInt(row));
+            for (let i = 0; i < state.length; i++) {
+                state[i] = Array(parseInt(col)).fill(0);
+            }
             pageThis.setState({ [arrId]: state });
             pageThis.setState({ [id]: `[${state.map(ele => '[' + ele.join(',') + ']').join(',')}]` });
             // re-render
@@ -1060,7 +1065,10 @@ define([
             // update state
             let state = pageThis.getState(arrId);
             if (!state) {
-                state = Array(rowIdx + 1).fill([]);
+                state = Array(rowIdx + 1);
+                for (let i = 0; i < state.length; i++) {
+                    state[i] = [];
+                }
             }
             state[rowIdx].push(0);
             pageThis.setState({ [arrId]: state });
diff --git a/js/com/component/NumpyComponent.js b/js/com/component/NumpyComponent.js
@@ -129,7 +129,7 @@ define([
             super.render();
 
             // show interface
-            com_generatorV2.vp_showInterfaceOnPage(this, this.package);
+            com_generatorV2.vp_showInterfaceOnPage(this, this.package, this.state);
 
             // hide optional page if no options
             if ($.trim($(this.wrapSelector('#vp_optionBox table tbody')).html())=='') {
