Merge remote-tracking branch 'origin/master'

src/wotu-ui.css

@@ -373,7 +373,11 @@
 }
 .wotu-ui .x-tab-bar-plain.x-tab-bar .x-tab.x-tab-active.x-tab-default{
     background: #fff;
+}
+.wotu-ui .x-tab-bar-plain.x-tab-bar .x-tab.x-tab-active.x-tab-default{
     position: relative;
+    overflow: visible;
+    z-index: 1;
 }
 .wotu-ui .x-tab-bar-plain.x-tab-bar .x-tab.x-tab-active.x-tab-default:after{
     width: 100%;
@@ -381,8 +385,11 @@
     background: #000;
     content: '';
     position: absolute;
-    left:0;
-    bottom:-1px
+    left:-10px;
+    bottom:-1px;
+    padding:0 10px;
+    box-sizing: content-box;
+    z-index: 9999;
 }
 .wotu-ui .x-tab-bar-plain.x-tab-bar .x-tab.x-tab-default .x-tab-close-btn{
     top: 10px;
@@ -528,4 +535,18 @@
 }
 .wotu-ui .x-menu-item-default.x-menu-item-focus,.wotu-ui .x-menu-item-default.x-menu-item-active{
     background: #004c8b;
+}
+.wotu-ui .x-grid-locked-split .x-grid-inner-normal{
+    border-width:0 0 0 1px
+}
+.wotu-ui .x-grid-locked .x-grid-inner-locked{
+    border-width:0 1px 0 0
+}
+.wotu-ui .x-grid-scrollbar-clipper-locked,.wotu-ui .x-grid-scrollbar-locked{
+    border-width:0 1px 0 0;
+    background: #000;
+}
+/*grid行颜色设定*/
+.x-grid-record-red{
+    color:red
 }