Просмотр исходного кода

Merge branch 'fix/Designer_list_scroll' into 'wrdp'

Merge of fix/Designer_list_scroll 修复设计元素列表超过屏幕高度没有滚动条的问题 to wrdp

See merge request o2oa/o2oa!1939
蔡祥熠 5 лет назад
Родитель
Сommit
06a9d8f47c

+ 1 - 1
o2web/source/x_component_ConfigDesigner/$Main/default/css.wcss

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

+ 1 - 1
o2web/source/x_component_cms_DictionaryDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "dictionaryListAreaSccrollNode": {
     "dictionaryListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_cms_QueryViewDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_cms_ViewDesigner/$Main/default/css.wcss

@@ -29,7 +29,7 @@
     "viewListAreaSccrollNode": {
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_process_DictionaryDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "dictionaryListAreaSccrollNode": {
     "dictionaryListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_process_StatDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_process_ViewDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_query_StatDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_query_StatementDesigner/$Main/default/css.wcss

@@ -46,7 +46,7 @@
     "statementListAreaSccrollNode": {
     "statementListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_query_TableDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

+ 1 - 1
o2web/source/x_component_query_ViewDesigner/$Main/default/css.wcss

@@ -35,7 +35,7 @@
     "viewListAreaSccrollNode": {
     "viewListAreaSccrollNode": {
         "margin": "4px",
         "margin": "4px",
         "margin-right": "8px",
         "margin-right": "8px",
-        "overflow": "hidden",
+        "overflow": "auto",
         "background-color": "#FFF",
         "background-color": "#FFF",
         "border-top": "1px solid #999",
         "border-top": "1px solid #999",
         "border-left": "1px solid #999",
         "border-left": "1px solid #999",

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

@@ -104,7 +104,7 @@ MWF.xApplication.service.AgentDesigner.Main = new Class({
         }).inject(this.agentListNode);
         }).inject(this.agentListNode);
 
 
         this.agentListResizeNode = new Element("div", {"styles": this.css.agentListResizeNode}).inject(this.agentListNode);
         this.agentListResizeNode = new Element("div", {"styles": this.css.agentListResizeNode}).inject(this.agentListNode);
-        this.agentListAreaSccrollNode = new Element("div", {"styles": this.css.agentListAreaSccrollNode}).inject(this.agentListNode);
+        this.agentListAreaSccrollNode = new Element("div.agentListAreaSccrollNode", {"styles": this.css.agentListAreaSccrollNode}).inject(this.agentListNode);
         this.agentListAreaNode = new Element("div", {"styles": this.css.agentListAreaNode}).inject(this.agentListAreaSccrollNode);
         this.agentListAreaNode = new Element("div", {"styles": this.css.agentListAreaNode}).inject(this.agentListAreaSccrollNode);
 
 
         this.loadAgentListResize();
         this.loadAgentListResize();

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

@@ -104,7 +104,7 @@ MWF.xApplication.service.InvokeDesigner.Main = new Class({
         }).inject(this.invokeListNode);
         }).inject(this.invokeListNode);
 
 
         this.invokeListResizeNode = new Element("div", {"styles": this.css.invokeListResizeNode}).inject(this.invokeListNode);
         this.invokeListResizeNode = new Element("div", {"styles": this.css.invokeListResizeNode}).inject(this.invokeListNode);
-        this.invokeListAreaSccrollNode = new Element("div", {"styles": this.css.invokeListAreaSccrollNode}).inject(this.invokeListNode);
+        this.invokeListAreaSccrollNode = new Element("div.invokeListAreaSccrollNode", {"styles": this.css.invokeListAreaSccrollNode}).inject(this.invokeListNode);
         this.invokeListAreaNode = new Element("div", {"styles": this.css.invokeListAreaNode}).inject(this.invokeListAreaSccrollNode);
         this.invokeListAreaNode = new Element("div", {"styles": this.css.invokeListAreaNode}).inject(this.invokeListAreaSccrollNode);
 
 
         this.loadInvokeListResize();
         this.loadInvokeListResize();