Merge pull request #74 from minjk-bl/devops

minjk-bl · web-flow · commit 7ba1abfe37a2 · 2021-08-18T10:27:33.000+09:00
Frame, Popup module run/add/apply operation bug fixed
diff --git a/src/common/vpFrameEditor.js b/src/common/vpFrameEditor.js
@@ -1131,20 +1131,22 @@ define([
         return code.toString();
     }
 
-    FrameEditor.prototype.apply = function(runCell = true) {
+    FrameEditor.prototype.apply = function(addCell=false, runCell=false) {
         var code = this.generateCode();
         if (this.pageThis) {
             $(this.pageThis.wrapSelector('#' + this.targetId)).val(code);
             $(this.pageThis.wrapSelector('#' + this.targetId)).trigger({
                 type: 'frame_run',
                 code: code,
+                addCell: addCell,
                 runCell: runCell
             });
         } else {
             $(vpCommon.wrapSelector('#' + this.targetId)).val(code);
             $(vpCommon.wrapSelector('#' + this.targetId)).trigger({
                 type: 'frame_run',
                 code: code,
+                addCell: addCell,
                 runCell: runCell
             });
         }
@@ -1551,7 +1553,7 @@ define([
 
         // click run
         $(document).on('click', this.wrapSelector('.' + VP_FE_BUTTON_RUN), function() {
-            that.apply();
+            that.apply(true, true);
             that.close();
         });
 
@@ -1561,11 +1563,14 @@ define([
             $(that.wrapSelector('.' + VP_FE_DETAIL_BOX)).show();
         });
 
-        // click add
+        // click add / apply
         $(document).on('click', this.wrapSelector('.' + VP_FE_DETAIL_ITEM), function() {
             var type = $(this).data('type');
             if (type == 'add') {
-                that.apply(false);
+                that.apply(true);
+                that.close();
+            } else if (type == 'apply') {
+                that.apply();
                 that.close();
             }
         });
diff --git a/src/common/vpPopupPage.js b/src/common/vpPopupPage.js
@@ -216,7 +216,7 @@ define([
 
         // click run
         $(document).on('click', this.wrapSelector('.' + VP_PP_BUTTON_RUN), function() {
-            that.apply();
+            that.apply(true, true);
             that.close();
         });
 
