Merge branch 'dev' into next

2020-09-06 07:59:45 +08:00
parent f19386fe1f aefec84e14
commit b01a587099
12 changed files with 109 additions and 28 deletions
@@ -160,6 +160,10 @@ export default createComponent({
        return 'disabled';
      }

+      if (currentDate === null) {
+        return;
+      }
+
      if (Array.isArray(currentDate)) {
        if (type === 'multiple') {
          return getMultipleDayType(day);