Instance's inner subset popup fixed, Instance shows error as alert

minjk-bl · minjk-bl · commit d6b964b1feeb · 2022-01-17T15:19:46.000+09:00
diff --git a/js/com/component/InstanceEditor.js b/js/com/component/InstanceEditor.js
@@ -433,6 +433,14 @@ define([
                 if (callback) {
                     callback(varObj);
                 }
+            }).catch(function(resultObj) {
+                let { result } = resultObj;
+                // show alert
+                com_util.renderAlertModal(result.ename + ': ' + result.evalue);
+                // callback
+                if (callback) {
+                    callback('');
+                }
             });
 
 
diff --git a/js/m_apps/Instance.js b/js/m_apps/Instance.js
@@ -157,6 +157,10 @@ define([
                 let component = evt.component;
                 component.close();
             });
+            $(this.wrapSelector('#vp_instanceVariable')).on('focus_option_page', function(evt) {
+                let component = evt.component;
+                component.focus();
+            });
             $(this.wrapSelector('#vp_instanceVariable')).on('apply_option_page', function(evt) {
                 let component = evt.component;
                 // apply its value
@@ -219,6 +223,21 @@ define([
             return sbCode.toString();
         }
 
+        hide() {
+            super.hide();
+            this.state.subsetEditor && this.state.subsetEditor.hide();
+        }
+
+        close() {
+            super.close();
+            this.state.subsetEditor && this.state.subsetEditor.close();
+        }
+
+        remove() {
+            super.remove();
+            this.state.subsetEditor && this.state.subsetEditor.remove();
+        }
+
         updateValue(value) {
             let cmObj = this.getCodemirror('vp_instanceVariable');
             if (cmObj && cmObj.cm) {
