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

fixed some bugs

Browse source 
fixed some bugs
This commit is contained in:
梁灏 2016-10-28 18:27:04 +08:00
parent 8a3bad748c
commit 4b7138b97f
6 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/modal/confirm.js
View file

@ -1,7 +1,7 @@
import Vue from 'vue';
import Modal from './modal.vue';
import Icon from '../icon/icon.vue';
import Button from '../button/button.vue';
import iButton from '../button/button.vue';
import { camelcaseToHyphen } from '../../utils/assist';
const prefixCls = 'ivu-modal-confirm';
@ -26,8 +26,8 @@ Modal.newInstance = properties => {
{{{ body }}}
</div>
<div class="${prefixCls}-footer">
<Button type="ghost" size="large" v-if="showCancel" @click="cancel">{{ cancelText }}</Button>
<Button type="primary" size="large" :loading="buttonLoading" @click="ok">{{ okText }}</Button>
<i-button type="ghost" size="large" v-if="showCancel" @click="cancel">{{ cancelText }}</i-button>
<i-button type="primary" size="large" :loading="buttonLoading" @click="ok">{{ okText }}</i-button>
</div>
</div>
</Modal>
@ -36,7 +36,7 @@ Modal.newInstance = properties => {
const modal = new Vue({
el: div,
components: { Modal, Button, Icon },
components: { Modal, iButton, Icon },
data: Object.assign(_props, {
visible: false,
width: 416,

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

@ -12,8 +12,8 @@
<div :class="[prefixCls + '-body']"><slot></slot></div>
<div :class="[prefixCls + '-footer']" v-if="!footerHide">
<slot name="footer">
<Button type="ghost" size="large" @click="cancel">{{ cancelText }}</Button>
<Button type="primary" size="large" :loading="buttonLoading" @click="ok">{{ okText }}</Button>
<i-button type="ghost" size="large" @click="cancel">{{ cancelText }}</i-button>
<i-button type="primary" size="large" :loading="buttonLoading" @click="ok">{{ okText }}</i-button>
</slot>
</div>
</div>
@ -22,13 +22,13 @@
</template>
<script>
import Icon from '../icon';
import Button from '../button';
import iButton from '../button/button.vue';
import { getScrollBarSize } from '../../utils/assist';
const prefixCls = 'ivu-modal';
export default {
components: { Icon, Button },
components: { Icon, iButton },
props: {
visible: {
type: Boolean,