zartui 1.0.2 → 2.0.2

package/es/mixins/checkbox.js

@@ -17,6 +17,8 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
       disabled: Boolean,
       iconSize: [Number, String],
       checkedColor: String,
+      boxShadow: String,
+      border: String,
       iconColor: String,
       labelPosition: String,
       labelDisabled: Boolean,
@@ -41,12 +43,15 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
       },
       iconStyle: function iconStyle() {
         var checkedColor = this.checkedColor || this.parent && this.parent.checkedColor;
+        var boxShadow = this.boxShadow || this.parent && this.parent.boxShadow;
+        var border = this.border || this.parent && this.parent.border;
         var iconColor = this.iconColor || this.parent && this.parent.iconColor;
 
-        if (checkedColor && this.checked && !this.isDisabled) {
+        if ((boxShadow || checkedColor) && this.checked && !this.isDisabled) {
           return {
             color: iconColor,
-            borderColor: checkedColor,
+            boxShadow: boxShadow,
+            border: border,
             backgroundColor: checkedColor
           };
         }
@@ -93,35 +98,11 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
           }
         }, [this.slots('icon', {
           checked: checked
-        }) || (role === 'radio' && checked ? this.genRadioIcon() : h(Icon, {
+        }) || h(Icon, {
           "attrs": {
-            "name": "success"
+            "name": role === 'radio' ? "radio-round" : "checkBox-select"
           },
           "style": this.iconStyle
-        }))]);
-      },
-      genRadioIcon: function genRadioIcon() {
-        var h = this.$createElement;
-        var iconSize = this.iconSize || this.parent && this.parent.iconSize;
-        return h("svg", {
-          "attrs": {
-            "xmlns": "http://www.w3.org/2000/svg",
-            "viewBox": "0 0 24 24"
-          },
-          "class": bem("custom-svg"),
-          "style": {
-            width: iconSize,
-            height: iconSize
-          }
-        }, [h("path", {
-          "style": {
-            fill: this.checkedColor
-          },
-          "attrs": {
-            "d": "M12,2 C17.5228475,2 22,6.4771525 22,12 C22,17.5228475 17.5228475,22 12,22 C6.4771525,22 2,17.5228475 2,12 C2,6.4771525 6.4771525,2 12,2 Z M12,7 C9.23857625,7 7,9.23857625 7,12 C7,14.7614237 9.23857625,17 12,17 C14.7614237,17 17,14.7614237 17,12 C17,9.23857625 14.7614237,7 12,7 Z",
-            "fill": "#0091FA",
-            "fill-rule": "nonzero"
-          }
         })]);
       },
       genLabel: function genLabel() {
@@ -147,16 +128,17 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
         Children.push(this.genLabel());
       }
 
+      var checked = this.checked;
       return h("div", {
         "attrs": {
           "role": role,
           "tabindex": this.tabindex,
           "aria-checked": String(this.checked)
         },
-        "class": bem([{
+        "class": [bem([{
           disabled: this.isDisabled,
           'label-disabled': this.labelDisabled
-        }, this.direction]),
+        }, this.direction]), checked ? '' : bem('disable-icon')],
         "on": {
           "click": this.onClick
         }

package/es/multiple-picker/index.css

@@ -1 +1 @@
-[class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-multiple-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-multiple-picker__toolbar{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}.zt-multiple-picker__border{position:relative}.zt-multiple-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-multiple-picker__cancel,.zt-multiple-picker__confirm{height:100%;padding:0 16px;font-size:16px;background-color:transparent;border:none;cursor:pointer}.zt-multiple-picker__cancel:active,.zt-multiple-picker__confirm:active{opacity:.7}.zt-multiple-picker__confirm{color:#0091fa;font-weight:700}.zt-multiple-picker__cancel{color:#000;font-weight:400}.zt-multiple-picker__title{max-width:50%;font-weight:400;font-size:14px;line-height:20px;text-align:center;color:rgba(0,0,0,.4)}.zt-multiple-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-multiple-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-multiple-picker__options{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-multiple-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;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;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-multiple-picker-options{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:scroll;font-size:16px}.zt-multiple-picker-options__wrapper{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;background-color:#fff;padding:12px 16px 4px 16px}.zt-multiple-picker-options__item{color:rgba(0,0,0,.6);padding:0 4px 8px 0;box-sizing:border-box;border-radius:2px;text-align:center;font-size:14px}.zt-multiple-picker-options__item .zt-ellipsis{height:28px;line-height:28px;background-color:rgba(0,0,0,.04);border:1px solid rgba(0,0,0,.04);border-radius:2px}.zt-multiple-picker-options__item--disabled{cursor:not-allowed;opacity:.3}.zt-multiple-picker-options__item--last{padding-right:0}.zt-multiple-picker-options__item--selected .zt-ellipsis{background:rgba(0,145,250,.1);border:1px solid #0091fa;border-radius:2px;color:#0091fa}
+[class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-multiple-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-multiple-picker__toolbar{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;border-top:1px solid rgba(45,75,115,.1)}.zt-multiple-picker__border{position:relative}.zt-multiple-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-multiple-picker__cancel,.zt-multiple-picker__confirm{height:100%;padding:0 16px;font-size:14px;background-color:transparent;border:none;cursor:pointer}.zt-multiple-picker__cancel:active,.zt-multiple-picker__confirm:active{opacity:.7}.zt-multiple-picker__confirm{color:#0091fa;font-weight:700}.zt-multiple-picker__cancel{color:#000;font-weight:400}.zt-multiple-picker__title{font-weight:400;font-size:14px;line-height:20px;text-align:center;color:#2d4b73;opacity:.4;padding:12px 0;border-bottom:1px solid rgba(45,75,115,.1)}.zt-multiple-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-multiple-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-multiple-picker__options{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-multiple-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;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;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-multiple-picker-options{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:scroll;font-size:14px}.zt-multiple-picker-options__wrapper{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;background-color:#fff;padding:12px 16px 4px 16px}.zt-multiple-picker-options__item{color:rgba(0,0,0,.6);padding:0 4px 8px 0;box-sizing:border-box;border-radius:2px;text-align:center;font-size:14px}.zt-multiple-picker-options__item .zt-ellipsis{height:28px;line-height:28px;border:1px solid rgba(45,75,115,.2);border-radius:18px}.zt-multiple-picker-options__item--disabled{cursor:not-allowed;opacity:.3}.zt-multiple-picker-options__item--last{padding-right:0}.zt-multiple-picker-options__item--selected .zt-ellipsis{background:rgba(0,145,250,.1);border:1px solid rgba(0,145,250,.6);border-radius:18px;color:#0091fa}

package/es/multiple-picker/index.js

@@ -9,6 +9,7 @@ import MultiplePickerOptions from './MultiplePickerOptions';
 import Popup from '../popup';
 import { PopupMixin } from '../mixins/popup';
 import { deepClone } from '../utils/deep-clone';
+import Button from '../button';
 
 var _createNamespace = createNamespace('multiple-picker'),
     createComponent = _createNamespace[0],
@@ -36,7 +37,7 @@ export default createComponent({
     },
     toolbarPosition: {
       type: String,
-      default: 'top'
+      default: 'bottom'
     },
     valueKey: {
       type: String,
@@ -125,11 +126,15 @@ export default createComponent({
     },
     genCancel: function genCancel() {
       var h = this.$createElement;
-      return h("button", {
+      return h(Button, {
         "attrs": {
-          "type": "button"
+          "size": "normal",
+          "block": true
+        },
+        "style": {
+          marginRigth: "4px",
+          backgroundColor: "white"
         },
-        "class": bem('cancel'),
         "on": {
           "click": this.cancel
         }
@@ -137,11 +142,15 @@ export default createComponent({
     },
     genConfirm: function genConfirm() {
       var h = this.$createElement;
-      return h("button", {
+      return h(Button, {
         "attrs": {
-          "type": "button"
+          "type": "primary",
+          "size": "normal",
+          "block": true
+        },
+        "style": {
+          marginLeft: "4px"
         },
-        "class": bem('confirm'),
         "on": {
           "click": this.confirm
         }
@@ -153,7 +162,7 @@ export default createComponent({
       if (this.showToolbar) {
         return h("div", {
           "class": bem('toolbar')
-        }, [this.slots() || [this.genCancel(), this.genTitle(), this.genConfirm()]]);
+        }, [this.slots() || [this.genCancel(), this.genConfirm()]]);
       }
     },
     genOptions: function genOptions() {
@@ -225,9 +234,7 @@ export default createComponent({
     }, [h("div", {
       "class": bem(),
       "ref": 'columnParent'
-    }, [this.toolbarPosition === 'top' ? this.genToolbar() : h(), this.toolbarPosition === 'top' ? h("div", {
-      "class": bem('border')
-    }) : h(), this.loading ? h(Loading, {
+    }, [this.genTitle(), this.loading ? h(Loading, {
       "class": bem('loading')
     }) : h(), this.genOptions(), this.toolbarPosition === 'bottom' ? this.genToolbar() : h()])]);
   }

package/es/multiple-picker/index.less

@@ -11,6 +11,8 @@
     align-items: center;
     justify-content: space-between;
     height: @picker-toolbar-height;
+    padding: 8px 16px;
+    border-top: 1px solid rgba(45,75,115,0.10);
   }
 
   &__border {
@@ -46,12 +48,14 @@
   }
 
   &__title {
-    max-width: 50%;
     font-weight: @plain-font-weight;
     font-size: @picker-title-font-size;
     line-height: @picker-title-line-height;
     text-align: center;
-    color: rgba(0, 0, 0, 0.4);
+    color: #2D4B73;
+    opacity: 0.4;
+    padding: 12px 0;
+    border-bottom: 1px solid rgba(45,75,115,0.10);
   }
 
   &__header {
@@ -107,12 +111,12 @@
       border-radius: 2px;
       text-align: center;
       font-size: 14px;
+
       .zt-ellipsis {
         height: 28px;
         line-height: 28px;
-        background-color: rgba(0,0,0,.04);
-        border: 1px solid rgba(0,0,0,.04);
-        border-radius: 2px;
+        border: 1px solid rgba(45,75,115,0.20);
+        border-radius: 18px;
       }
 
       &--disabled {
@@ -127,8 +131,8 @@
       &--selected {
         .zt-ellipsis {
           background: rgba(0,145,250,0.10);
-          border: 1px solid #0091FA;
-          border-radius: 2px;
+          border: 1px solid rgba(0,145,250,0.60);
+          border-radius: 18px;
           color: #0091FA;
         }
       }

package/es/multiple-picker/style/index.js

@@ -4,4 +4,5 @@ import '../../info/index.css';
 import '../../icon/index.css';
 import '../../popup/index.css';
 import '../../loading/index.css';
+import '../../button/index.css';
 import '../index.css';

package/es/multiple-picker/style/less.js

@@ -4,4 +4,5 @@ import '../../info/index.less';
 import '../../icon/index.less';
 import '../../popup/index.less';
 import '../../loading/index.less';
+import '../../button/index.less';
 import '../index.less';

package/es/pdf-viewer/style/index.js

@@ -5,5 +5,6 @@ import '../../icon/index.css';
 import '../../popup/index.css';
 import '../../loading/index.css';
 import '../../toast/index.css';
+import '../../button/index.css';
 import '../../picker/index.css';
 import '../index.css';

package/es/pdf-viewer/style/less.js

@@ -5,5 +5,6 @@ import '../../icon/index.less';
 import '../../popup/index.less';
 import '../../loading/index.less';
 import '../../toast/index.less';
+import '../../button/index.less';
 import '../../picker/index.less';
 import '../index.less';

package/es/picker/index.css

@@ -1 +1 @@
-[class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-picker__toolbar{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}.zt-picker__border{position:relative}.zt-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-picker__cancel,.zt-picker__confirm{height:100%;padding:0 16px;font-size:16px;background-color:transparent;border:none;cursor:pointer}.zt-picker__cancel:active,.zt-picker__confirm:active{opacity:.7}.zt-picker__confirm{color:#0091fa;font-weight:700}.zt-picker__cancel{color:#000;font-weight:400}.zt-picker__title{max-width:50%;font-weight:400;font-size:14px;line-height:20px;text-align:center;color:rgba(0,0,0,.4)}.zt-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-picker__columns{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;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;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-picker__frame{position:absolute;top:50%;right:16px;left:16px;z-index:2;-webkit-transform:translateY(-50%);transform:translateY(-50%);pointer-events:none}.zt-picker__background{position:absolute;width:100%;height:100%;opacity:.04;background-color:#000}.zt-picker__mask{position:absolute;top:0;left:0;z-index:1;width:100%;height:100%;background-image:-webkit-linear-gradient(top,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),-webkit-linear-gradient(bottom,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-image:linear-gradient(180deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),linear-gradient(0deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-repeat:no-repeat;background-position:top,bottom;-webkit-transform:translateZ(0);transform:translateZ(0);pointer-events:none}.zt-picker-column{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:hidden;font-size:16px}.zt-picker-column__wrapper{-webkit-transition-timing-function:cubic-bezier(.23,1,.68,1);transition-timing-function:cubic-bezier(.23,1,.68,1)}.zt-picker-column__item{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;padding:0 4px;color:#000}.zt-picker-column__item--disabled{cursor:not-allowed;opacity:.3}.zt-picker-column__item--selected{font-weight:700}
+[class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-picker__toolbar{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-picker__border{position:relative}.zt-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-picker__cancel,.zt-picker__confirm{height:100%;padding:0 16px;font-size:14px;background-color:transparent;border:none;cursor:pointer}.zt-picker__cancel:active,.zt-picker__confirm:active{opacity:.7}.zt-picker__confirm{color:#0091fa;font-weight:700}.zt-picker__cancel{color:#000;font-weight:400}.zt-picker__title{font-weight:400;font-size:14px;line-height:20px;text-align:center;color:#2d4b73;opacity:.4;padding:12px 0;border-bottom:1px solid rgba(45,75,115,.1)}.zt-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-picker__columns{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;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;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-picker__frame{position:absolute;top:50%;right:16px;left:16px;z-index:2;-webkit-transform:translateY(-50%);transform:translateY(-50%);pointer-events:none}.zt-picker__background{position:absolute;width:100%;height:100%;opacity:.04;background-color:#000}.zt-picker__mask{position:absolute;top:0;left:0;z-index:1;width:100%;height:100%;background-image:-webkit-linear-gradient(top,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),-webkit-linear-gradient(bottom,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-image:linear-gradient(180deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),linear-gradient(0deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-repeat:no-repeat;background-position:top,bottom;-webkit-transform:translateZ(0);transform:translateZ(0);pointer-events:none}.zt-picker-column{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:hidden;font-size:14px}.zt-picker-column__wrapper{-webkit-transition-timing-function:cubic-bezier(.23,1,.68,1);transition-timing-function:cubic-bezier(.23,1,.68,1)}.zt-picker-column__item{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;padding:0 4px;color:#000}.zt-picker-column__item--disabled{cursor:not-allowed;opacity:.3}.zt-picker-column__item--selected{font-weight:700}

package/es/picker/index.js

@@ -8,6 +8,7 @@ import { unitToPx } from '../utils/format/unit'; // Components
 import Loading from '../loading';
 import PickerColumn from './PickerColumn';
 import Popup from '../popup';
+import Button from '../button';
 import { PopupMixin } from '../mixins/popup';
 
 var _createNamespace = createNamespace('picker'),
@@ -38,7 +39,7 @@ export default createComponent({
     },
     toolbarPosition: {
       type: String,
-      default: 'top'
+      default: 'bottom'
     },
     valueKey: {
       type: String,
@@ -322,11 +323,15 @@ export default createComponent({
     },
     genCancel: function genCancel() {
       var h = this.$createElement;
-      return h("button", {
+      return h(Button, {
         "attrs": {
-          "type": "button"
+          "size": "normal",
+          "block": true
+        },
+        "style": {
+          marginRigth: "4px",
+          backgroundColor: "white"
         },
-        "class": bem('cancel'),
         "on": {
           "click": this.cancel
         }
@@ -334,11 +339,15 @@ export default createComponent({
     },
     genConfirm: function genConfirm() {
       var h = this.$createElement;
-      return h("button", {
+      return h(Button, {
         "attrs": {
-          "type": "button"
+          "type": "primary",
+          "size": "normal",
+          "block": true
+        },
+        "style": {
+          marginLeft: "4px"
         },
-        "class": bem('confirm'),
         "on": {
           "click": this.confirm
         }
@@ -350,7 +359,7 @@ export default createComponent({
       if (this.showToolbar) {
         return h("div", {
           "class": bem('toolbar')
-        }, [this.slots() || [this.genCancel(), this.genTitle(), this.genConfirm()]]);
+        }, [this.slots() || [this.genCancel(), this.genConfirm()]]);
       }
     },
     genHeaders: function genHeaders() {
@@ -439,7 +448,7 @@ export default createComponent({
     }, [h("div", {
       "class": bem(),
       "ref": 'columnParent'
-    }, [this.toolbarPosition === 'top' ? this.genToolbar() : h(), this.toolbarPosition === 'top' ? h("div", {
+    }, [this.toolbarPosition === 'top' ? this.genToolbar() : h(), this.toolbarPosition === 'top' ? h() : this.genTitle(), this.toolbarPosition === 'top' ? h("div", {
       "class": bem('border')
     }) : h(), this.loading ? h(Loading, {
       "class": bem('loading')

package/es/picker/index.less

@@ -11,6 +11,20 @@
     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;
+
+    // &::before {
+    //   content: '';
+    //   display: inline-block;
+    //   width: 100%;
+    //   height: 1px;
+    //   box-shadow: inset 0 0 0 0 rgba(45,75,115,0.10);
+    //   position: absolute;
+    //   top: 0;
+    //   right: 0;
+    // }
   }
 
   &__border {
@@ -46,12 +60,14 @@
   }
 
   &__title {
-    max-width: 50%;
     font-weight: @plain-font-weight;
     font-size: @picker-title-font-size;
     line-height: @picker-title-line-height;
     text-align: center;
-    color: rgba(0, 0, 0, 0.4);
+    color: #2D4B73;
+    opacity: 0.4;
+    padding: 12px 0;
+    border-bottom: 1px solid rgba(45,75,115,0.10);
   }
 
   &__header {

package/es/picker/style/index.js

@@ -4,4 +4,5 @@ import '../../info/index.css';
 import '../../icon/index.css';
 import '../../popup/index.css';
 import '../../loading/index.css';
+import '../../button/index.css';
 import '../index.css';

package/es/picker/style/less.js

@@ -4,4 +4,5 @@ import '../../info/index.less';
 import '../../icon/index.less';
 import '../../popup/index.less';
 import '../../loading/index.less';
+import '../../button/index.less';
 import '../index.less';

package/es/popup/index.css

@@ -1 +1 @@
-.zt-overflow-hidden{overflow:hidden!important}.zt-popup{position:fixed;max-height:100%;overflow-y:auto;background-color:#fff;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;-webkit-overflow-scrolling:touch}.zt-popup--center{top:50%;left:50%;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.zt-popup--center.zt-popup--round{border-radius:8px}.zt-popup--top{top:0;left:0;width:100%}.zt-popup--top.zt-popup--round{border-radius:0 0 8px 8px}.zt-popup--right{top:50%;right:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--right.zt-popup--round{border-radius:8px 0 0 8px}.zt-popup--bottom{bottom:0;left:0;width:100%}.zt-popup--bottom.zt-popup--round{border-radius:8px 8px 0 0}.zt-popup--left{top:50%;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--left.zt-popup--round{border-radius:0 8px 8px 0}.zt-popup--safe-area-inset-bottom{padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}.zt-popup-slide-bottom-enter-active,.zt-popup-slide-left-enter-active,.zt-popup-slide-right-enter-active,.zt-popup-slide-top-enter-active{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.zt-popup-slide-bottom-leave-active,.zt-popup-slide-left-leave-active,.zt-popup-slide-right-leave-active,.zt-popup-slide-top-leave-active{-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}.zt-popup-slide-top-enter,.zt-popup-slide-top-leave-active{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}.zt-popup-slide-right-enter,.zt-popup-slide-right-leave-active{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}.zt-popup-slide-bottom-enter,.zt-popup-slide-bottom-leave-active{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.zt-popup-slide-left-enter,.zt-popup-slide-left-leave-active{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.zt-popup__close-icon{position:absolute;z-index:1;color:#c8c9cc;font-size:20px;cursor:pointer}.zt-popup__close-icon:active{color:#969799}.zt-popup__close-icon--top-left{top:16px;left:16px}.zt-popup__close-icon--top-right{top:16px;right:16px}.zt-popup__close-icon--bottom-left{bottom:16px;left:16px}.zt-popup__close-icon--bottom-right{right:16px;bottom:16px}
+.zt-overflow-hidden{overflow:hidden!important}.zt-popup{position:fixed;max-height:100%;overflow-y:auto;background-color:#fff;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;-webkit-overflow-scrolling:touch}.zt-popup__slider{position:fixed;width:100%;bottom:0;border-radius:16px 16px 0 0;background-color:#fff}.zt-popup__slider-title{height:40px;text-align:center}.zt-popup__slider-bar{display:inline-block;width:32px;height:4px;-webkit-transform:scaleY(-1);transform:scaleY(-1);background:rgba(45,75,115,.2);border-radius:3px}.zt-popup__slider-content{overflow-y:auto}.zt-popup--center{top:50%;left:50%;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.zt-popup--center.zt-popup--round{border-radius:16px}.zt-popup--top{top:0;left:0;width:100%}.zt-popup--top.zt-popup--round{border-radius:0 0 16px 16px}.zt-popup--right{top:50%;right:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--right.zt-popup--round{border-radius:16px 0 0 16px}.zt-popup--bottom{bottom:0;left:0;width:100%}.zt-popup--bottom.zt-popup--round{border-radius:16px 16px 0 0}.zt-popup--left{top:50%;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--left.zt-popup--round{border-radius:0 16px 16px 0}.zt-popup--safe-area-inset-bottom{padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}.zt-popup-slide-bottom-enter-active,.zt-popup-slide-left-enter-active,.zt-popup-slide-right-enter-active,.zt-popup-slide-top-enter-active{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.zt-popup-slide-bottom-leave-active,.zt-popup-slide-left-leave-active,.zt-popup-slide-right-leave-active,.zt-popup-slide-top-leave-active{-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}.zt-popup-slide-top-enter,.zt-popup-slide-top-leave-active{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}.zt-popup-slide-right-enter,.zt-popup-slide-right-leave-active{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}.zt-popup-slide-bottom-enter,.zt-popup-slide-bottom-leave-active{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.zt-popup-slide-left-enter,.zt-popup-slide-left-leave-active{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.zt-popup__slider-icon{z-index:1;color:rgba(45,75,115,.6);font-size:24px;cursor:pointer}.zt-popup__close-icon{position:absolute;z-index:1;color:rgba(45,75,115,.6);font-size:24px;cursor:pointer}.zt-popup__close-icon:active{color:#969799}.zt-popup__close-icon--top-left{top:12px;left:16px}.zt-popup__close-icon--top-right{top:12px;right:16px}.zt-popup__close-icon--bottom-left{bottom:16px;left:16px}.zt-popup__close-icon--bottom-right{right:16px;bottom:16px}

package/es/popup/index.js

@@ -16,7 +16,7 @@ export default createComponent({
     safeAreaInsetBottom: Boolean,
     closeIcon: {
       type: String,
-      default: 'cross'
+      default: 'clear'
     },
     closeIconPosition: {
       type: String,
@@ -37,6 +37,14 @@ export default createComponent({
     customOnClickOverlay: {
       type: Function,
       default: null
+    },
+    sliderContentHeight: {
+      type: Number,
+      default: 60
+    },
+    sliderShow: {
+      type: Boolean,
+      default: false
     }
   },
   beforeCreate: function beforeCreate() {
@@ -52,71 +60,134 @@ export default createComponent({
     this.onOpened = createEmitter('opened');
     this.onClosed = createEmitter('closed');
   },
+  data: function data() {
+    return {
+      positionY: 0,
+      timerId: null,
+      contentStyle: "height:" + this.sliderContentHeight + "px;",
+      touchHeight: 0
+    };
+  },
   methods: {
     onClickCloseIcon: function onClickCloseIcon(event) {
       this.$emit('click-close-icon', event);
       this.close();
     },
     onClickOverlay: function onClickOverlay() {
+      if (this.sliderShow) {
+        this.contentStyle = 'height:60px';
+      }
+
       if (this.customOnClickOverlay) {
         this.customOnClickOverlay();
       } else if (this.closeOnClickOverlay) {
         this.close();
       }
+    },
+    move: function move(event) {
+      var _this2 = this;
+
+      if (this.timerId) {
+        event.preventDefault();
+      }
+
+      var h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+      this.positionY = event.touches[0].clientY;
+      this.timerId = setTimeout(function () {
+        if (_this2.positionY === 0 || _this2.positionY < h * 0.15) {
+          return;
+        }
+
+        _this2.touchHeight = _this2.positionY - 40 > h - 40 ? h - 40 : _this2.positionY;
+        _this2.contentStyle = "height:" + (h - _this2.touchHeight - 40) + "px;";
+      }, 10);
+    },
+    endMove: function endMove() {
+      clearInterval(this.timerId);
+      this.timerId = null;
+    },
+    startMove: function startMove() {
+      if (this.timerId) {
+        clearInterval(this.timerId);
+      }
+    },
+    allowSliderRender: function allowSliderRender() {
+      var h = this.$createElement;
+      return h("div", {
+        "class": bem('slider'),
+        "directives": [{
+          name: "show",
+          value: this.value
+        }]
+      }, [h("div", {
+        "class": bem('slider-title'),
+        "on": {
+          "touchmove": this.move,
+          "touchend": this.endMove,
+          "touchstart": this.startMove
+        }
+      }, [h("div", {
+        "class": bem('slider-bar')
+      })]), h("div", {
+        "class": bem('slider-content'),
+        "style": this.contentStyle
+      }, [this.slots()])]);
+    },
+    popupRender: function popupRender() {
+      var _bem;
+
+      var h = this.$createElement;
+      var round = this.round,
+          position = this.position,
+          duration = this.duration;
+      var isCenter = position === 'center';
+      var transitionName = this.transition || (isCenter ? 'zt-fade' : "zt-popup-slide-" + position);
+      var style = {};
+
+      if (isDef(duration)) {
+        var key = isCenter ? 'animationDuration' : 'transitionDuration';
+        style[key] = duration + "s";
+      }
+
+      return h("transition", {
+        "attrs": {
+          "appear": this.transitionAppear,
+          "name": transitionName
+        },
+        "on": {
+          "afterEnter": this.onOpened,
+          "afterLeave": this.onClosed
+        }
+      }, [h("div", {
+        "directives": [{
+          name: "show",
+          value: this.value
+        }],
+        "style": style,
+        "class": bem((_bem = {
+          round: round
+        }, _bem[position] = position, _bem['safe-area-inset-bottom'] = this.safeAreaInsetBottom, _bem)),
+        "on": {
+          "click": this.onClick
+        }
+      }, [this.slots(), this.closeable && h(Icon, {
+        "attrs": {
+          "role": "button",
+          "tabindex": "0",
+          "name": this.closeIcon
+        },
+        "class": bem('close-icon', this.closeIconPosition),
+        "on": {
+          "click": this.onClickCloseIcon
+        }
+      })])]);
     }
   },
   render: function render() {
-    var _bem;
-
-    var h = arguments[0];
-
     if (!this.shouldRender) {
       return;
     }
 
-    var round = this.round,
-        position = this.position,
-        duration = this.duration;
-    var isCenter = position === 'center';
-    var transitionName = this.transition || (isCenter ? 'zt-fade' : "zt-popup-slide-" + position);
-    var style = {};
-
-    if (isDef(duration)) {
-      var key = isCenter ? 'animationDuration' : 'transitionDuration';
-      style[key] = duration + "s";
-    }
-
-    return h("transition", {
-      "attrs": {
-        "appear": this.transitionAppear,
-        "name": transitionName
-      },
-      "on": {
-        "afterEnter": this.onOpened,
-        "afterLeave": this.onClosed
-      }
-    }, [h("div", {
-      "directives": [{
-        name: "show",
-        value: this.value
-      }],
-      "style": style,
-      "class": bem((_bem = {
-        round: round
-      }, _bem[position] = position, _bem['safe-area-inset-bottom'] = this.safeAreaInsetBottom, _bem)),
-      "on": {
-        "click": this.onClick
-      }
-    }, [this.slots(), this.closeable && h(Icon, {
-      "attrs": {
-        "role": "button",
-        "tabindex": "0",
-        "name": this.closeIcon
-      },
-      "class": bem('close-icon', this.closeIconPosition),
-      "on": {
-        "click": this.onClickCloseIcon
-      }
-    })])]);
+    return this.sliderShow ? this.allowSliderRender() : this.popupRender();
   }
 });