Merge branch 'master' of gitlab.qima-inc.com:fe/zanui-vue

This commit is contained in:
niunai 2017-03-30 14:23:42 +08:00
commit 926524e330
5 changed files with 5 additions and 4 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "@youzan/zanui-vue", "name": "@youzan/zanui-vue",
"version": "0.0.44", "version": "0.0.45",
"description": "有赞vue wap组件库", "description": "有赞vue wap组件库",
"main": "lib/zanui.js", "main": "lib/zanui.js",
"style": "lib/zanui-css/index.css", "style": "lib/zanui-css/index.css",

View File

@ -9,7 +9,7 @@
<span class="zan-cell__label" v-if="label" v-text="label"></span> <span class="zan-cell__label" v-if="label" v-text="label"></span>
</slot> </slot>
</div> </div>
<div class="zan-cell__value" :class="{ <div class="zan-cell__value" v-if="value || this.$slots.default" :class="{
'is-link': isLink, 'is-link': isLink,
'is-alone': !this.$slots.title && !title && !label 'is-alone': !this.$slots.title && !title && !label
}"> }">

View File

@ -51,6 +51,7 @@
this.value = ''; this.value = '';
this.focusStatus = false; this.focusStatus = false;
this.isFocus = false; this.isFocus = false;
this.$emit('cancel');
}, },
handleSearch() { handleSearch() {
// input // input

View File

@ -1,6 +1,6 @@
{ {
"name": "@youzan/zanui-css", "name": "@youzan/zanui-css",
"version": "0.0.44", "version": "0.0.45",
"description": "zanui css.", "description": "zanui css.",
"main": "lib/index.css", "main": "lib/index.css",
"style": "lib/index.css", "style": "lib/index.css",

View File

@ -80,7 +80,7 @@ if (typeof window !== 'undefined' && window.Vue) {
module.exports = { module.exports = {
install, install,
version: '0.0.44', version: '0.0.45',
Button, Button,
Switch, Switch,
Field, Field,