zartui 2.0.5 → 2.0.7

package/lib/index.js

@@ -313,7 +313,7 @@ exports.Toast = _toast.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.0.5';
+var version = '2.0.7';
 exports.version = version;
 
 function install(Vue) {

package/lib/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;

package/lib/zart.js

@@ -4168,8 +4168,8 @@ module.exports = Array.isArray || function (arr) {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_3_2_cache_loader_dist_cjs_js_ref_0_0_vue_loader_lib_index_js_vue_loader_options_resize_sensor_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
-/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_3_2_cache_loader_dist_cjs_js_ref_0_0_vue_loader_lib_index_js_vue_loader_options_resize_sensor_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_3_2_cache_loader_dist_cjs_js_ref_0_0_vue_loader_lib_index_js_vue_loader_options_resize_sensor_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_2_2_cache_loader_dist_cjs_js_ref_0_0_vue_loader_lib_index_js_vue_loader_options_resize_sensor_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18);
+/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_2_2_cache_loader_dist_cjs_js_ref_0_0_vue_loader_lib_index_js_vue_loader_options_resize_sensor_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_2_2_cache_loader_dist_cjs_js_ref_0_0_vue_loader_lib_index_js_vue_loader_options_resize_sensor_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -13163,8 +13163,8 @@ module.exports = function() {
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_3_2_annotationLayer_css_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(21);
-/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_3_2_annotationLayer_css_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_3_2_annotationLayer_css_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_2_2_annotationLayer_css_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(21);
+/* harmony import */ var _style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_2_2_annotationLayer_css_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_style_loader_dist_cjs_js_css_loader_dist_cjs_js_vue_loader_lib_loaders_stylePostLoader_js_postcss_loader_src_index_js_ref_2_2_annotationLayer_css_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -28970,6 +28970,7 @@ Divider.props = {
 
 
 
+
 var cascader_createNamespace = Object(utils["b" /* createNamespace */])('cascader'),
     cascader_createComponent = cascader_createNamespace[0],
     cascader_bem = cascader_createNamespace[1],
@@ -28987,10 +28988,6 @@ var cascader_createNamespace = Object(utils["b" /* createNamespace */])('cascade
       default: function _default() {
         return [];
       }
-    },
-    closeable: {
-      type: Boolean,
-      default: true
     }
   },
   data: function data() {
@@ -29146,8 +29143,8 @@ var cascader_createNamespace = Object(utils["b" /* createNamespace */])('cascade
         this.$emit('finish', eventParams);
       }
     },
-    onClose: function onClose() {
-      this.$emit('close');
+    onCancel: function onCancel() {
+      this.$emit('cancel');
     },
     renderHeader: function renderHeader() {
       var h = this.$createElement;
@@ -29155,15 +29152,7 @@ var cascader_createNamespace = Object(utils["b" /* createNamespace */])('cascade
         "class": cascader_bem('header')
       }, [h("h2", {
         "class": cascader_bem('title')
-      }, [this.slots('title') || this.title]), this.closeable ? h(es_icon, {
-        "attrs": {
-          "name": "cross"
-        },
-        "class": cascader_bem('close-icon'),
-        "on": {
-          "click": this.onClose
-        }
-      }) : null]);
+      }, [this.slots('title') || this.title])]);
     },
     renderDivider: function renderDivider() {
       var h = this.$createElement;
@@ -29241,13 +29230,26 @@ var cascader_createNamespace = Object(utils["b" /* createNamespace */])('cascade
           }
         }
       }, [this.tabs.map(this.renderTab)]);
+    },
+    renderMenu: function renderMenu() {
+      var h = this.$createElement;
+      return h(es_button, {
+        "class": cascader_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": cascader_bem()
-    }, [this.renderHeader(), this.renderDivider(), this.renderTabs()]);
+    }, [this.renderHeader(), this.renderDivider(), this.renderTabs(), this.renderDivider(), this.renderMenu()]);
   }
 }));
 // CONCATENATED MODULE: ./es/cell/shared.js
@@ -36194,9 +36196,15 @@ var field_createNamespace = Object(utils["b" /* createNamespace */])('field'),
     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) {
@@ -52600,7 +52608,7 @@ var uploader_createNamespace = Object(utils["b" /* createNamespace */])('uploade
 
 
 
-var version = '2.0.5';
+var version = '2.0.7';
 
 function install(Vue) {
   var components = [action_sheet, es_area, avatar, back_top, badge, es_button, calendar, cascader, cell, cell_group, es_checkbox, checkbox_group, col, collapse, collapse_item, count_down, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, fold_dialog, es_form, grid, grid_item, hierarchy_select, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, lazyload, es_list, es_loading, locale["a" /* default */], media_picker, media_player, multiple_picker, nav_bar, notice_bar, number_keyboard, es_overlay, password_input, pdf_viewer, picker, popover, popup, pull_refresh, es_radio, radio_group, rate, row, search, signature, skeleton, slider, es_step, stepper, es_steps, es_sticky, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, table, tabs, es_tag, timeline, es_toast, uploader];