Fix bug and styles on Subset, Instance apps

minjk-bl · minjk-bl · commit 4229cf66774d · 2022-06-07T17:55:45.000+09:00
diff --git a/css/component/popupComponent.css b/css/component/popupComponent.css
@@ -205,7 +205,6 @@
 .vp-popup-save-button {
     float: right;
     height: 30px;
-    width: 100px;
     margin-top: 9px;
     margin-right: 10px;
 }
diff --git a/css/m_apps/instance.css b/css/m_apps/instance.css
@@ -48,20 +48,16 @@
     display: inline-block;
     width: calc(100% - 55px);
     height: 30px;
-    border: 1px solid var(--gray-color);
+    border: 0.25px solid var(--grid-line-color);
     border-radius: 3px;
+    background-image: repeating-linear-gradient( to right, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ), repeating-linear-gradient( to bottom, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px );
+    background-color: white;
     overflow: hidden;
 }
-.vp-instance-box .CodeMirror.selected {
-    display: inline-block;
-    border: 1px solid silver;
-    overflow: hidden;
+/* .vp-instance-box .CodeMirror.selected {
     width: 88%;
     height: 31px;
-    background-image: repeating-linear-gradient( to right, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px ), repeating-linear-gradient( to bottom, var(--grid-line-color) 0, var(--grid-line-color) 0.25px, transparent 1px, transparent 5px );
-    background-color: white;
-    border: 0.25px solid #E4E4E4;
-}
+} */
 .vp-instance-box .CodeMirror-empty { outline: none; }
 .vp-instance-box .CodeMirror-empty.CodeMirror-focused { outline: none; }
 .vp-instance-box .CodeMirror pre.CodeMirror-placeholder { color: #999; }
diff --git a/html/component/popupComponent.html b/html/component/popupComponent.html
@@ -93,7 +93,7 @@
                         <div class="vp-popup-detail-button" data-type="add" title="Save to block & Add cell">Code to cell</div>
                     </div>
                 </div>
-                <button type="button" class="vp-button activated vp-popup-button vp-popup-save-button" data-type="save" title="Save to block" style="display:none;">Save to block</button>
+                <button type="button" class="vp-button activated vp-popup-button vp-popup-save-button" data-type="save" title="Save to target" style="display:none;">OK</button>
                 <button type="button" class="vp-button vp-popup-button" data-type="cancel">Cancel</button>
             </div>
         </div>
diff --git a/js/m_apps/Subset.js b/js/m_apps/Subset.js
@@ -1037,7 +1037,9 @@ define([
                 // open popup
                 $(document).on('click', com_util.formatString('.{0}.{1}', VP_DS_BTN, this.uuid), function (event) {
                     if (!$(this).hasClass('disabled')) {
-                        that.beforeOpen(that);
+                        if (that.beforeOpen && typeof that.beforeOpen == 'function') {
+                            that.beforeOpen(that);
+                        }
                         that.open();
                         $(that.wrapSelector()).css({ 'z-index': 205 }); // move forward
                     }

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@`
`205`	`205`	`.vp-popup-save-button {`
`206`	`206`	`float: right;`
`207`	`207`	`height: 30px;`
`208`		`- width: 100px;`
`209`	`208`	`margin-top: 9px;`
`210`	`209`	`margin-right: 10px;`
`211`	`210`	`}`