Add Text checkbox on Reshape - melt page

minjk-bl · minjk-bl · commit 369444dbdcf8 · 2022-06-08T13:00:02.000+09:00
diff --git a/html/m_apps/reshape.html b/html/m_apps/reshape.html
@@ -59,10 +59,12 @@
             <div>
                 <label for="vp_rsVarName" class="w100">Var name</label>
                 <input type="text" id="vp_rsVarName" class="vp-state" data-key="melt.varName" placeholder="Var name">
+                <label><input type="checkbox" id="varNameText" class="vp-state" data-key="melt.varNameText" checked/><span>Text</span></label>
             </div>
             <div>
                 <label for="vp_rsValueName" class="w100">Value name</label>
                 <input type="text" id="vp_rsValueName" class="vp-state" data-key="melt.valueName" placeholder="Value name">
+                <label><input type="checkbox" id="valueNameText" class="vp-state" data-key="melt.valueNameText" checked/><span>Text</span></label>
             </div>
         </div>
         <hr style="margin: 5px 0;">
diff --git a/js/m_apps/Reshape.js b/js/m_apps/Reshape.js
@@ -45,7 +45,9 @@ define([
                     idVars: [],
                     ValueVars: [],
                     varName: '',
-                    valueName: ''
+                    varNameText: true,
+                    valueName: '',
+                    valueNameText: true
                 },
                 userOption: '',
                 allocateTo: '',
@@ -304,7 +306,9 @@ define([
             this._loadColumnSelectorInput(this.wrapSelector('#vp_rsIdVars'), melt.idVars);
             this._loadColumnSelectorInput(this.wrapSelector('#vp_rsValueVars'), melt.valueVars);
             $(this.wrapSelector('#vp_rsVarName')).val(melt.varName);
+            $(this.wrapSelector('#varNameText')).prop('checked', melt.varNameText);
             $(this.wrapSelector('#vp_rsValueName')).val(melt.valueName);
+            $(this.wrapSelector('#valueNameText')).prop('checked', melt.valueNameText);
 
             // userOption
             $(this.wrapSelector('#vp_rsUserOption')).val(userOption);
@@ -520,12 +524,12 @@ define([
 
                 // var name (optional)
                 if (melt.varName) {
-                    options.push(com_util.formatString("var_name='{0}'", melt.varName));
+                    options.push(com_util.formatString("var_name={0}", com_util.convertToStr(melt.varName, melt.varNameText)));
                 }
 
                 // value name (optional)
-                if (melt.varName) {
-                    options.push(com_util.formatString("value_name='{0}'", melt.valueName));
+                if (melt.valueName) {
+                    options.push(com_util.formatString("value_name={0}", com_util.convertToStr(melt.valueName, melt.valueNameText)));
                 }
             }
 
