Except block changed

minjk-bl · minjk-bl · commit 21a207fcdd6d · 2022-01-21T12:54:25.000+09:00
diff --git a/css/root.css b/css/root.css
@@ -288,6 +288,9 @@ hr.vp-extra-menu-line {
 .wp5 {
     width: 5% !important;
 }
+.w150 {
+    width: 150px !important;
+}
 .w100 {
     width: 100px !important;
 }
diff --git a/js/m_logic/Except.js b/js/m_logic/Except.js
@@ -31,13 +31,12 @@ define([
             this.state = {
                 v1: '',
                 v2: '',
-                v3: '',
                 ...this.state
             }
         }
 
         templateForBody() {
-            let { v1, v2, v3 } = this.state;
+            let { v1, v2 } = this.state;
             let page = new com_String();
             // suggestInput for operator
             let errorList = [ 
@@ -48,7 +47,7 @@ define([
             ];
             var suggestInput = new SuggestInput();
             suggestInput.setComponentID('v1');
-            suggestInput.addClass('vp-input vp-state w100 v1');
+            suggestInput.addClass('vp-input vp-state w150 v1');
             suggestInput.setSuggestList(function() { return errorList; });
             suggestInput.setPlaceholder('Error');
             suggestInput.setNormalFilter(false);
@@ -59,16 +58,16 @@ define([
                 $(this.wrapSelector()).trigger('change');
             });
             page.appendLine(suggestInput.toTagString());
+            page.appendLine('<label style="padding: 0 10px 0 10px;">as</label>');
             page.appendFormatLine('<input type="text" id="v2" class="vp-input vp-state w50 v2" value="{0}"/>', v2);
-            page.appendFormatLine('<input type="text" id="v3" class="vp-input vp-state w50 v3" value="{0}"/>', v3);
             return page.toString();
         }
 
         generateCode() {
-            let { v1, v2, v3 } = this.state;
+            let { v1, v2 } = this.state;
             let asVariableStr = '';
             if (v2 != '') {
-                asVariableStr = ' ' + v2 + ' ' + v3;
+                asVariableStr = ' as ' + v2;
             }
             return `except ${v1}${asVariableStr}:`;
         }

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,9 @@ hr.vp-extra-menu-line {`
`288`	`288`	`.wp5 {`
`289`	`289`	`width: 5% !important;`
`290`	`290`	`}`
	`291`	`+.w150 {`
	`292`	`+ width: 150px !important;`
	`293`	`+}`
`291`	`294`	`.w100 {`
`292`	`295`	`width: 100px !important;`
`293`	`296`	`}`