Merge branch 'fix/Query.view_script_editor' into 'wrdp'

Merge of fix/Query.view_script_editor 修复视图过滤条件脚本报错的问题 to wrdp

See merge request o2oa/o2oa!4234

o2web/source/o2_core/o2/widget/JavascriptEditor.js

@@ -6,6 +6,7 @@ o2.widget.JavascriptEditor = new Class({
 	options: {
         //"type": "ace",
         "type": "monaco",
+        "forceType": null,
 		"title": "JavascriptEditor",
 		"style": "default",
 		"option": {
@@ -55,7 +56,7 @@ o2.widget.JavascriptEditor = new Class({
     },
     load: function(callback){
         this.getEditorTheme(function(json){
-            this.options.type = o2.editorData.javascriptEditor.editor || "monaco";
+            this.options.type = this.options.forceType || o2.editorData.javascriptEditor.editor || "monaco";
             if (this.options.type.toLowerCase()=="ace"){
                 this.loadAce(callback);
             }

o2web/source/o2_core/o2/widget/ScriptArea.js

@@ -13,7 +13,8 @@ o2.widget.ScriptArea = new Class({
         "isbind": true,
         "mode": "javascript",
         "runtime": "all",
-        "key": "code"
+        "key": "code",
+        "forceType": null
     },
     initialize: function(node, options){
         this.setOptions(options);
@@ -187,6 +188,7 @@ o2.widget.ScriptArea = new Class({
         value = (value) ? value : "";
         this.jsEditor = new o2.widget.JavascriptEditor(this.contentNode,{
             "runtime": this.options.runtime || "all",
+            "forceType": this.options.forceType,
             "option": {
                 "value": value,
                 "lineNumbers": false,

o2web/source/x_component_Profile/Main.js

@@ -1297,6 +1297,12 @@ MWF.xApplication.Profile.emPowerPopupForm = new Class({
         sdata.toPerson = data.toPerson.split("@")[0];
         sdata.startTime = data.startDateInput+" "+data.startTimeInput+":00";
         sdata.completedTime = data.endDateInput+" "+data.endTimeInput+":00";
+
+        if( Date.parse(sdata.completedTime) - Date.parse(sdata.startTime) < 0 ){
+            this.app.notice(this.lp.startTimeEarlyCompleteTime,"error");
+            return;
+        }
+
         sdata.enable = true;
 
         if(data.type=="all"){

o2web/source/x_component_Profile/lp/en.js

@@ -90,6 +90,7 @@ MWF.xApplication.Profile.LP = {
         "type_process":"Process",
         "type_filter":"File type",
         "saveNotAll":"Partial save failed",
+        "startTimeEarlyCompleteTime": "The start time cannot be later than the end time",
         "title":"Title",
         "activityName":"Activity",
         "createTime":"Commission time",

o2web/source/x_component_Profile/lp/zh-cn.js

@@ -91,6 +91,7 @@ MWF.xApplication.Profile.LP = {
         "type_process":"流程",
         "type_filter":"文件类型",
         "saveNotAll":"部分保存失败",
+        "startTimeEarlyCompleteTime": "开始时间不能晚于结束时间",
         "title":"标题",
         "activityName":"状态",
         "createTime":"委托时间",

o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js

@@ -73,6 +73,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 "title": title,
                 "isload" : true,
                 "isbind" : false,
+                "forceType": "ace",
                 "maxObj": this.app.formContentNode || this.app.pageContentNode,
                 "onChange": function(){
                     this.customFilterValueScriptData = this.customFilterValueScriptArea.toJson();