Просмотр исходного кода

Merge branch 'feature/Query.embeded_view_style_custom' into 'develop'

Merge of feature/Query.embeded_view_style_custom to develop

See merge request o2oa/o2oa!257
蔡祥熠 5 лет назад
Родитель
Сommit
13127b35c7
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js

+ 3 - 3
o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js

@@ -133,8 +133,6 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
             }
         }
 
-        this.datatypeInput.addEvent("change");
-
         MWF.require("MWF.widget.Calendar", function(){
             this.calendar = new MWF.widget.Calendar(this.valueDatetimeInput, {
                 "style": "xform",
@@ -1020,7 +1018,9 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 break;
         }
         this.scriptData = data.code;
-        if (this.scriptArea && this.scriptArea.editor) this.scriptArea.editor.setValue(this.scriptData.code);
+        try{
+            if (this.scriptArea && this.scriptArea.editor) this.scriptArea.editor.setValue(this.scriptData.code);
+        }catch (e) {}
 
         debugger;
         if( data.type === "custom" ){