From 77d7a8b7e41904d2d41066a7215b2777338a09d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 10 Apr 2020 22:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../o2_core/o2/widget/$Paging/red/css.wcss | 145 ++++ .../o2/widget/$Paging/red/icon/left.png | Bin 0 -> 1224 bytes .../o2/widget/$Paging/red/icon/right.png | Bin 0 -> 1222 bytes .../$View/skin/styles_blue-flat.json | 19 +- .../$View/skin/styles_blue-simple.json | 411 +---------- .../$View/skin/styles_cmcc.json | 439 +---------- .../$View/skin/styles_default.json | 10 +- .../$View/skin/styles_official.json | 460 +----------- .../$View/skin/styles_red-simple.json | 412 +---------- .../$View/view.html | 16 +- .../$View/view.json | 2 +- .../Property.js | 32 + .../x_component_query_ViewDesigner/View.js | 685 +++++++----------- 13 files changed, 465 insertions(+), 2166 deletions(-) create mode 100644 o2web/source/o2_core/o2/widget/$Paging/red/css.wcss create mode 100644 o2web/source/o2_core/o2/widget/$Paging/red/icon/left.png create mode 100644 o2web/source/o2_core/o2/widget/$Paging/red/icon/right.png diff --git a/o2web/source/o2_core/o2/widget/$Paging/red/css.wcss b/o2web/source/o2_core/o2/widget/$Paging/red/css.wcss new file mode 100644 index 0000000000..51a68293cd --- /dev/null +++ b/o2web/source/o2_core/o2/widget/$Paging/red/css.wcss @@ -0,0 +1,145 @@ +{ + "pagingBar" : { + "float": "left", + "margin-left": "10px", + "height": "24px", + "color": "#777777" + }, + "firstPage" : { + "height": "24px", + "width": "80px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "margin-right": "10px", + "background-color": "#ffffff", + "float": "left" + }, + "firstPage_over" : { + "background-color": "#f1f1f1" + }, + "lastPage" : { + "height": "24px", + "width": "80px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "background-color": "#ffffff", + "float": "left" + }, + "lastPage_over" : { + "background-color": "#f1f1f1" + }, + "prePage" : { + "width": "24px", + "height": "24px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "background-color": "#ffffff", + "float": "left", + "margin-right": "10px", + "background": "url(/o2_core/o2/widget/$Paging/default/icon/left.png) no-repeat center center" + }, + "prePage_over" : { + "background-color": "#f1f1f1" + }, + "nextPage" : { + "width": "24px", + "height": "24px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "background-color": "#ffffff", + "float": "left", + "margin-right": "10px", + "background": "url(/o2_core/o2/widget/$Paging/default/icon/right.png) no-repeat center center" + }, + "nextPage_over" : { + "background-color": "#f1f1f1" + }, + "pageTurnContainer" : { + "float" : "left" + }, + "pageItem" : { + "padding-left": "5px", + "padding-right" : "5px", + "height": "24px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "float": "left", + "margin-right": "10px", + "background-color": "#ffffff" + }, + "pageItem_over" : { + "background-color": "#f1f1f1" + }, + "preBatchPage" : { + "padding-left": "5px", + "padding-right" : "5px", + "height": "24px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "float": "left", + "margin-right": "10px", + "background-color": "#ffffff" + }, + "preBatchPage_over" : { + "background-color": "#f1f1f1" + }, + "nextBatchPage" : { + "padding-left": "5px", + "padding-right" : "5px", + "height": "24px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "float": "left", + "margin-right": "10px", + "background-color": "#ffffff" + }, + "nextBatchPage_over" : { + "background-color": "#f1f1f1" + }, + "currentPage" : { + "width": "24px", + "height": "24px", + "border": "1px solid #e6e6e6", + "text-align": "center", + "line-height": "24px", + "cursor": "pointer", + "float": "left", + "margin-right": "10px", + "background-color": "#cc3d3d", + "color": "#ffffff" + }, + "pageJumper" : { + "float" : "left", + "height" : "20px", + "line-height" : "20px", + "text-align" : "center", + "width" : "20px", + "margin-left" : "10px", + "border" : "1px solid #ddd" + }, + "pageJumper_over" : { + "border" : "1px solid #cc3d3d" + }, + "pageJumperText" : { + "float" : "left", + "height" : "20px", + "padding" : "2px 5px", + "text-align" : "center", + "line-height" : "20px", + "margin-right" : "5px" + } +} \ No newline at end of file diff --git a/o2web/source/o2_core/o2/widget/$Paging/red/icon/left.png b/o2web/source/o2_core/o2/widget/$Paging/red/icon/left.png new file mode 100644 index 0000000000000000000000000000000000000000..91b6bbc35cb495aa14b629e232a456e508a09621 GIT binary patch literal 1224 zcmah|&ui0A9FI}R1EjVEZ-;&ohw8@LftL+A& z$PgwBHWcv>n73`7WQPe}yod({PYU93C(*+|*~yn~trJ!ZN!|}W-_Q5+{WUi}cBQ-P zbQi~Q-I=R;maT`_ceryu`&Wh+N7-_UrYC5Q6le|km`hq@3iBBU6>%0LYx>SRJj8Jw z8+LwzP8g%mB#wwej97O(X3cR!!*vgtWlZ@gT(sSU@MHarz}r?rxEVKO!_#odzB=RM z+{{?soGF{CB@AEUhw6|KIG7^7?o`|W))PX57qWeLEeU)BLdywZThxRx&TGWSd|Zr0 zOc?-PQAE%mR}^rOkIEn_$?R1kpdZE+7#-ku9)WrDtpd#IBRjs>DIt_7^`IoxYBjMI z6Nz7xfU2q?M>HB?h)6K)QdEz)L2r{m$ARhF9<_WWEd^@p0tkBLI*U9|Hif_I>=9Z zSjysnRDF{bxzHQR@}TBpM2Vj#q|(gzc!^LFl!(V`Ifd`LX}cDw1?P9+v5qKC2rT<* zL>`F9N*)YCS%ES2g3LDZHq;=NU6|ezIsk$E50sVOLKOWMY?-h?d}=nQ2g^^ho%{MrE9%DOm*5dNxO}U8{>6I7x6cPoa%lDX+PldGHPnzvkLjza+YkQ$ DV0wj^ literal 0 HcmV?d00001 diff --git a/o2web/source/o2_core/o2/widget/$Paging/red/icon/right.png b/o2web/source/o2_core/o2/widget/$Paging/red/icon/right.png new file mode 100644 index 0000000000000000000000000000000000000000..36b4c152471e624c6ed75f1eea1f08a5437a113c GIT binary patch literal 1222 zcmah}O-$2J9IqIZpcsx|VyxwY==!m-j=nI-Xg8Um1jiC42eq_sqhaltcm|K4EG}v;q+$jdhjh}?axeuoqkQ2d?4_vP z-^_FdXVgKUBa7913|q1s!ltO+zLKNqlMvJ6FlX9PX7%9{hBl2TGa6QT)sf+ZIWXnI zk*T4yJ~gRJ2Ge(f?kxc#U_q?WB`a@xpcG{)x`6EcV~(LK5Ih-WHk`_+!?cWCNQc=_ zK<5R47DZO*4vV62oDT9rkmJcM283=97C|sVZ(a3N06_%2vW>M;!1g+-3JUae*L1LnY}!}U#!&%B8RF?i2$oZmwY|+W zk%Vz2&EW)=_d}`x4ZVhQ3U0n)+|W6ghZeN4N3cQ-OR}V@HTaIQmQ_Q0I0d(2+Y#-h z%MRpH&_e}RCq>S7_-;8scAr|V-G+yXhGCQ; z*_Q%*B*2Slp$G6H2ua6yvf($NDl*J$c}HjjgoFP;N$Cv@YySlsI>;i|(n$VIzgs!S z&Q+|bDoENM)@&Unl_*0(V@=Zl@t7jSWFamkl(0aSo=`|m@S%QLh=mj3P^8LLkY4bs zP~{q1+(ccj-_L%XfC63fA~X^%vgk@JfLY%cxvt(O*QoD{QkTmSXE?t*w{>gvh>U>0 zt<4_!s7)`l$;i57HqY%cyU1J@l1eOH`k24*eoy>JYy8%q#`W0sna=p{^;u|2MqRs^Jd~UbzViPp$@q}6(0~5Y EUyv+^O#lD@ literal 0 HcmV?d00001 diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json index 5dedac372b..f0c080bcfc 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json +++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-flat.json @@ -1,11 +1,9 @@ { "name": "蓝白扁平", - "form": { - "styles":{ - "background-color": "#f1f4f9" - } - }, "table": { + "containerStyles" : { + + }, "tableStyles": { "background-color": "#FFF", "border" : "1px solid #DCDFE6" @@ -42,9 +40,16 @@ "style": "xform_blue_flat", "iconOverStyle": "xform_blue_flat_over", "customIconStyle" : "blue", - "customIconOverStyle" : "white" + "customIconOverStyle" : "white", + "forceStyles" : { + "container" : { + "width" : "100%", + "padding-left" : "10px", + "padding-right" : "10px" + } + } }, "paging" : { - + "style" : "default" } } \ No newline at end of file diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json index 6d3bddfc55..3169a7ab4f 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json +++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_blue-simple.json @@ -1,419 +1,10 @@ { "name": "蓝色简洁", - "form": { - "styles":{ - "background-color": "#f0f0f0" - } - }, - "label": { - "banner": { - "name": "横幅", - "styles": { - "background-color": "#3c76b7", - "height": "40px", - "line-height": "40px", - "color": "#ffffff", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "24px", - "line-height": "60px", - "font-weight": "bold", - "color": "#3c76b7", - "height": "60px" - } - }, - - "section": { - "name": "区段标题", - "styles": { - "height": "40px", - "background-color": "#f7f7f7", - "line-height": "40px", - "padding": "0px 20px", - "font-weight": "bold", - "color": "#666", - "border-bottom": "1px solid #cccccc" - } - } - }, - - "div": { - "banner": { - "name": "横幅", - "styles": { - "background-color": "#3c76b7", - "height": "40px", - "line-height": "40px", - "color": "#ffffff", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "24px", - "line-height": "60px", - "font-weight": "bold", - "color": "#3c76b7", - "height": "60px" - } - }, - "section": { - "name": "区段", - "styles": { - "padding": "20px 0px", - "background-color": "#FFF", - "border": "1px solid #cccccc" - } - } - }, - - "tab": { - "styles": {}, - "tabAreaStyles": { - "height": "40px", - "border-bottom": "2px solid #3c76b7" - }, - "contentAreaStyles": { - "line-height": "normal", - "clear": "both", - "overflow": "hidden" - }, - "tabStyles": { - "position": "relative", - "margin-left": "4px", - "margin-top": "0px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "cursor": "pointer", - "min-width": "100px", - "background": "transparent ", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border": "0px solid #f0f0f0", - "border-bottom": "1px solid #3c76b7" - }, - "tabTextStyles": { - "color": "#666", - "font-weight": "bold", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-top": "0px", - "margin-left": "8px" - }, - "tabCurrentStyles": { - "position": "relative", - "margin-top": "0px", - "margin-left": "2px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "min-width": "100px", - "background": "#3c76b7", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border-top": "0px solid #f0f0f0", - "border-left": "0px solid #f0f0f0", - "border-right": "0px solid #f0f0f0", - "border-bottom": "1px solid #3c76b7" - }, - "tabCurrentTextStyles": { - "color": "#FFF", - "font-weight": "bold", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-left": "8px", - "margin-top": "0px" - } - }, - "tab$Content": { - "styles": { - "padding": "20px 0px" - } - }, - "table": { - "styles": { - "background-color": "#FFF", - "margin": "10px 0px" - }, - "titleStyles":{ - "background-color": "#fff", - "color": "#333", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "right" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333" - }, - "layoutStyles": {}, - "properties": { - "width": "90%", - "border": "0", - "cellpadding": "3", - "cellspacing": "5", - "align": "center" - } - }, - "log" : { - "tableStyles": { - "background-color": "#FFF", - "margin": "10px 0px" - }, - "titleStyles":{ - "background-color": "#fff", - "color": "#333", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "right" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333" - }, - "properties": { - "width": "90%", - "border": "0", - "cellpadding": "3", - "cellspacing": "5", - "align": "center" - } - }, - "datagrid": { - "styles": {}, - "tableStyles": { - "border": "1px solid #cccccc" - }, - "titleStyles": { - "height": "28px", - "cursor": "pointer", - "line-height": "28px", - "overflow": "hidden", - "opacity": 1, - "border-bottom": "1px solid #ccc", - "background-color": "#f0f0f0" - }, - "contentStyles": { - "text-align": "center", - "height": "30px", - "line-height": "30px", - "color": "#666" - }, - "actionStyles": { - "background-color": "#f7f7f7" - }, - "editStyles": { - "background-color": "#fff6f6", - "text-align": "center", - "height": "30px", - "line-height": "30px" - }, - "amountStyles": { - "border-top": "1px solid #ccc", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center", - "background-color": "#f0f0f0" - }, - "itemTitleStyles": { - "height": "40px", - "background-color": "#ffffff", - "line-height": "30px", - "padding": "0px 15px", - "color": "#fb4747", - "font-size": "18px", - "font-weight": "bold", - "border-bottom": "0px solid #cccccc" - }, - "properties": { - "border": "0", - "cellpadding": "3", - "cellspacing": "0", - "align": "center" - } - }, - "datagrid$Title": { - "styles": { - "background-color": "#f0f0f0" - } - }, - "address": { - "styles": { - "border-bottom": "1px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "color": "#666", - "border": "0px solid #ccc" - } - }, - "combox": { - "styles": { - "border-bottom": "1px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "color": "#666", - "border": "0px solid #ccc" - } - }, - "textfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "color": "#666", - "border-bottom": "1px solid #ccc" - } - }, - "calendar": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "color": "#666", - "border-bottom": "1px solid #ccc" - } - }, - "number": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "color": "#666", - "border-bottom": "1px solid #ccc" - } - }, - "personfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "20px", - "line-height": "26px" - }, - "inputStyles": { - "min-height": "26px", - "color": "#666", - "border-bottom": "1px solid #ccc" - } - }, - "orgfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "20px", - "line-height": "26px" - }, - "inputStyles": { - "min-height": "26px", - "color": "#666", - "border-bottom": "1px solid #ccc" - } - }, - "org": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "20px", - "line-height": "26px" - }, - "inputStyles": { - "min-height": "26px", - "color": "#666", - "border-bottom": "1px solid #ccc" - } - }, - "select": { - "styles": { - "border-bottom": "0px solid #999", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "margin-top": "5px", - "color": "#666" - }, - "inputStyles": { - "height": "26px", - "font-size": "14px" - } - }, - "textarea": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px" - }, - "inputStyles": { - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "opinion": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px" - }, - "inputStyles": { - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, "actionbar": { "style": "xform_blue_simple", "customIconStyle" : "" }, - "attachment" : { + "paging" : { "style" : "default" } } \ No newline at end of file diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json index cd660a3da9..e2f4a249ad 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json +++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_cmcc.json @@ -1,445 +1,10 @@ { "name": "集团样式", - "form": { - "styles":{ - "background-color": "#f0f0f0" - } - }, - "label": { - "banner": { - "name": "横幅", - "styles": { - "background-color": "#3c76b7", - "height": "40px", - "line-height": "40px", - "color": "#ffffff", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "36px", - "line-height": "100px", - "font-weight": "bold", - "color": "#f81313", - "height": "100px" - } - }, - - "section": { - "name": "区段标题", - "styles": { - "background-color": "#f7f7f7", - "height": "35px", - "font-size" : "16px", - "line-height": "35px", - "padding": "0px 10px", - "font-weight": "normal", - "color": "#555", - "border-bottom": "0px" - } - } - }, - - "div": { - "banner": { - "name": "横幅", - "styles": { - "background-color": "#3c76b7", - "height": "40px", - "line-height": "40px", - "color": "#ffffff", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "24px", - "line-height": "60px", - "font-weight": "bold", - "color": "#3c76b7", - "height": "60px" - } - }, - "section": { - "name": "区段标题", - "styles": { - "background-color": "#f7f7f7", - "height": "35px", - "font-size" : "16px", - "line-height": "35px", - "padding": "0px 10px", - "font-weight": "normal", - "color": "#555", - "border-bottom": "0px" - } - } - }, - - "tab": { - "styles": {}, - "tabAreaStyles": { - "height": "40px", - "border-bottom": "2px solid #3c76b7" - }, - "contentAreaStyles": { - "line-height": "normal", - "clear": "both", - "overflow": "hidden" - }, - "tabStyles": { - "position": "relative", - "margin-left": "4px", - "margin-top": "0px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "cursor": "pointer", - "min-width": "100px", - "background": "transparent ", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border": "0px solid #f0f0f0", - "border-bottom": "1px solid #3c76b7" - }, - "tabTextStyles": { - "color": "#666", - "font-weight": "bold", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-top": "0px", - "margin-left": "8px" - }, - "tabCurrentStyles": { - "position": "relative", - "margin-top": "0px", - "margin-left": "2px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "min-width": "100px", - "background": "#3c76b7", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border-top": "0px solid #f0f0f0", - "border-left": "0px solid #f0f0f0", - "border-right": "0px solid #f0f0f0", - "border-bottom": "1px solid #3c76b7" - }, - "tabCurrentTextStyles": { - "color": "#FFF", - "font-weight": "bold", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-left": "8px", - "margin-top": "0px" - } - }, - "tab$Content": { - "styles": { - "padding": "20px 0px" - } - }, - "table": { - "styles": { - "background-color": "#FFF", - "margin": "10px 10px", - "border" : "1px solid #e1e1e1" - }, - "titleStyles":{ - "background-color": "#f7f7f7", - "color": "#333", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333" - }, - "layoutStyles": {}, - "properties": { - "width": "100%", - "border": "0", - "cellpadding": "3", - "cellspacing": "5", - "align": "center" - } - }, - "log" : { - "tableStyles": { - "background-color": "#FFF", - "margin": "10px 10px", - "border" : "1px solid #e1e1e1" - }, - "titleStyles":{ - "background-color": "#f7f7f7", - "color": "#333", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333" - }, - "properties": { - "width": "100%", - "border": "0", - "cellpadding": "3", - "cellspacing": "5", - "align": "center" - } - }, - "datagrid": { - "styles": {}, - "tableStyles": { - "border": "1px solid #cccccc" - }, - "titleStyles": { - "height": "28px", - "cursor": "pointer", - "line-height": "28px", - "overflow": "hidden", - "opacity": 1, - "border-bottom": "1px solid #ccc", - "background-color": "#f0f0f0" - }, - "contentStyles": { - "text-align": "center", - "height": "30px", - "line-height": "30px", - "color": "#666" - }, - "actionStyles": { - "background-color": "#f7f7f7" - }, - "editStyles": { - "background-color": "#fff6f6", - "text-align": "center", - "height": "30px", - "line-height": "30px" - }, - "amountStyles": { - "border-top": "1px solid #ccc", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center", - "background-color": "#f0f0f0" - }, - "itemTitleStyles": { - "height": "40px", - "background-color": "#ffffff", - "line-height": "30px", - "padding": "0px 15px", - "color": "#fb4747", - "font-size": "18px", - "font-weight": "bold", - "border-bottom": "0px solid #cccccc" - }, - "properties": { - "border": "0", - "cellpadding": "3", - "cellspacing": "0", - "align": "center" - } - }, - "datagrid$Title": { - "styles": { - "background-color": "#f0f0f0" - } - }, - "address": { - "styles": { - "border-bottom": "1px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "height": "30px", - "color": "#666", - "border": "0px solid #ccc" - } - }, - "combox": { - "styles": { - "border-bottom": "1px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "height": "30px", - "color": "#666", - "border": "0px solid #ccc" - } - }, - "textfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "height": "30px", - "color": "#666", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc" - } - }, - "calendar": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "height": "30px", - "color": "#666", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc" - } - }, - "number": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "height": "30px", - "color": "#666", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc" - } - }, - "personfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "30px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "min-height": "30px", - "color": "#666", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc" - } - }, - "orgfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "30px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "min-height": "30px", - "color": "#666", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc" - } - }, - "org": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "30px", - "line-height": "30px" - }, - "inputStyles": { - "font-size" : "100%", - "min-height": "30px", - "color": "#666", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc" - } - }, - "select": { - "styles": { - "border-bottom": "0px solid #999", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "margin-top": "5px", - "color": "#666" - }, - "inputStyles": { - "height": "30px", - "font-size": "100%" - } - }, - "textarea": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px" - }, - "inputStyles": { - "font-size" : "100%", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "opinion": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px" - }, - "inputStyles": { - "font-size" : "100%", - "border": "1px solid transparent", - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, "actionbar": { "style": "cmcc", "customIconStyle" : "white" }, - "attachment" : { - "style" : "cmcc" + "paging" : { + "style" : "default" } } \ No newline at end of file diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json index d29b870d2d..70c887d8a0 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json +++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_default.json @@ -1,11 +1,9 @@ { "name": "传统样式", - "form": { - "styles":{ - "background-color": "#f0f0f0" - } - }, "table": { + "containerStyles" : { + + }, "tableStyles": { "background-color": "#FFF", "border": "1px solid #ddd" @@ -41,7 +39,7 @@ "style": "xform_blue_simple", "customIconStyle" : "" }, - "pagingBar" : { + "paging" : { "style" : "default" } } \ No newline at end of file diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json index a57034a0d8..a58a583de9 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json +++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_official.json @@ -1,467 +1,9 @@ { "name": "公文样式", - "form": { - "styles":{ - "background-color": "#ffffff", - "font-family": "宋体" - } - }, - "label": { - "banner": { - "name": "横幅", - "styles": { - "height": "40px", - "line-height": "40px", - "color": "#fd1113", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold", - "text-align": "center" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "36px", - "line-height": "60px", - "font-weight": "bold", - "color": "#fd1113", - "height": "60px", - "font-family": "宋体" - } - }, - - "section": { - "name": "区段标题", - "styles": { - "height": "40px", - "background-color": "#f7f7f7", - "line-height": "40px", - "padding": "0px 20px", - "font-weight": "bold", - "color": "#666", - "border-bottom": "1px solid #cccccc" - } - } - }, - - "div": { - "banner": { - "name": "横幅", - "styles": { - "height": "40px", - "line-height": "40px", - "color": "#fd1113", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold", - "text-align": "center" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "36px", - "line-height": "60px", - "font-weight": "bold", - "color": "#fd1113", - "height": "60px" - } - }, - "section": { - "name": "区段", - "styles": { - "padding": "20px 0px", - "background-color": "#FFF", - "border": "1px solid #cccccc" - } - } - }, - - "tab": { - "styles": {}, - "tabAreaStyles": { - "height": "40px", - "border-bottom": "2px solid #cc3d3d" - }, - "contentAreaStyles": { - "line-height": "normal", - "clear": "both", - "overflow": "hidden" - }, - "tabStyles": { - "position": "relative", - "margin-left": "4px", - "margin-top": "0px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "cursor": "pointer", - "min-width": "100px", - "background": "transparent ", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border": "0px solid #f0f0f0", - "border-bottom": "1px solid #cc0000" - }, - "tabTextStyles": { - "color": "#666", - "font-weight": "bold", - "font-size": "18px", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-top": "0px", - "margin-left": "8px" - }, - "tabCurrentStyles": { - "position": "relative", - "margin-top": "0px", - "margin-left": "2px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "min-width": "100px", - "background": "#cc0000", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border-top": "0px solid #f0f0f0", - "border-left": "0px solid #f0f0f0", - "border-right": "0px solid #f0f0f0", - "border-bottom": "1px solid #cc3d3d" - }, - "tabCurrentTextStyles": { - "color": "#FFF", - "font-weight": "bold", - "font-size": "18px", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-left": "8px", - "margin-top": "0px" - } - }, - "tab$Content": { - "styles": { - "padding": "20px 0px" - } - }, - "table": { - "styles": { - "background-color": "#FFF", - "border": "1px solid #fd1113" - }, - "titleStyles":{ - "background-color": "#fff", - "color": "#fd1113", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center", - "font-size": "18px" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333", - "font-size": "18px", - "min-height": "30px" - }, - "layoutStyles": {}, - "properties": { - "width": "100%", - "border": "0", - "cellpadding": "5", - "align": "center" - } - }, - "log" : { - "tableStyles": { - "background-color": "#FFF", - "border": "1px solid #fd1113" - }, - "titleStyles":{ - "background-color": "#fff", - "color": "#fd1113", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center", - "font-size": "18px" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333", - "font-size": "18px", - "min-height": "30px" - }, - "properties": { - "width": "100%", - "border": "0", - "cellpadding": "5", - "align": "center" - } - }, - "datagrid": { - "styles": { - - }, - "tableStyles": { - "border-left": "1px solid #fd1113", - "border-top": "1px solid #fd1113" - }, - "titleStyles": { - "height": "28px", - "cursor": "pointer", - "line-height": "28px", - "overflow": "hidden", - "opacity": 1, - "color": "#fd1113", - "border-right": "1px solid #fd1113", - "border-bottom": "1px solid #fd1113", - "background-color": "#f0f0f0" - }, - "contentStyles": { - "text-align": "center", - "height": "30px", - "line-height": "30px", - "border-right": "1px solid #fd1113", - "border-bottom": "1px solid #fd1113" - }, - "actionStyles": { - "background-color": "#f7f7f7", - "border-right": "1px solid #fd1113", - "border-bottom": "1px solid #fd1113" - }, - "editStyles": { - "background-color": "#fff6f6", - "text-align": "center", - "height": "30px", - "line-height": "30px", - "border-right": "1px solid #fd1113", - "border-bottom": "1px solid #fd1113" - }, - "amountStyles": { - "border-top": "1px solid #ccc", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center", - "background-color": "#f0f0f0", - "border-right": "1px solid #fd1113", - "border-bottom": "1px solid #fd1113" - }, - "itemTitleStyles": { - "height": "40px", - "background-color": "#ffffff", - "line-height": "30px", - "padding": "0px 15px", - "color": "#fd1113", - "font-size": "18px", - "font-weight": "bold", - "border-bottom": "0px solid #cccccc" - }, - "properties": { - "width": "90%", - "border": "0", - "cellpadding": "3", - "cellspacing": "0", - "align": "center" - } - }, - "datagrid$Title": { - "styles": { - "background-color": "#f0f0f0" - } - }, - "textfield": { - "styles": { - "border-bottom": "0px", - "border": "0px solid #999999", - "height": "auto", - "font-size": "18px", - "line-height": "30px" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "font-size": "18px", - "color": "#666", - "font-family": "宋体" - } - }, - "calendar": { - "styles": { - "border-bottom": "0px", - "border": "0px solid #999999", - "height": "auto", - "font-size": "18px", - "line-height": "30px" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "font-size": "18px", - "color": "#666", - "font-family": "宋体" - } - }, - "number": { - "styles": { - "border-bottom": "0px", - "border": "0px solid #999999", - "height": "auto", - "font-size": "18px", - "line-height": "30px" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "font-size": "18px", - "color": "#666", - "font-family": "宋体" - } - }, - "address": { - "styles": { - "border-bottom": "0px", - "height": "auto", - "line-height": "30px", - "font-size": "18px", - "border": "0px solid #999999" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "color": "#666", - "font-size": "18px", - "font-family": "宋体" - } - }, - "combox": { - "styles": { - "border-bottom": "0px", - "height": "auto", - "line-height": "30px", - "font-size": "18px", - "border": "0px solid #999999" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "color": "#666", - "font-size": "18px", - "font-family": "宋体" - } - }, - "personfield": { - "styles": { - "border-bottom": "0px", - "height": "auto", - "line-height": "30px", - "font-size": "18px", - "border": "0px solid #999999" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "color": "#666", - "font-size": "18px", - "font-family": "宋体" - } - }, - "orgfield": { - "styles": { - "border-bottom": "0px", - "height": "auto", - "line-height": "30px", - "font-size": "18px", - "border": "0px solid #999999" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "color": "#666", - "font-size": "18px", - "font-family": "宋体" - } - }, - "org": { - "styles": { - "border-bottom": "0px", - "height": "auto", - "line-height": "30px", - "font-size": "18px", - "border": "0px solid #999999" - }, - "inputStyles": { - "border": "1px solid #999999", - "height": "30px", - "line-height": "30px", - "color": "#666", - "font-size": "18px", - "font-family": "宋体" - } - }, - "select": { - "styles": { - "border-bottom": "0px", - "margin-top": "5px", - "height": "auto", - "line-height": "30px", - "font-size": "18px", - "color": "#333" - }, - "inputStyles": { - "height": "30px", - "line-height": "30px", - "font-size": "18px", - "color": "#666", - "font-family": "宋体" - } - }, - "textarea": { - "styles": { - "border": "0px solid #999999", - "font-size": "18px" - }, - "inputStyles": { - "border": "1px solid #999999", - "color": "#666", - "font-size": "18px", - "font-family": "宋体" - } - }, - "opinion": { - "styles": { - "border": "0px solid #999999", - "font-size": "18px" - }, - "inputStyles": { - "border": "1px solid #999999", - "color": "#666", - "font-size": "18px", - "font-family": "宋体" - } - }, "actionbar": { "style": "xform_red_simple" }, - "sidebar": { - "style": "xform_side_red_simple", - "customIconStyle" : "" - }, - "attachment" : { + "paging" : { "style" : "default" } } \ No newline at end of file diff --git a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json index 0b2148a25d..302613341d 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json +++ b/o2web/source/x_component_query_ViewDesigner/$View/skin/styles_red-simple.json @@ -1,418 +1,10 @@ { "name": "红色简洁", - "form": { - "styles":{ - "background-color": "#f0f0f0" - } - }, - "label": { - "banner": { - "name": "横幅", - "styles": { - "background-color": "#cc3d3d", - "height": "40px", - "line-height": "40px", - "color": "#ffffff", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "24px", - "line-height": "60px", - "font-weight": "bold", - "color": "#cc3d3d", - "height": "60px" - } - }, - - "section": { - "name": "区段标题", - "styles": { - "height": "40px", - "background-color": "#f7f7f7", - "line-height": "40px", - "padding": "0px 20px", - "font-weight": "bold", - "color": "#666", - "border-bottom": "1px solid #cccccc" - } - } - }, - - "div": { - "banner": { - "name": "横幅", - "styles": { - "background-color": "#cc3d3d", - "height": "40px", - "line-height": "40px", - "color": "#ffffff", - "font-size": "18px", - "padding": "0px 10px", - "font-weight": "bold" - } - }, - - "title": { - "name": "标题", - "styles": { - "text-align": "center", - "font-size": "24px", - "line-height": "60px", - "font-weight": "bold", - "color": "#cc3d3d", - "height": "60px" - } - }, - "section": { - "name": "区段", - "styles": { - "padding": "20px 0px", - "background-color": "#FFF", - "border": "1px solid #cccccc" - } - } - }, - - "tab": { - "styles": {}, - "tabAreaStyles": { - "height": "40px", - "border-bottom": "2px solid #cc3d3d" - }, - "contentAreaStyles": { - "line-height": "normal", - "clear": "both", - "overflow": "hidden" - }, - "tabStyles": { - "position": "relative", - "margin-left": "4px", - "margin-top": "0px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "cursor": "pointer", - "min-width": "100px", - "background": "transparent ", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border": "0px solid #f0f0f0", - "border-bottom": "1px solid #cc3d3d" - }, - "tabTextStyles": { - "color": "#666", - "font-weight": "bold", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-top": "0px", - "margin-left": "8px" - }, - "tabCurrentStyles": { - "position": "relative", - "margin-top": "0px", - "margin-left": "2px", - "margin-right": "0px", - "float": "left", - "height": "40px", - "min-width": "100px", - "background": "#cc3d3d", - "border-top-left-radius": "5px", - "border-top-right-radius": "5px", - "border-top": "0px solid #f0f0f0", - "border-left": "0px solid #f0f0f0", - "border-right": "0px solid #f0f0f0", - "border-bottom": "1px solid #cc3d3d" - }, - "tabCurrentTextStyles": { - "color": "#FFF", - "font-weight": "bold", - "line-height": "40px", - "text-align": "center", - "margin-right": "8px", - "margin-left": "8px", - "margin-top": "0px" - } - }, - "tab$Content": { - "styles": { - "padding": "20px 0px" - } - }, - "table": { - "styles": { - "background-color": "#FFF", - "margin": "10px 0px" - }, - "titleStyles":{ - "background-color": "#fff", - "color": "#333", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "right" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333" - }, - "layoutStyles": {}, - "properties": { - "width": "90%", - "border": "0", - "cellpadding": "3", - "cellspacing": "5", - "align": "center" - } - }, - "log" : { - "tableStyles": { - "background-color": "#FFF", - "margin": "10px 0px" - }, - "titleStyles":{ - "background-color": "#fff", - "color": "#333", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "right" - }, - "contentStyles": { - "background-color": "#FFFFFF", - "color": "#333" - }, - "properties": { - "width": "90%", - "border": "0", - "cellpadding": "3", - "cellspacing": "5", - "align": "center" - } - }, - "datagrid": { - "styles": {}, - "tableStyles": { - "border": "1px solid #cccccc" - }, - "titleStyles": { - "height": "28px", - "cursor": "pointer", - "line-height": "28px", - "overflow": "hidden", - "opacity": 1, - "border-bottom": "1px solid #ccc", - "background-color": "#f0f0f0" - }, - "contentStyles": { - "text-align": "center", - "height": "30px", - "line-height": "30px", - "color": "#666" - }, - "actionStyles": { - "background-color": "#f7f7f7" - }, - "editStyles": { - "background-color": "#fff6f6", - "text-align": "center", - "height": "30px", - "line-height": "30px" - }, - "amountStyles": { - "border-top": "1px solid #ccc", - "font-weight": "bold", - "height": "30px", - "line-height": "30px", - "text-align": "center", - "background-color": "#f0f0f0" - }, - "itemTitleStyles": { - "height": "40px", - "background-color": "#ffffff", - "line-height": "30px", - "padding": "0px 15px", - "color": "#fb4747", - "font-size": "18px", - "font-weight": "bold", - "border-bottom": "0px solid #cccccc" - }, - "properties": { - "width": "90%", - "border": "0", - "cellpadding": "3", - "cellspacing": "0", - "align": "center" - } - }, - "datagrid$Title": { - "styles": { - "background-color": "#f0f0f0" - } - }, - "address": { - "styles": { - "border-bottom": "1px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "border": "0px solid #ccc", - "color": "#666" - } - }, - "combox": { - "styles": { - "border-bottom": "1px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "border": "0px solid #ccc", - "color": "#666" - } - }, - "textfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "calendar": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "number": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "line-height": "26px" - }, - "inputStyles": { - "height": "26px", - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "personfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "20px", - "line-height": "26px" - }, - "inputStyles": { - "min-height": "26px", - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "orgfield": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "20px", - "line-height": "26px" - }, - "inputStyles": { - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "org": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "min-height": "20px", - "line-height": "26px" - }, - "inputStyles": { - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "select": { - "styles": { - "border-bottom": "0px solid #999", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px", - "margin-top": "5px", - "color": "#666", - "line-height": "26px" - }, - "inputStyles": { - - } - }, - "textarea": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px" - }, - "inputStyles": { - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, - "opinion": { - "styles": { - "border-bottom": "0px solid #ccc", - "border-top": "0px", - "border-left": "0px", - "border-right": "0px" - }, - "inputStyles": { - "border-bottom": "1px solid #ccc", - "color": "#666" - } - }, "actionbar": { "style": "xform_red_simple", "customIconStyle" : "" }, - "attachment" : { - "style" : "default" + "paging" : { + "style" : "red" } } \ No newline at end of file diff --git a/o2web/source/x_component_query_ViewDesigner/$View/view.html b/o2web/source/x_component_query_ViewDesigner/$View/view.html index 3850908ea1..347848c99d 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/view.html +++ b/o2web/source/x_component_query_ViewDesigner/$View/view.html @@ -24,6 +24,12 @@ 否 + + 视图样式: + + + + 展开分类: @@ -46,12 +52,6 @@ 每页行数: - - - - - - 隐藏操作条: @@ -685,6 +685,10 @@ +
+
+
+
diff --git a/o2web/source/x_component_query_ViewDesigner/$View/view.json b/o2web/source/x_component_query_ViewDesigner/$View/view.json index 65cffa8708..9a3e5a6e95 100644 --- a/o2web/source/x_component_query_ViewDesigner/$View/view.json +++ b/o2web/source/x_component_query_ViewDesigner/$View/view.json @@ -5,7 +5,7 @@ "alias": "", "description": "", "display": true, - "type": "process", + "type": "View", "data": { "exportGrid": true, diff --git a/o2web/source/x_component_query_ViewDesigner/Property.js b/o2web/source/x_component_query_ViewDesigner/Property.js index ec09ecfae8..165e177e2f 100644 --- a/o2web/source/x_component_query_ViewDesigner/Property.js +++ b/o2web/source/x_component_query_ViewDesigner/Property.js @@ -64,6 +64,7 @@ MWF.xApplication.query.ViewDesigner.Property = MWF.FVProperty = new Class({ this.loadJSONArea(); this.loadEventsEditor(); + this.loadViewStylesArea(); this.loadPagingStylesArea(); this.loadActionStylesArea(); this.loadActionArea(); @@ -710,6 +711,37 @@ MWF.xApplication.query.ViewDesigner.Property = MWF.FVProperty = new Class({ var filter = new MWF.xApplication.query.ViewDesigner.Property.Filter(op, table, this); filter.editMode(); }, + loadViewStylesArea: function(){ + var _self = this; + var viewAreas = this.propertyContent.getElements(".MWFViewStylesArea"); + viewAreas.each(function(node){ + var name = node.get("name"); + var viewStyles = this.data[name] || {}; + MWF.require("MWF.widget.Maplist", function(){ + var maps = []; + Object.each(viewStyles, function(v, k){ + var mapNode = new Element("div").inject(node); + mapNode.empty(); + + var maplist = new MWF.widget.Maplist(mapNode, { + "title": k, + "collapse": true, + "onChange": function(){ + var oldData = _self.data[name]; + maps.each(function(o){ + _self.data[name][o.key] = o.map.toJson(); + }.bind(this)); + _self.changeData(name, node, oldData); + } + }); + maps.push({"key": k, "map": maplist}); + maplist.load(v); + }.bind(this)); + }.bind(this)); + + + }.bind(this)); + }, loadActionStylesArea: function(){ var _self = this; var actionAreas = this.propertyContent.getElements(".MWFActionStylesArea"); diff --git a/o2web/source/x_component_query_ViewDesigner/View.js b/o2web/source/x_component_query_ViewDesigner/View.js index c73b4c98ed..4fa1a6b107 100644 --- a/o2web/source/x_component_query_ViewDesigner/View.js +++ b/o2web/source/x_component_query_ViewDesigner/View.js @@ -527,6 +527,7 @@ MWF.xApplication.query.ViewDesigner.View = new Class({ // if( !noSetHeight )this.setContentHeight(); }, setViewWidth: function(){ + if( !this.viewAreaNode )return; this.viewAreaNode.setStyle("width", "auto"); this.viewTitleNode.setStyle("width", "auto"); @@ -643,6 +644,8 @@ MWF.xApplication.query.ViewDesigner.View = new Class({ } if (name=="data.viewStyleType"){ + debugger; + var file = (this.stylesList && this.json.data.viewStyleType) ? this.stylesList[this.json.data.viewStyleType].file : null; var extendFile = (this.stylesList && this.json.data.viewStyleType) ? this.stylesList[this.json.data.viewStyleType].extendFile : null; this.loadTemplateStyles( file, extendFile, function( templateStyles ){ @@ -657,10 +660,26 @@ MWF.xApplication.query.ViewDesigner.View = new Class({ this.json.data.styleConfig = (this.stylesList && this.json.data.viewStyleType) ? this.stylesList[this.json.data.viewStyleType] : null; - if (oldTemplateStyles["form"]) this.clearTemplateStyles(oldTemplateStyles["form"]); - if (this.templateStyles["form"]) this.setTemplateStyles(this.templateStyles["form"]); + if (oldTemplateStyles["table"]) this.clearTemplateStyles(oldTemplateStyles["table"]); + if (this.templateStyles["table"]) this.setTemplateStyles(this.templateStyles["table"]); + + this.setAllStyles(); - // this.setAllStyles(); + this.actionbarList.each( function (module) { + if (oldTemplateStyles["actionbar"]){ + module.clearTemplateStyles(oldTemplateStyles["actionbar"]); + } + module.setStyleTemplate(); + module.setAllStyles(); + }) + + this.pagingList.each( function (module) { + if (oldTemplateStyles["paging"]){ + module.clearTemplateStyles(oldTemplateStyles["paging"]); + } + module.setStyleTemplate(); + module.setAllStyles(); + }); // this.moduleList.each(function(module){ // if (oldTemplateStyles[module.moduleName]){ @@ -674,6 +693,40 @@ MWF.xApplication.query.ViewDesigner.View = new Class({ }.bind(this)) } }, + setAllStyles: function(){ + this.setPropertiesOrStyles("styles"); + this.setPropertiesOrStyles("properties"); + this.reloadMaplist(); + }, + reloadMaplist: function(){ + if (this.property) Object.each(this.property.maplists, function(map, name){ map.reload(this.json[name]);}.bind(this)); + }, + setPropertiesOrStyles: function(name){ + if (name=="styles"){ + this.setCustomStyles(); + } + if (name=="properties"){ + this.node.setProperties(this.json.properties); + } + }, + setCustomStyles: function(){ + // var border = this.node.getStyle("border"); + // this.node.clearStyles(); + // this.node.setStyles((this.options.mode==="Mobile") ? this.css.formMobileNode : this.css.formNode); + // var y = this.container.getStyle("height"); + // y = (y) ? y.toInt()-2 : this.container.getSize().y-2; + // this.node.setStyle("min-height", ""+y+"px"); + // + // if (this.initialStyles) this.node.setStyles(this.initialStyles); + // this.node.setStyle("border", border); + // + // Object.each(this.json.styles, function(value, key){ + // var reg = /^border\w*/ig; + // if (!key.test(reg)){ + // this.node.setStyle(key, value); + // } + // }.bind(this)); + }, saveAs: function(){ var form = new MWF.xApplication.query.ViewDesigner.View.NewNameForm(this, { @@ -755,11 +808,11 @@ MWF.xApplication.query.ViewDesigner.View = new Class({ this.templateStyles = templateStyles; // this.loadDomModules(); - if (this.json.data.viewStyleType && this.templateStyles && this.templateStyles["form"]){ - this.setTemplateStyles(this.templateStyles["form"]); + if (this.json.data.viewStyleType && this.templateStyles && this.templateStyles["table"]){ + this.setTemplateStyles(this.templateStyles["table"]); } - // this.setCustomStyles(); + this.setCustomStyles(); this.node.setProperties(this.json.data.properties); if(callback)callback(); @@ -1252,178 +1305,56 @@ MWF.xApplication.query.ViewDesigner.View.Column = new Class({ }); -MWF.require("MWF.widget.Toolbar", null, false); -MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({ +MWF.xApplication.query.ViewDesigner.View.$Module = MWF.QV$Module = new Class({ + Extends: MWF.widget.Common, Implements: [Options, Events], - options : { - "style" : "default", - "customImageStyle" : "default" - }, - initialize: function(json, jsonList, view, options){ - this.setOptions( options ); - this.propertyPath = "/x_component_query_ViewDesigner/$View/actionbar.html"; - this.path = "/x_component_query_ViewDesigner/$View/"; - this.imagePath_default = "/x_component_query_ViewDesigner/$View/"; - this.imagePath_custom = "/x_component_process_FormDesigner/Module/Actionbar/"; - this.cssPath = "/x_component_query_ViewDesigner/$View/"+this.options.style+"/actionbar.wcss"; - this.view = view; - this.json = json; - this.jsonList = jsonList; - this.css = this.view.css; - this.container = this.view.actionbarNode; - this.load(); + copyStyles: function(from, to){ + if (!this.json[to]) this.json[to] = {}; + Object.each(from, function(style, key){ + //if (!this.json[to][key]) + this.json[to][key] = style; + }.bind(this)); }, - load: function(){ - this.systemTools = []; - this.customTools = []; - if( !this.json ){ - this.loadDefaultJson(function(){ - this._load() + removeStyles: function(from, to){ + if (this.json[to]){ + Object.each(from, function(style, key){ + if (this.json[to][key] && this.json[to][key]==style){ + delete this.json[to][key]; + } + //if (this.json[from][key]){ + // delete this.json[to][key]; + //} }.bind(this)); - }else{ - this._load() } }, - _load : function(){ - this._createNode(); - //this._createIconAction(); - //if (!this.json.export) this.hideMode(); - this.setEvent(); - }, - loadDefaultJson: function(callback){ - var url = this.path+"actionbar.json"; - MWF.getJSON(url, { - "onSuccess": function(obj){ - this.view.designer.actions.getUUID(function(id){ - obj.id=id; - //obj.isNewView = true; - //obj.application = this.view.designer.application.id; - this.json = obj; - this.jsonList.push( this.json ); - if (callback) callback(obj); - }.bind(this)); - }.bind(this), - "onerror": function(text){ - this.view.designer.notice(text, "error"); - }.bind(this), - "onRequestFailure": function(xhr){ - this.view.designer.notice(xhr.responseText, "error"); - }.bind(this) - }); + setTemplateStyles: function(styles){ + if (styles.styles) this.copyStyles(styles.styles, "styles"); + if (styles.properties) this.copyStyles(styles.properties, "properties"); }, - setEvent: function(){ - this.node.addEvents({ - "click": function(e){this.selected(); e.stopPropagation();}.bind(this), - "mouseover": function(){if (!this.isSelected) this.node.setStyles(this.css.toolbarWarpNode_over)}.bind(this), - "mouseout": function(){if (!this.isSelected) this.node.setStyles(this.css.toolbarWarpNode) }.bind(this) - }); + clearTemplateStyles: function(styles){ + if (styles){ + if (styles.styles) this.removeStyles(styles.styles, "styles"); + if (styles.properties) this.removeStyles(styles.properties, "properties"); + } }, - //_createIconAction: function(){ - // if (!this.actionArea){ - // this.actionArea = new Element("div", {"styles": this.css.actionAreaNode}).inject(this.container, "after"); - // - // //this._createAction({ - // // "name": "move", - // // "icon": "move1.png", - // // "event": "mousedown", - // // "action": "move", - // // "title": MWF.APPDVD.LP.action.move - // //}); - // //this._createAction({ - // // "name": "add", - // // "icon": "add.png", - // // "event": "click", - // // "action": "addColumn", - // // "title": MWF.APPDVD.LP.action.add - // //}); - // this._createAction({ - // "name": "delete", - // "icon": "delete1.png", - // "event": "click", - // "action": "delete", - // "title": MWF.APPDVD.LP.action["delete"] - // }); - // } - //}, - //_createAction: function(action){ - // var actionNode = new Element("div", { - // "styles": this.css.actionNodeStyles, - // "title": action.title - // }).inject(this.actionArea); - // actionNode.setStyle("background", "url("+this.view.path+this.view.options.style+"/action/"+action.icon+") no-repeat left center"); - // actionNode.addEvent(action.event, function(e){ - // this[action.action](e); - // }.bind(this)); - // actionNode.addEvents({ - // "mouseover": function(e){ - // e.target.setStyle("border", "1px solid #999"); - // }.bind(this), - // "mouseout": function(e){ - // e.target.setStyle("border", "1px solid #F1F1F1"); - // }.bind(this) - // }); - //}, - //_setActionAreaPosition: function(){ - // var p = this.node.getPosition(this.view.areaNode.getOffsetParent()); - // var y = p.y-25; - // var x = p.x; - // this.actionArea.setPosition({"x": x, "y": y}); - //}, - //_showActions: function(){ - // if (this.actionArea){ - // this._setActionAreaPosition(); - // this.actionArea.setStyle("display", "block"); - // } - //}, - //_hideActions: function(){ - // if (this.actionArea) this.actionArea.setStyle("display", "none"); - //}, - - selected: function(){ - if (this.view.currentSelectedModule){ - if (this.view.currentSelectedModule==this){ - return true; - }else{ - this.view.currentSelectedModule.unSelected(); - } + setStyleTemplate: function(){ + if( this.view.templateStyles && this.view.templateStyles[this.moduleName] ){ + this.setTemplateStyles(this.view.templateStyles[this.moduleName]); } - this.node.setStyles(this.css.toolbarWarpNode_selected); - //this.listNode.setStyles(this.css.cloumnListNode_selected); - new Fx.Scroll(this.view.areaNode, {"wheelStops": false, "duration": 100}).toElementEdge(this.node); - //new Fx.Scroll(this.view.designer.propertyDomArea, {"wheelStops": false, "duration": 100}).toElement(this.listNode); - - this.view.currentSelectedModule = this; - this.isSelected = true; - //this._showActions(); - this.showProperty(); }, - unSelected: function(){ - this.view.currentSelectedModule = null; - this.node.setStyles(this.css.toolbarWarpNode) - - //this.listNode.setStyles(this.css.cloumnListNode); - this.isSelected = false; - //this._hideActions(); - this.hideProperty(); + setAllStyles: function(){ + this.setPropertiesOrStyles("styles"); + this.setPropertiesOrStyles("inputStyles"); + this.setPropertiesOrStyles("properties"); + this.reloadMaplist(); }, - showProperty: function(){ if (!this.property){ this.property = new MWF.xApplication.query.ViewDesigner.Property(this, this.view.designer.propertyContentArea, this.view.designer, { "path": this.propertyPath, "onPostLoad": function(){ this.property.show(); - //var processDiv = this.property.propertyContent.getElements("#"+this.json.id+"dataPathSelectedProcessArea"); - //var cmsDiv = this.property.propertyContent.getElements("#"+this.json.id+"dataPathSelectedCMSArea"); - // - //if (this.view.json.type=="cms"){ - // processDiv.setStyle("display", "none"); - // cmsDiv.setStyle("display", "block"); - //}else{ - // processDiv.setStyle("display", "block"); - // cmsDiv.setStyle("display", "none"); - //} }.bind(this) }); this.property.load(); @@ -1435,129 +1366,6 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({ if (this.property) this.property.hide(); }, - resetTextNode: function(){ - var listText = (this.json.selectType=="attribute") ? (this.json.attribute || "") : (this.json.path || ""); - if (!listText) listText = "unnamed"; - - this.textNode.set("text", this.json.displayName); - this.listNode.getLast().set("text", this.json.displayName+"("+listText+")"); - }, - //"delete": function(e){ - // var _self = this; - // if (!e) e = this.node; - // this.view.designer.confirm("warn", e, MWF.APPDVD.LP.notice.deleteColumnTitle, MWF.APPDVD.LP.notice.deleteColumn, 300, 120, function(){ - // _self.destroy(); - // - // this.close(); - // }, function(){ - // this.close(); - // }, null); - //}, - //destroy: function(){ - // if (this.view.currentSelectedModule==this) this.view.currentSelectedModule = null; - // if (this.actionArea) this.actionArea.destroy(); - // if (this.listNode) this.listNode.destroy(); - // if (this.property) this.property.propertyContent.destroy(); - // - // var idx = this.view.items.indexOf(this); - // - // if (this.view.viewContentTableNode){ - // var trs = this.view.viewContentTableNode.getElements("tr"); - // trs.each(function(tr){ - // tr.deleteCell(idx); - // }.bind(this)); - // } - // - // if (this.view.json.data.selectList) this.view.json.data.selectList.erase(this.json); - // if (this.view.json.data.calculate) if (this.view.json.data.calculate.calculateList) this.view.json.data.calculate.calculateList.erase(this.json); - // this.view.items.erase(this); - // if (this.view.property) this.view.property.loadStatColumnSelect(); - // - // this.areaNode.destroy(); - // this.view.selected(); - // - // this.view.setViewWidth(); - // - // MWF.release(this); - // delete this; - //}, - - //move: function(e){ - // this._createMoveNode(); - // - // //this._setNodeMove(columnNodes, e); - //}, - //_createMoveNode: function(){ - // this.moveNode = new Element("div", {"text": this.node.get("text")}); - // this.moveNode.inject(this.view.designer.content); - // this.moveNode.setStyles({ - // "border": "2px dashed #ffa200", - // "opacity": 0.7, - // "height": "30px", - // "line-height": "30px", - // "padding": "0px 10px", - // "position": "absolute" - // }); - //}, - //_setMoveNodePosition: function(e){ - // var x = e.page.x+2; - // var y = e.page.y+2; - // this.moveNode.positionTo(x, y); - //}, - //createMoveFlagNode: function(){ - // this.moveFlagNode = new Element("td", {"styles": this.css.moveFlagNode}); - //}, - //_setNodeMove: function(droppables, e){ - // this._setMoveNodePosition(e); - // var movePosition = this.moveNode.getPosition(); - // var moveSize = this.moveNode.getSize(); - // var contentPosition = this.content.getPosition(); - // var contentSize = this.content.getSize(); - // - // var nodeDrag = new Drag.Move(this.moveNode, { - // "droppables": droppables, - // "limit": { - // "x": [contentPosition.x, contentPosition.x+contentSize.x], - // "y": [movePosition.y, movePosition.y+moveSize.y] - // }, - // "onEnter": function(dragging, inObj){ - // if (!this.moveFlagNode) this.createMoveFlagNode(); - // this.moveFlagNode.inject(inObj, "before"); - // }.bind(this), - // "onLeave": function(dragging, inObj){ - // if (this.moveFlagNode){ - // this.moveFlagNode.dispose(); - // } - // }.bind(this), - // "onDrop": function(dragging, inObj){ - // if (inObj){ - // this.areaNode.inject(inObj, "before"); - // var column = inObj.retrieve("column"); - // this.listNode.inject(column.listNode, "before"); - // var idx = this.view.json.data.selectList.indexOf(column.json); - // - // this.view.json.data.selectList.erase(this.json); - // this.view.items.erase(this); - // - // this.view.json.data.selectList.splice(idx, 0, this.json); - // this.view.items.splice(idx, 0, this); - // - // if (this.moveNode) this.moveNode.destroy(); - // if (this.moveFlagNode) this.moveFlagNode.destroy(); - // this._setActionAreaPosition(); - // }else{ - // if (this.moveNode) this.moveNode.destroy(); - // if (this.moveFlagNode) this.moveFlagNode.destroy(); - // } - // }.bind(this), - // "onCancel": function(dragging){ - // if (this.moveNode) this.moveNode.destroy(); - // if (this.moveFlagNode) this.moveFlagNode.destroy(); - // }.bind(this) - // }); - // nodeDrag.start(e); - //}, - deletePropertiesOrStyles: function(name, key){ if (name=="properties"){ try{ @@ -1653,10 +1461,10 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({ this._setEditStyle_custom(name, obj, oldValue); }, + reloadMaplist: function(){ if (this.property) Object.each(this.property.maplists, function(map, name){ map.reload(this.json[name]);}.bind(this)); }, - getHtml: function(){ var copy = this.node.clone(true, true); copy.clearStyles(true); @@ -1671,8 +1479,130 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({ var o = {}; o[json.id] = json; return o; + } +}) + +MWF.require("MWF.widget.Toolbar", null, false); +MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({ + Extends: MWF.xApplication.query.ViewDesigner.View.$Module, + options : { + "style" : "default", + "customImageStyle" : "default" }, + initialize: function(json, jsonList, view, options){ + this.setOptions( options ); + this.propertyPath = "/x_component_query_ViewDesigner/$View/actionbar.html"; + this.path = "/x_component_query_ViewDesigner/$View/"; + this.imagePath_default = "/x_component_query_ViewDesigner/$View/"; + this.imagePath_custom = "/x_component_process_FormDesigner/Module/Actionbar/"; + this.cssPath = "/x_component_query_ViewDesigner/$View/"+this.options.style+"/actionbar.wcss"; + this.view = view; + this.json = json; + this.jsonList = jsonList; + this.css = this.view.css; + this.container = this.view.actionbarNode; + this.moduleName = "actionbar"; + this.load(); + }, + load: function(){ + this.systemTools = []; + this.customTools = []; + if( !this.json ){ + this.loadDefaultJson(function(){ + this._load() + }.bind(this)); + }else{ + this._load() + } + }, + _load : function(){ + this.json.moduleName = this.moduleName; + this._createNode(); + //this._createIconAction(); + //if (!this.json.export) this.hideMode(); + this.setEvent(); + }, + loadDefaultJson: function(callback){ + var url = this.path+"actionbar.json"; + MWF.getJSON(url, { + "onSuccess": function(obj){ + this.view.designer.actions.getUUID(function(id){ + obj.id=id; + //obj.isNewView = true; + //obj.application = this.view.designer.application.id; + this.json = obj; + this.jsonList.push( this.json ); + if (callback) callback(obj); + }.bind(this)); + }.bind(this), + "onerror": function(text){ + this.view.designer.notice(text, "error"); + }.bind(this), + "onRequestFailure": function(xhr){ + this.view.designer.notice(xhr.responseText, "error"); + }.bind(this) + }); + }, + setTemplateStyles: function(styles){ + this.json.style = styles.style; + this.json.iconOverStyle = styles.iconOverStyle || ""; + this.json.customIconStyle = styles.customIconStyle; + this.json.customIconOverStyle = styles.customIconOverStyle || ""; + this.json.forceStyles = styles.forceStyles || ""; + }, + clearTemplateStyles: function(styles){ + this.json.style = "form"; + this.json.iconOverStyle = ""; + this.json.customIconStyle = ""; + this.json.customIconOverStyle = ""; + this.json.forceStyles = ""; + }, + setAllStyles: function(){ + this._resetActionbar(); + }, + setEvent: function(){ + this.node.addEvents({ + "click": function(e){this.selected(); e.stopPropagation();}.bind(this), + "mouseover": function(){if (!this.isSelected) this.node.setStyles(this.css.toolbarWarpNode_over)}.bind(this), + "mouseout": function(){if (!this.isSelected) this.node.setStyles(this.css.toolbarWarpNode) }.bind(this) + }); + }, + selected: function(){ + if (this.view.currentSelectedModule){ + if (this.view.currentSelectedModule==this){ + return true; + }else{ + this.view.currentSelectedModule.unSelected(); + } + } + this.node.setStyles(this.css.toolbarWarpNode_selected); + //this.listNode.setStyles(this.css.cloumnListNode_selected); + new Fx.Scroll(this.view.areaNode, {"wheelStops": false, "duration": 100}).toElementEdge(this.node); + //new Fx.Scroll(this.view.designer.propertyDomArea, {"wheelStops": false, "duration": 100}).toElement(this.listNode); + + this.view.currentSelectedModule = this; + this.isSelected = true; + //this._showActions(); + this.showProperty(); + }, + unSelected: function(){ + this.view.currentSelectedModule = null; + this.node.setStyles(this.css.toolbarWarpNode) + + //this.listNode.setStyles(this.css.cloumnListNode); + this.isSelected = false; + //this._hideActions(); + this.hideProperty(); + }, + + resetTextNode: function(){ + var listText = (this.json.selectType=="attribute") ? (this.json.attribute || "") : (this.json.path || ""); + if (!listText) listText = "unnamed"; + + this.textNode.set("text", this.json.displayName); + this.listNode.getLast().set("text", this.json.displayName+"("+listText+")"); + }, _createNode: function(callback){ this.node = new Element("div", { @@ -1771,9 +1701,9 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({ this.toolbarNode.empty(); this.toolbarWidget = new MWF.widget.Toolbar(this.toolbarNode, {"style": this.json.style}, this); if (!this.json.actionStyles){ - this.json.actionStyles = Object.clone(this.toolbarWidget.css); + this.json.actionStyles = Object.merge( Object.clone( this.toolbarWidget.css ), this.json.forceStyles || {} ); }else{ - this.toolbarWidget.css = Object.merge( Object.clone(this.json.actionStyles), this.toolbarWidget.css ); + this.toolbarWidget.css = Object.merge( Object.clone( this.json.actionStyles ), this.toolbarWidget.css, this.json.forceStyles || {} ); this.json.actionStyles = Object.clone(this.toolbarWidget.css); } @@ -1866,11 +1796,9 @@ MWF.xApplication.query.ViewDesigner.View.Actionbar = new Class({ }); - - MWF.require("MWF.widget.Paging", null, false); MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ - Implements: [Options, Events], + Extends: MWF.xApplication.query.ViewDesigner.View.$Module, options : { "style" : "default" }, @@ -1883,6 +1811,7 @@ MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ this.jsonList = jsonList; this.css = this.view.css; this.container = this.view.pagingNode; + this.moduleName = "paging"; this.load(); }, load: function(){ @@ -1890,14 +1819,17 @@ MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ this.customTools = []; if( !this.json ){ this.loadDefaultJson(function(){ - this._createNode(); - this.setEvent(); + this._load(); }.bind(this)); }else{ - this._createNode(); - this.setEvent(); + this._load(); } }, + _load : function(){ + this.json.moduleName = this.moduleName; + this._createNode(); + this.setEvent(); + }, loadDefaultJson: function(callback){ var url = this.view.path+"paging.json"; MWF.getJSON(url, { @@ -1917,6 +1849,17 @@ MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ }.bind(this) }); }, + setTemplateStyles: function(styles){ + this.json.style = styles.style; + this.json.forceStyles = styles.forceStyles || ""; + }, + clearTemplateStyles: function(styles){ + this.json.style = "default"; + this.json.forceStyles = ""; + }, + setAllStyles: function(){ + this._resetPaging(); + }, setEvent: function(){ this.node.addEvents({ "click": function(e){this.selected(); e.stopPropagation();}.bind(this), @@ -1947,22 +1890,7 @@ MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ this.hideProperty(); }, - showProperty: function(){ - if (!this.property){ - this.property = new MWF.xApplication.query.ViewDesigner.Property(this, this.view.designer.propertyContentArea, this.view.designer, { - "path": this.propertyPath, - "onPostLoad": function(){ - this.property.show(); - }.bind(this) - }); - this.property.load(); - }else{ - this.property.show(); - } - }, - hideProperty: function(){ - if (this.property) this.property.hide(); - }, + resetTextNode: function(){ var listText = (this.json.selectType=="attribute") ? (this.json.attribute || "") : (this.json.path || ""); @@ -1972,121 +1900,6 @@ MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ this.listNode.getLast().set("text", this.json.displayName+"("+listText+")"); }, - deletePropertiesOrStyles: function(name, key){ - if (name=="properties"){ - try{ - this.node.removeProperty(key); - }catch(e){} - } - }, - setPropertiesOrStyles: function(name){ - if (name=="styles"){ - try{ - this.setCustomStyles(); - }catch(e){} - } - if (name=="properties"){ - try{ - this.node.setProperties(this.json.properties); - }catch(e){} - } - }, - setCustomNodeStyles: function(node, styles){ - var border = node.getStyle("border"); - node.clearStyles(); - //node.setStyles(styles); - node.setStyle("border", border); - - Object.each(styles, function(value, key){ - var reg = /^border\w*/ig; - if (!key.test(reg)){ - node.setStyle(key, value); - } - }.bind(this)); - }, - setCustomStyles: function(){ - var border = this.node.getStyle("border"); - this.node.clearStyles(); - this.node.setStyles(this.css.moduleNode); - - if (this.initialStyles) this.node.setStyles(this.initialStyles); - this.node.setStyle("border", border); - - if (this.json.styles) Object.each(this.json.styles, function(value, key){ - if ((value.indexOf("x_processplatform_assemble_surface")!=-1 || value.indexOf("x_portal_assemble_surface")!=-1)){ - var host1 = MWF.Actions.getHost("x_processplatform_assemble_surface"); - var host2 = MWF.Actions.getHost("x_portal_assemble_surface"); - if (value.indexOf("/x_processplatform_assemble_surface")!==-1){ - value = value.replace("/x_processplatform_assemble_surface", host1+"/x_processplatform_assemble_surface"); - }else if (value.indexOf("x_processplatform_assemble_surface")!==-1){ - value = value.replace("x_processplatform_assemble_surface", host1+"/x_processplatform_assemble_surface"); - } - if (value.indexOf("/x_portal_assemble_surface")!==-1){ - value = value.replace("/x_portal_assemble_surface", host2+"/x_portal_assemble_surface"); - }else if (value.indexOf("x_portal_assemble_surface")!==-1){ - value = value.replace("x_portal_assemble_surface", host2+"/x_portal_assemble_surface"); - } - } - - var reg = /^border\w*/ig; - if (!key.test(reg)){ - if (key){ - if (key.toString().toLowerCase()==="display"){ - if (value.toString().toLowerCase()==="none"){ - this.node.setStyle("opacity", 0.3); - }else{ - this.node.setStyle("opacity", 1); - this.node.setStyle(key, value); - } - }else{ - this.node.setStyle(key, value); - } - } - } - //this.node.setStyle(key, value); - }.bind(this)); - }, - - _setEditStyle: function(name, obj, oldValue){ - var title = ""; - var text = ""; - if (name==="name"){ - title = this.json.name || this.json.id; - text = this.json.type.substr(this.json.type.lastIndexOf("$")+1, this.json.type.length); - this.treeNode.setText("<"+text+"> "+title); - } - if (name==="id"){ - title = this.json.name || this.json.id; - if (!this.json.name){ - text = this.json.type.substr(this.json.type.lastIndexOf("$")+1, this.json.type.length); - this.treeNode.setText("<"+text+"> "+this.json.id); - } - this.treeNode.setTitle(this.json.id); - this.node.set("id", this.json.id); - } - - this._setEditStyle_custom(name, obj, oldValue); - }, - reloadMaplist: function(){ - if (this.property) Object.each(this.property.maplists, function(map, name){ map.reload(this.json[name]);}.bind(this)); - }, - - getHtml: function(){ - var copy = this.node.clone(true, true); - copy.clearStyles(true); - - var html = copy.outerHTML; - copy.destroy(); - - return html; - }, - getJson: function(){ - var json = Object.clone(this.json); - var o = {}; - o[json.id] = json; - return o; - }, - _createNode: function(callback){ this.node = new Element("div", { @@ -2109,7 +1922,7 @@ MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ // } // this.pagingWidget.load(); }, - loadWidget : function(){ + loadWidget : function( isReset ){ var visiblePages = this.json.visiblePages ? this.json.visiblePages.toInt() : 9; this.pagingWidget = new o2.widget.Paging(this.pagingNode, { style : this.json.style || "default", @@ -2139,13 +1952,25 @@ MWF.xApplication.query.ViewDesigner.View.Paging = new Class({ this.view.setContentHeight() // if(this.setContentHeightFun)this.setContentHeightFun(); }.bind(this) - }, this.json.pagingStyles || {}); - if (!this.json.pagingStyles){ - this.json.pagingStyles = Object.clone(this.pagingWidget.css); + }, isReset ? {} : (this.json.pagingStyles || {})); + if( isReset ){ + if (!this.json.pagingStyles){ + this.json.pagingStyles = Object.merge( Object.clone( this.pagingWidget.css ), this.json.forceStyles || {} ); + }else{ + this.pagingWidget.css = Object.merge( Object.clone( this.json.pagingStyles ), this.pagingWidget.css, this.json.forceStyles || {} ); + this.json.pagingStyles = Object.clone(this.pagingWidget.css); + } + }else{ + if (!this.json.pagingStyles){ + this.json.pagingStyles = Object.clone(this.pagingWidget.css); + } } this.pagingWidget.load(); }, - + _resetPaging : function(){ + this.pagingNode.empty(); + this.loadWidget( true ); + }, _refreshPaging: function(){ this.pagingNode.empty(); this.loadWidget(); -- GitLab