zartui 2.0.5 → 2.0.8

package/es/cascader/index.css

@@ -1 +1 @@
-.zt-cascader__header{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:0 16px}.zt-cascader__title{font-weight:700;font-size:16px;line-height:44px}.zt-cascader__close-icon{color:rgba(0,0,0,.4);font-size:20px}.zt-cascader__close-icon:active{color:rgba(0,0,0,.6)}.zt-cascader__tabs .zt-tab{-webkit-box-flex:0;-webkit-flex:none;flex:none;margin:0 8px;padding:0}.zt-cascader__tabs.zt-tabs--line .zt-tabs__wrap{height:48px}.zt-cascader__tabs .zt-tabs__nav--complete{padding-right:8px;padding-left:8px}.zt-cascader__tab{color:#000;font-weight:700;font-size:14px;line-height:44px}.zt-cascader__tab--unselected{color:rgba(0,0,0,.4);font-weight:400}.zt-cascader__option{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-family:PingFangSC-Regular;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#000;padding:0 16px;font-weight:400;font-size:14px;line-height:44px}.zt-cascader__option:active{background-color:rgba(0,0,0,.04)}.zt-cascader__option--selected{color:#0091fa;font-weight:700}.zt-cascader__selected-icon{font-size:24px}.zt-cascader__options{box-sizing:border-box;height:352px;overflow-y:auto;-webkit-overflow-scrolling:touch}
+.zt-cascader__header{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;height:44px;padding:0 16px}.zt-cascader__title{font-weight:700;font-size:14px;line-height:44px;color:rgba(45,75,115,.4)}.zt-cascader__tabs .zt-tab{-webkit-box-flex:0;-webkit-flex:none;flex:none;margin:0 8px;padding:0}.zt-cascader__tabs .zt-tabs__wrap{position:relative;height:44px}.zt-cascader__tabs .zt-tabs__wrap::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-cascader__tabs .zt-tabs__nav--complete{padding-right:8px;padding-left:8px}.zt-cascader__tab{color:#2d4b73;font-weight:700;font-size:14px;line-height:44px}.zt-cascader__tab--unselected{color:rgba(45,75,115,.4);font-weight:400}.zt-cascader__option{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-family:PingFangSC-Regular;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#2d4b73;padding:0 16px;font-weight:400;font-size:14px;line-height:44px}.zt-cascader__option:active{background-color:rgba(0,0,0,.04)}.zt-cascader__option--selected{color:#0091fa;font-weight:700}.zt-cascader__selected-icon{font-size:24px}.zt-cascader__options{box-sizing:border-box;height:352px;overflow-y:auto;-webkit-overflow-scrolling:touch}.zt-cascader .zt-tabs__nav{background:#fff}.zt-cascader__cancel{margin:8px 16px;width:calc(100% - 32px);background:rgba(45,75,115,.04);border-radius:20.5px}

package/es/cascader/index.js

@@ -2,6 +2,7 @@ import { createNamespace } from '../utils';
 import Tab from '../tab';
 import Tabs from '../tabs';
 import Icon from '../icon';
+import Button from '../button';
 import Divider from "../divider";
 
 var _createNamespace = createNamespace('cascader'),
@@ -21,10 +22,6 @@ export default createComponent({
       default: function _default() {
         return [];
       }
-    },
-    closeable: {
-      type: Boolean,
-      default: true
     }
   },
   data: function data() {
@@ -180,8 +177,8 @@ export default createComponent({
         this.$emit('finish', eventParams);
       }
     },
-    onClose: function onClose() {
-      this.$emit('close');
+    onCancel: function onCancel() {
+      this.$emit('cancel');
     },
     renderHeader: function renderHeader() {
       var h = this.$createElement;
@@ -189,15 +186,7 @@ export default createComponent({
         "class": bem('header')
       }, [h("h2", {
         "class": bem('title')
-      }, [this.slots('title') || this.title]), this.closeable ? h(Icon, {
-        "attrs": {
-          "name": "cross"
-        },
-        "class": bem('close-icon'),
-        "on": {
-          "click": this.onClose
-        }
-      }) : null]);
+      }, [this.slots('title') || this.title])]);
     },
     renderDivider: function renderDivider() {
       var h = this.$createElement;
@@ -275,12 +264,25 @@ export default createComponent({
           }
         }
       }, [this.tabs.map(this.renderTab)]);
+    },
+    renderMenu: function renderMenu() {
+      var h = this.$createElement;
+      return h(Button, {
+        "class": bem('cancel'),
+        "attrs": {
+          "background-color": "rgba(45, 75, 115, 0.04)",
+          "color": "#2D4B73"
+        },
+        "on": {
+          "click": this.onCancel
+        }
+      }, ["\u53D6\u6D88"]);
     }
   },
   render: function render() {
     var h = arguments[0];
     return h("div", {
       "class": bem()
-    }, [this.renderHeader(), this.renderDivider(), this.renderTabs()]);
+    }, [this.renderHeader(), this.renderDivider(), this.renderTabs(), this.renderDivider(), this.renderMenu()]);
   }
 });

package/es/cascader/index.less

@@ -1,10 +1,11 @@
 @import '../style/var';
+@import '../style/mixins/hairline';
 
 .zt-cascader {
   &__header {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
     height: @cascader-header-height;
     padding: 0 @padding-md;
   }
@@ -13,15 +14,8 @@
     font-weight: @font-weight-bold;
     font-size: @cascader-title-font-size;
     line-height: @cascader-title-line-height;
-  }
-
-  &__close-icon {
-    color: @cascader-close-icon-color;
-    font-size: @cascader-close-icon-size;
+    color: @cascader-title-color;
 
-    &:active {
-      color: @cascader-close-icon-active-color;
-    }
   }
 
   &__tabs {
@@ -31,8 +25,12 @@
       padding: 0;
     }
 
-    &.zt-tabs--line .zt-tabs__wrap {
+    .zt-tabs__wrap {
+      position: relative;
       height: @cascader-tabs-height;
+      &::after {
+        .hairline-bottom()
+      }
     }
 
     .zt-tabs__nav--complete {
@@ -58,7 +56,7 @@
     align-items: center;
     font-family: PingFangSC-Regular;
     justify-content: space-between;
-    color: @black;
+    color: #2D4B73;
     padding: 0 @padding-md;
     font-weight: normal;
     font-size: @font-size-md;
@@ -84,4 +82,15 @@
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
   }
+
+  .zt-tabs__nav {
+      background: #fff;
+  }
+
+  &__cancel {
+    margin: 8px 16px;
+    width: calc(100% - 32px);
+    background: rgba(45, 75, 115, 0.04);
+    border-radius: 20.5px;
+  }
 }

package/es/cascader/style/index.js

@@ -1,6 +1,8 @@
 import '../../style/base.css';
 import '../../info/index.css';
 import '../../icon/index.css';
+import '../../loading/index.css';
+import '../../button/index.css';
 import '../../tab/index.css';
 import '../../sticky/index.css';
 import '../../tabs/index.css';

package/es/cascader/style/less.js

@@ -1,6 +1,8 @@
 import '../../style/base.less';
 import '../../info/index.less';
 import '../../icon/index.less';
+import '../../loading/index.less';
+import '../../button/index.less';
 import '../../tab/index.less';
 import '../../sticky/index.less';
 import '../../tabs/index.less';

package/es/field/index.js

@@ -626,9 +626,15 @@ export default createComponent({
     var slots = this.slots;
     var disabled = this.getProp('disabled');
     var labelAlign = this.getProp('labelAlign');
-    var scopedSlots = {
-      icon: this.genLeftIcon
-    };
+    var scopedSlots = {};
+    var SlotIcon = this.genLeftIcon();
+
+    if (SlotIcon) {
+      scopedSlots.icon = function () {
+        return SlotIcon;
+      };
+    }
+
     var Label = this.genLabel();
 
     if (Label) {

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.5';
+var version = '2.0.8';
 
 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/es/rate/index.css

@@ -1 +1 @@
-.zt-rate{display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;cursor:pointer;-webkit-user-select:none;user-select:none}.zt-rate__item{position:relative}.zt-rate__item:not(:last-child){padding-right:4px}.zt-rate__icon{display:block;width:1em;color:rgba(0,0,0,.2);font-size:20px}.zt-rate__icon--half{position:absolute;top:0;left:0;width:.5em;overflow:hidden}.zt-rate__icon--full{color:#ffcd23}.zt-rate__icon--disabled{color:#c8c9cc}.zt-rate--disabled{cursor:not-allowed}.zt-rate--readonly{cursor:default}
+.zt-rate{display:-webkit-inline-box;display:-webkit-inline-flex;display:inline-flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;cursor:pointer;-webkit-user-select:none;user-select:none}.zt-rate .zt-rate__item{position:relative}.zt-rate .zt-rate__item .zt-rate__item:not(:last-child){padding-right:4px}.zt-rate .zt-rate__item .zt-rate__icon{display:block;width:1em;color:rgba(45,75,115,.2);font-size:24px}.zt-rate .zt-rate__item .zt-rate__icon--half{position:absolute;top:0;left:0;width:.5em;overflow:hidden}.zt-rate .zt-rate__item .zt-rate__icon--full{color:#ffcd23}.zt-rate .zt-rate__item .zt-rate__icon--disabled{color:#c8c9cc}.zt-rate .zt-rate--disabled{cursor:not-allowed}.zt-rate .zt-rate--readonly{cursor:default}

package/es/rate/index.js

@@ -188,6 +188,10 @@ export default createComponent({
           }
         }
       }), this.allowHalf && h(Icon, {
+        "directives": [{
+          name: "show",
+          value: !isVoid
+        }],
         "attrs": {
           "size": this.sizeWithUnit,
           "name": isVoid ? voidIcon : icon,

package/es/rate/index.less

@@ -6,42 +6,42 @@
   cursor: pointer;
   user-select: none;
 
-  &__item {
+  .zt-rate__item {
     position: relative;
 
-    &:not(:last-child) {
+    .zt-rate__item:not(:last-child) {
       padding-right: @rate-icon-gutter;
     }
-  }
-
-  &__icon {
-    display: block;
-    width: 1em;
-    color: @rate-icon-void-color;
-    font-size: @rate-icon-size;
-
-    &--half {
+    .zt-rate__icon {
+        display: block;
+        width: 1em;
+        color: @rate-icon-void-color;
+        font-size: @rate-icon-size;
+        
+    }
+    .zt-rate__icon--half {
       position: absolute;
       top: 0;
       left: 0;
       width: 0.5em;
       overflow: hidden;
     }
-
-    &--full {
+    
+    .zt-rate__icon--full {
       color: @rate-icon-full-color;
     }
-
-    &--disabled {
+    
+    .zt-rate__icon--disabled {
       color: @rate-icon-disabled-color;
     }
   }
 
-  &--disabled {
+
+  .zt-rate--disabled {
     cursor: not-allowed;
   }
 
-  &--readonly {
+  .zt-rate--readonly {
     cursor: default;
   }
 }

package/es/style/var.less

@@ -257,17 +257,15 @@
 
 // Cascader
 @cascader-header-height: 44px;
-@cascader-title-font-size: @font-size-lg;
+@cascader-title-font-size: @font-size-md;
 @cascader-title-line-height: 44px;
-@cascader-close-icon-size: 20px;
-@cascader-close-icon-color: @gray-a4;
-@cascader-close-icon-active-color: @gray-a6;
+@cascader-title-color: rgba(45, 75, 115, 0.4);
 @cascader-selected-icon-size: 24px;
-@cascader-tabs-height: 48px;
+@cascader-tabs-height: 44px;
 @cascader-active-color: @blue;
 @cascader-options-height: 352px;
-@cascader-tab-color: @black;
-@cascader-unselected-tab-color: @gray-a4;
+@cascader-tab-color: rgba(45, 75, 115, 1);
+@cascader-unselected-tab-color: rgba(45, 75, 115, 0.4);
 
 // Cell
 @cell-font-size: @font-size-lg;
@@ -746,9 +744,9 @@
 @radio-disabled-background-color: @gradient-white;
 
 // Rate
-@rate-icon-size: 20px;
+@rate-icon-size: 24px;
 @rate-icon-gutter: @padding-base;
-@rate-icon-void-color: @gray-a2;
+@rate-icon-void-color: rgba(45, 75, 115, .2);
 @rate-icon-full-color: @yellow;
 @rate-icon-disabled-color: @gray-5;
 

package/lib/cascader/index.css

@@ -1 +1 @@
-.zt-cascader__header{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:0 16px}.zt-cascader__title{font-weight:700;font-size:16px;line-height:44px}.zt-cascader__close-icon{color:rgba(0,0,0,.4);font-size:20px}.zt-cascader__close-icon:active{color:rgba(0,0,0,.6)}.zt-cascader__tabs .zt-tab{-webkit-box-flex:0;-webkit-flex:none;flex:none;margin:0 8px;padding:0}.zt-cascader__tabs.zt-tabs--line .zt-tabs__wrap{height:48px}.zt-cascader__tabs .zt-tabs__nav--complete{padding-right:8px;padding-left:8px}.zt-cascader__tab{color:#000;font-weight:700;font-size:14px;line-height:44px}.zt-cascader__tab--unselected{color:rgba(0,0,0,.4);font-weight:400}.zt-cascader__option{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-family:PingFangSC-Regular;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#000;padding:0 16px;font-weight:400;font-size:14px;line-height:44px}.zt-cascader__option:active{background-color:rgba(0,0,0,.04)}.zt-cascader__option--selected{color:#0091fa;font-weight:700}.zt-cascader__selected-icon{font-size:24px}.zt-cascader__options{box-sizing:border-box;height:352px;overflow-y:auto;-webkit-overflow-scrolling:touch}
+.zt-cascader__header{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;height:44px;padding:0 16px}.zt-cascader__title{font-weight:700;font-size:14px;line-height:44px;color:rgba(45,75,115,.4)}.zt-cascader__tabs .zt-tab{-webkit-box-flex:0;-webkit-flex:none;flex:none;margin:0 8px;padding:0}.zt-cascader__tabs .zt-tabs__wrap{position:relative;height:44px}.zt-cascader__tabs .zt-tabs__wrap::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-cascader__tabs .zt-tabs__nav--complete{padding-right:8px;padding-left:8px}.zt-cascader__tab{color:#2d4b73;font-weight:700;font-size:14px;line-height:44px}.zt-cascader__tab--unselected{color:rgba(45,75,115,.4);font-weight:400}.zt-cascader__option{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-family:PingFangSC-Regular;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;color:#2d4b73;padding:0 16px;font-weight:400;font-size:14px;line-height:44px}.zt-cascader__option:active{background-color:rgba(0,0,0,.04)}.zt-cascader__option--selected{color:#0091fa;font-weight:700}.zt-cascader__selected-icon{font-size:24px}.zt-cascader__options{box-sizing:border-box;height:352px;overflow-y:auto;-webkit-overflow-scrolling:touch}.zt-cascader .zt-tabs__nav{background:#fff}.zt-cascader__cancel{margin:8px 16px;width:calc(100% - 32px);background:rgba(45,75,115,.04);border-radius:20.5px}

package/lib/cascader/index.js

@@ -13,6 +13,8 @@ var _tabs = _interopRequireDefault(require("../tabs"));
 
 var _icon = _interopRequireDefault(require("../icon"));
 
+var _button = _interopRequireDefault(require("../button"));
+
 var _divider = _interopRequireDefault(require("../divider"));
 
 var _createNamespace = (0, _utils.createNamespace)('cascader'),
@@ -32,10 +34,6 @@ var _default2 = createComponent({
       default: function _default() {
         return [];
       }
-    },
-    closeable: {
-      type: Boolean,
-      default: true
     }
   },
   data: function data() {
@@ -191,8 +189,8 @@ var _default2 = createComponent({
         this.$emit('finish', eventParams);
       }
     },
-    onClose: function onClose() {
-      this.$emit('close');
+    onCancel: function onCancel() {
+      this.$emit('cancel');
     },
     renderHeader: function renderHeader() {
       var h = this.$createElement;
@@ -200,15 +198,7 @@ var _default2 = createComponent({
         "class": bem('header')
       }, [h("h2", {
         "class": bem('title')
-      }, [this.slots('title') || this.title]), this.closeable ? h(_icon.default, {
-        "attrs": {
-          "name": "cross"
-        },
-        "class": bem('close-icon'),
-        "on": {
-          "click": this.onClose
-        }
-      }) : null]);
+      }, [this.slots('title') || this.title])]);
     },
     renderDivider: function renderDivider() {
       var h = this.$createElement;
@@ -286,13 +276,26 @@ var _default2 = createComponent({
           }
         }
       }, [this.tabs.map(this.renderTab)]);
+    },
+    renderMenu: function renderMenu() {
+      var h = this.$createElement;
+      return h(_button.default, {
+        "class": bem('cancel'),
+        "attrs": {
+          "background-color": "rgba(45, 75, 115, 0.04)",
+          "color": "#2D4B73"
+        },
+        "on": {
+          "click": this.onCancel
+        }
+      }, ["\u53D6\u6D88"]);
     }
   },
   render: function render() {
     var h = arguments[0];
     return h("div", {
       "class": bem()
-    }, [this.renderHeader(), this.renderDivider(), this.renderTabs()]);
+    }, [this.renderHeader(), this.renderDivider(), this.renderTabs(), this.renderDivider(), this.renderMenu()]);
   }
 });
 

package/lib/cascader/index.less

@@ -1,10 +1,11 @@
 @import '../style/var';
+@import '../style/mixins/hairline';
 
 .zt-cascader {
   &__header {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    justify-content: center;
     height: @cascader-header-height;
     padding: 0 @padding-md;
   }
@@ -13,15 +14,8 @@
     font-weight: @font-weight-bold;
     font-size: @cascader-title-font-size;
     line-height: @cascader-title-line-height;
-  }
-
-  &__close-icon {
-    color: @cascader-close-icon-color;
-    font-size: @cascader-close-icon-size;
+    color: @cascader-title-color;
 
-    &:active {
-      color: @cascader-close-icon-active-color;
-    }
   }
 
   &__tabs {
@@ -31,8 +25,12 @@
       padding: 0;
     }
 
-    &.zt-tabs--line .zt-tabs__wrap {
+    .zt-tabs__wrap {
+      position: relative;
       height: @cascader-tabs-height;
+      &::after {
+        .hairline-bottom()
+      }
     }
 
     .zt-tabs__nav--complete {
@@ -58,7 +56,7 @@
     align-items: center;
     font-family: PingFangSC-Regular;
     justify-content: space-between;
-    color: @black;
+    color: #2D4B73;
     padding: 0 @padding-md;
     font-weight: normal;
     font-size: @font-size-md;
@@ -84,4 +82,15 @@
     overflow-y: auto;
     -webkit-overflow-scrolling: touch;
   }
+
+  .zt-tabs__nav {
+      background: #fff;
+  }
+
+  &__cancel {
+    margin: 8px 16px;
+    width: calc(100% - 32px);
+    background: rgba(45, 75, 115, 0.04);
+    border-radius: 20.5px;
+  }
 }

package/lib/cascader/style/index.js

@@ -1,6 +1,8 @@
 require('../../style/base.css');
 require('../../info/index.css');
 require('../../icon/index.css');
+require('../../loading/index.css');
+require('../../button/index.css');
 require('../../tab/index.css');
 require('../../sticky/index.css');
 require('../../tabs/index.css');

package/lib/cascader/style/less.js

@@ -1,6 +1,8 @@
 require('../../style/base.less');
 require('../../info/index.less');
 require('../../icon/index.less');
+require('../../loading/index.less');
+require('../../button/index.less');
 require('../../tab/index.less');
 require('../../sticky/index.less');
 require('../../tabs/index.less');

package/lib/field/index.js

@@ -642,9 +642,15 @@ var _default = createComponent({
     var slots = this.slots;
     var disabled = this.getProp('disabled');
     var labelAlign = this.getProp('labelAlign');
-    var scopedSlots = {
-      icon: this.genLeftIcon
-    };
+    var scopedSlots = {};
+    var SlotIcon = this.genLeftIcon();
+
+    if (SlotIcon) {
+      scopedSlots.icon = function () {
+        return SlotIcon;
+      };
+    }
+
     var Label = this.genLabel();
 
     if (Label) {