Merge branch 'fix/Process.form_datatable' into 'wrdp'

Merge of fix/Process.form_datatable 修复数据表格滚动条问题、修复查询语句操作条问题 to wrdp

See merge request o2oa/o2oa!4268

(cherry picked from commit 696321fe)

15a81f99 修复数据表格滚动条的问题
491437bc 修复查询语句操作条的问题

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_blue-simple.json

@@ -234,7 +234,8 @@
   "datatable": {
     "styles": {},
     "tableStyles": {
-      "border": "1px solid #cccccc"
+      "border": "1px solid #cccccc",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_default.json

@@ -244,7 +244,8 @@
     "styles": {},
     "tableStyles": {
       "border-top": "1px solid #666666",
-      "border-left": "1px solid #666666"
+      "border-left": "1px solid #666666",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_cms_FormDesigner/Module/Form/skin/styles_red-simple.json

@@ -235,7 +235,8 @@
   "datatable": {
     "styles": {},
     "tableStyles": {
-      "border": "1px solid #cccccc"
+      "border": "1px solid #cccccc",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_blue-flat.json

@@ -308,7 +308,8 @@
   "datatable": {
     "styles": {},
     "tableStyles": {
-      "border": "1px solid #DCDFE6"
+      "border": "1px solid #DCDFE6",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_blue-simple.json

@@ -283,7 +283,8 @@
   "datatable": {
     "styles": {},
     "tableStyles": {
-      "border": "1px solid #cccccc"
+      "border": "1px solid #cccccc",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_cmcc.json

@@ -291,7 +291,8 @@
   "datatable": {
     "styles": {},
     "tableStyles": {
-      "border": "1px solid #cccccc"
+      "border": "1px solid #cccccc",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_default.json

@@ -290,7 +290,8 @@
     "styles": {},
     "tableStyles": {
       "border-top": "1px solid #666666",
-      "border-left": "1px solid #666666"
+      "border-left": "1px solid #666666",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_official.json

@@ -307,7 +307,8 @@
     },
     "tableStyles": {
       "border-left": "1px solid #fd1113",
-      "border-top": "1px solid #fd1113"
+      "border-top": "1px solid #fd1113",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_process_FormDesigner/Module/Form/skin/styles_red-simple.json

@@ -284,7 +284,8 @@
   "datatable": {
     "styles": {},
     "tableStyles": {
-      "border": "1px solid #cccccc"
+      "border": "1px solid #cccccc",
+      "width": "calc(100% - 2px)"
     },
     "titleStyles": {
       "height": "28px",

o2web/source/x_component_query_ViewDesigner/View.js

@@ -1999,7 +1999,8 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({
             this.toolbarWidget.load();
             this._setEditStyle_custom("hideSystemTools");
         }else{
-            MWF.getJSON(this.path+"toolbars.json", function(json){
+            // MWF.getJSON(this.path+"toolbars.json", function(json){
+            MWF.getJSON(this.getJsonPath(), function(json){
                 this.json.multiTools = json.map( function (d) { d.system = true; return d; });
                 if (this.json.tools){
                     this.json.multiTools = this.json.multiTools.concat( this.json.tools )