Ver código fonte

添加im模块

fancy 5 anos atrás
pai
commit
57f9988166

+ 5 - 1
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Components.java

@@ -39,12 +39,13 @@ public class Components extends ConfigObject {
 	public static final String NAME_CALENDAR = "Calendar";
 	public static final String NAME_ANN = "ANN";
 	public static final String NAME_SEARCH = "Search";
+	public static final String NAME_IM = "IMV2";
 
 	public static List<String> SYSTEM_NAME_NAMES = ListTools.toList(NAME_SETTING, NAME_ORG, NAME_CMSMANAGER,
 			NAME_APPLICATIONEXPLORER, NAME_PORTALEXPLORER, NAME_DATAEXPLORER, NAME_SERVICEMANAGER, NAME_APPMARKET,
 			NAME_APPCENTER, NAME_LOGVIEWER, NAME_PROFILE, NAME_BAM, NAME_CMS, NAME_TASKCENTER, NAME_HOMEPAGE,
 			NAME_HOTARTICLE, NAME_FILE, NAME_NOTE, NAME_MEETING, NAME_ONLINEMEETING, NAME_ATTENDANCE, NAME_FORUM,
-			NAME_MINDER, NAME_CALENDAR, NAME_ANN, NAME_SEARCH);
+			NAME_MINDER, NAME_CALENDAR, NAME_ANN, NAME_SEARCH, NAME_IM);
 
 	public static final String APPICON_PNG = "appicon.png";
 
@@ -107,6 +108,8 @@ public class Components extends ConfigObject {
 			return new Component(NAME_ANN, NAME_ANN, "神经网络", APPICON_PNG, 24, Component.TYPE_SYSTEM);
 		case NAME_SEARCH:
 			return new Component(NAME_SEARCH, NAME_SEARCH, "搜索", APPICON_PNG, 25, Component.TYPE_SYSTEM);
+		case NAME_IM:
+			return new Component(NAME_IM, NAME_IM, "聊天", APPICON_PNG, 26, Component.TYPE_SYSTEM);
 		default:
 			return null;
 		}
@@ -140,6 +143,7 @@ public class Components extends ConfigObject {
 		o.systems.add(systemComponent(NAME_CALENDAR));
 		o.systems.add(systemComponent(NAME_ANN));
 		o.systems.add(systemComponent(NAME_SEARCH));
+		o.systems.add(systemComponent(NAME_IM));
 		return o;
 	}
 

+ 18 - 9
o2web/source/x_component_process_Xform/Form.js

@@ -3853,16 +3853,25 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
                 _self.app.action.setReaded(function () {
                     this.fireEvent("afterReaded");
                     _self.app.reload();
+                    if (layout.mobile) {
+
+                        //移动端页面关闭
+                        _self.finishOnMobile()
+                    } else {
+                        this.close();
+                    }
                 }.bind(_self), null, read.id, read);
             } else {
                 _self.app.reload();
+                if (layout.mobile) {
+
+                    //移动端页面关闭
+                    _self.finishOnMobile()
+                } else {
+                    this.close();
+                }
             }
-            if (layout.mobile) {
-                //移动端页面关闭
-                _self.finishOnMobile()
-            } else {
-                this.close();
-            }
+            
         }, function () {
             this.close();
         }, null, this.app.content, this.json.confirmStyle);
@@ -3918,11 +3927,11 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
         var _self = this;
         //新建检查
         this.workAction.checkDraft(this.businessData.work.id, function (json) {
-            var str = JSON.stringify(json);
-            // console.log("===========success==============");
+            // var str = JSON.stringify(json);
+
             _self.finishOnMobileReal();
         }.bind(this), function () {
-            console.log("===========fail..==============");
+
             _self.finishOnMobileReal();
         }, false);