fix(date-picker): fix invaild date

style(date-picker): fix ios mask index test(pagination): update pagination test
fisherspy · Sep 30, 2018 · 6620635 · 6620635
1 parent a3c6150
commit 6620635
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/components/date-picker/date-picker.component.ts b/components/date-picker/date-picker.component.ts
@@ -546,7 +546,7 @@ export class DatePickerComponent implements OnInit, OnDestroy, AfterViewInit {
     } else {
       result = this.resultArr.map(v => v).join('-');
     }
-    this.resultDate = new Date(result);
+    this.resultDate = new Date(result.replace(/-/g, '/'));
     if (this.options.minDate.getTime() > this.resultDate.getTime()) {
       if (this.resultArr.length > 0) {
         for (let index = 0; index < this.resultArr.length; index++) {

diff --git a/components/pagination/pagination.component.spec.ts b/components/pagination/pagination.component.spec.ts
@@ -80,8 +80,8 @@ describe('pagination', () => {
   it('should local work', () => {
     nextButton = paginationEle.nativeElement.querySelector('.am-pagination-wrap-btn-next').firstElementChild;
     prevButton = paginationEle.nativeElement.querySelector('.am-pagination-wrap-btn-prev').firstElementChild;
-    expect(prevButton.firstElementChild.innerText.trim()).toBe(component.locale.prevText);
-    expect(nextButton.firstElementChild.innerText.trim()).toBe(component.locale.nextText);
+    expect(prevButton.lastElementChild.innerText.trim()).toBe(component.locale.prevText);
+    expect(nextButton.lastElementChild.innerText.trim()).toBe(component.locale.nextText);
   });
 
   it('should onChange work', () => {

diff --git a/components/picker/style/index.less b/components/picker/style/index.less
@@ -10,6 +10,8 @@
   position: fixed;
   width: 100%;
   background-color: @fill-base;
+  -webkit-transform: translateZ(1px);
+  transform: translateZ(1px);
 
   &-wrap {
     position: fixed;
@@ -21,8 +23,6 @@
     z-index: @picker-zindex;
     -webkit-overflow-scrolling: touch;
     outline: 0;
-    -webkit-transform: translateZ(1px);
-    transform: translateZ(1px);
   }
 
   &-mask {
@@ -34,8 +34,6 @@
     background-color: @fill-mask;
     height: 100%;
     z-index: @picker-zindex;
-    -webkit-transform: translateZ(1px);
-    transform: translateZ(1px);
 
     &-hidden {
       display: none;