فهرست منبع

修复门户中分类出现null的问题

unknown 5 سال پیش
والد
کامیت
55a38d5dde

+ 2 - 2
o2web/source/x_component_Calendar/Main.js

@@ -1147,8 +1147,8 @@ MWF.xApplication.Calendar.CalendarMarket = new Class({
 
                     new Element("div", {
                         styles : this.css.marketItemDescriptiontInfor,
-                        text : d.description,
-                        title : d.description
+                        text : d.description || "",
+                        title : d.description || ""
                     }).inject( middleNode );
 
                     var followedAction, followAction;

+ 1 - 1
o2web/source/x_component_portal_PortalExplorer/Main.js

@@ -42,7 +42,7 @@ MWF.xApplication.portal.PortalExplorer.Main = new Class({
             "name": nameNode.get("value"),
             "alias": aliasNode.get("value"),
             "description": descriptionNode.get("value"),
-            "portalCategory": typeNode.get("value")
+            "portalCategory": typeNode.get("value") || ""
         };
         if (data.name){
             this.restActions.saveApplication(data, function(json){

+ 1 - 1
o2web/source/x_component_portal_PortalManager/Main.js

@@ -290,7 +290,7 @@ MWF.xApplication.portal.PortalManager.ApplicationProperty = new Class({
         this.data.name = this.nameInput.input.get("value");
         this.data.alias = this.aliasInput.input.get("value");
         this.data.description = this.descriptionInput.input.get("value");
-        this.data.portalCategory = this.typeInput.input.get("value");
+        this.data.portalCategory = this.typeInput.input.get("value") || "";
         this.data.firstPage = this.firstPageInput.input.get("value");
         this.data.pcClient = this.pcClientInput.getValue()==="true";
         this.data.mobileClient = this.mobileClientInput.getValue()==="true";

+ 7 - 3
o2web/source/x_component_process_ApplicationExplorer/Main.js

@@ -363,6 +363,7 @@ MWF.xApplication.process.ApplicationExplorer.Main = new Class({
 				var emptyCategory = null;
 				json.data.each(function(category){
 					var categoryName = category.applicationCategory || category.portalCategory || category.protalCategory || category.name;
+					if( categoryName === "null" )categoryName = "";
 					if (categoryName){
 						this.createCategoryItemNode(categoryName, category.count);
 					}else{
@@ -797,9 +798,12 @@ MWF.xApplication.process.ApplicationExplorer.Application = new Class({
 			this.openApplication(e);
 		}.bind(this));
 		this.categoryNode = this.node.getElement(".o2_process_AppExp_item_categoryNode");
-		this.categoryNode.set("text", this.data.applicationCategory || this.data.portalCategory || this.data.protalCategory || this.lp.unCategory);
-		if (this.data.applicationCategory || this.data.portalCategory || this.data.protalCategory){
-			this.categoryNode.set("title", this.data.applicationCategory);
+		var category = this.data.applicationCategory || this.data.portalCategory || this.data.protalCategory;
+		var categoryText = category;
+		if( !category || category === "null" )categoryText = this.lp.unCategory;
+		this.categoryNode.set("text", categoryText );
+		if ( category && category !== "null" ){
+			this.categoryNode.set("title", category );
 			this.categoryNode.addClass("o2_process_AppExp_item_categoryColorNode");
 		}
 		this.actionArea = this.node.getElement(".o2_process_AppExp_item_ActionArea");

+ 1 - 1
o2web/source/x_component_process_ProcessManager/Explorer.js

@@ -225,7 +225,7 @@ MWF.xApplication.process.ProcessManager.Explorer = new Class({
         var node = new Element("div", {"styles": this.css.categoryElementItemAllNode, "text": MWF.xApplication.process.ProcessManager.LP.all}).inject(this.categoryElementNode);
         if (!this.elementCategory) node.setStyles(this.css.categoryElementItemAllNode_current);
         this.categoryList.each(function(category){
-            if( category ){
+            if( category && category !== "null" ){
                 node = new Element("div", {"styles": this.css.categoryElementItemNode, "text": category}).inject(this.categoryElementNode);
                 if (this.elementCategory===category){
                     node.setStyles(this.css.categoryElementItemNode_current);

+ 7 - 0
o2web/source/x_component_process_Work/Processor.js

@@ -388,17 +388,24 @@ MWF.xApplication.process.Work.Processor = new Class({
         if (this.selectedRoute){
             if (this.selectedRoute.get("text") != node.get("text")){
                 this.selectedRoute.setStyles(this.css.routeNode);
+                this.selectedRoute.removeClass("mainColor_bg");
 
                 this.selectedRoute = node;
                 node.setStyles(this.css.routeNode_selected);
+                node.addClass("mainColor_bg");
+                node.removeClass("lightColor_bg");
 
             }else{
                 this.selectedRoute.setStyles(this.css.routeNode);
+                this.selectedRoute.addClass("lightColor_bg");
+                this.selectedRoute.removeClass("mainColor_bg");
                 this.selectedRoute = null;
             }
         }else{
             this.selectedRoute = node;
             node.setStyles(this.css.routeNode_selected);
+            node.addClass("mainColor_bg");
+            node.removeClass("lightColor_bg");
         }
         this.routeSelectorArea.setStyle("background-color", "#FFF");
     },