zartui 2.0.2 → 2.0.3

package/es/datetime-picker/DatePicker.js

@@ -283,7 +283,13 @@ export default createComponent({
     updateColumnValue: function updateColumnValue() {
       var _this5 = this;
 
-      var value = this.innerValue ? this.innerValue : this.minDate;
+      var defaultValue = new Date();
+
+      if (defaultValue.getTime() < this.minDate.getTime() || defaultValue.getTime() > this.maxDate.getTime()) {
+        defaultValue = this.minDate;
+      }
+
+      var value = this.innerValue ? this.innerValue : defaultValue;
       var formatter = this.formatter;
       var values = this.originColumns.map(function (column) {
         switch (column.type) {

package/es/dialog/Dialog.js

@@ -99,8 +99,7 @@ export default createComponent({
       this.$emit('closed');
     },
     genButtons: function genButtons() {
-      var _this2 = this,
-          _ref;
+      var _this2 = this;
 
       var h = this.$createElement;
       var multiple = this.showCancelButton && this.showConfirmButton;
@@ -108,12 +107,15 @@ export default createComponent({
         "class": [BORDER_TOP, bem('footer')]
       }, [this.showCancelButton && h(Button, {
         "attrs": {
-          "size": "large",
+          "size": "normal",
+          "block": true,
           "loading": this.loading.cancel,
           "text": this.cancelButtonText || t('cancel')
         },
         "class": bem('cancel'),
         "style": {
+          marginRigth: "4px",
+          backgroundColor: "white",
           color: this.cancelButtonColor
         },
         "on": {
@@ -123,12 +125,15 @@ export default createComponent({
         }
       }), this.showConfirmButton && h(Button, {
         "attrs": {
-          "size": "large",
+          "type": "primary",
+          "size": "normal",
           "loading": this.loading.confirm,
-          "text": this.confirmButtonText || t('confirm')
+          "text": this.confirmButtonText || t('confirm'),
+          "block": true
         },
-        "class": [bem('confirm'), (_ref = {}, _ref[BORDER_LEFT] = multiple, _ref)],
+        "class": bem('confirm'),
         "style": {
+          marginLeft: "4px",
           color: this.confirmButtonColor
         },
         "on": {

package/es/dialog/index.css

@@ -1 +1 @@
-.zt-dialog{position:fixed;top:45%;left:50%;width:327px;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0);-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition:.3s;transition:.3s;-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}@media (max-width:328px){.zt-dialog{width:90%}}.zt-dialog__header{padding-top:24px;font-weight:700;line-height:24px;text-align:center;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;padding-left:16px;padding-right:16px}.zt-dialog__header--isolated{padding:24px 0}.zt-dialog__header--custom-title{height:44px;padding-left:0;padding-right:0;padding-top:0}.zt-dialog__content{text-align:center;word-break:break-all}.zt-dialog__content--isolated{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;min-height:100px}.zt-dialog__message{max-height:60vh;padding:24px 16px;overflow-y:auto;font-size:16px;line-height:20px;color:rgba(0,0,0,.6);display:inline-block;text-align:left;white-space:pre-wrap;word-wrap:break-word;-webkit-overflow-scrolling:touch}.zt-dialog__message--has-title{padding-top:8px;font-size:14px}.zt-dialog__message--left{text-align:left}.zt-dialog__message--right{text-align:right}.zt-dialog__footer{display:-webkit-box;display:-webkit-flex;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.zt-dialog__footer .zt-hairline--left::after{top:calc(-50% + 20px);bottom:calc(-50% + 20px)}.zt-dialog__cancel.zt-button,.zt-dialog__confirm.zt-button{-webkit-box-flex:1;-webkit-flex:1;flex:1;height:44px;margin:0;border:0}.zt-dialog__confirm.zt-button,.zt-dialog__confirm.zt-button:active{color:#0091fa}.zt-dialog__cancel{color:#000;font-weight:400}.zt-dialog-bounce-enter{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.zt-dialog-bounce-leave-active{-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9);opacity:0}
+.zt-dialog{position:fixed;top:45%;left:50%;width:327px;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0);-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition:.3s;transition:.3s;-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}@media (max-width:328px){.zt-dialog{width:90%}}.zt-dialog__header{padding-top:24px;font-weight:700;line-height:24px;text-align:center;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;padding-left:16px;padding-right:16px}.zt-dialog__header--isolated{padding:24px 0}.zt-dialog__header--custom-title{height:44px;padding-left:0;padding-right:0;padding-top:0}.zt-dialog__content{text-align:center;word-break:break-all}.zt-dialog__content--isolated{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;min-height:100px}.zt-dialog__message{max-height:60vh;padding:24px 16px;overflow-y:auto;font-size:16px;line-height:20px;color:rgba(0,0,0,.6);display:inline-block;text-align:left;white-space:pre-wrap;word-wrap:break-word;-webkit-overflow-scrolling:touch}.zt-dialog__message--has-title{padding-top:8px;font-size:14px}.zt-dialog__message--left{text-align:left}.zt-dialog__message--right{text-align:right}.zt-dialog__footer{overflow:hidden;-webkit-user-select:none;user-select:none;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;height:44px;padding:8px 16px 8px 16px;border-top:1px solid rgba(45,75,115,.1);position:relative}.zt-dialog-bounce-enter{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.zt-dialog-bounce-leave-active{-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9);opacity:0}

package/es/dialog/index.less

@@ -86,39 +86,15 @@
   }
 
   &__footer {
-    display: flex;
     overflow: hidden;
     user-select: none;
-
-    //底部按钮中间垂直分割线，上下各留10px间距
-    .zt-hairline--left::after {
-      top: calc(-50% + 20px);
-      bottom: calc(-50% + 20px);
-    }
-  }
-
-  // 提高优先级避免被zt-button--default的样式覆盖了
-  &__confirm,
-  &__cancel {
-    &.zt-button {
-      flex: 1;
-      height: @dialog-button-height;
-      margin: 0;
-      border: 0;
-    }
-  }
-
-  &__confirm {
-    &.zt-button,
-    &.zt-button:active {
-      color: @dialog-confirm-button-text-color;
-    }
-  }
-  
-  //取消按钮不加粗、纯黑色
-  &__cancel {
-    color: @black;
-    font-weight: normal;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: @picker-toolbar-height;
+    padding: 8px 16px 8px 16px;
+    border-top: 1px solid rgba(45,75,115,0.10);
+    position: relative;
   }
 
   &-bounce-enter {

package/es/index.js

@@ -75,7 +75,7 @@ import Tag from './tag';
 import Timeline from './timeline';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '2.0.2';
+var version = '2.0.3';
 
 function install(Vue) {
   var components = [ActionSheet, Area, Avatar, BackTop, Badge, Button, Calendar, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Col, Collapse, CollapseItem, CountDown, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, FoldDialog, Form, Grid, GridItem, HierarchySelect, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, Lazyload, List, Loading, Locale, MediaPicker, MediaPlayer, MultiplePicker, NavBar, NoticeBar, NumberKeyboard, Overlay, PasswordInput, PdfViewer, Picker, Popover, Popup, PullRefresh, Radio, RadioGroup, Rate, Row, Search, Signature, Skeleton, Slider, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Table, Tabs, Tag, Timeline, Toast, Uploader];

package/lib/datetime-picker/DatePicker.js

@@ -297,7 +297,13 @@ var _default2 = createComponent({
     updateColumnValue: function updateColumnValue() {
       var _this5 = this;
 
-      var value = this.innerValue ? this.innerValue : this.minDate;
+      var defaultValue = new Date();
+
+      if (defaultValue.getTime() < this.minDate.getTime() || defaultValue.getTime() > this.maxDate.getTime()) {
+        defaultValue = this.minDate;
+      }
+
+      var value = this.innerValue ? this.innerValue : defaultValue;
       var formatter = this.formatter;
       var values = this.originColumns.map(function (column) {
         switch (column.type) {

package/lib/dialog/Dialog.js

@@ -110,8 +110,7 @@ var _default = createComponent({
       this.$emit('closed');
     },
     genButtons: function genButtons() {
-      var _this2 = this,
-          _ref;
+      var _this2 = this;
 
       var h = this.$createElement;
       var multiple = this.showCancelButton && this.showConfirmButton;
@@ -119,12 +118,15 @@ var _default = createComponent({
         "class": [_constant.BORDER_TOP, bem('footer')]
       }, [this.showCancelButton && h(_button.default, {
         "attrs": {
-          "size": "large",
+          "size": "normal",
+          "block": true,
           "loading": this.loading.cancel,
           "text": this.cancelButtonText || t('cancel')
         },
         "class": bem('cancel'),
         "style": {
+          marginRigth: "4px",
+          backgroundColor: "white",
           color: this.cancelButtonColor
         },
         "on": {
@@ -134,12 +136,15 @@ var _default = createComponent({
         }
       }), this.showConfirmButton && h(_button.default, {
         "attrs": {
-          "size": "large",
+          "type": "primary",
+          "size": "normal",
           "loading": this.loading.confirm,
-          "text": this.confirmButtonText || t('confirm')
+          "text": this.confirmButtonText || t('confirm'),
+          "block": true
         },
-        "class": [bem('confirm'), (_ref = {}, _ref[_constant.BORDER_LEFT] = multiple, _ref)],
+        "class": bem('confirm'),
         "style": {
+          marginLeft: "4px",
           color: this.confirmButtonColor
         },
         "on": {

package/lib/dialog/index.css

@@ -1 +1 @@
-.zt-dialog{position:fixed;top:45%;left:50%;width:327px;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0);-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition:.3s;transition:.3s;-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}@media (max-width:328px){.zt-dialog{width:90%}}.zt-dialog__header{padding-top:24px;font-weight:700;line-height:24px;text-align:center;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;padding-left:16px;padding-right:16px}.zt-dialog__header--isolated{padding:24px 0}.zt-dialog__header--custom-title{height:44px;padding-left:0;padding-right:0;padding-top:0}.zt-dialog__content{text-align:center;word-break:break-all}.zt-dialog__content--isolated{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;min-height:100px}.zt-dialog__message{max-height:60vh;padding:24px 16px;overflow-y:auto;font-size:16px;line-height:20px;color:rgba(0,0,0,.6);display:inline-block;text-align:left;white-space:pre-wrap;word-wrap:break-word;-webkit-overflow-scrolling:touch}.zt-dialog__message--has-title{padding-top:8px;font-size:14px}.zt-dialog__message--left{text-align:left}.zt-dialog__message--right{text-align:right}.zt-dialog__footer{display:-webkit-box;display:-webkit-flex;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.zt-dialog__footer .zt-hairline--left::after{top:calc(-50% + 20px);bottom:calc(-50% + 20px)}.zt-dialog__cancel.zt-button,.zt-dialog__confirm.zt-button{-webkit-box-flex:1;-webkit-flex:1;flex:1;height:44px;margin:0;border:0}.zt-dialog__confirm.zt-button,.zt-dialog__confirm.zt-button:active{color:#0091fa}.zt-dialog__cancel{color:#000;font-weight:400}.zt-dialog-bounce-enter{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.zt-dialog-bounce-leave-active{-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9);opacity:0}
+.zt-dialog{position:fixed;top:45%;left:50%;width:327px;overflow:hidden;font-size:16px;background-color:#fff;border-radius:4px;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0);-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition:.3s;transition:.3s;-webkit-transition-property:opacity,-webkit-transform;transition-property:opacity,-webkit-transform;transition-property:transform,opacity;transition-property:transform,opacity,-webkit-transform}@media (max-width:328px){.zt-dialog{width:90%}}.zt-dialog__header{padding-top:24px;font-weight:700;line-height:24px;text-align:center;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;word-break:break-all;padding-left:16px;padding-right:16px}.zt-dialog__header--isolated{padding:24px 0}.zt-dialog__header--custom-title{height:44px;padding-left:0;padding-right:0;padding-top:0}.zt-dialog__content{text-align:center;word-break:break-all}.zt-dialog__content--isolated{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;min-height:100px}.zt-dialog__message{max-height:60vh;padding:24px 16px;overflow-y:auto;font-size:16px;line-height:20px;color:rgba(0,0,0,.6);display:inline-block;text-align:left;white-space:pre-wrap;word-wrap:break-word;-webkit-overflow-scrolling:touch}.zt-dialog__message--has-title{padding-top:8px;font-size:14px}.zt-dialog__message--left{text-align:left}.zt-dialog__message--right{text-align:right}.zt-dialog__footer{overflow:hidden;-webkit-user-select:none;user-select:none;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;height:44px;padding:8px 16px 8px 16px;border-top:1px solid rgba(45,75,115,.1);position:relative}.zt-dialog-bounce-enter{-webkit-transform:translate3d(-50%,-50%,0) scale(.7);transform:translate3d(-50%,-50%,0) scale(.7);opacity:0}.zt-dialog-bounce-leave-active{-webkit-transform:translate3d(-50%,-50%,0) scale(.9);transform:translate3d(-50%,-50%,0) scale(.9);opacity:0}

package/lib/dialog/index.less

@@ -86,39 +86,15 @@
   }
 
   &__footer {
-    display: flex;
     overflow: hidden;
     user-select: none;
-
-    //底部按钮中间垂直分割线，上下各留10px间距
-    .zt-hairline--left::after {
-      top: calc(-50% + 20px);
-      bottom: calc(-50% + 20px);
-    }
-  }
-
-  // 提高优先级避免被zt-button--default的样式覆盖了
-  &__confirm,
-  &__cancel {
-    &.zt-button {
-      flex: 1;
-      height: @dialog-button-height;
-      margin: 0;
-      border: 0;
-    }
-  }
-
-  &__confirm {
-    &.zt-button,
-    &.zt-button:active {
-      color: @dialog-confirm-button-text-color;
-    }
-  }
-  
-  //取消按钮不加粗、纯黑色
-  &__cancel {
-    color: @black;
-    font-weight: normal;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height: @picker-toolbar-height;
+    padding: 8px 16px 8px 16px;
+    border-top: 1px solid rgba(45,75,115,0.10);
+    position: relative;
   }
 
   &-bounce-enter {