Merge branch 'fix/process_invoke_centerserve' into 'develop'

Merge of fix/process_invoke_centerserve 流程的服务调用中加入中心服务 to develop

See merge request o2oa/o2oa!1202

o2web/source/o2_core/o2/xScript/ViewEnvironment.js

@@ -5207,7 +5207,7 @@ MWF.xScript.ViewEnvironment = function (ev) {
      * @method rowCountWhere
      * @methodOf module:Table
      * @instance
-     * @param {String} where 查询条件，格式为jpql语法,o.name='zhangsan'，允许为空。
+     * @param {String} where 查询条件，格式为jpql语法,o.name='zhangsan'。
      * @param {Function} [success] 调用成功时的回调函数。
      * @param {Function} [failure] 调用错误时的回调函数。
      * @param {Boolean} [async] 是否异步调用，默认为true。

o2web/source/x_component_process_ProcessDesigner/Property.js

@@ -976,6 +976,7 @@ MWF.xApplication.process.ProcessDesigner.Property = new Class({
                 Object.each(layout.serviceAddressList, function(v, key){
                     var option = new Element("option", {"value": key, "text": v.name, "selected": (value==key)}).inject(select);
                 }.bind(this));
+                var option = new Element("option", {"value": "x_program_center", "text": this.process.designer.lp.centerServer, "selected": (value=="x_program_center")}).inject(select);
                 select.addEvent("change", function(){
                     var data = select.options[select.selectedIndex].value;
                     // this.changeJsonDate(name, data);

o2web/source/x_component_process_ProcessDesigner/lp/en.js

@@ -97,6 +97,7 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 	"deleteDutyTitle": "Remove duty confirmation",
 	"deleteDutyText": "Are you sure you want to remove the duty \"{duty}\"?",
 	"selectIcon": "Select Icon",
+	"centerServer": "Center Serve",
 
 	"creatorUnit": "The Unit of the author",
 	"currentUnit": "The Unit of the processor",

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

@@ -97,6 +97,7 @@ MWF.xApplication.process.ProcessDesigner.LP = {
     "deleteDutyTitle": "移除职务确认",
     "deleteDutyText": "您确认要移除职务“{duty}”吗？",
     "selectIcon": "选择图标",
+	"centerServer": "中心服务",
 
     "creatorUnit": "拟稿人所在组织",
     "currentUnit": "处理人所在组织",
@@ -348,7 +349,7 @@ MWF.xApplication.process.ProcessDesigner.LP = {
 		"responseScript": "响应脚本",
 
 		"use": "使用",
-		"getJson": "获取响应内容。如果响应内容是JSON格式的字符串，则返回JSON对象；否则返回原始响应内容。",
+		"getJson": "获取响应内容。如果响应内容是JSON格式的字符串，则返回JSON对象；否则返回原始响应内容。如果调用本平台服务管理中的接口，在接口中返回的数据需放在data中，如:{ \"data\" : [] }",
 		"systemRequest": "系统内请求",
 		"restAddr": "REST地址",
 		"requestBodyScript": "消息体脚本",