@douyinfe/semi-foundation 2.43.1 → 2.43.2

package/calendar/eventUtil.ts

@@ -230,7 +230,11 @@ export const filterEvents = (events: Map<string, EventObject[]>, start: Date, en
         const item = events.get(day);
         const date = new Date(day);
         if (isDateInRange(date, start, end)) {
-            res.set(day, item);
+            if (res.has(day)) {
+                res.set(day, [...res.get(day), ...item]);
+            } else {
+                res.set(day, item);
+            }
         } else if (isBefore(end, date)) {
             // do nothing
         } else {

package/calendar/foundation.ts

@@ -320,13 +320,13 @@ export default class CalendarFoundation<P = Record<string, any>, S = Record<stri
 
     convertMapToArray(weekMap: Map<string, EventObject[]>, weekStart: Date) {
         const eventArray = [];
+        const map = new Map();
         for (const entry of weekMap.entries()) {
             const [key, value] = entry;
-            const map = new Map();
             map.set(key, value);
-            const weekEvents = this._parseWeeklyEvents(map, weekStart);
-            eventArray.push(...weekEvents);
         }
+        const weekEvents = this._parseWeeklyEvents(map, weekStart);
+        eventArray.push(...weekEvents);
         return eventArray;
     }
 

package/lib/cjs/calendar/eventUtil.js

@@ -218,7 +218,11 @@ const filterEvents = (events, start, end) => {
     const item = events.get(day);
     const date = new Date(day);
     if (isDateInRange(date, start, end)) {
-      res.set(day, item);
+      if (res.has(day)) {
+        res.set(day, [...res.get(day), ...item]);
+      } else {
+        res.set(day, item);
+      }
     } else if ((0, _dateFns.isBefore)(end, date)) {
       // do nothing
     } else {

package/lib/cjs/calendar/foundation.js

@@ -225,13 +225,13 @@ class CalendarFoundation extends _foundation.default {
   }
   convertMapToArray(weekMap, weekStart) {
     const eventArray = [];
+    const map = new Map();
     for (const entry of weekMap.entries()) {
       const [key, value] = entry;
-      const map = new Map();
       map.set(key, value);
-      const weekEvents = this._parseWeeklyEvents(map, weekStart);
-      eventArray.push(...weekEvents);
     }
+    const weekEvents = this._parseWeeklyEvents(map, weekStart);
+    eventArray.push(...weekEvents);
     return eventArray;
   }
   getParseMonthlyEvents(itemLimit) {

package/lib/cjs/popconfirm/popconfirm.css

@@ -37,9 +37,11 @@
   flex-direction: column;
 }
 .semi-popconfirm-body {
-  margin-left: 36px;
   color: var(--semi-color-text-2);
 }
+.semi-popconfirm-body-withIcon {
+  margin-left: 36px;
+}
 .semi-popconfirm-body > p {
   margin: 0;
   padding: 0;

package/lib/cjs/popconfirm/popconfirm.scss

@@ -46,8 +46,9 @@ $module: #{$prefix}-popconfirm;
     }
 
     &-body {
-        margin-left: $width-popconfirm-icon + $spacing-popconfirm_header_icon-marginRight;
-
+        &-withIcon {
+            margin-left: $width-popconfirm-icon + $spacing-popconfirm_header_icon-marginRight;
+        }
         color: $color-popconfirm_body-text;
 
         & > p {

package/lib/cjs/table/table.css

@@ -493,6 +493,11 @@
   transform: rotate(0deg);
 }
 
+.semi-table-column-filter-dropdown .semi-dropdown-menu {
+  max-height: 290px;
+  overflow-y: auto;
+}
+
 .semi-table-wrapper-rtl .semi-table {
   direction: rtl;
   text-align: right;

package/lib/cjs/table/table.scss

@@ -620,4 +620,11 @@ $module: #{$prefix}-table;
     }
 }
 
+.#{$module}-column-filter-dropdown {
+    .#{$prefix}-dropdown-menu {
+        max-height: $height-table_column_filter_dropdown;
+        overflow-y: auto;
+    }
+}
+
 @import './rtl.scss';

package/lib/cjs/table/variables.scss

@@ -42,6 +42,7 @@ $width-table_cell_fixed_left_last: 1px; // 表格左上角单元格底部描边
 $width-table_cell_fixed_right_first: 1px; // 表格左上角单元格右侧描边宽度
 $width-table_react_resizable_handle: 9px; // 表格伸缩列调节热区宽度
 $height-table_pagination_outer_min: 60px; // 表格分页器高度
+$height-table_column_filter_dropdown: 290px; // 表格过滤筛选列表最大高度
 
 
 // Color no need to change

package/lib/es/calendar/eventUtil.js

@@ -199,7 +199,11 @@ export const filterEvents = (events, start, end) => {
     const item = events.get(day);
     const date = new Date(day);
     if (isDateInRange(date, start, end)) {
-      res.set(day, item);
+      if (res.has(day)) {
+        res.set(day, [...res.get(day), ...item]);
+      } else {
+        res.set(day, item);
+      }
     } else if (isBefore(end, date)) {
       // do nothing
     } else {

package/lib/es/calendar/foundation.js

@@ -218,13 +218,13 @@ export default class CalendarFoundation extends BaseFoundation {
   }
   convertMapToArray(weekMap, weekStart) {
     const eventArray = [];
+    const map = new Map();
     for (const entry of weekMap.entries()) {
       const [key, value] = entry;
-      const map = new Map();
       map.set(key, value);
-      const weekEvents = this._parseWeeklyEvents(map, weekStart);
-      eventArray.push(...weekEvents);
     }
+    const weekEvents = this._parseWeeklyEvents(map, weekStart);
+    eventArray.push(...weekEvents);
     return eventArray;
   }
   getParseMonthlyEvents(itemLimit) {

package/lib/es/popconfirm/popconfirm.css

@@ -37,9 +37,11 @@
   flex-direction: column;
 }
 .semi-popconfirm-body {
-  margin-left: 36px;
   color: var(--semi-color-text-2);
 }
+.semi-popconfirm-body-withIcon {
+  margin-left: 36px;
+}
 .semi-popconfirm-body > p {
   margin: 0;
   padding: 0;

package/lib/es/popconfirm/popconfirm.scss

@@ -46,8 +46,9 @@ $module: #{$prefix}-popconfirm;
     }
 
     &-body {
-        margin-left: $width-popconfirm-icon + $spacing-popconfirm_header_icon-marginRight;
-
+        &-withIcon {
+            margin-left: $width-popconfirm-icon + $spacing-popconfirm_header_icon-marginRight;
+        }
         color: $color-popconfirm_body-text;
 
         & > p {

package/lib/es/table/table.css

@@ -493,6 +493,11 @@
   transform: rotate(0deg);
 }
 
+.semi-table-column-filter-dropdown .semi-dropdown-menu {
+  max-height: 290px;
+  overflow-y: auto;
+}
+
 .semi-table-wrapper-rtl .semi-table {
   direction: rtl;
   text-align: right;

package/lib/es/table/table.scss

@@ -620,4 +620,11 @@ $module: #{$prefix}-table;
     }
 }
 
+.#{$module}-column-filter-dropdown {
+    .#{$prefix}-dropdown-menu {
+        max-height: $height-table_column_filter_dropdown;
+        overflow-y: auto;
+    }
+}
+
 @import './rtl.scss';

package/lib/es/table/variables.scss

@@ -42,6 +42,7 @@ $width-table_cell_fixed_left_last: 1px; // 表格左上角单元格底部描边
 $width-table_cell_fixed_right_first: 1px; // 表格左上角单元格右侧描边宽度
 $width-table_react_resizable_handle: 9px; // 表格伸缩列调节热区宽度
 $height-table_pagination_outer_min: 60px; // 表格分页器高度
+$height-table_column_filter_dropdown: 290px; // 表格过滤筛选列表最大高度
 
 
 // Color no need to change

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.43.1",
+    "version": "2.43.2",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.43.1",
+        "@douyinfe/semi-animation": "2.43.2",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.29.3",
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "84abaef26e42768a44ba5db31b9891bf508a314e",
+    "gitHead": "6c7218869ff6a0c83525f49845b7dc7a858f3705",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/popconfirm/popconfirm.scss

@@ -46,8 +46,9 @@ $module: #{$prefix}-popconfirm;
     }
 
     &-body {
-        margin-left: $width-popconfirm-icon + $spacing-popconfirm_header_icon-marginRight;
-
+        &-withIcon {
+            margin-left: $width-popconfirm-icon + $spacing-popconfirm_header_icon-marginRight;
+        }
         color: $color-popconfirm_body-text;
 
         & > p {

package/table/table.scss

@@ -620,4 +620,11 @@ $module: #{$prefix}-table;
     }
 }
 
+.#{$module}-column-filter-dropdown {
+    .#{$prefix}-dropdown-menu {
+        max-height: $height-table_column_filter_dropdown;
+        overflow-y: auto;
+    }
+}
+
 @import './rtl.scss';

package/table/variables.scss

@@ -42,6 +42,7 @@ $width-table_cell_fixed_left_last: 1px; // 表格左上角单元格底部描边
 $width-table_cell_fixed_right_first: 1px; // 表格左上角单元格右侧描边宽度
 $width-table_react_resizable_handle: 9px; // 表格伸缩列调节热区宽度
 $height-table_pagination_outer_min: 60px; // 表格分页器高度
+$height-table_column_filter_dropdown: 290px; // 表格过滤筛选列表最大高度
 
 
 // Color no need to change