Merge branch 'fix/Regeist_add_mail' into 'release'

Merge of fix/Regeist_add_mail 人员注册中增加了邮件地址，内容管理增加了Base64图片的设置项 to release

See merge request o2oa/o2oa!3516

o2web/source/o2_core/o2/lp/en.js

@@ -437,6 +437,7 @@ o2.LP.authentication = {
 	"resendVerification": "ReSend",
 	"passwordIsSimple": "Please use alphanumeric mix and at least 7 bits",
 	"mobileIsRegisted": "Mobile phone number has been registered",
+	"mailFormatError": "Please enter a properly formatted email",
 	"hasAccount": "Already have an account？",
 	"gotoLogin": "Goto Login",
 	"weak": "weak",
@@ -446,6 +447,7 @@ o2.LP.authentication = {
 	"userNotExist": "The user does not exist.",
 	"passwordNotEqual": "The password is inconsistent with the above, please try again",
 	"changeVerification": "Change",
+	"mail": "mail",
 	"genderType": "Gender",
 	"genderTypeText": ",Men, Female",
 	"genderTypeValue": ",m,f",

o2web/source/o2_core/o2/lp/zh-cn.js

@@ -439,6 +439,7 @@ o2.LP.authentication = {
     "resendVerification": "重新发送",
     "passwordIsSimple": "请使用数字字母混合且至少7位",
     "mobileIsRegisted": "手机号码已经被注册",
+    "mailFormatError": "请输入正确格式的邮件地址",
     "hasAccount": "已有账号？",
     "gotoLogin": "去登录",
     "weak": "弱",
@@ -448,6 +449,7 @@ o2.LP.authentication = {
     "userNotExist": "用户不存在",
     "passwordNotEqual": "密码与上面不一致，请重新输入",
     "changeVerification": "换一张",
+    "mail": "邮件",
     "genderType": "性别",
     "genderTypeText": ",男,女",
     "genderTypeValue": ",m,f",

o2web/source/o2_core/o2/xDesktop/Authentication.js

@@ -1176,9 +1176,10 @@ MWF.xDesktop.Authentication.SignUpForm = new Class({
             signUpMode = json.data.value;
         }.bind(this), null, false);
 
+        this.formTopNode.setStyle("height","50px");
         this.formTableContainer.setStyles({
             "width": "890px",
-            "margin-top": "50px"
+            "margin-top": "40px"
         });
 
         var html = "<table width='100%' bordr='0' cellpadding='5' cellspacing='0' styles='formTable'>" +
@@ -1194,9 +1195,9 @@ MWF.xDesktop.Authentication.SignUpForm = new Class({
             "<tr><td styles='formTableTitle' lable='genderType'></td>" +
             "   <td styles='formTableValue' item='genderType'></td>" +
             "   <td styles='formTableValue' item='genderTypeTip'></td></tr>" +
-            //"<tr><td styles='formTableTitle' lable='mail'></td>" +
-            //"   <td styles='formTableValue' item='mail'></td>" +
-            //"   <td styles='formTableValue' item='mailTip'></td></tr>" +
+            "<tr><td styles='formTableTitle' lable='mail'></td>" +
+            "   <td styles='formTableValue' item='mail'></td>" +
+            "   <td styles='formTableValue' item='mailTip'></td></tr>" +
             "<tr><td styles='formTableTitle' lable='mobile'></td>" +
             "   <td styles='formTableValue' item='mobile'></td>" +
             "   <td styles='formTableValue' item='mobileTip'></td></tr>";
@@ -1234,7 +1235,7 @@ MWF.xDesktop.Authentication.SignUpForm = new Class({
                     form.getItem("name").tipNode = table.getElement("[item='nameTip']");
                     form.getItem("password").tipNode = table.getElement("[item='passwordTip']");
                     form.getItem("confirmPassword").tipNode = table.getElement("[item='confirmPasswordTip']");
-                    //form.getItem("mail").tipNode = table.getElement("[item='mailTip']")[0];
+                    form.getItem("mail").tipNode = table.getElement("[item='mailTip']");
                     form.getItem("genderType").tipNode = table.getElement("[item='genderTypeTip']");
                     form.getItem("mobile").tipNode = table.getElement("[item='mobileTip']");
                     this.tipNode = table.getElement("[item='signUpTip']");
@@ -1315,14 +1316,33 @@ MWF.xDesktop.Authentication.SignUpForm = new Class({
                     },
                     mail: {
                         text: this.lp.mail, defaultValue: this.lp.inputYourMail, className: "inputMail",
-                        notEmpty: true, defaultValueAsEmpty: true, emptyTip: this.lp.inputYourMail, validRule: { email: true }, event: {
-                            focus: function (it) { if (this.lp.inputYourMail === it.getValue()) it.setValue(""); if (!it.warningStatus) it.getElements()[0].setStyles(this.css.inputActive); }.bind(this),
-                            blur: function (it) { it.verify(true); if (!it.warningStatus) it.getElements()[0].setStyles(this.css.inputMail); }.bind(this),
+                        notEmpty: false, defaultValueAsEmpty: true, emptyTip: this.lp.inputYourMail,
+                        validRule: { isFormatInvalid: function (value, it) {
+                            if( (!value || value===this.lp.inputYourMail) ||
+                                /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test( value ) ){
+                                it.tipNode.empty();
+                                it.warningStatus = false;
+                                return true;
+                            }else{
+                                it.warningStatus = true;
+                                return false;
+                            }
+                        }.bind(this) },
+                        validMessage: { isFormatInvalid: this.lp.mailFormatError },
+                        event: { //validRule: { email: false },
+                            focus: function (it) {
+                                if (this.lp.inputYourMail === it.getValue()) it.setValue("");
+                                if (!it.warningStatus) it.getElements()[0].setStyles(this.css.inputActive);
+                            }.bind(this),
+                            blur: function (it) {
+                                it.verify(true);
+                                if (!it.warningStatus) it.getElements()[0].setStyles(this.css.inputMail);
+                            }.bind(this),
                             keyup: function (it, ev) { if (ev.event.keyCode === 13) { this.ok() } }.bind(this)
                         }, onEmpty: function (it) {
-                            it.getElements()[0].setStyles(this.css.inputEmpty);
+                            // it.getElements()[0].setStyles(this.css.inputEmpty);
                         }.bind(this), onUnempty: function (it) {
-                            it.getElements()[0].setStyles(this.css.inputMail);
+                            // it.getElements()[0].setStyles(this.css.inputMail);
                         }.bind(this)
                     },
                     genderType: {

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

@@ -193,7 +193,20 @@ MWF.xScript.Environment = function(ev){
          * 获取当前流程实例对象：work对象或workCompleted对象。
          * @method getWork
          * @static
-         * @return {(Work|WorkCompleted)} 流程实例对象；如果流程已结束，返回已结束的流程实例对象.
+         * @return {(Work|WorkCompleted)} 流程实例对象；如果流程已结束，返回已结束的流程实例对象。
+         * <div><br/>
+         * 下面的Work对象和WorkCompleted对象为后台返回的数据，脚本中我们对这两个对象进行了修改和补充，如下：
+         * </div>
+         * <pre><code class='language-js'>{
+         *      "creatorPersonDn": "张三@zhangsan@P",		//创建人，可能为空，如果由系统创建.
+         *      "creatorPerson": "张三",  //创建人姓名
+         *      "creatorIdentityDn": "张三@481c9edc-5fb5-41f1-b5c2-6ea609082cdb@I",		//创建人Identity,可能为空,如果由系统创建.
+         *      "creatorIdentity": "张三" //创建人姓名
+         *      "creatorUnitDn": "开发部@c448d8bb-98b8-4305-9d3f-12537723cfcc@U", //创建人组织全称,如果由系统创建。
+         *      "creatorUnit": "开发部",  //创建人组织名称
+         *      "creatorDepartment": "开发部",  //创建人组织名称，同creatorUnit
+         *      "creatorCompany": "xx公司"  //创建人组织公司名称，creatorUnitLevel的第一段
+         * }</code></pre>
          * @o2ActionOut x_processplatform_assemble_surface.WorkAction.manageGet|example=Work|ignoreNoDescr=true|ignoreProps=[properties]|Work对象:
          * @o2ActionOut x_processplatform_assemble_surface.WorkCompletedAction.get|example=WorkCompleted|ignoreProps=[properties]|WorkCompleted对象:
          * @o2syntax
@@ -223,10 +236,22 @@ MWF.xScript.Environment = function(ev){
         /**
          * 当前流程实例正在流转中，并且当前用户有待办，则返回当前用户的待办对象，否则返回null。
          * @summary 获取当前流程与当前用户相关的待办对象：task对象。
-         * @o2ActionOut x_processplatform_assemble_surface.TaskAction.get|example=Task
+         * @o2ActionOut x_processplatform_assemble_surface.TaskAction.get|example=Task|Task对象:
          * @method getTask
          * @static
-         * @return {(Task|Null)} 当前用户的待办任务对象：task。当前用户没有对此流程实例的待办时，或流程实例已经流转结束，返回null.
+         * @return {(Task|Null)} 当前用户的待办任务对象：task。当前用户没有对此流程实例的待办时，或流程实例已经流转结束，返回null。
+         * <div><br/>
+         * 下面的Task对象为后台返回的数据，脚本中我们对这它进行了修改和补充，如下：
+         * </div>
+         * <pre><code class='language-js'>{
+         *      "personDn": "张三@zhangsan@P",		//创建人，可能为空，如果由系统创建.
+         *      "person": "张三",  //创建人姓名
+         *      "identityDn": "张三@481c9edc-5fb5-41f1-b5c2-6ea609082cdb@I",		//创建人Identity,可能为空,如果由系统创建.
+         *      "identity": "张三" //创建人姓名
+         *      "unitDn": "开发部@c448d8bb-98b8-4305-9d3f-12537723cfcc@U", //创建人组织全称,如果由系统创建。
+         *      "unit": "开发部",  //创建人组织名称
+         *      "department": "开发部",  //创建人组织名称，unit
+         * }</code></pre>
          * @o2syntax
          * var task = this.workContext.getTask();
          */
@@ -518,24 +543,24 @@ MWF.xScript.Environment = function(ev){
          * var routeList = this.workContext.getRouteList();
          */
         "getRouteList": function(){return (ev.task) ? ev.task.routeNameList: null;},
-        "getInquiredRouteList": function(){return null;},
-        /**
-         * @summary 重新设置流程实例标题。。
-         * @method setTitle
-         * @static
-         * @param {String} title - 标题字符串.
-         * @o2syntax
-         * this.workContext.setTitle(title);
-         * @example
-         * this.workContext.setTitle("标题");
-         */
-        "setTitle": function(title){
-            if (!this.workAction){
-                MWF.require("MWF.xScript.Actions.WorkActions", null, false);
-                this.workAction = new MWF.xScript.Actions.WorkActions();
-            }
-            this.workAction.setTitle(ev.work.id, {"title": title});
-        }
+        "getInquiredRouteList": function(){return null;}
+        // /**
+        //  * @summary 重新设置流程实例标题。。
+        //  * @method setTitle
+        //  * @static
+        //  * @param {String} title - 标题字符串.
+        //  * @o2syntax
+        //  * this.workContext.setTitle(title);
+        //  * @example
+        //  * this.workContext.setTitle("标题");
+        //  */
+        // "setTitle": function(title){
+        //     if (!this.workAction){
+        //         MWF.require("MWF.xScript.Actions.WorkActions", null, false);
+        //         this.workAction = new MWF.xScript.Actions.WorkActions();
+        //     }
+        //     this.workAction.setTitle(ev.work.id, {"title": title});
+        // }
     };
     this.workContent = this.workContext;
     var _redefineWorkProperties = function(work){

o2web/source/o2_lib/htmleditor/ckeditor4114/plugins/image/dialogs/image.js

@@ -356,6 +356,7 @@
                 }, {
                     type: "hbox",
                     widths: ["100%"],
+                    hidden: !d.config.base64Encode,
                     children: [{
                         id: "base64enable",
                         type: "checkbox",

o2web/source/o2_lib/htmleditor/ckeditor4130/plugins/image/dialogs/image.js

@@ -724,6 +724,7 @@
 						}, {
 							type: "hbox",
 							widths: ["100%"],
+							hidden: !editor.config.base64Encode,
 							children: [{
 								id: "base64enable",
 								type: "checkbox",

o2web/source/x_component_cms_Xform/Htmleditor.js

@@ -96,6 +96,7 @@ MWF.xApplication.cms.Xform.Htmleditor = MWF.CMSHtmleditor =  new Class({
             //    _self.selectCloudFilesImage( e, callback );
             //};
 
+            editorConfig.base64Encode = (this.json.base64Encode === "y");
             editorConfig.localImageMaxWidth = 800;
             editorConfig.reference = this.form.businessData.document.id;
             editorConfig.referenceType = "cmsDocument";

o2web/source/x_component_process_FormDesigner/Module/Htmleditor/htmleditor.html

@@ -21,6 +21,13 @@
 
 				</td>
 			</tr>
+			<tr>
+				<td class="editTableTitle">图片Base64编码:</td>
+				<td class="editTableValue">
+					<input class="editTableRadio" name="base64Encode" text{($.ecnet=='y')?'checked':''} type="radio" value="y"/>启用
+					<input class="editTableRadio" name="base64Encode" text{($.ecnet!='y')?'checked':''} type="radio" value="n"/>禁用
+				</td>
+			</tr>
 		</table>
 
 		<div class="MWFMaplist" name="editorProperties" title="属性"></div>

o2web/source/x_component_process_Xform/Htmleditor.js

@@ -94,6 +94,7 @@ MWF.xApplication.process.Xform.Htmleditor = MWF.APPHtmleditor =  new Class(
                 }
             }
 
+            editorConfig.base64Encode = (this.json.base64Encode === "y");
             editorConfig.localImageMaxWidth = 800;
             editorConfig.reference = this.form.businessData.work.job;
             editorConfig.referenceType = "processPlatformJob";

o2web/source/x_component_query_Query/Viewer.js

@@ -386,13 +386,13 @@ MWF.xApplication.query.Query.Viewer = MWF.QViewer = new Class({
         //     return true;
         // }
         if( this.options && this.options.select ){
-            return  this.options.select === "none";
+            return  this.options.select === "none" || this.options.select === "no";
         }
         if( this.json && this.json.select ){
-            return  this.json.select === "none";
+            return  this.json.select === "none" || this.json.select === "no";
         }
         if( this.viewJson && this.viewJson.select ){
-            return  this.viewJson.select === "none";
+            return  this.viewJson.select === "none" || this.viewJson.select === "no";
         }
         return true;
         // if( this.json.select === "single" || this.json.select === "multi" || this.json.defaultSelectedScript || this.viewJson.defaultSelectedScript ){

o2web/source/x_component_service_InvokeDesigner/Main.js

@@ -609,6 +609,9 @@ MWF.xApplication.service.InvokeDesigner.Main = new Class({
         node = new Element("div", {"styles": this.css.propertyItemTitleNode, "text": this.lp.invokeMethod+":"}).inject(this.propertyContentArea);
         this.propertyInvokeMethodNode = new Element("div", {"styles": this.css.propertyTextNode, "text": "POST"}).inject(this.propertyContentArea);
 
+        node = new Element("div", {"styles": this.css.propertyItemTitleNode, "text": this.lp.invokeHead+":"}).inject(this.propertyContentArea);
+        this.propertyInvokeHeadTextNode = new Element("div", {"styles": this.css.propertyTextNode, "text": "Content-Type:application/json; charset=utf-8"}).inject(this.propertyContentArea);
+
     },
 	loadPropertyResize: function(){
 //		var size = this.propertyNode.getSize();