Skip to content

Commit 93d5c0d

Browse files
yuhaojuyuhaoju
committed
merge(smartgrid): fix content line-break and other bugs
1 parent 6cb0b75 commit 93d5c0d

File tree

4 files changed

+864
-922
lines changed

4 files changed

+864
-922
lines changed

‎smartgrid/avalon.smartgrid.css

+9-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
font-size: 12px;
77
line-height: 20px;
88
position: relative;
9+
opacity: 0;
10+
/* IE 8 */
11+
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
12+
/* IE 5-7 */
13+
filter: alpha(opacity=0);
914
/*三种容器的规则*/
1015
/*三种容器下三角形的共同点*/
1116
/*上三角*/
@@ -141,7 +146,9 @@
141146
*vertical-align: auto;
142147
overflow: hidden; }
143148
.oni-smartgrid-column-cell {
144-
padding: 7px 5px; }
149+
padding: 7px 5px;
150+
word-wrap: break-word;
151+
word-break: normal; }
145152

146153
.oni-smartgrid-pager-options {
147154
float: left;
@@ -198,6 +205,7 @@
198205
border: 1px solid #ccc; }
199206
.oni-smartgrid-handler .oni-smartgrid-handler-mode {
200207
padding: 9px 10px;
208+
line-height: 14px;
201209
border-bottom: 1px #f2f2f2 solid;
202210
color: #0084bb; }
203211
.oni-smartgrid-handler .oni-smartgrid-handler-mode .oni-smartgrid-handler-mode-item {

‎smartgrid/avalon.smartgrid.html

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
<div class="oni-smartgrid" id='oni-smartgrid'>
2-
<div class='oni-smartgrid-main-wrapper'>
3-
<div class='oni-smartgrid-main' id='oni-smartgrid-main'>
4-
<div class="oni-smartgrid-header" ms-if='!noHeader'>
5-
<div class="oni-smartgrid-header-fixed"
1+
<div class="oni-smartgrid" id="oni-smartgrid">
2+
<div class="oni-smartgrid-main-wrapper">
3+
<div class="oni-smartgrid-main" id="oni-smartgrid-main">
4+
<div class="oni-smartgrid-header" ms-if="!noHeader">
5+
<div class="oni-smartgrid-header-fixed"
66
ms-if="isAffix"
7-
ms-css-top="_headerTop"
8-
ms-visible="_fixHeaderToggle"
9-
ms-css-position="_position"
7+
ms-css-top="_headerTop"
8+
ms-visible="_fixHeaderToggle"
9+
ms-css-position="_position"
1010
ms-css-width="_gridWidth">
11-
<div ms-repeat-column="columns"
11+
<div ms-repeat-column="columns"
1212
class="oni-smartgrid-column"
1313
ms-visible="column.toggle"
14-
ms-css-width="column.width"
14+
ms-css-width="column.width"
1515
ms-css-text-align="column.align"
1616
ms-class="{{column.customClass}}"
1717
ms-class-1="oni-smartgrid-hidden: _hiddenAffixHeader(column, allChecked)">
1818
<div class="oni-smartgrid-column-cell">
1919
{{column.name|sanitize|html}}
2020
<span ms-click="sortColumn(column, $index, $event)"
21-
ms-if="column.sortable"
21+
ms-if="column.sortable"
2222
ms-class="oni-helper-{{column.sortTrend}}">
2323
<span class="oni-helper-sort-top"></span>
2424
<span class="oni-helper-sort-bottom"></span>
@@ -27,17 +27,17 @@
2727
</div>
2828
</div>
2929
<div id="oni-smartgrid-header">
30-
<div ms-repeat-column="columns"
30+
<div ms-repeat-column="columns"
3131
class="oni-smartgrid-column"
3232
ms-visible="column.toggle"
3333
ms-css-width="column.width"
34-
ms-css-text-align="column.align"
34+
ms-css-text-align="column.align"
3535
ms-class="{{column.customClass}}"
3636
ms-class-1="oni-smartgrid-hidden: _hiddenAffixHeader(column, allChecked)">
3737
<div class="oni-smartgrid-column-cell">
3838
{{column.name|sanitize|html}}
3939
<span ms-click="sortColumn(column, $index, $event)"
40-
ms-if="column.sortable"
40+
ms-if="column.sortable"
4141
ms-class="oni-helper-{{column.sortTrend}}">
4242
<span class="oni-helper-sort-top"></span>
4343
<span class="oni-helper-sort-bottom"></span>
@@ -46,32 +46,33 @@
4646
</div>
4747
</div>
4848
</div>
49-
<div class='oni-smartgrid-body-wrapper'>
50-
<div class="oni-smartgrid-body" id="oni-smartgrid-body">
49+
<div class="oni-smartgrid-body-wrapper">
50+
<div class="oni-smartgrid-body-modal" ms-if="loadingToggle"></div>
51+
<div id="oni-smartgrid-loading-text" class="oni-smartgrid-body-loading" ms-if="loadingToggle">{{loadingText}}</div>
52+
<div class="oni-smartgrid-body" id="oni-smartgrid-body" ms-css-min-height="bodyMinHeight">
5153
</div>
5254
</div>
5355
</div>
5456
</div>
55-
<div class="oni-smartgrid-footer" ms-if='!noFooter'>
57+
<div class="oni-smartgrid-footer" ms-if="!noFooter">
5658
<div class="oni-smartgrid-pager-wrapper" ms-visible="pageable && _pagerShow">
5759
<div ms-if="pageable" ms-widget="pager, $, $pagerConfig"></div>
5860
</div>
5961
</div>
60-
<div ms-widget="loading"></div>
6162
</div>
6263
MS_OPTION_EJS
6364
<&- var trl = @data.length &>
6465
<&- if(!trl) { &>
6566
<div class="oni-smartgrid-nodata"><&=@noResult&></div>
6667
<&- } else { &>
6768
<&- for(var i=0, tr; i<trl; i++) { &>
68-
<&- tr = @data[i];
69+
<&- tr = @data[i];
6970
var selectedClass = "";
7071
if (i%2==0) {
7172
selectedClass = "oni-smartgrid-odd";
7273
} else {
7374
selectedClass = "oni-smartgrid-even"
74-
}
75+
}
7576
if (tr.selected && @checkRow) {
7677
selectedClass += " oni-smartgrid-selected"
7778
}
@@ -80,7 +81,7 @@
8081
}&>
8182
<div id="<&=tr.$id&>" class="<&=selectedClass&> oni-smartgrid-row" ms-hover="oni-smartgrid-hover">
8283
<&- for(var j=0, [email protected], td; j<tdl; j++) { &>
83-
<&- td=@columns[j].$model;
84+
<&- td=@columns[j].$model;
8485
var textAlign="text-align:"+td.align,
8586
customClass = td.customClass || "",
8687
format = td.format;&>
@@ -90,7 +91,6 @@
9091
</div>
9192
</div>
9293
<& } &>
93-
</div>
94-
<& } &>
94+
</div>
95+
<& } &>
9596
<& } &>
96-

0 commit comments

Comments
 (0)