zartui 1.0.2 → 2.0.2

package/lib/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/lib/picker/index.js

@@ -21,6 +21,8 @@ var _PickerColumn = _interopRequireDefault(require("./PickerColumn"));
 
 var _popup = _interopRequireDefault(require("../popup"));
 
+var _button = _interopRequireDefault(require("../button"));
+
 var _popup2 = require("../mixins/popup");
 
 // Utils
@@ -53,7 +55,7 @@ var _default2 = createComponent({
     },
     toolbarPosition: {
       type: String,
-      default: 'top'
+      default: 'bottom'
     },
     valueKey: {
       type: String,
@@ -337,11 +339,15 @@ var _default2 = createComponent({
     },
     genCancel: function genCancel() {
       var h = this.$createElement;
-      return h("button", {
+      return h(_button.default, {
         "attrs": {
-          "type": "button"
+          "size": "normal",
+          "block": true
+        },
+        "style": {
+          marginRigth: "4px",
+          backgroundColor: "white"
         },
-        "class": bem('cancel'),
         "on": {
           "click": this.cancel
         }
@@ -349,11 +355,15 @@ var _default2 = createComponent({
     },
     genConfirm: function genConfirm() {
       var h = this.$createElement;
-      return h("button", {
+      return h(_button.default, {
         "attrs": {
-          "type": "button"
+          "type": "primary",
+          "size": "normal",
+          "block": true
+        },
+        "style": {
+          marginLeft: "4px"
         },
-        "class": bem('confirm'),
         "on": {
           "click": this.confirm
         }
@@ -365,7 +375,7 @@ var _default2 = 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() {
@@ -454,7 +464,7 @@ var _default2 = 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.default, {
       "class": bem('loading')

package/lib/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/lib/picker/style/index.js

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

package/lib/picker/style/less.js

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

package/lib/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/lib/popup/index.js

@@ -25,7 +25,7 @@ var _default = createComponent({
     safeAreaInsetBottom: Boolean,
     closeIcon: {
       type: String,
-      default: 'cross'
+      default: 'clear'
     },
     closeIconPosition: {
       type: String,
@@ -46,6 +46,14 @@ var _default = createComponent({
     customOnClickOverlay: {
       type: Function,
       default: null
+    },
+    sliderContentHeight: {
+      type: Number,
+      default: 60
+    },
+    sliderShow: {
+      type: Boolean,
+      default: false
     }
   },
   beforeCreate: function beforeCreate() {
@@ -61,72 +69,135 @@ var _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 ((0, _utils.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.default, {
+        "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 ((0, _utils.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.default, {
-      "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();
   }
 });
 

package/lib/popup/index.less

@@ -13,6 +13,29 @@
     transition: @popup-transition;
     -webkit-overflow-scrolling: touch;
 
+    &__slider {
+      position: fixed;
+      width: 100%;
+      bottom: 0;
+      border-radius: 16px 16px 0 0;
+      background-color: #fff;
+
+      &-title {
+        height: 40px;
+        text-align: center;
+      }
+      &-bar {
+        display: inline-block;
+        width: 32px;
+        height: 4px;
+        transform: scaleY(-1);
+        background: rgba(45,75,115,0.20);
+        border-radius: 3px;
+      }
+      &-content {
+        overflow-y: auto;
+      }
+    }
     &--center {
       top: 50%;
       left: 50%;
@@ -101,7 +124,13 @@
     &-slide-left-leave-active {
       transform: translate3d(-100%, -50%, 0);
     }
+    &__slider-icon{
+      z-index: @popup-close-icon-z-index;
+      color: @popup-close-icon-color;
+      font-size: @popup-close-icon-size;
+      cursor: pointer;
 
+    }
     &__close-icon {
       position: absolute;
       z-index: @popup-close-icon-z-index;
@@ -114,12 +143,12 @@
       }
 
       &--top-left {
-        top: @popup-close-icon-margin;
+        top: @popup-close-icon-z-margin-top;
         left: @popup-close-icon-margin;
       }
 
       &--top-right {
-        top: @popup-close-icon-margin;
+        top: @popup-close-icon-z-margin-top;
         right: @popup-close-icon-margin;
       }
 

package/lib/radio/index.css

@@ -1 +1 @@
-.zt-radio{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;overflow:hidden;cursor:pointer;-webkit-user-select:none;user-select:none;padding:10px 0}.zt-radio__custom-svg{width:24px;height:24px;border-radius:50%}.zt-radio__icon--disabled .zt-radio__custom-svg{opacity:.2}.zt-radio--disabled{cursor:not-allowed}.zt-radio--label-disabled{cursor:default}.zt-radio--horizontal{margin-left:12px}.zt-radio__icon{-webkit-box-flex:0;-webkit-flex:none;flex:none;height:1em;font-size:24px;line-height:1em;cursor:pointer}.zt-radio__icon i,.zt-radio__icon img{-webkit-transform:scale(.8333);transform:scale(.8333);-webkit-transform-origin:center;transform-origin:center}.zt-radio__icon img{width:1em;height:1em}.zt-radio__icon .zt-icon{display:block;box-sizing:border-box;width:1em;height:1em;color:transparent;font-size:1em;line-height:1.25;text-align:center;border:1px solid #c8c9cc;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:color,border-color,background-color;transition-property:color,border-color,background-color}.zt-radio__icon--round .zt-icon{border-radius:100%}.zt-radio__icon--checked .zt-icon{color:#fff;background-color:#0091fa;border-color:#0091fa}.zt-radio__icon--disabled{cursor:not-allowed}.zt-radio__icon--disabled .zt-icon{background-color:rgba(0,0,0,.1);border-color:#c8c9cc}.zt-radio__icon--disabled.zt-radio__icon--checked .zt-icon{color:#c8c9cc}.zt-radio__label{margin-left:8px;color:#000;line-height:24px}.zt-radio__label--left{margin:0 8px 0 0}.zt-radio__label--disabled{color:#c8c9cc}
+.zt-radio{display:-webkit-box;display:-webkit-flex;display:flex;overflow:hidden;cursor:pointer;-webkit-user-select:none;user-select:none;padding:14px 0}.zt-radio--disabled{cursor:not-allowed}.zt-radio--label-disabled{cursor:default}.zt-radio--horizontal{margin-left:12px}.zt-radio__icon{font-size:20px;cursor:pointer}.zt-radio__icon .zt-icon{display:block;box-sizing:border-box;width:1em;height:1em;color:transparent;font-size:inherit;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:color,border-color,background-color;transition-property:color,border-color,background-color}.zt-radio__icon--round .zt-icon{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center;border-radius:100%}.zt-radio__icon--checked .zt-icon{color:#fff;background-color:#0091fa;border:1px solid rgba(255,255,255,.5);box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,.2)}.zt-radio__icon--disabled{cursor:not-allowed}.zt-radio__icon--disabled .zt-icon{background-image:-webkit-linear-gradient(316deg,#e1e6eb 0,#e5edf5 100%);background-image:linear-gradient(134deg,#e1e6eb 0,#e5edf5 100%);border:1px solid rgba(45,75,115,.08);box-shadow:-1px -1px 2px 0 #fff,0 0 3px 0 rgba(45,75,115,.2)}.zt-radio__icon--disabled.zt-radio__icon--checked .zt-icon{opacity:.4;background:#0091fa;color:#fff}.zt-radio__label{margin-left:8px;color:#000;line-height:20px}.zt-radio__label--left{margin:0 8px 0 0}.zt-radio__label--disabled{color:#c8c9cc}.zt-radio__disable-icon .zt-radio__icon--round:not(.zt-radio__icon--disabled,.zt-radio__icon--checked){width:1em;height:1em;box-sizing:border-box;border-radius:100%;background-image:-webkit-linear-gradient(315deg,#e6ebf0 0,#fff 100%);background-image:linear-gradient(135deg,#e6ebf0 0,#fff 100%);border:1px solid rgba(45,75,115,.13);box-shadow:-1px -1px 2px 0 #fff,0 0 3px 0 rgba(45,75,115,.2)}

package/lib/radio/index.less

@@ -2,21 +2,11 @@
 
 .zt-radio {
   display: flex;
-  align-items: center;
   overflow: hidden;
   cursor: pointer;
   user-select: none;
   padding: @radio-padding;
 
-  &__custom-svg {
-    width: @radio-size;
-    height: @radio-size;
-    border-radius: 50%;
-  }
-  &__icon--disabled &__custom-svg {
-    opacity: .2;
-  }
-
   &--disabled {
     cursor: not-allowed;
   }
@@ -30,19 +20,8 @@
   }
 
   &__icon {
-    flex: none;
-    height: 1em;
     font-size: @radio-size;
-    line-height: 1em;
     cursor: pointer;
-    i, img {
-      transform: scale(0.8333);
-      transform-origin: center;
-    }
-    img {
-      width: 1em;
-      height: 1em;
-    }
 
     .zt-icon {
       display: block;
@@ -50,16 +29,16 @@
       width: 1em;
       height: 1em;
       color: transparent;
-      font-size: 1em;
-      line-height: 1.25;
-      text-align: center;
-      border: 1px solid @radio-border-color;
+      font-size: inherit;
       transition-duration: @radio-transition-duration;
       transition-property: color, border-color, background-color;
     }
 
     &--round {
       .zt-icon {
+        display: flex;
+        justify-content: center;
+        align-items: center;
         border-radius: 100%;
       }
     }
@@ -68,7 +47,8 @@
       .zt-icon {
         color: @white;
         background-color: @radio-checked-icon-color;
-        border-color: @radio-checked-icon-color;
+        border: 1px solid @checkbox-disabled-border-color;
+        box-shadow: inset 1px 1px 2px 0 @gray-a2;
       }
     }
 
@@ -76,14 +56,17 @@
       cursor: not-allowed;
 
       .zt-icon {
-        background-color: @radio-disabled-background-color;
-        border-color: @radio-disabled-icon-color;
+        background-image: @radio-disabled-background-color;
+        border: 1px solid @radio-disabled-border-color;
+        box-shadow: -1px -1px 2px 0 #fff, 0 0 3px 0 rgba(45,75,115,0.20);
       }
     }
 
     &--disabled&--checked {
       .zt-icon {
-        color: @radio-disabled-icon-color;
+        opacity: .4;
+        background: @checkbox-checked-icon-color;
+        color: @white;
       }
     }
   }
@@ -102,3 +85,15 @@
     }
   }
 }
+
+.zt-radio__disable-icon {
+  .zt-radio__icon--round:not(.zt-radio__icon--disabled,.zt-radio__icon--checked){
+    width: 1em;
+    height: 1em;
+    box-sizing: border-box;
+    border-radius: 100%;
+    background-image: @gradient-white-1;
+    border: 1px solid @radio-border-color;
+    box-shadow: -1px -1px 2px 0 #FFF, 0 0 3px 0 rgba(45,75,115,0.20);
+  }
+}

package/lib/radio-group/index.js

@@ -20,6 +20,7 @@ var _default = createComponent({
     disabled: Boolean,
     direction: String,
     checkedColor: String,
+    boxShadow: String,
     iconSize: [Number, String]
   },
   watch: {

package/lib/search/index.css

@@ -1 +1 @@
-.zt-search{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-sizing:border-box;padding:8px 16px;background-color:#fff}.zt-search__content{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1;background-color:rgba(0,0,0,.04);border:0 solid rgba(0,0,0,.06);border-radius:2px}.zt-search__content--round{border-radius:999px}.zt-search__label{padding:4px 0 4px 8px;color:rgba(0,0,0,.6);font-family:PingFangSC-Semibold;font-weight:400;font-size:14px;line-height:20px}.zt-search .zt-field__root{background-color:transparent;padding:0}.zt-search .zt-cell{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:4px 8px;background-color:transparent;line-height:20px;font-size:14px;font-family:PingFangSC-Regular;font-weight:400}.zt-search .zt-cell__left-icon{color:#969799}.zt-search .zt-field{margin:0}.zt-search .zt-field__control{color:#000}.zt-search--show-action{padding-right:0}.zt-search input{caret-color:#0091fa}.zt-search input::-webkit-search-cancel-button,.zt-search input::-webkit-search-decoration,.zt-search input::-webkit-search-results-button,.zt-search input::-webkit-search-results-decoration{display:none}.zt-search__action{padding:0 16px;color:#0091fa;font-size:16px;font-family:PingFangSC-Semibold;height:28px;font-weight:600;cursor:pointer;-webkit-user-select:none;user-select:none;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-search__action:active{background-color:rgba(0,0,0,.04)}
+.zt-search{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;box-sizing:border-box;padding:8px 16px;background-color:#f5faff}.zt-search__content{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1;background-color:rgba(45,75,115,.04);border:1px solid transparent;border-radius:2px;box-shadow:inset 4px 4px 8px 0 rgba(45,75,115,.1);background-clip:padding-box;position:relative}.zt-search__content::before{content:'';position:absolute;top:0;right:0;left:0;bottom:0;z-index:-1;margin:-1px;border-radius:inherit;background:-webkit-linear-gradient(#fff,rgba(255,255,255,.4));background:linear-gradient(#fff,rgba(255,255,255,.4))}.zt-search__content--round{border-radius:999px}.zt-search__label{padding:8px 0 8px 12px;color:rgba(0,0,0,.6);font-family:PingFangSC-Semibold;font-weight:400;font-size:14px;line-height:20px}.zt-search .zt-field__root{background-color:transparent;padding:0}.zt-search .zt-field__label{margin-right:0}.zt-search .zt-cell__title.zt-field__label{-webkit-box-flex:unset;-webkit-flex:unset;flex:unset}.zt-search .zt-cell{-webkit-box-flex:1;-webkit-flex:1;flex:1;padding:8px 12px;background:0 0;line-height:20px;font-size:14px;font-family:PingFangSC-Regular;font-weight:400}.zt-search .zt-cell__left-icon{color:#969799}.zt-search .zt-field{margin:0}.zt-search .zt-field__control{color:#000}.zt-search--show-action{padding-right:0}.zt-search input{caret-color:#0091fa}.zt-search input::-webkit-search-cancel-button,.zt-search input::-webkit-search-decoration,.zt-search input::-webkit-search-results-button,.zt-search input::-webkit-search-results-decoration{display:none}.zt-search input::-webkit-input-placeholder{color:rgba(45,75,115,.2)}.zt-search input::placeholder{color:rgba(45,75,115,.2)}.zt-search__action{padding:0 16px 0 12px;color:#0091fa;font-size:16px;font-family:PingFangSC-Semibold;height:28px;font-weight:600;cursor:pointer;-webkit-user-select:none;user-select:none;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-search__action:active{background-color:rgba(0,0,0,.04)}

package/lib/search/index.js

@@ -114,7 +114,7 @@ Search.props = {
   clearTrigger: String,
   shape: {
     type: String,
-    default: 'square'
+    default: 'round'
   },
   clearable: {
     type: Boolean,

package/lib/search/index.less

@@ -11,8 +11,24 @@
     display: flex;
     flex: 1;
     background-color: @search-content-background-color;
-    border: 0 solid rgba(0,0,0,0.06);
+    border: 1px solid transparent;
     border-radius: @border-radius-sm;
+    box-shadow: @search-content-box-shadow;
+    background-clip: padding-box;
+    position: relative;
+
+    &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        right: 0;
+        left: 0;
+        bottom: 0;
+        z-index: -1;
+        margin: -1px;
+        border-radius: inherit; 
+        background: @search-content-border-color;
+    }
 
     &--round {
       border-radius: @border-radius-max;
@@ -33,10 +49,18 @@
     padding: 0;
   }
 
+  .zt-field__label {
+    margin-right: 0;
+  }
+
+  .zt-cell__title.zt-field__label {
+    flex: unset;
+  }
+
   .zt-cell {
     flex: 1;
-    padding: 4px @padding-xs;
-    background-color: transparent;
+    padding: @search-cell-padding;
+    background: transparent;
     line-height: @search-input-height;
     font-size: @font-size-md;
     font-family: PingFangSC-Regular;
@@ -66,6 +90,10 @@
       display: none;
     }
 
+    &::placeholder {
+        color: @text-color-5;
+    }
+
     caret-color:@search-input-caret-color;
   }
 

package/lib/signature/index.js

@@ -37,7 +37,7 @@ var _default = createComponent({
     },
     backgroundStyle: {
       type: String,
-      default: '#f5f5f5'
+      default: '#FFFFFF'
     },
     imageType: {
       type: String,
@@ -266,23 +266,24 @@ var _default = createComponent({
       "class": bem('actions')
     }, [h(_button.default, {
       "attrs": {
-        "plain": true,
-        "type": "warning"
+        "border-color": "#FF8700",
+        "color": "#FF8700",
+        "background-color": "#fff"
       },
       "on": {
         "click": this.clear
       }
     }, [t('reSign')]), h(_button.default, {
       "attrs": {
-        "plain": true,
-        "type": "default"
+        "border-color": "rgba(45,75,115,0.20)",
+        "color": "#2D4B73",
+        "background-color": "#fff"
       },
       "on": {
         "click": this.cancel
       }
     }, [t('cancel')]), h(_button.default, {
       "attrs": {
-        "block": true,
         "type": "primary",
         "disabled": this.isCompleteButtonDisabled
       },

package/lib/signature/index.less

@@ -37,7 +37,7 @@
   &__actions {
     z-index: @signature-actions-z-index;
     position: absolute;
-    right: 0px;
+    right: 0;
     bottom: 16px;
     width: 320px;
     float: right;