fix(date-picker): menu's quarter text isn't same having `type="quarte…

…rrange"` and `type="quarter"`, closes #3217
tusen-ai · Jul 2, 2022 · dd5fa45 · dd5fa45
1 parent 04960e9
commit dd5fa45
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -8,6 +8,7 @@
 - Fix `n-data-table` doesn't show `summary` row in virtual scroll mode, closes [#3202](https://github.com/TuSimple/naive-ui/issues/3202).
 - Fix `n-cascader`'s filter menu doesn't show option path, closes [#3220](https://github.com/TuSimple/naive-ui/issues/3220).
 - Fix `n-cascader`'s `filter` prop may not get correct `path`.
+- Fix `n-date-picker` menu's quarter text isn't same having `type="quarterrange"` and `type="quarter"`, closes [#3217](https://github.com/TuSimple/naive-ui/issues/3217).
 
 ## 2.30.8
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -8,6 +8,7 @@
 - 修复 `n-data-table` 在虚拟滚动模式下 `summary` 行不显示，关闭 [#3202](https://github.com/TuSimple/naive-ui/issues/3202)
 - 修复 `n-cascader` 的搜索菜单没有显示节点路径，关闭 [#3220](https://github.com/TuSimple/naive-ui/issues/3220)
 - 修复 `n-cascader` 的 `filter` 属性接收到的 `path` 可能有误
+- 修复 `n-date-picker` 在 `type="quarterrange"` 和 `type="quarter"` 时菜单季度文案不一致，关闭 [#3217](https://github.com/TuSimple/naive-ui/issues/3217)
 
 ## 2.30.8
 

diff --git a/src/date-picker/src/panel/month.tsx b/src/date-picker/src/panel/month.tsx
@@ -35,7 +35,7 @@ export default defineComponent({
         case 'month':
           return item.dateObject.month + 1
         case 'quarter':
-          return `Q ${item.dateObject.quarter}`
+          return `Q${item.dateObject.quarter}`
       }
     }
     const { useAsQuickJump } = props

diff --git a/src/date-picker/src/panel/monthrange.tsx b/src/date-picker/src/panel/monthrange.tsx
@@ -73,7 +73,7 @@ export default defineComponent({
           {item.type === 'month'
             ? item.dateObject.month + 1
             : item.type === 'quarter'
-              ? item.dateObject.quarter
+              ? `Q${item.dateObject.quarter}`
               : item.dateObject.year}
         </div>
       )