Permalink
Browse files

fix: i18n demo

  • Loading branch information...
1 parent 8f7a9e3 commit fa275468d8298578cd7ba0da608bb2207783e6b3 @onvno onvno committed Dec 14, 2016
Showing with 3,863 additions and 2,553 deletions.
  1. +67 −18 dist/css/grid.css
  2. +1 −1 dist/css/grid.min.css
  3. +18 −10 dist/css/tree.css
  4. +2 −2 dist/css/tree.min.css
  5. +264 −90 dist/js/kero-adapter.js
  6. +347 −102 dist/js/kero.js
  7. +2,784 −2,199 dist/js/u-grid.js
  8. +6 −5 dist/js/u-grid.min.js
  9. +4 −1 dist/js/u-tree.js
  10. +3 −3 dist/js/u-tree.min.js
  11. +352 −107 dist/js/u.js
  12. +14 −14 dist/js/u.min.js
  13. +1 −1 test/i18n.html
View
@@ -157,6 +157,10 @@ header区域css begin
height: 3.14285714em;
line-height: 3.14285714em;
}
+
+.u-grid-hide-title-icon .uf-fontselectioneditor {
+ display: none
+}
.u-gird-parent {
position: absolute;
top: 0px;
@@ -176,6 +180,8 @@ header区域css begin
.u-grid-header-link:visited {
//color: #a8a8a8;
}
+
+
.u-grid-header-columnmenu {
position: absolute;
padding: 0 .4em 0 .6em;
@@ -235,7 +241,7 @@ header区域css begin
.u-grid-header-sort-span {
width: 1.3em;
text-align: center;
- font-size: 1.3em;
+ font-size: 12px;
position: absolute;
height: inherit;
line-height: inherit;
@@ -257,9 +263,9 @@ header区域css end
content区域css begin
*/
.u-grid td {
- border-style: solid !important;
- border-color: #cecece !important;
- border-width: 0 0 1px 0 !important;
+ border-style: solid ;
+ border-color: #cecece ;
+ border-width: 0 0 1px 0 ;
box-sizing: border-box;
padding:0px !important;
-moz-box-sizing: border-box;
@@ -272,6 +278,23 @@ content区域css begin
height: 2.68em \9;
line-height: 2.68em \9;
font-size: 16px !important;
+ overflow: hidden;
+}
+
+.u-grid .grid_edit_form_td{
+ overflow: visible;
+}
+
+.u-grid tbody tr:last-child td{
+ border-bottom-width: 0px;
+}
+
+.u-grid-content-left>div:last-child{
+ border-bottom-width: 0px;
+}
+
+.u-grid-content-left.u-grid-content-left-sum>div:last-child{
+ border-bottom-width: 1px;
}
.u-grid-content tr{
@@ -291,11 +314,20 @@ content区域css begin
margin: 0 1em 0 1em;
line-height: 3.5em;
font-size: 12px;
- overflow: hidden;
+ overflow: visible;
white-space: nowrap;
text-overflow: ellipsis;
height: 100%;
}
+.u-grid-content-td-div-over::after{
+ content:"...";
+ font-weight:bold;
+ position:absolute;
+ bottom:15px;
+ right: -5px;
+}
+
+
.u-grid-content-td-div > input{
height:100%;
}
@@ -306,7 +338,21 @@ content区域css begin
width: 2rem;
text-align: center;
}
+
+/*checkbox样式*/
+
+.u-grid-content-td-div .u-checkbox-outline,.u-grid-content-td-div .u-checkbox-focus-helper {
+ top: -10px;
+}
+
.u-grid-content {
+ border-style: solid;
+ border-color: #cecece;
+ border-width: 0px;
+ border-bottom-width: 1px;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
position: relative;
zoom: 1;
background-color: #fff ;
@@ -327,13 +373,6 @@ content区域css begin
height: 2.125em;
z-index: 11;
background-color: #FFF;
- border-style: solid;
- border-color: #cecece;
- border-width: 0px;
- border-bottom-width: 1px;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
}
.u-grid-content-left-bottom {
position: absolute;
@@ -401,7 +440,7 @@ content区域css begin
}
.u-grid-content-focus-row {
- background-color: #03cc71 !important;
+ background-color: #e9f7fc !important;
//color: #FFF !important;
}
.u-grid-content-tree-span {
@@ -410,6 +449,16 @@ content区域css begin
color: #007ae3;
font-size: 14px !important;
}
+
+
+/*行拖拽*/
+td.u-grid-drag-icon:before {
+ content: "\e6d1";
+ font-family: "uf" !important;
+ font-size: 12px;
+ position: absolute;
+ z-index: 100;
+}
/*
content区域css end
*/
@@ -721,7 +770,7 @@ form展示区域css begin
width: 2rem;
text-align: center;
}
-
+
.u-grid-content-td-div .checkbox label {
top: -2px;
}
@@ -753,11 +802,11 @@ form展示区域css end
/*鼠标滑过begin*/
.u-grid-move-bg{
- background: #e9f7fc !important;;
+ background: #f4f8fb !important;;
color:#333;
}
-.u-grid-move-bg a{
- color: #0377c1 !important;
+.u-grid .u-grid-move-bg a{
+ color: #0377c1;
}
.u-grid-move-bg a:hover{
text-decoration: underline;
@@ -816,4 +865,4 @@ form展示区域css end
mask: none;
background: #1baede url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgdmVyc2lvbj0iMS4xIgogICB2aWV3Qm94PSIwIDAgMSAxIgogICBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWluWU1pbiBtZWV0Ij4KICA8cGF0aAogICAgIGQ9Ik0gMC4wNDAzODA1OSwwLjYyNjc3NjcgMC4xNDY0NDY2MSwwLjUyMDcxMDY4IDAuNDI5Mjg5MzIsMC44MDM1NTMzOSAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IE0gMC4yMTcxNTcyOSwwLjgwMzU1MzM5IDAuODUzNTUzMzksMC4xNjcxNTcyOSAwLjk1OTYxOTQxLDAuMjczMjIzMyAwLjMyMzIyMzMsMC45MDk2MTk0MSB6IgogICAgIGlkPSJyZWN0Mzc4MCIKICAgICBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO3N0cm9rZTpub25lIiAvPgo8L3N2Zz4K);
}
-/*复选框end*/
+/*复选框end*/
Oops, something went wrong.
View
@@ -1,5 +1,5 @@
/**
- * tinper-neoui-tree v0.1.0
+ * tinper-neoui-tree v3.1.16
* tree
* author : yonyou FED
* homepage : https://github.com/iuap-design/tinper-neoui-tree#readme
@@ -37,6 +37,7 @@ website: http://code.google.com/p/jquerytree/
vertical-align: middle;
// padding: 6px 10px;
}
+
.ztree li ul {
margin: 0;
padding: 0 0 0 18px;
@@ -54,17 +55,18 @@ website: http://code.google.com/p/jquerytree/
vertical-align: top;
display: inline-block;
position: relative;
- padding: 6px 10px;
+ /*padding: 6px 10px;*/
+ padding: 4px 10px;
box-sizing: border-box;
}
.ztree li a:hover {
- color:#3949AB !important;
- background-color: #eee !important;
+ color:#3949AB ;
+ background-color: #eee ;
}
-/*.ztree li:hover >span{
- color:#3949AB;
-}*/
+.ztree li.hoverNode .switch {
+ color: #3949AB;
+}
.ztree li a.focusNode {
/*background-color: #eee;*/
// background-color: #C0EBF4;
@@ -439,13 +441,17 @@ ul.ztree.zTreeDragUL {
border-color: #bcbcbc;
}
+.ztree li.focusNode span.button.switch {
+ color: #FFFFFF;
+}
+
.ztree li span.button.switch {
position: relative;
z-index: 1000;
line-height: 21px;
}
- .ztree li span.button.switch.noline_close:after {
+.ztree li span.button.switch.noline_close:after {
/* -webkit-transform: scale(.5) rotate(0deg); */
/* transform: scale(.5) rotate(0deg); */
/* zoom: 1; */
@@ -463,7 +469,8 @@ ul.ztree.zTreeDragUL {
font-family: 'uf';
/*color: #3881D8;*/
position: absolute;
- top: 10px;
+ /*top: 10px;*/
+ top: 8px;
font-size: 12px;
}
@@ -484,7 +491,8 @@ ul.ztree.zTreeDragUL {
font-family: 'uf';
/*color: #3881D8;*/
position: absolute;
- top: 10px;
+ /*top: 10px;*/
+ top: 8px;
font-size: 12px;
left:5px;
}
Oops, something went wrong.
Oops, something went wrong.

0 comments on commit fa27546

Please sign in to comment.