Frame, Subset style, operation detail fix

minjk-bl · minjk-bl · commit 32afd57b1020 · 2021-08-17T18:26:21.000+09:00
diff --git a/src/common/vpFrameEditor.js b/src/common/vpFrameEditor.js
@@ -1647,6 +1647,8 @@ define([
         }
         if (isText) {
             newCode = newCode + "'" + code + "'";
+        } else {
+            newCode = code;
         }
         return newCode;
     }
diff --git a/src/common/vpSubsetEditor.js b/src/common/vpSubsetEditor.js
@@ -316,7 +316,7 @@ define([
         popupTag.appendLine('</div>'); // VP_DS_ROWTYPE_BOX
 
         // condition box start
-        popupTag.appendFormatLine('<div class="{0} {1} {2}" style="display:none;">', VP_DS_ROWTYPE_BOX, 'condition', 'no-selection');
+        popupTag.appendFormatLine('<div class="{0} {1} {2} {3}" style="display:none;">', VP_DS_ROWTYPE_BOX, 'condition', 'vp-apiblock-scrollbar', 'no-selection');
         // row condition
         // popupTag.appendFormatLine('<label class="{0}">{1}</label>'
         //                         , '', 'Conditional Subset');
@@ -650,8 +650,8 @@ define([
         var that = this;
         var tag = new sb.StringBuilder();
         tag.appendFormatLine('<div class="{0}">', VP_DS_SLICING_BOX);
-        tag.appendFormatLine('<label class="{0}">{1}</label>'
-                                , '', 'Slice');
+        // tag.appendFormatLine('<label class="{0}">{1}</label>'
+        //                         , '', 'Slice');
         // tag.appendFormatLine('<input type="text" class="{0} {1}" placeholder="{2}"/> : ', VP_DS_COL_SLICE_START, 'vp-input m', 'start');
         // tag.appendFormatLine('<input type="text" class="{0} {1}" placeholder="{2}"/>', VP_DS_COL_SLICE_END, 'vp-input m', 'end');
         var vpColStart = new vpSuggestInputText.vpSuggestInputText();

Original file line number	Diff line number	Diff line change
`@@ -1647,6 +1647,8 @@ define([`
`1647`	`1647`	`}`
`1648`	`1648`	`if (isText) {`
`1649`	`1649`	`newCode = newCode + "'" + code + "'";`
	`1650`	`+ } else {`
	`1651`	`+ newCode = code;`
`1650`	`1652`	`}`
`1651`	`1653`	`return newCode;`
`1652`	`1654`	`}`