Merge pull request #127 from visualpython/release

minjk-bl · web-flow · commit 13dd1028cd51 · 2022-04-09T17:23:16.000+09:00
Release v2.1.3 (Hotfix)
diff --git a/js/com/com_Config.js b/js/com/com_Config.js
@@ -462,7 +462,7 @@ define([
     /**
      * Version
      */
-    Config.version = "2.1.2";
+    Config.version = "2.1.3";
 
     /**
      * Type of mode
diff --git a/js/com/com_Const.js b/js/com/com_Const.js
@@ -19,7 +19,7 @@ define ([
     class Constants { }
 
     Constants.TOOLBAR_BTN_INFO = {
-        HELP: "Visual Python 2.1.2"
+        HELP: "Visual Python 2.1.3"
         , ICON: "vp-main-icon"
         , ID: "vpBtnToggle"
         , NAME: "toggle-vp"
diff --git a/js/com/com_generatorV2.js b/js/com/com_generatorV2.js
@@ -214,7 +214,9 @@ define([
         let content = '';
         let value = state[obj.name];
         if (value == undefined) {
-            if (obj.default != undefined) {
+            if (obj.value != undefined) {
+                value = obj.value;
+            } else if (obj.default != undefined) {
                 value = obj.default;
             } else {
                 value = '';
@@ -591,12 +593,9 @@ define([
         try {
             package.options && package.options.forEach(function(v, i) {
                 var val = state[v.name];
-                if (val == undefined || val == '') {
+                if (val == undefined || val == '' || val == v.default) {
                     val = vp_getTagValue(pageThis, v);
                 }
-                if (val == v.default) {
-                    val = '';
-                }
                 var id = '${' + v.name + '}';
                 if (val == undefined || val.trim() == '') {
                     if (v.required == true) {
diff --git a/js/com/component/ModelEditor.js b/js/com/component/ModelEditor.js
