Merge branch 'feature-appmarketv2' into 'develop'

应用市场修改

See merge request o2oa/o2oa!1548

o2web/gulpapps.js

@@ -3,13 +3,11 @@ var apps = [
     { "folder": "o2_core", "tasks": ["move", "min"] },
     { "folder": "x_component_ANN", "tasks": ["move", "min"] },
     { "folder": "x_component_AppCenter", "tasks": ["move", "min"] },
-    { "folder": "x_component_AppMarket", "tasks": ["move", "min"] },
     { "folder": "x_component_AppMarketV2", "tasks": ["move", "min"] },
     { "folder": "x_component_AppMarketV2_Application", "tasks": ["move", "min"] },
     { "folder": "x_component_Attendance", "tasks": ["move", "min"] },
     { "folder": "x_component_BAM", "tasks": ["move", "min"] },
     { "folder": "x_component_Calendar", "tasks": ["move", "min"] },
-    { "folder": "x_component_ConfigDesigner", "tasks": ["move", "min"] },
     { "folder": "x_component_cms_Column", "tasks": ["move", "min"] },
     { "folder": "x_component_cms_ColumnManager", "tasks": ["move", "min"] },
     { "folder": "x_component_cms_DictionaryDesigner", "tasks": ["move", "min"] },

o2web/source/x_component_AppMarketV2/$Main/default/applicationsContent.html

@@ -10,9 +10,6 @@
             </div>
         </div>
         <div style="clear:both;"></div>
-        <div class="o2_appmarket_appcategory_count" data-o2-element="appCategory_count">
-        </div>
-        <div style="clear:both;"></div>
         <div class="o2_appmarket_applist" data-o2-element="appList">
         </div>
 

o2web/source/x_component_AppMarketV2/$Main/default/style.css

@@ -202,17 +202,18 @@
 .o2_appmarket_app_search_inputArea{
     height: 28px;
     border-radius: 20px;
-    padding: 0 10px;
+    padding: 1px 10px;
     margin-right: 52px;
 }
 
 .o2_appmarket_app_searchinput{
-    height: 26px;
+    height: 25px;
     width: 99%;
-    line-height: 26px;
+    line-height: 25px;
     border: 0;
     border-radius: 20px;
     float: left;
+    background-color: #f0f0f0;
 }
 .o2_appmarket_applist{
     min-width: 1280px;
@@ -230,7 +231,7 @@
 }
 .o2_appmarket_application{
     width:285px;
-    height:555px;
+    height:452px;
     background:rgba(255,255,255,1);
     box-shadow:0px 0px 8px 0px rgba(0,0,0,0.25);
     border-radius:16px;

o2web/source/x_component_AppMarketV2/ApplicationsContent.js

@@ -50,7 +50,7 @@ MWF.xApplication.AppMarketV2.ApplicationsContent = new Class({
         }else{
             this.searchAppClearNode.removeClass("icon_clear");
         }
-        if (e.keyCode===13) this.doSearch();
+        if (e.keyCode===13) this.doAppSearch();
     },
     clearAppSearch: function(){
         this.searchAppInputNode.set("value", "");
@@ -68,6 +68,8 @@ MWF.xApplication.AppMarketV2.ApplicationsContent = new Class({
             }else{
                 this.applicationsContentV.load();
             }
+        }else{
+            this.clearSearchResult();
         }
     },
     clearSearchResult: function(){
@@ -182,8 +184,8 @@ MWF.xApplication.AppMarketV2.ApplicationsContent.Applications= new Class({
     showApplications: function(data){
         debugger;
         //show category count
-        this.content.appCategory_count.empty();
-        new Element("div",{"text":this.content.currentcategory.name+"("+this.content.currentcategory.count+")"}).inject(this.content.appCategory_count);        
+        //this.content.appCategory_count.empty();
+        //new Element("div",{"text":this.content.currentcategory.name+"("+this.content.currentcategory.count+")"}).inject(this.content.appCategory_count);        
         var appsdiv = this.content.appList;
         var appsdivwidth= appsdiv.clientWidth-80;
         //appwidth = (appsdivwidth-200)/7;

o2web/source/x_component_AppMarketV2/Main.js

@@ -19,12 +19,12 @@ MWF.xApplication.AppMarketV2.Main = new Class({
         this.lp = MWF.xApplication.AppMarketV2.LP;
         this.actions = MWF.Actions.load("x_program_center");
 		this.viewPath = this.path+this.options.style+"/view.html";
-		this.iconPath = this.path+this.options.style+"/icon/";
+		this.iconPath = this.path+this.options.style+"/icon/";		
 	},
 	mask: function(){
         if (!this.maskNode){
             this.maskNode = new MWF.widget.MaskNode(this.marketnode, {"style": "bam"});
-            this.maskNode.load();
+			this.maskNode.load();
         }
     },
     unmask: function(){
@@ -37,7 +37,19 @@ MWF.xApplication.AppMarketV2.Main = new Class({
 		this.content.loadHtml(this.viewPath, {"bind": {"lp": this.lp}, "module": this}, function(){
 			if (!this.options.isRefresh){
 				this.maxSize(function(){
-					this.loadApp(callback);
+					//检查是否在云服务器上已注册
+					this.actions.CollectAction.login(//平台封装好的方法
+						function( json ){ //服务调用成功的回调函数, json为服务传回的数据
+							//alert(json.type)
+							if (json.type && json.type=="error"){
+								o2.xDesktop.notice("error", {x: "right", y:"top"}, json.message+"请至系统配置——云服务配置——连接配置注册并连接到O2云");
+							}
+							if (json.type && json.type=="success"){
+								this.loadApp(callback);
+							}
+						}.bind(this),null,false //同步执行 
+					);
+					
 				}.bind(this));
 			}else{
 				this.loadApp(callback);