zartui 2.0.4 → 2.0.7

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/cell/index.css

@@ -1 +1 @@
-.zt-cell{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:border-box;width:100%;padding:12px 16px;overflow:hidden;color:#2d4b73;font-size:16px;line-height:20px;background-color:#fff}.zt-cell--noFlex{display:block}.zt-cell--noFlex .zt-cell__title{margin-bottom:10px;width:100%;max-width:100%}.zt-cell--borderless::after,.zt-cell:last-child::after{display:none}.zt-cell__label{margin-top:10px;color:#2d4b73;font-size:14px;line-height:18px}.zt-cell__title,.zt-cell__value{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt-cell__title-content,.zt-cell__value-content{-webkit-box-flex:18;-webkit-flex:18;flex:18}.zt-cell__value{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.zt-cell__placeholder{color:#c8c9cc;-webkit-box-flex:9;-webkit-flex:9;flex:9;text-align:right}.zt-cell__value{position:relative;overflow:hidden;color:#2d4b73;text-align:right;vertical-align:middle;word-wrap:break-word}.zt-cell__value--alone{color:rgba(0,0,0,.6);text-align:left}.zt-cell__left-icon,.zt-cell__right-icon{height:20px;font-size:16px;line-height:20px}.zt-cell__left-icon{margin-right:4px}.zt-cell__right-icon{margin:auto 0;margin-left:4px;color:#969799}.zt-cell--center{-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-cell--large{padding-top:12px;padding-bottom:12px}.zt-cell--large .zt-cell__title{font-size:16px}.zt-cell--large .zt-cell__label{font-size:14px}.zt-cell__direction-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f5faff;font-size:14px;line-height:20px}.zt-cell__direction-column .zt-cell__title{margin-bottom:8px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-cell__direction-column .zt-cell__title-content{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt-cell__direction-column .zt-cell__title-subtitle{display:-webkit-box;display:-webkit-flex;display:flex;white-space:nowrap;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end;-webkit-box-flex:1;-webkit-flex:1;flex:1;opacity:.4}.zt-cell__direction-column .zt-cell__value{display:-webkit-box;display:-webkit-flex;display:flex;text-align:left;min-height:44px;padding:12px;box-sizing:border-box;background-color:#fff;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.zt-cell__direction-column .zt-cell__value .zt-icon{-webkit-box-flex:2;-webkit-flex:2;flex:2;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.zt-cell__direction-column .zt-cell__value-content{-webkit-box-flex:18;-webkit-flex:18;flex:18;word-break:break-all}.zt-cell__clickable{cursor:pointer}.zt-cell__clickable:active{background-color:rgba(0,0,0,.04)}
+.zt-cell{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;box-sizing:border-box;width:100%;padding:12px 16px;overflow:hidden;color:#2d4b73;font-size:16px;line-height:20px;background-color:#fff}.zt-cell--noFlex{display:block}.zt-cell--noFlex .zt-cell__title{margin-bottom:10px;width:100%;max-width:100%}.zt-cell--borderless::after,.zt-cell:last-child::after{display:none}.zt-cell__label{margin-top:10px;color:#2d4b73;font-size:14px;line-height:18px}.zt-cell__title,.zt-cell__value{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt-cell__title-content,.zt-cell__value-content{-webkit-box-flex:18;-webkit-flex:18;flex:18}.zt-cell__value{-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.zt-cell__placeholder{color:#c8c9cc;-webkit-box-flex:9;-webkit-flex:9;flex:9;text-align:right}.zt-cell__value{position:relative;overflow:hidden;color:#2d4b73;text-align:right;vertical-align:middle;word-wrap:break-word}.zt-cell__value--alone{color:rgba(0,0,0,.6);text-align:left}.zt-cell__left-icon,.zt-cell__right-icon{height:20px;font-size:16px;line-height:20px}.zt-cell__left-icon{margin-right:4px}.zt-cell__right-icon{margin:auto 0;margin-left:4px;color:#969799}.zt-cell--center{-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-cell--large{padding-top:12px;padding-bottom:12px}.zt-cell--large .zt-cell__title{font-size:16px}.zt-cell--large .zt-cell__label{font-size:14px}.zt-cell__direction-row{position:relative}.zt-cell__direction-row::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:16px;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-cell__direction-row:last-child::after{display:none}.zt-cell__direction-column{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;flex-direction:column;background-color:#f5faff;font-size:14px;line-height:20px}.zt-cell__direction-column .zt-cell__title{margin-bottom:8px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.zt-cell__direction-column .zt-cell__title-content{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt-cell__direction-column .zt-cell__title-subtitle{display:-webkit-box;display:-webkit-flex;display:flex;white-space:nowrap;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end;-webkit-box-flex:1;-webkit-flex:1;flex:1;opacity:.4}.zt-cell__direction-column .zt-cell__value{display:-webkit-box;display:-webkit-flex;display:flex;text-align:left;min-height:44px;padding:12px;box-sizing:border-box;background-color:#fff;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;justify-content:flex-start}.zt-cell__direction-column .zt-cell__value .zt-icon{-webkit-box-flex:2;-webkit-flex:2;flex:2;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;justify-content:flex-end}.zt-cell__direction-column .zt-cell__value-content{-webkit-box-flex:18;-webkit-flex:18;flex:18;word-break:break-all}.zt-cell__clickable{cursor:pointer}.zt-cell__clickable:active{background-color:rgba(0,0,0,.04)}

package/lib/cell/index.js

@@ -157,7 +157,7 @@ function Cell(h, props, slots, ctx) {
   }
 
   return h("div", (0, _babelHelperVueJsxMergeProps.default)([{
-    "class": [bem(classes), direction === 'column' ? bem('direction-column') : '', clickable && direction !== 'column' ? bem('clickable') : ''],
+    "class": [bem(classes), direction === 'column' ? bem('direction-column') : bem('direction-row'), clickable && direction !== 'column' ? bem('clickable') : ''],
     "attrs": {
       "role": clickable ? 'button' : null,
       "tabindex": clickable ? 0 : null

package/lib/cell/index.less

@@ -108,6 +108,18 @@
   }
 }
 
+.zt-cell__direction-row {
+  position: relative;
+
+  &::after {
+    .hairline-bottom(@cell-border-color, @padding-md);
+  }
+
+  &:last-child::after {
+    display: none;
+  }
+}
+
 .zt-cell__direction-column {
   flex-direction: column;
   background-color: #f5faff;

package/lib/datetime-picker/shared.js

@@ -158,12 +158,13 @@ var TimePickerMixin = {
       props[key] = _this5[key];
     });
     return h(_picker.default, {
-      "ref": "picker",
       "attrs": {
+        "show-picker": this.showPicker,
         "headers": this.headers,
         "columns": this.columns,
         "readonly": this.readonly
       },
+      "ref": "picker",
       "scopedSlots": this.$scopedSlots,
       "on": {
         "change": this.onChange,

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) {