Merge pull request #163 from minjk-bl/devops

minjk-bl · web-flow · commit e4e10f772c32 · 2022-08-08T17:57:50.000+09:00
Update for v2.2.12
diff --git a/js/com/component/PopupComponent.js b/js/com/component/PopupComponent.js
@@ -792,7 +792,20 @@ define([
         open() {
             vpLog.display(VP_LOG_TYPE.DEVELOP, 'open popup', this);
             this.loadState();
+            
             this.show();
+
+            // set popup position if its top-left side is outside of view
+            let pos = $(this.wrapSelector()).position();
+            if (pos) {
+                if (pos.top < 0) {
+                    $(this.wrapSelector()).css({ top: 0 });
+                }
+                if (pos.left < 0) {
+                    $(this.wrapSelector()).css({ left: 0 });
+                }
+            }
+
             this._bindCodemirror();
 
             $(this.eventTarget).trigger({
diff --git a/js/m_apps/Frame.js b/js/m_apps/Frame.js
@@ -1302,12 +1302,12 @@ define([
                     var tab = content.addtype;
                     if (tab == 'value') {
                         var value = com_util.convertToStr(content.value, content.valueastext);
-                        code.appendFormat("{0}[[{1}]] = {2}", tempObj, name, value);
+                        code.appendFormat("{0}[{1}] = {2}", tempObj, name, value);
                     } else if (tab == 'calculation') {
                         var { var1col, oper, var2col } = content;
                         var var1code = tempObj + "['" + var1col + "']";
                         var var2code = tempObj + "['" + var2col + "']";
-                        code.appendFormat('{0}[[{1}]] = {2} {3} {4}', tempObj, name, var1code, oper, var2code);
+                        code.appendFormat('{0}[{1}] = {2} {3} {4}', tempObj, name, var1code, oper, var2code);
                     } else if (tab == 'replace') {
                         var replaceStr = new com_String();
                         var useRegex = content['useregex'];
@@ -1325,7 +1325,7 @@ define([
                         if (selectedName && selectedName != '') {
                             selectedName = '[[' + selectedName + ']]';
                         }
-                        code.appendFormat("{0}[[{1}]] = {2}{3}.replace({{4}}", tempObj, name, tempObj, selectedName, replaceStr);
+                        code.appendFormat("{0}[{1}] = {2}{3}.replace({{4}}", tempObj, name, tempObj, selectedName, replaceStr);
                         if (useRegex) {
                             code.append(', regex=True');
                         }
@@ -1334,7 +1334,7 @@ define([
                         var value = com_util.convertToStr(content.value, content.valueastext);
                         code.appendFormat("{0} = {1}", content.subset, value);
                     } else if (tab == 'apply') {
-                        code.appendFormat("{0}[[{1}]] = {2}[{3}].apply({4})", tempObj, name, tempObj, content.column, content.apply);
+                        code.appendFormat("{0}[{1}] = {2}[{3}].apply({4})", tempObj, name, tempObj, content.column, content.apply);
                     }
                     break;
                 case FRAME_EDIT_TYPE.ADD_ROW: 
