Comparing version 0.10.7 to 0.10.8
@@ -33,3 +33,3 @@ 'use strict'; | ||
_vm.$emit('input', $event); | ||
}, "focus": _vm.handleFocus, "blur": _vm.handleBlur } }, [_c('template', { attrs: { "slot": "icon" }, slot: "icon" }, [_vm.showIcon && _vm.isAndroid ? _c('span', { staticClass: "van-address-edit-detail__finish-edit" }, [_vm._v("完成")]) : _vm.showIcon ? _c('van-icon', { attrs: { "name": "clear" } }) : _vm._e()], 1)], 2), _vm.showSearchList ? _c('van-cell-group', { staticClass: "van-address-edit-detail__suggest-list" }, _vm._l(_vm.searchResult, function (express) { | ||
}, "focus": _vm.handleFocus, "blur": _vm.handleBlur } }, [_c('div', { attrs: { "slot": "icon" }, slot: "icon" }, [_vm.showIcon && _vm.isAndroid ? _c('span', { staticClass: "van-address-edit-detail__finish-edit" }, [_vm._v("完成")]) : _vm.showIcon ? _c('van-icon', { attrs: { "name": "clear" } }) : _vm._e()], 1)]), _vm.showSearchList ? _c('van-cell-group', { staticClass: "van-address-edit-detail__suggest-list" }, _vm._l(_vm.searchResult, function (express) { | ||
return _c('van-cell', { key: express.name + express.address, staticClass: "van-address-edit-detail__suggest-item", on: { "click": function click($event) { | ||
@@ -36,0 +36,0 @@ _vm.onSuggestSelect(express); |
@@ -11,2 +11,6 @@ 'use strict'; | ||
var _routerLink = require('../mixins/router-link'); | ||
var _routerLink2 = _interopRequireDefault(_routerLink); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -24,6 +28,7 @@ | ||
mixins: [_routerLink2.default], | ||
components: (_components = {}, _components[_icon2.default.name] = _icon2.default, _components), | ||
props: { | ||
url: String, | ||
icon: String, | ||
@@ -33,5 +38,3 @@ title: String, | ||
isLink: Boolean, | ||
replace: Boolean, | ||
required: Boolean, | ||
to: [String, Object], | ||
value: [String, Number] | ||
@@ -43,15 +46,5 @@ }, | ||
this.$emit('click'); | ||
var to = this.to, | ||
url = this.url, | ||
$router = this.$router, | ||
replace = this.replace; | ||
if (to && $router) { | ||
$router[replace ? 'replace' : 'push'](to); | ||
} else if (url) { | ||
replace ? location.replace(url) : location.href = url; | ||
} | ||
this.routerLink(); | ||
} | ||
} | ||
}; |
@@ -248,3 +248,3 @@ 'use strict'; | ||
var version = '0.10.7'; | ||
var version = '0.10.8'; | ||
var components = [_actionsheet2.default, _addressEdit2.default, _addressList2.default, _area2.default, _badge2.default, _badgeGroup2.default, _button2.default, _card2.default, _cell2.default, _cellGroup2.default, _cellSwipe2.default, _checkbox2.default, _checkboxGroup2.default, _col2.default, _contactCard2.default, _contactEdit2.default, _contactList2.default, _couponCell2.default, _couponList2.default, _datetimePicker2.default, _field2.default, _goodsAction2.default, _goodsActionBigBtn2.default, _goodsActionMiniBtn2.default, _icon2.default, _loading2.default, _navBar2.default, _noticeBar2.default, _numberKeyboard2.default, _panel2.default, _passwordInput2.default, _picker2.default, _popup2.default, _progress2.default, _pullRefresh2.default, _radio2.default, _radioGroup2.default, _row2.default, _search2.default, _sku2.default, _step2.default, _stepper2.default, _steps2.default, _submitBar2.default, _swipe2.default, _swipeItem2.default, _switch2.default, _switchCell2.default, _tab2.default, _tabbar2.default, _tabbarItem2.default, _tabs2.default, _tag2.default, _treeSelect2.default, _uploader2.default]; | ||
@@ -251,0 +251,0 @@ |
@@ -5,3 +5,3 @@ 'use strict'; | ||
var VALID_TYPES = ['gradient-circle', 'circle']; | ||
var VALID_TYPES = ['gradient-circle', 'circle', 'spinner']; | ||
var VALID_COLORS = ['black', 'white']; | ||
@@ -11,3 +11,5 @@ | ||
render: function render() { | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { class: ['van-loading', 'van-loading--' + _vm.type] }, [_c('span', { class: ['van-loading__spinner', 'van-loading__spinner--' + _vm.type, 'van-loading__spinner--' + _vm.color] })]); | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { class: ['van-loading', 'van-loading--' + _vm.type, 'van-loading--' + _vm.color] }, [_c('span', { class: ['van-loading__spinner', 'van-loading__spinner--' + _vm.type, 'van-loading__spinner--' + _vm.color] }, _vm._l(12, function (item) { | ||
return _vm.type === 'spinner' ? _c('i') : _vm._e(); | ||
}))]); | ||
}, | ||
@@ -14,0 +16,0 @@ |
'use strict'; | ||
exports.__esModule = true; | ||
var DEFAULT_COLOR = '#38f'; | ||
var DEFAULT_TEXT_COLOR = '#fff'; | ||
var INACTIVE_COLOR = '#cacaca'; | ||
exports.default = { | ||
render: function render() { | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { staticClass: "van-progress" }, [_c('span', { staticClass: "van-progress__portion", style: _vm.portionStyle }), _c('span', { staticClass: "van-progress__pivot", style: _vm.pivotStyle }, [_vm._v(_vm._s(_vm.pivotText))])]); | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { staticClass: "van-progress" }, [_c('span', { staticClass: "van-progress__portion", style: _vm.portionStyle }), _c('span', { directives: [{ name: "show", rawName: "v-show", value: _vm.showPivot, expression: "showPivot" }], staticClass: "van-progress__pivot", style: _vm.pivotStyle }, [_vm._v(_vm._s(_vm.pivotText))])]); | ||
}, | ||
@@ -17,2 +12,3 @@ | ||
props: { | ||
inactive: Boolean, | ||
percentage: { | ||
@@ -25,3 +21,6 @@ type: Number, | ||
}, | ||
inactive: Boolean, | ||
showPivot: { | ||
type: Boolean, | ||
default: true | ||
}, | ||
pivotText: { | ||
@@ -35,7 +34,7 @@ type: String, | ||
type: String, | ||
default: DEFAULT_COLOR | ||
default: '#38f' | ||
}, | ||
textColor: { | ||
type: String, | ||
default: DEFAULT_TEXT_COLOR | ||
default: '#fff' | ||
} | ||
@@ -46,3 +45,3 @@ }, | ||
componentColor: function componentColor() { | ||
return this.inactive ? INACTIVE_COLOR : this.color; | ||
return this.inactive ? '#cacaca' : this.color; | ||
}, | ||
@@ -49,0 +48,0 @@ pivotStyle: function pivotStyle() { |
@@ -13,10 +13,6 @@ 'use strict'; | ||
render: function render() { | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { staticClass: "van-stepper", class: { 'van-stepper--disabled': _vm.disabled } }, [_c('button', { staticClass: "van-stepper__stepper van-stepper__minus", class: { | ||
'van-stepper__minus--disabled': _vm.isMinusDisabled | ||
}, on: { "click": function click($event) { | ||
_vm.handleChange('minus'); | ||
} } }), _c('input', { staticClass: "van-stepper__input", attrs: { "type": "number", "disabled": _vm.disabled || _vm.disableInput }, domProps: { "value": _vm.currentValue }, on: { "input": _vm.handleInputChange } }), _c('button', { staticClass: "van-stepper__stepper van-stepper__plus", class: { | ||
'van-stepper__plus--disabled': _vm.isPlusDisabled | ||
}, on: { "click": function click($event) { | ||
_vm.handleChange('plus'); | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('div', { staticClass: "van-stepper", class: { 'van-stepper--disabled': _vm.disabled } }, [_c('button', { staticClass: "van-stepper__stepper van-stepper__minus", class: { 'van-stepper__minus--disabled': _vm.isMinusDisabled }, on: { "click": function click($event) { | ||
_vm.onChange('minus'); | ||
} } }), _c('input', { staticClass: "van-stepper__input", attrs: { "type": "number", "disabled": _vm.disabled || _vm.disableInput }, domProps: { "value": _vm.currentValue }, on: { "input": _vm.onInput } }), _c('button', { staticClass: "van-stepper__stepper van-stepper__plus", class: { 'van-stepper__plus--disabled': _vm.isPlusDisabled }, on: { "click": function click($event) { | ||
_vm.onChange('plus'); | ||
} } })]); | ||
@@ -28,2 +24,5 @@ }, | ||
props: { | ||
value: {}, | ||
disabled: Boolean, | ||
disableInput: Boolean, | ||
min: { | ||
@@ -37,3 +36,2 @@ type: [String, Number], | ||
}, | ||
value: {}, | ||
step: { | ||
@@ -43,4 +41,2 @@ type: [String, Number], | ||
}, | ||
disabled: Boolean, | ||
disableInput: Boolean, | ||
defaultValue: { | ||
@@ -59,2 +55,3 @@ type: [String, Number], | ||
} | ||
return { | ||
@@ -95,3 +92,2 @@ currentValue: value | ||
methods: { | ||
// 纠正value值 | ||
correctValue: function correctValue(value) { | ||
@@ -107,8 +103,7 @@ if ((0, _isNan2.default)(value)) { | ||
}, | ||
handleInputChange: function handleInputChange(event) { | ||
onInput: function onInput(event) { | ||
var val = +event.target.value; | ||
this.currentValue = this.correctValue(val); | ||
}, | ||
handleChange: function handleChange(type) { | ||
onChange: function onChange(type) { | ||
if (this.isMinusDisabled && type === 'minus' || this.isPlusDisabled && type === 'plus') { | ||
@@ -122,4 +117,5 @@ this.$emit('overlimit', type); | ||
this.currentValue = type === 'minus' ? currentValue - step : currentValue + step; | ||
this.$emit(type); | ||
} | ||
} | ||
}; |
@@ -11,2 +11,6 @@ 'use strict'; | ||
var _routerLink = require('../mixins/router-link'); | ||
var _routerLink2 = _interopRequireDefault(_routerLink); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -21,2 +25,4 @@ | ||
mixins: [_routerLink2.default], | ||
components: (_components = {}, _components[_icon2.default.name] = _icon2.default, _components), | ||
@@ -46,4 +52,5 @@ | ||
this.$parent.onChange(this.$parent.items.indexOf(this)); | ||
this.routerLink(); | ||
} | ||
} | ||
}; |
@@ -20,7 +20,7 @@ 'use strict'; | ||
_vm.handleTabClick(index); | ||
} } }, [_vm._v("\n " + _vm._s(tab.title) + "\n ")]); | ||
} } }, [_c('span', [_vm._v(_vm._s(tab.title))])]); | ||
})], 2)])]) : _c('div', { staticClass: "van-tabs__nav", class: ["van-tabs__nav--" + this.type] }, [_vm.type === 'line' ? _c('div', { staticClass: "van-tabs__nav-bar", style: _vm.navBarStyle }) : _vm._e(), _vm._l(_vm.tabs, function (tab, index) { | ||
return _c('div', { key: index, ref: "tabkey", refInFor: true, staticClass: "van-tab van-hairline", class: { 'van-tab--active': index === _vm.curActive }, on: { "click": function click($event) { | ||
_vm.handleTabClick(index); | ||
} } }, [_vm._v("\n " + _vm._s(tab.title) + "\n ")]); | ||
} } }, [_c('span', [_vm._v(_vm._s(tab.title))])]); | ||
})], 2), _c('div', { staticClass: "van-tabs__content" }, [_vm._t("default")], 2)]); | ||
@@ -27,0 +27,0 @@ }, |
@@ -30,2 +30,3 @@ 'use strict'; | ||
duration: 3000, | ||
mask: false, | ||
forbidClick: false, | ||
@@ -32,0 +33,0 @@ clear: function clear() { |
@@ -22,3 +22,3 @@ 'use strict'; | ||
render: function render() { | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('transition', { attrs: { "name": "van-toast-fade" } }, [_c('div', { directives: [{ name: "show", rawName: "v-show", value: _vm.visible, expression: "visible" }], staticClass: "van-toast-wrapper" }, [_c('div', { class: ['van-toast', "van-toast--" + _vm.displayStyle, "van-toast--" + _vm.position] }, [_vm.displayStyle === 'text' ? _c('div', [_vm._v(_vm._s(_vm.message))]) : _vm._e(), _vm.displayStyle === 'html' ? _c('div', { domProps: { "innerHTML": _vm._s(_vm.message) } }) : _vm._e(), _vm.displayStyle === 'default' ? [_vm.type === 'loading' ? _c('van-loading', { attrs: { "color": "white" } }) : _c('van-icon', { staticClass: "van-toast__icon", attrs: { "name": _vm.type } }), _vm.message ? _c('div', { staticClass: "van-toast__text" }, [_vm._v(_vm._s(_vm.message))]) : _vm._e()] : _vm._e()], 2), _vm.forbidClick ? _c('div', { staticClass: "van-toast__overlay" }) : _vm._e()])]); | ||
var _vm = this;var _h = _vm.$createElement;var _c = _vm._self._c || _h;return _c('transition', { attrs: { "name": "van-toast-fade" } }, [_c('div', { directives: [{ name: "show", rawName: "v-show", value: _vm.visible, expression: "visible" }], staticClass: "van-toast-wrapper" }, [_c('div', { class: ['van-toast', "van-toast--" + _vm.displayStyle, "van-toast--" + _vm.position] }, [_vm.displayStyle === 'text' ? _c('div', [_vm._v(_vm._s(_vm.message))]) : _vm._e(), _vm.displayStyle === 'html' ? _c('div', { domProps: { "innerHTML": _vm._s(_vm.message) } }) : _vm._e(), _vm.displayStyle === 'default' ? [_vm.type === 'loading' ? _c('van-loading', { attrs: { "color": "white" } }) : _c('van-icon', { staticClass: "van-toast__icon", attrs: { "name": _vm.type } }), _vm.message ? _c('div', { staticClass: "van-toast__text" }, [_vm._v(_vm._s(_vm.message))]) : _vm._e()] : _vm._e()], 2), _vm.forbidClick || _vm.mask ? _c('div', { class: ['van-toast__overlay', { 'van-toast__overlay--mask': _vm.mask }] }) : _vm._e()])]); | ||
}, | ||
@@ -49,2 +49,6 @@ | ||
default: 'middle' | ||
}, | ||
mask: { | ||
type: Boolean, | ||
default: false | ||
} | ||
@@ -51,0 +55,0 @@ }, |
{ | ||
"name": "vant", | ||
"version": "0.10.7", | ||
"version": "0.10.8", | ||
"description": "有赞vue wap组件库", | ||
@@ -18,5 +18,5 @@ "main": "lib/vant.js", | ||
"build:components": "node build/bin/build-components.js --color", | ||
"build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color && mkdir lib/vant-css && cp -R packages/vant-css/lib/ lib/vant-css", | ||
"build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color", | ||
"build:vant": "cross-env NODE_ENV=production webpack --progress --hide-modules --color --config build/webpack.build.js && cross-env NODE_ENV=production webpack -p --progress --hide-modules --color --config build/webpack.build.js", | ||
"build:style-entry": "VUE_ENV=server node build/bin/build-style-entry.js", | ||
"build:style-entry": "cross-env VUE_ENV=server node build/bin/build-style-entry.js", | ||
"build:changelog": "sh build/bin/build-changelog.sh", | ||
@@ -60,3 +60,2 @@ "deploy": "npm run deploy:docs && npm run deploy:cdn && gh-pages -d docs/dist --remote youzan && rimraf docs/dist", | ||
"babel-loader": "^7.1.2", | ||
"babel-plugin-module-resolver": "^2.7.1", | ||
"babel-plugin-syntax-jsx": "^6.18.0", | ||
@@ -73,3 +72,3 @@ "babel-plugin-transform-object-rest-spread": "^6.26.0", | ||
"css-loader": "^0.28.7", | ||
"dependency-tree": "^5.11.1", | ||
"dependency-tree": "^5.12.0", | ||
"eslint-plugin-vue": "^2.1.0", | ||
@@ -101,3 +100,3 @@ "extract-text-webpack-plugin": "2.0.0", | ||
"mocha": "^3.4.2", | ||
"postcss": "^6.0.10", | ||
"postcss": "^6.0.14", | ||
"postcss-calc": "^6.0.0", | ||
@@ -115,15 +114,15 @@ "postcss-easy-import": "^3.0.0", | ||
"url-loader": "^0.6.2", | ||
"vue": "^2.5.2", | ||
"vue-loader": "^13.3.0", | ||
"vue-markdown-loader": "^2.2.2", | ||
"vue": "^2.5.3", | ||
"vue-loader": "^13.5.0", | ||
"vue-markdown-loader": "^2.2.3", | ||
"vue-router": "^3.0.1", | ||
"vue-sfc-compiler": "^0.0.4", | ||
"vue-style-loader": "^3.0.0", | ||
"vue-template-compiler": "^2.5.2", | ||
"vue-template-compiler": "^2.5.3", | ||
"webpack": "^3.8.1", | ||
"webpack-bundle-analyzer": "^2.9.0", | ||
"webpack-dev-server": "^2.9.2", | ||
"webpack-merge": "^4.1.0", | ||
"zan-doc": "^0.3.9" | ||
"webpack-dev-server": "^2.9.4", | ||
"webpack-merge": "^4.1.1", | ||
"zan-doc": "0.3.11" | ||
} | ||
} |
@@ -62,3 +62,3 @@ import Actionsheet from './actionsheet'; | ||
const version = '0.10.7'; | ||
const version = '0.10.8'; | ||
const components = [ | ||
@@ -65,0 +65,0 @@ Actionsheet, |
@@ -11,2 +11,3 @@ import Vue from 'vue'; | ||
duration: 3000, | ||
mask: false, | ||
forbidClick: false, | ||
@@ -13,0 +14,0 @@ clear: () => { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
69
401
20648
1259712