Merge pull request #2232 from XiaoMi/hotfix/#2217(V4)

fix(date-picker): 修复节气显示问题
XiaoMi · Sep 9, 2022 · 2dca325 · 2dca325
2 parents d561f56 + ac04d10
commit 2dca325
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/ui/date-picker/src/components/calendar.tsx b/packages/ui/date-picker/src/components/calendar.tsx
@@ -220,6 +220,7 @@ const Calendar = ({
         altCalendarPresetData,
         dateMarkPresetData,
       }) as FormatCalendarItem
+
       return (
         <React.Fragment>
           {fullTimeInfo.nodeMark && (
@@ -235,7 +236,7 @@ const Calendar = ({
               {fullTimeInfo.nodeMark}
             </div>
           )}
-          {fullTimeInfo.text ? (
+          {fullTimeInfo.text || fullTimeInfo.name ? (
             <span
               onMouseEnter={() => {
                 altCalendarPreset === 'id-ID' && showHolidayDetail(fullTimeInfo)
@@ -250,7 +251,8 @@ const Calendar = ({
                 fullTimeInfo.highlight ? `${prefixCls}__lunar--highlight` : ''
               }`}
             >
-              {fullTimeInfo.text}
+              {/* 如果是节气，使用 fullTimeInfo.name */}
+              {fullTimeInfo.name || fullTimeInfo.text}
             </span>
           ) : null}
         </React.Fragment>

diff --git a/packages/ui/date-picker/src/types.ts b/packages/ui/date-picker/src/types.ts
@@ -49,7 +49,10 @@ export interface FormatCalendarItem {
    * 节点标记
    */
   nodeMark?: React.ReactNode
-
+  /**
+   * 节气名称
+   */
+  name?: string
   FullText?: string
 }