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

fixed Modal bug,when loading status changed,the button can not change status

Browse source 
fixed Modal bug,when loading status changed,the button can not change
status
This commit is contained in:
梁灏 2016-11-09 17:36:40 +08:00
parent 09a0430201
commit 3c01d81a11
22 changed files with 199 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -199,6 +199,11 @@
this.wrapShow = true;
this.addScrollEffect();
}
},
loading (val) {
if (!val) {
this.buttonLoading = false;
}
}
}
}

3
src/components/radio/radio.vue
View file

@ -8,8 +8,7 @@
:disabled="disabled"
:checked="selected"
@change="change">
</span>
<slot>{{ value }}</slot>
</span><slot>{{ value }}</slot>
</label>
</template>
<script>

14
src/styles/article/index.less
View file

@ -1,21 +1,27 @@
.ivu-article {
h1{
font-size: 28px;
font-size: 26px;
font-weight: normal;
}
h2{
font-size: 22px;
font-size: 20px;
font-weight: normal;
}
h3{
font-size: 18px;
font-size: 16px;
font-weight: normal;
}
h4{
font-size: 14px;
font-weight: normal;
}
h5{
font-size: 12px;
font-weight: normal;
}
h6{
font-size: 12px;
font-weight: normal;
}
blockquote{
@ -33,6 +39,7 @@
}
li{
margin-bottom: 5px;
font-size: 14px;
}
ul ul, ol ul{
list-style-type: circle;
@ -40,5 +47,6 @@
p{
margin: 5px;
font-size: 14px;
}
}

4
src/styles/common/base.less
View file

@ -12,7 +12,7 @@
body {
font-family: @font-family;
font-size: @font-size-base;
font-size: @font-size-small;
line-height: @line-height-base;
color: @text-color;
background-color: @body-background;
@ -64,7 +64,7 @@ a {
&[disabled] {
color: #ccc;
cursor: not-allowed;
cursor: @cursor-disabled;
pointer-events: none;
}
}

6
src/styles/components/alert.less
View file

@ -6,7 +6,7 @@
padding: 8px 48px 8px 16px;
border-radius: @border-radius-base;
color: @text-color;
font-size: 12px;
font-size: @font-size-small;
line-height: 16px;
margin-bottom: 10px;
@ -15,14 +15,14 @@
}
&-icon {
font-size: 14px;
font-size: @font-size-base;
top: 8px;
left: 16px;
position: absolute;
}
&-desc {
font-size: 12px;
font-size: @font-size-small;
color: @text-color;
line-height: 21px;
display: none;

2
src/styles/components/card.less
View file

@ -41,7 +41,7 @@
&-extra {
position: absolute;
right: 16px;
top: 10px;
top: 14px;
}
&-body {

28
src/styles/components/input-number.less
View file

@ -13,8 +13,8 @@
margin: 0;
padding: 0;
width: 80px;
height: 28px;
line-height: 28px;
height: @input-height-base;
line-height: @input-height-base;
vertical-align: middle;
border: 1px solid @border-color-base;
border-radius: @btn-border-radius;
@ -53,7 +53,7 @@
&-handler {
display: block;
width: 100%;
height: 14px;
height: @input-height-base / 2;
line-height: 0;
text-align: center;
overflow: hidden;
@ -93,13 +93,13 @@
&-input-wrap {
overflow: hidden;
height: 28px;
height: @input-height-base;
}
&-input {
width: 100%;
height: 28px;
line-height: 28px;
height: @input-height-base;
line-height: @input-height-base;
padding: 0 7px;
text-align: left;
outline: 0;
@ -117,15 +117,15 @@
&-large {
padding: 0;
.@{input-number-prefix-cls}-input-wrap {
height: 32px;
height: @input-height-large;
}
.@{input-number-prefix-cls}-handler {
height: 16px;
height: @input-height-large / 2;
}
input {
height: 32px;
line-height: 32px;
height: @input-height-large;
line-height: @input-height-large;
}
.@{input-number-prefix-cls}-handler-up-inner {
@ -139,15 +139,15 @@
&-small {
padding: 0;
.@{input-number-prefix-cls}-input-wrap {
height: 22px;
height: @input-height-small;
}
.@{input-number-prefix-cls}-handler {
height: 11px;
height: @input-height-small / 2;
}
input {
height: 22px;
line-height: 22px;
height: @input-height-small;
line-height: @input-height-small;
margin-top: -1px;
vertical-align: top;
}

4
src/styles/components/input.less
View file

@ -8,7 +8,7 @@
position: relative;
}
&-icon {
width: 28px;
width: 32px;
height: 100%;
font-size: 16px;
text-align: center;
@ -26,7 +26,7 @@
}
&-icon + &{
padding-right: 28px;
padding-right: 32px;
}
}

2
src/styles/components/message.less
View file

@ -2,7 +2,7 @@
@icon-prefix-cls: ~"@{css-prefix}icon";
.@{message-prefix-cls} {
font-size: 12px;
font-size: @font-size-small;
position: fixed;
z-index: @zindex-message;
width: 100%;

35
src/styles/components/radio.less
View file

@ -5,12 +5,12 @@
.@{radio-group-prefix-cls} {
display: inline-block;
font-size: @font-size-base;
font-size: @font-size-small;
}
// 普通状态
.@{radio-prefix-cls}-wrapper {
font-size: @font-size-base;
font-size: @font-size-small;
vertical-align: middle;
display: inline-block;
position: relative;
@ -19,9 +19,10 @@
}
.@{radio-prefix-cls} {
display: inline-block;
margin-right: 4px;
white-space: nowrap;
outline: none;
display: inline-block;
position: relative;
line-height: 1;
vertical-align: middle;
@ -124,19 +125,24 @@ span.@{radio-prefix-cls} + * {
font-size: 0;
-webkit-text-size-adjust:none;
.@{radio-prefix-cls}{
width: 0;
margin-right: 0;
}
.@{radio-prefix-cls}-wrapper {
font-size: 14px;
margin: 0;
height: 28px;
line-height: 26px;
color: @btn-default-color;
display: inline-block;
height: @btn-circle-size;
line-height: @btn-circle-size - 2px;
margin: 0;
padding: 0 16px;
font-size: @font-size-small;
color: @btn-default-color;
.transition(all @transition-time ease-in-out);
cursor: pointer;
border: 1px solid @border-color-base;
border-left: 0;
background: #fff;
padding: 0 16px;
> span {
margin-left: 0;
@ -232,15 +238,16 @@ span.@{radio-prefix-cls} + * {
}
.@{radio-group-button-prefix-cls}.@{radio-group-prefix-cls}-large .@{radio-prefix-cls}-wrapper{
height: 32px;
line-height: 30px;
height: @btn-circle-size-large;
line-height: @btn-circle-size-large - 2px;
font-size: @font-size-base;
}
.@{radio-group-button-prefix-cls}.@{radio-group-prefix-cls}-small .@{radio-prefix-cls}-wrapper{
height: 22px;
line-height: 20px;
height: @btn-circle-size-small;
line-height: @btn-circle-size-small - 2px;
padding: 0 12px;
font-size: 12px;
font-size: @font-size-small;
&:first-child {
border-radius: @btn-border-radius-small 0 0 @btn-border-radius-small;
}

34
src/styles/components/select.less
View file

@ -80,7 +80,7 @@
}
&-single &-selection{
height: 28px;
height: @input-height-base;
position: relative;
.@{select-prefix-cls}-placeholder{
@ -89,8 +89,8 @@
.@{select-prefix-cls}-placeholder, .@{select-prefix-cls}-selected-value{
display: block;
height: 26px;
line-height: 26px;
height: @input-height-base - 2px;
line-height: @input-height-base - 2px;
font-size: @font-size-small;
overflow: hidden;
text-overflow: ellipsis;
@ -101,33 +101,33 @@
}
&-large&-single &-selection{
height: 36px;
height: @input-height-large;
.@{select-prefix-cls}-placeholder, .@{select-prefix-cls}-selected-value{
height: 34px;
line-height: 34px;
height: @input-height-large - 2px;
line-height: @input-height-large - 2px;
font-size: @font-size-base;
}
}
&-small&-single &-selection{
height: 24px;
height: @input-height-small;
border-radius: @btn-border-radius-small;
.@{select-prefix-cls}-placeholder, .@{select-prefix-cls}-selected-value{
height: 22px;
line-height: 22px;
height: @input-height-small - 2px;
line-height: @input-height-small - 2px;
}
}
&-multiple &-selection{
padding: 0 24px 0 2px;
min-height: 28px;
padding: 0 24px 0 4px;
min-height: @input-height-base;
.@{select-prefix-cls}-placeholder{
display: block;
height: 26px;
line-height: 26px;
height: @input-height-base - 2px;
line-height: @input-height-base - 2px;
color: @input-placeholder-color;
overflow: hidden;
text-overflow: ellipsis;
@ -168,8 +168,8 @@
}
&-multiple &-input{
height: 25px;
line-height: 28px;
height: @input-height-base - 3px;
line-height: @input-height-base;
padding: 0 0 0 6px;
}
@ -177,6 +177,10 @@
text-align: center;
color: @btn-disable-color;
}
&-multiple .@{css-prefix}tag{
margin: 3px 4px 2px 0;
}
}
.@{select-item-prefix-cls} {

2
src/styles/components/switch.less
View file

@ -16,7 +16,7 @@
&-inner {
color: #fff;
font-size: 12px;
font-size: @font-size-small;
position: absolute;
left: 25px;

6
src/styles/components/timeline.less
View file

@ -55,7 +55,7 @@
line-height: 1;
border: 0;
border-radius: 0;
font-size: 14px;
font-size: @font-size-base;
position: absolute;
left: -14px;
.transform(translateY(-50%));
@ -63,9 +63,9 @@
&-content {
padding: 1px 1px 10px 24px;
font-size: @font-size-base;
font-size: @font-size-small;
position: relative;
top: -5px;
top: -4px;
}
&:last-child {

4
src/styles/mixins/checkbox.less
View file

@ -136,7 +136,7 @@
.@{checkbox-prefix-cls}-wrapper {
cursor: pointer;
font-size: @font-size-base;
font-size: @font-size-small;
display: inline-block;
& + & {
margin-left: 8px;
@ -145,7 +145,7 @@
.@{checkbox-prefix-cls}-wrapper + span,
.@{checkbox-prefix-cls} + span {
margin-left: 4px;
//margin-left: 4px;
margin-right: 4px;
}

6
src/styles/themes/default/custom.less
View file

@ -48,7 +48,7 @@
// Button
@btn-font-weight : normal;
@btn-padding-base : 4px 15px;
@btn-padding-base : 6px 15px;
@btn-padding-large : 6px 15px 7px 15px;
@btn-padding-small : 2px 7px;
@btn-font-size : 12px;
@ -72,7 +72,7 @@
@btn-ghost-bg : transparent;
@btn-ghost-border : @border-color-base;
@btn-circle-size : 28px;
@btn-circle-size : 32px;
@btn-circle-size-large : 36px;
@btn-circle-size-small : 24px;
@ -84,7 +84,7 @@
@legend-color : #999;
// Input
@input-height-base : 28px;
@input-height-base : 32px;
@input-height-large : 36px;
@input-height-small : 24px;