From e69b9b7d5a3809073d1f930e5b305ebc1320023b Mon Sep 17 00:00:00 2001
From: mengxiong10 <15623530290@163.com>
Date: Thu, 21 Nov 2019 12:43:14 +0800
Subject: [PATCH] fix: ie style compatible
---
.../__snapshots__/date-picker.test.js.snap | 24 +-
.../__snapshots__/time-panel.test.js.snap | 902 +++++++++---------
.../__snapshots__/time-range.test.js.snap | 46 +-
src/date-picker.vue | 2 +-
src/style/index.scss | 52 +-
src/time/list-columns.vue | 4 +-
src/time/list-options.vue | 20 +-
7 files changed, 528 insertions(+), 522 deletions(-)
diff --git a/__test__/__snapshots__/date-picker.test.js.snap b/__test__/__snapshots__/date-picker.test.js.snap
index a9c8ce8c..bad43443 100644
--- a/__test__/__snapshots__/date-picker.test.js.snap
+++ b/__test__/__snapshots__/date-picker.test.js.snap
@@ -30,18 +30,18 @@ exports[`DatePicker prop: attrs of input 1`] = `
-
-
`;
@@ -76,18 +76,18 @@ exports[`DatePicker prop: clearable 1`] = `
-
-
`;
@@ -127,18 +127,18 @@ exports[`DatePicker prop: editable 1`] = `
-
-
`;
diff --git a/__test__/__snapshots__/time-panel.test.js.snap b/__test__/__snapshots__/time-panel.test.js.snap
index ea7b12d6..506dfc6a 100644
--- a/__test__/__snapshots__/time-panel.test.js.snap
+++ b/__test__/__snapshots__/time-panel.test.js.snap
@@ -17,157 +17,153 @@ exports[`TimePanel render: correct 12hours in the fixed time list 1`] = `
class="mx-scrollbar-wrap"
style="margin-right: -0px;"
>
-
- -
-
- 08:30 AM
-
-
- -
-
- 09:00 AM
-
-
- -
-
- 09:30 AM
-
-
- -
-
- 10:00 AM
-
-
- -
-
- 10:30 AM
-
-
- -
-
- 11:00 AM
-
-
- -
-
- 11:30 AM
-
-
- -
-
- 12:00 PM
-
-
- -
-
- 12:30 PM
-
-
- -
-
- 01:00 PM
-
-
- -
-
- 01:30 PM
-
-
- -
-
- 02:00 PM
-
-
- -
-
- 02:30 PM
-
-
- -
-
- 03:00 PM
-
-
- -
-
- 03:30 PM
-
-
- -
-
- 04:00 PM
-
-
- -
-
- 04:30 PM
-
-
- -
-
- 05:00 PM
-
-
- -
-
- 05:30 PM
-
-
- -
-
- 06:00 PM
-
-
- -
-
- 06:30 PM
-
-
-
+
+ 08:30 AM
+
+
+
+
+ 09:00 AM
+
+
+
+
+ 09:30 AM
+
+
+
+
+ 10:00 AM
+
+
+
+
+ 10:30 AM
+
+
+
+
+ 11:00 AM
+
+
+
+
+ 11:30 AM
+
+
+
+
+ 12:00 PM
+
+
+
+
+ 12:30 PM
+
+
+
+
+ 01:00 PM
+
+
+
+
+ 01:30 PM
+
+
+
+
+ 02:00 PM
+
+
+
+
+ 02:30 PM
+
+
+
+
+ 03:00 PM
+
+
+
+
+ 03:30 PM
+
+
+
+
+ 04:00 PM
+
+
+
+
+ 04:30 PM
+
+
+
+
+ 05:00 PM
+
+
+
+
+ 05:30 PM
+
+
+
+
+ 06:00 PM
+
+
+
+
+ 06:30 PM
+
+
-
@@ -215,7 +212,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -223,7 +220,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -231,7 +228,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -239,7 +236,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -247,7 +244,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -255,7 +252,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -263,7 +260,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -271,7 +268,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -279,7 +276,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -287,7 +284,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -295,7 +292,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -303,7 +300,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -311,7 +308,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -319,7 +316,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -327,7 +324,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -335,7 +332,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -343,7 +340,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -351,7 +348,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -359,7 +356,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -367,7 +364,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -375,7 +372,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -383,7 +380,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -391,7 +388,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -418,11 +415,12 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -430,7 +428,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -438,7 +436,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -446,7 +444,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -454,7 +452,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -462,7 +460,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -470,7 +468,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -478,7 +476,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -486,7 +484,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -494,7 +492,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -502,7 +500,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -510,7 +508,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -518,7 +516,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -526,7 +524,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -534,7 +532,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -542,7 +540,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -550,7 +548,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -558,7 +556,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -566,7 +564,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -574,7 +572,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -582,7 +580,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -590,7 +588,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -598,7 +596,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -606,7 +604,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -614,7 +612,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -622,7 +620,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -630,7 +628,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -638,7 +636,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -646,7 +644,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -654,7 +652,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -662,7 +660,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -670,7 +668,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -678,7 +676,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -686,7 +684,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -694,7 +692,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -702,7 +700,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -710,7 +708,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -718,7 +716,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -726,7 +724,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -734,7 +732,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -742,7 +740,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -750,7 +748,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -758,7 +756,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -766,7 +764,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -774,7 +772,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -782,7 +780,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -790,7 +788,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -798,7 +796,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -806,7 +804,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -814,7 +812,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -822,7 +820,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -830,7 +828,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -838,7 +836,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -846,7 +844,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -854,7 +852,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -862,7 +860,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -870,7 +868,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -878,7 +876,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -886,7 +884,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -894,7 +892,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -921,11 +919,12 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -933,7 +932,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -941,7 +940,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -949,7 +948,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -957,7 +956,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -965,7 +964,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -973,7 +972,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -981,7 +980,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -989,7 +988,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -997,7 +996,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1005,7 +1004,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1013,7 +1012,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1021,7 +1020,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1029,7 +1028,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1037,7 +1036,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1045,7 +1044,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1053,7 +1052,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1061,7 +1060,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1069,7 +1068,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1077,7 +1076,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1085,7 +1084,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1093,7 +1092,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1101,7 +1100,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1109,7 +1108,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1117,7 +1116,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1125,7 +1124,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1133,7 +1132,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1141,7 +1140,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1149,7 +1148,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1157,7 +1156,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1165,7 +1164,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1173,7 +1172,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1181,7 +1180,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1189,7 +1188,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1197,7 +1196,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1205,7 +1204,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1213,7 +1212,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1221,7 +1220,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1229,7 +1228,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1237,7 +1236,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1245,7 +1244,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1253,7 +1252,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1261,7 +1260,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1269,7 +1268,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1277,7 +1276,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1285,7 +1284,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1293,7 +1292,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1301,7 +1300,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1309,7 +1308,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1317,7 +1316,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1325,7 +1324,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1333,7 +1332,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1341,7 +1340,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1349,7 +1348,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1357,7 +1356,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1365,7 +1364,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1373,7 +1372,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1381,7 +1380,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1389,7 +1388,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1397,7 +1396,7 @@ exports[`TimePanel render: correct classes of the columns 1`] = `
-
@@ -1437,157 +1436,153 @@ exports[`TimePanel render: correct classes of the fixed time list 1`] = `
class="mx-scrollbar-wrap"
style="margin-right: -0px;"
>
-
- -
-
- 08:30
-
-
- -
-
- 09:00
-
-
- -
-
- 09:30
-
-
- -
-
- 10:00
-
-
- -
-
- 10:30
-
-
- -
-
- 11:00
-
-
- -
-
- 11:30
-
-
- -
-
- 12:00
-
-
- -
-
- 12:30
-
-
- -
-
- 13:00
-
-
- -
-
- 13:30
-
-
- -
-
- 14:00
-
-
- -
-
- 14:30
-
-
- -
-
- 15:00
-
-
- -
-
- 15:30
-
-
- -
-
- 16:00
-
-
- -
-
- 16:30
-
-
- -
-
- 17:00
-
-
- -
-
- 17:30
-
-
- -
-
- 18:00
-
-
- -
-
- 18:30
-
-
-
+
+ 08:30
+
+
+
+
+ 09:00
+
+
+
+
+ 09:30
+
+
+
+
+ 10:00
+
+
+
+
+ 10:30
+
+
+
+
+ 11:00
+
+
+
+
+ 11:30
+
+
+
+
+ 12:00
+
+
+
+
+ 12:30
+
+
+
+
+ 13:00
+
+
+
+
+ 13:30
+
+
+
+
+ 14:00
+
+
+
+
+ 14:30
+
+
+
+
+ 15:00
+
+
+
+
+ 15:30
+
+
+
+
+ 16:00
+
+
+
+
+ 16:30
+
+
+
+
+ 17:00
+
+
+
+
+ 17:30
+
+
+
+
+ 18:00
+
+
+
+
+ 18:30
+
+
-
@@ -1635,7 +1631,7 @@ exports[`TimePanel render: correct columns by format 1`] = `
-
@@ -1643,7 +1639,7 @@ exports[`TimePanel render: correct columns by format 1`] = `
-
@@ -1651,7 +1647,7 @@ exports[`TimePanel render: correct columns by format 1`] = `
-
@@ -1678,11 +1674,12 @@ exports[`TimePanel render: correct columns by format 1`] = `
style="margin-right: -0px;"
>
-
@@ -1690,7 +1687,7 @@ exports[`TimePanel render: correct columns by format 1`] = `
-
@@ -1717,11 +1714,12 @@ exports[`TimePanel render: correct columns by format 1`] = `
style="margin-right: -0px;"
>
-
@@ -1729,7 +1727,7 @@ exports[`TimePanel render: correct columns by format 1`] = `
-
diff --git a/__test__/__snapshots__/time-range.test.js.snap b/__test__/__snapshots__/time-range.test.js.snap
index 962a9422..c0251a1f 100644
--- a/__test__/__snapshots__/time-range.test.js.snap
+++ b/__test__/__snapshots__/time-range.test.js.snap
@@ -24,11 +24,12 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -36,7 +37,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -44,7 +45,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -52,7 +53,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -60,7 +61,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -68,7 +69,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -95,11 +96,12 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -107,7 +109,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -134,11 +136,12 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -146,7 +149,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -187,11 +190,12 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -199,7 +203,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -207,7 +211,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -215,7 +219,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -223,7 +227,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -231,7 +235,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -258,11 +262,12 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -270,7 +275,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
@@ -297,11 +302,12 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
style="margin-right: -0px;"
>
-
@@ -309,7 +315,7 @@ exports[`TimeRange render: correct classes of the columns 1`] = `
-
diff --git a/src/date-picker.vue b/src/date-picker.vue
index e3049e8d..12c36bbb 100644
--- a/src/date-picker.vue
+++ b/src/date-picker.vue
@@ -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)) {
diff --git a/src/style/index.scss b/src/style/index.scss
index af530bd9..de261204 100644
--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -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;
+ }
+}
diff --git a/src/time/list-columns.vue b/src/time/list-columns.vue
index 516b7aaa..bc2a3b84 100644
--- a/src/time/list-columns.vue
+++ b/src/time/list-columns.vue
@@ -1,11 +1,11 @@
-
+
-
diff --git a/src/time/list-options.vue b/src/time/list-options.vue
index 43a1abb2..330d512a 100644
--- a/src/time/list-options.vue
+++ b/src/time/list-options.vue
@@ -1,16 +1,14 @@
-
+
+ {{ item.text }}
+