Bladeren bron

Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!1919
胡起 5 jaren geleden
bovenliggende
commit
e1d83b53ec

+ 2 - 2
o2web/source/x_component_cms_ScriptDesigner/$Main/default/css.wcss

@@ -34,7 +34,7 @@
     "scriptListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
@@ -229,4 +229,4 @@
 		"background": "#FFF",
 		"margin-bottom": "2px"
 	}
-}
+}

+ 2 - 2
o2web/source/x_component_portal_ScriptDesigner/$Main/default/css.wcss

@@ -34,7 +34,7 @@
     "scriptListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
@@ -229,4 +229,4 @@
 		"background": "#FFF",
 		"margin-bottom": "2px"
 	}
-}
+}

+ 2 - 2
o2web/source/x_component_process_ScriptDesigner/$Main/default/css.wcss

@@ -34,7 +34,7 @@
     "scriptListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
@@ -229,4 +229,4 @@
 		"background": "#FFF",
 		"margin-bottom": "2px"
 	}
-}
+}

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

@@ -172,7 +172,7 @@ MWF.xApplication.process.ScriptDesigner.Main = new Class({
 
         listScriptItem.store("script", script);
         listScriptItem.addEvents({
-            "dblclick": function(e){_self.loadScriptByData(this, e);},
+            "click": function(e){_self.loadScriptByData(this, e);},
             "mouseover": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem_over);},
             "mouseout": function(){if (_self.currentListScriptItem!=this) this.setStyles(_self.css.listScriptItem);}
         });

+ 2 - 2
o2web/source/x_component_service_AgentDesigner/$Main/default/css.wcss

@@ -34,7 +34,7 @@
     "agentListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
@@ -241,4 +241,4 @@
 		"background": "#FFF",
 		"margin-bottom": "2px"
 	}
-}
+}

+ 2 - 2
o2web/source/x_component_service_InvokeDesigner/$Main/default/css.wcss

@@ -34,7 +34,7 @@
     "invokeListAreaSccrollNode": {
         "margin": "4px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
@@ -244,4 +244,4 @@
 		"background": "#FFF",
 		"margin-bottom": "2px"
 	}
-}
+}

+ 1 - 1
o2web/source/x_desktop/workmobilewithaction.html

@@ -36,7 +36,7 @@
 
     </div>
 
-    <script type="text/javascript" src="/o2_lib/wechat/jweixin-1.6.0.js"></script>
+    <script type="text/javascript" src="../o2_lib/wechat/jweixin-1.6.0.js"></script>
 </body>
 
 </html>