@aleen42/calendar 1.1.0-beta.17 → 1.1.0-beta.18

package/dist/calendar.css

@@ -1810,7 +1810,7 @@ input[disabled][role=dropdown] + i {
 .u-btn.u-btn-toolbar i.checkbox {
   float: none;
   display: inline-block;
-  vertical-align: middle;
+  vertical-align: middle !important;
   margin-top: 0;
 }
 
@@ -1818,7 +1818,7 @@ input[disabled][role=dropdown] + i {
 .u-btn.u-btn-primary.u-btn-toolbar i.checkbox + i,
 .u-btn.u-btn-toolbar i.checkbox + i {
   font-size: 14px;
-  vertical-align: middle;
+  vertical-align: middle !important;
 }
 
 [dir="ltr"] .lyToolbar .u-btn.u-btn-primary i.checkbox + i,
@@ -3211,6 +3211,13 @@ span.tmpzTreeMove_arrow {
   overflow-y: hidden;
 }
 
+.m-cal-day .content-wrapper .main-content .calendar.calendar-s .event_icon,
+.m-cal-week .content-wrapper .main-content .calendar.calendar-s .event_icon,
+.m-cal-month .content-wrapper .main-content .calendar.calendar-s .event_icon,
+.m-cal-list .content-wrapper .main-content .calendar.calendar-s .event_icon {
+  display: none;
+}
+
 .m-cal-week[firstweekday] .content-wrapper .main-content .calendar .main table td:last-child,
 .m-cal-week[firstweekday="0"] .content-wrapper .main-content .calendar .main table td:nth-child(1),
 .m-cal-week[firstweekday="1"] .content-wrapper .main-content .calendar .main table td:nth-child(6) {

package/dist/calendar.js

@@ -36147,9 +36147,12 @@ function dropdown($trigger, settings) {
 
             const $triggerElement = settings.align || $this;
 
+            const menuStyle = $menu.attr('style');
+            _setPosition($menu, $triggerElement);
+
             // 根据菜单是否溢出来计算菜单的最大高度
             if ($this.is(`.${subMenuClass}`) && getMenu($wrapper).is(`[${ADAPTIVE_MENU}]`)) {
-                $menu.attr(ADAPTIVE_SUBMENU, $menu.attr('style') || '').css('position', 'fixed');
+                $menu.attr(ADAPTIVE_SUBMENU, menuStyle || '').css('position', 'fixed');
             } else if ($menu.is($wrapper)) {
                 const menuRect = $menu[0].getBoundingClientRect();
                 const winHeight = $(window).height();
@@ -36172,7 +36175,6 @@ function dropdown($trigger, settings) {
                 }
             }
 
-            _setPosition($menu, $triggerElement);
         } else {
             // 隐藏时清掉搜索框所输入的关键词
             const input = $menu.find('input').data('self');
@@ -37237,6 +37239,8 @@ const Calendar = ([$context, $datePicker], viewType, options) => {
     // 注册 resize 事件
     const RESIZE_EVENT = 'resize.calendar.index';
     const scrollable = $e => $e[0].scrollHeight > $e[0].offsetHeight;
+    const adjustViewport = () =>
+        viewType === 'MONTH' && $calendar.toggleClass('calendar-s', external_$_('.cal-table', $calendar).outerWidth() < 990);
     const $window = external_$_(window).off(RESIZE_EVENT).on(RESIZE_EVENT, () => {
         if ($thead.is(':visible')) {
             adjustContainer?.();
@@ -37245,6 +37249,7 @@ const Calendar = ([$context, $datePicker], viewType, options) => {
                 // paddingLeft | paddingRight
                 [`padding${CF_USER.isRtl ? 'Left' : 'Right'}`] : isScrollable ? jquery_scrollbarWidth() : 0,
             });
+            adjustViewport();
         }
     });
     ({DAY : js_fn.fn(renderDayOrWeek, 0), WEEK : js_fn.fn(renderDayOrWeek, 1), MONTH : renderMonth, LIST : renderEventList})[viewType]();
@@ -37619,6 +37624,7 @@ const Calendar = ([$context, $datePicker], viewType, options) => {
             setTimeout(() => {
                 adjustTable(); // 避免动画过程触发 resize 导致计算的宽度不准, 因此在结束时再计算一次
                 $main.removeClass(TRANSITION_CLASS);
+                adjustViewport();
             }, 200);
 
             // 通过 js 动态渲染 ASIDE_WIDTH 使得 adjustTable 可以忽略动画直接根据准确的宽度计算