Merge branch 'fix/Process.copy_form_execption' into 'develop'

Merge of fix/【流程管理】隐藏普通人员打开流程应用编号视图报无权限的错误 to develop

See merge request o2oa/o2oa!734

o2web/source/x_component_process_Application/SerialExplorer.js

@@ -110,6 +110,8 @@ MWF.xApplication.process.Application.SerialExplorer = new Class({
                 this.items.push(item);
             }.bind(this));
             this.mask.hide();
+        }.bind(this), function () {
+            if(this.mask)this.mask.hide();
         }.bind(this));
     },
     _createItem: function(data){

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -733,8 +733,22 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
 		this._hideInjectAction();
 	},
 
-
-
+	// _clearSubform: function(node){
+	// 	var subNode = node.getFirst();
+	// 	while (subNode){
+	// 		var nextNode = subNode.getNext();
+	// 		if (subNode.get("MWFType")){
+	// 			if ( subNode.get("MWFType") === "subform" ){
+	// 				subNode.destroy();
+	// 			}else{
+	// 				if (subNode) this._clearSubform(subNode);
+	// 			}
+	// 		}else{
+	// 			if (subNode) this._clearSubform(subNode);
+	// 		}
+	// 		subNode = nextNode;
+	// 	}
+	// },
     _clearNoId: function(node){
         var subNode = node.getFirst();
         while (subNode){

o2web/source/x_component_process_ProcessManager/DictionaryExplorer.js

@@ -218,7 +218,9 @@ MWF.xApplication.process.ProcessManager.DictionaryExplorer = new Class({
         this.app.desktop.openApplication(e, "process.DictionaryDesigner", options);
     },
     _loadItemDataList: function(callback){
-        this.actions.listDictionary(this.app.options.application.id,callback);
+        this.actions.listDictionary(this.app.options.application.id,callback, function () {
+
+        }.bind(this));
     },
     _getItemObject: function(item){
         return new MWF.xApplication.process.ProcessManager.DictionaryExplorer.Dictionary(this, item)