Merge branch 'fix/Attandence.baidu_account' into 'wrdp'

Merge of fix/Attandence.baidu_account 流程管理表单操作条增加了已阅的显示选项 to wrdp

See merge request o2oa/o2oa!2192

o2web/source/x_component_process_FormDesigner/Module/Actionbar/actionbar.html

@@ -20,7 +20,13 @@
                 <input type="radio" name="hideSystemTools" value="true" text{($.hideSystemTools)?'checked':''}/>不显示
             </td>
           </tr>
-
+			<tr>
+			<td class="editTableTitle">已阅:</td>
+			<td class="editTableValue">
+				<input type="radio" name="hideReadedAction" value="false" text{(!$.hideReadedAction)?'checked':''}/>显示
+				<input type="radio" name="hideReadedAction" value="true" text{($.hideReadedAction)?'checked':''}/>不显示
+			</td>
+		</tr>
 		</table>
 	</div>
     <div title="操作"  class="MWFTab" style="overflow: hidden">

o2web/source/x_component_process_Xform/Actionbar.js

@@ -29,7 +29,7 @@ MWF.xApplication.process.Xform.Actionbar = MWF.APPActionbar =  new Class({
                 //alert(this.readonly)
 
                 if( this.json.multiTools ){ //自定义操作和系统操作混合的情况，用 system : true 来区分系统和自定义
-                    var addReadActionFlag = !this.json.hideSystemTools; //是否需要增加已阅
+                    var addReadActionFlag = !this.json.hideSystemTools && !this.json.hideReadedAction; //是否需要增加已阅
                     this.json.multiTools.each( function (tool) {
                         if( tool.system ){
                             if( !this.json.hideSystemTools ){
@@ -80,7 +80,9 @@ MWF.xApplication.process.Xform.Actionbar = MWF.APPActionbar =  new Class({
 
                             //this.json.defaultTools.push(o);
                             this.setToolbars(this.json.defaultTools, this.toolbarNode, this.readonly);
-                            this.setToolbars(addActions, this.toolbarNode, this.readonly);
+                            if( !this.json.hideReadedAction ){
+                                this.setToolbars(addActions, this.toolbarNode, this.readonly);
+                            }
 
                             this.setCustomToolbars(this.json.tools, this.toolbarNode);
                             this.toolbarWidget.load();