@deanwu/vue-component-library 1.0.56 → 1.0.58

package/dist/vue-component-library.umd.js

@@ -253,17 +253,6 @@ module.exports = __webpack_require__("0bad") ? function (object, key, value) {
 };
 
 
-/***/ }),
-
-/***/ "05bb":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_12_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_12_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_12_oneOf_1_2_node_modules_stylus_loader_index_js_ref_12_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_button_vue_vue_type_style_index_0_id_1e87103a_prod_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6c61");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_12_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_12_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_12_oneOf_1_2_node_modules_stylus_loader_index_js_ref_12_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_button_vue_vue_type_style_index_0_id_1e87103a_prod_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_12_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_12_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_12_oneOf_1_2_node_modules_stylus_loader_index_js_ref_12_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_button_vue_vue_type_style_index_0_id_1e87103a_prod_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "05f3":
@@ -537,6 +526,13 @@ module.exports = function (it) {
 };
 
 
+/***/ }),
+
+/***/ "0b82":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "0b99":
@@ -3092,6 +3088,17 @@ module.exports = function (it) {
 }));
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__("c8ba")))
 
+/***/ }),
+
+/***/ "2372":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_12_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_12_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_12_oneOf_1_2_node_modules_stylus_loader_index_js_ref_12_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_button_vue_vue_type_style_index_0_id_0ee48e3b_prod_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("0b82");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_12_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_12_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_12_oneOf_1_2_node_modules_stylus_loader_index_js_ref_12_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_button_vue_vue_type_style_index_0_id_0ee48e3b_prod_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_12_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_12_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_12_oneOf_1_2_node_modules_stylus_loader_index_js_ref_12_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_button_vue_vue_type_style_index_0_id_0ee48e3b_prod_lang_stylus_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "23cb":
@@ -67818,13 +67825,6 @@ exports.default = {
 
 /***/ }),
 
-/***/ "6c61":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "6ca1":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -97464,8 +97464,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var components = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a2ced774-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/unit/button.vue?vue&type=template&id=1e87103a&scoped=true&
-var buttonvue_type_template_id_1e87103a_scoped_true_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"a2ced774-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/unit/button.vue?vue&type=template&id=0ee48e3b&scoped=true&
+var buttonvue_type_template_id_0ee48e3b_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('button', {
@@ -97493,9 +97493,9 @@ var buttonvue_type_template_id_1e87103a_scoped_true_render = function render() {
     class: _vm.icon
   }) : _vm._e(), _c('span', [_vm._t("default")], 2)])]);
 };
-var buttonvue_type_template_id_1e87103a_scoped_true_staticRenderFns = [];
+var buttonvue_type_template_id_0ee48e3b_scoped_true_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/unit/button.vue?vue&type=template&id=1e87103a&scoped=true&
+// CONCATENATED MODULE: ./src/components/unit/button.vue?vue&type=template&id=0ee48e3b&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/unit/button.vue?vue&type=script&lang=js&
 /* harmony default export */ var buttonvue_type_script_lang_js_ = ({
@@ -97527,27 +97527,34 @@ var buttonvue_type_template_id_1e87103a_scoped_true_staticRenderFns = [];
   },
   computed: {
     sizeStyle() {
-      return this.$compsConfig.style.buttonSize[this.size];
+      return this.$compsConfig.style.buttonSize[this.size] || {};
     },
     colorStyle() {
       let config = this.$compsConfig.style.buttonColor[this.color];
       if (!config) return {};
       let color = config[this.hoverState ? 'hover' : 'normal'];
-      return {
-        'border-color': color,
-        'color': this.hollow ? color : config.font || '#fff',
-        'background': this.hollow ? '#fff' : color
-      };
+      if (this.color == 'normal') {
+        return {
+          'border-color': color,
+          'color': this.hoverState ? config.hover : config.font
+        };
+      } else {
+        return {
+          'border-color': color,
+          'color': this.hollow ? color : config.font || '#fff',
+          'background': this.hollow ? '#fff' : color
+        };
+      }
     },
     compStyle() {
-      return Object.assign(this.sizeStyle || {}, this.colorStyle || {});
+      return Object.assign({}, this.sizeStyle, this.colorStyle);
     }
   }
 });
 // CONCATENATED MODULE: ./src/components/unit/button.vue?vue&type=script&lang=js&
  /* harmony default export */ var unit_buttonvue_type_script_lang_js_ = (buttonvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/components/unit/button.vue?vue&type=style&index=0&id=1e87103a&prod&lang=stylus&scoped=true&
-var buttonvue_type_style_index_0_id_1e87103a_prod_lang_stylus_scoped_true_ = __webpack_require__("05bb");
+// EXTERNAL MODULE: ./src/components/unit/button.vue?vue&type=style&index=0&id=0ee48e3b&prod&lang=stylus&scoped=true&
+var buttonvue_type_style_index_0_id_0ee48e3b_prod_lang_stylus_scoped_true_ = __webpack_require__("2372");
 
 // CONCATENATED MODULE: ./src/components/unit/button.vue
 
@@ -97560,11 +97567,11 @@ var buttonvue_type_style_index_0_id_1e87103a_prod_lang_stylus_scoped_true_ = __w
 
 var button_component = normalizeComponent(
   unit_buttonvue_type_script_lang_js_,
-  buttonvue_type_template_id_1e87103a_scoped_true_render,
-  buttonvue_type_template_id_1e87103a_scoped_true_staticRenderFns,
+  buttonvue_type_template_id_0ee48e3b_scoped_true_render,
+  buttonvue_type_template_id_0ee48e3b_scoped_true_staticRenderFns,
   false,
   null,
-  "1e87103a",
+  "0ee48e3b",
   null
   
 )