huqi 5 лет назад
Родитель
Сommit
70362906bc

+ 6 - 6
o2web/source/x_component_FindDesigner/FindWorker.js

@@ -105,21 +105,21 @@ _worker._getRequestOption = function(data, par){
     };
 };
 
-_worker._createFilterOption = function(moduleType, appId, desingerType, desingerId){
+_worker._createFilterOption = function(moduleType, appId, designerType, desingerId){
     var filterOption = JSON.parse(_worker.filterOptionTemplete);
     filterOption.moduleList.push({
         "moduleType": moduleType,
-        "moduleAppList": [{"appId": appId, "designerList": [{"desingerType": desingerType, "designerIdList": [desingerId]}]}]
+        "moduleAppList": [{"appId": appId, "designerList": [{"designerType": designerType, "designerIdList": [desingerId]}]}]
     });
     this.filterOptionList.push(filterOption);
     return filterOption;
 };
-_worker._getDesingerModule = function(id, restful, par, moduleType, desingerType){
+_worker._getDesingerModule = function(id, restful, par, moduleType, designerType){
     var p = _worker.action.sendRequest(_worker._getRequestOption({"url": restful, "debug": _worker.findData.debug, "token": _worker.findData.token }, par));
     return p.then(function(json){
         list = json.data;
         list.forEach(function(designer){
-            _worker._createFilterOption(moduleType, id, desingerType, designer.id)
+            _worker._createFilterOption(moduleType, id, designerType, designer.id)
         });
     }, function(){});
 };
@@ -232,7 +232,7 @@ _worker._parseFindModule = function(moduleList){
                         promiseArr = promiseArr.concat(_worker["_getDesinger_"+module.moduleType](flag.id));
                     }else{
                         flag.designerList.forEach(function(designer){
-                            var filterOption = _worker._createFilterOption(module.moduleType, flag.id, designer.desingerType, designer.id)
+                            var filterOption = _worker._createFilterOption(module.moduleType, flag.id, designer.designerType, designer.id)
                             promiseArr = promiseArr.concat(Promise.resolve(filterOption));
                         });
                     }
@@ -268,7 +268,7 @@ _worker._parseFindModule = function(moduleList){
                         promiseArr = promiseArr.concat(_worker["_getDesinger_"+module.moduleType](flag.id));
                     }else{
                         flag.designerList.forEach(function(designer){
-                            var filterOption = _worker._createFilterOption(module.moduleType, flag.id, designer.desingerType, designer.id)
+                            var filterOption = _worker._createFilterOption(module.moduleType, flag.id, designer.designerType, designer.id)
                             promiseArr = promiseArr.concat(Promise.resolve(filterOption));
                         });
                     }

+ 20 - 1
o2web/source/x_component_FindDesigner/Main.js

@@ -411,6 +411,17 @@ MWF.xApplication.FindDesigner.Main = new Class({
 		}
 		return tree.appendChild(obj);
 	},
+
+	updatePatternCount: function(node){
+		node.patternCount++;
+		var textDivNode = node.textNode.getElement("div");
+		if (textDivNode){
+			var text = this.lp.patternCount.replace("{n}", node.patternCount)
+			var t = node.options.text+"&nbsp;&nbsp;<span style='color: #666666'>("+text+")</span>>";
+			//var html = item.options.text;
+			textDivNode.set("html", t);
+		}
+	},
 	showFindResult: function(data){
 		if (!this.patternCount) this.patternCount = 0;
 		this.patternCount++;
@@ -425,30 +436,38 @@ MWF.xApplication.FindDesigner.Main = new Class({
 			var moduleNode = (this.tree.modules) ? this.tree.modules[data.module] : null;
 			if (!moduleNode){
 				moduleNode = this.createResultCategroyItem(this.lp[data.module], this.lp[data.module], this.tree);
+				moduleNode.patternCount = 0;
 				if (!this.tree.modules) this.tree.modules = {};
 				this.tree.modules[data.module] = moduleNode;
 			}
+		this.updatePatternCount(moduleNode);
+
 			var appNode = (moduleNode.apps) ? moduleNode.apps[data.appId] : null;
 			if (!appNode){
 				appNode = this.createResultAppItem(data.appName, data.appName, moduleNode);
+				appNode.patternCount = 0;
 				if (!moduleNode.apps) moduleNode.apps = {};
 				moduleNode.apps[data.appId] = appNode;
 			}
+		this.updatePatternCount(appNode);
 
 			var typeNode = (appNode.types) ? appNode.types[data.designerType] : null;
 			if (!typeNode){
 				typeNode = this.createResultTypeItem(this.lp[data.designerType], this.lp[data.designerType], appNode);
+				typeNode.patternCount = 0;
 				if (!appNode.types) appNode.types = {};
 				appNode.types[data.designerType] = typeNode;
 			}
+		this.updatePatternCount(typeNode);
 
 			var designerNode = (typeNode.designers) ? typeNode.designers[data.designerId] : null;
 			if (!designerNode){
 				designerNode = this.createResultTypeItem(data.designerName, data.designerName, typeNode);
+				designerNode.patternCount = 0;
 				if (!typeNode.designers) typeNode.designers = {};
 				typeNode.designers[data.designerId] = designerNode;
 			}
-
+		this.updatePatternCount(designerNode);
 
 			switch (data.designerType){
 				case "script":