drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from iview/master

Browse source 
合并原作者更新
This commit is contained in:
GITleonine1989 2017-02-21 17:32:54 +08:00 • committed by GitHub
commit 14ad333882
4 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/input-number/input-number.vue
View file

@ -34,7 +34,7 @@
const iconPrefixCls = 'ivu-icon';
function isValueNumber (value) {
return (/(^-?[0-9]+\.{1}\d+$)|(^-?[1-9][0-9]*$)/).test(value + '');
return (/(^-?[0-9]+\.{1}\d+$)|(^-?[1-9][0-9]*$)|(^-?0{1}$)/).test(value + '');
}
function addNum (num1, num2) {
let sq1, sq2, m;

8
src/components/modal/modal.vue
View file

@ -1,6 +1,6 @@
<template>
<div :class="wrapClasses">
<div :class="maskClasses" v-show="visible" @click="mask" transition="fade"></div>
<div :class="maskClasses" v-show="visible" @click="mask" transition="fade"></div>
<div :class="wrapClasses" @click="handleWrapClick">
<div :class="classes" :style="styles" v-show="visible" transition="ease">
<div :class="[prefixCls + '-content']">
<a :class="[prefixCls + '-close']" v-if="closable" @click="close">
@ -130,6 +130,10 @@
this.close();
}
},
handleWrapClick (event) {
// use indexOf,do not use === ,because ivu-modal-wrap can have other custom className
if (event.target.getAttribute('class').indexOf(`${prefixCls}-wrap`) > -1) this.mask();
},
cancel () {
this.close();
},