2
0
mirror of https://github.com/tenrok/vue2-datepicker.git synced 2026-06-18 23:30:36 +03:00

fix: ie style compatible

This commit is contained in:
mengxiong10
2019-11-21 12:43:14 +08:00
parent f9d21eb3a1
commit e69b9b7d5a
7 changed files with 528 additions and 522 deletions
+1 -1
View File
@@ -258,7 +258,7 @@ export default {
return this.value2date(this.value);
},
text() {
if (this.userInput !== null) {
if (this.userInput) {
return this.userInput;
}
if (!this.isValidValue(this.innerValue)) {
+28 -24
View File
@@ -102,7 +102,6 @@
color: $default-color;
background-color: #fff;
border: 1px solid $border-color;
display: flex;
}
.mx-datepicker-popup {
@@ -114,11 +113,16 @@
}
.mx-datepicker-sidebar {
float: left;
box-sizing: border-box;
width: 100px;
padding: 6px;
overflow: auto;
border-right: 1px solid $border-color;
}
.mx-datepicker-sidebar + .mx-datepicker-content {
margin-left: 100px;
border-left: 1px solid $border-color;
}
.mx-datepicker-body {
@@ -308,8 +312,7 @@
&:first-child {
border-left: 0;
}
ul {
.mx-time-list {
margin: 0;
padding: 0;
list-style: none;
@@ -319,29 +322,11 @@
height: 32 * 6px;
}
}
li {
.mx-time-item {
cursor: pointer;
font-size: 12px;
height: 32px;
line-height: 32px;
}
}
.mx-time-list {
margin: 0;
padding: 0;
list-style: none;
li {
padding: 8px 10px;
font-size: 14px;
line-height: 20px;
}
}
.mx-time-list,
.mx-time-column {
li {
cursor: pointer;
&:hover {
background-color: $hover-color;
}
@@ -356,3 +341,22 @@
}
}
}
.mx-time-option {
cursor: pointer;
padding: 8px 10px;
font-size: 14px;
line-height: 20px;
&:hover {
background-color: $hover-color;
}
&.active {
color: $primary-color;
font-weight: 700;
}
&.disabled {
cursor: not-allowed;
color: #ccc;
background-color: #f3f3f3;
}
}
+2 -2
View File
@@ -1,11 +1,11 @@
<template>
<div class="mx-time-columns">
<scrollbar-vertical v-for="(col, i) in columns" :key="i" class="mx-time-column">
<ul :data-type="col.type" :data-index="i" @click="handleSelect">
<ul class="mx-time-list" :data-type="col.type" :data-index="i" @click="handleSelect">
<li
v-for="(item, j) in col.list"
:key="item.value"
class="cell"
class="mx-time-item"
:data-index="j"
:class="getClasses(item.value)"
>
+9 -11
View File
@@ -1,16 +1,14 @@
<template>
<scrollbar-vertical>
<ul class="mx-time-list">
<li
v-for="item in list"
:key="item.value"
class="cell"
:class="getClasses(item.value)"
@click="handleSelect(item.value)"
>
{{ item.text }}
</li>
</ul>
<div
v-for="item in list"
:key="item.value"
class="mx-time-option"
:class="getClasses(item.value)"
@click="handleSelect(item.value)"
>
{{ item.text }}
</div>
</scrollbar-vertical>
</template>