From c96fc4382928dd7447e2267287616005dc56f936 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Sun, 5 Jun 2022 16:40:20 +0800 Subject: [PATCH] feat(breadcrumb-item): add clickable prop --- .eslintrc.js | 1 + CHANGELOG.en-US.md | 1 + CHANGELOG.zh-CN.md | 1 + src/breadcrumb/demos/enUS/basic.demo.vue | 20 ++-- src/breadcrumb/demos/enUS/custom.demo.vue | 20 +++- src/breadcrumb/demos/enUS/index.demo-entry.md | 9 +- .../demos/enUS/separator-per-item.demo.vue | 12 +-- src/breadcrumb/demos/enUS/separator.demo.vue | 9 +- src/breadcrumb/demos/zhCN/basic.demo.vue | 21 ++-- src/breadcrumb/demos/zhCN/custom.demo.vue | 16 ++- src/breadcrumb/demos/zhCN/index.demo-entry.md | 8 +- .../demos/zhCN/separator-per-item.demo.vue | 9 +- src/breadcrumb/demos/zhCN/separator.demo.vue | 9 +- src/breadcrumb/src/Breadcrumb.tsx | 12 ++- src/breadcrumb/src/BreadcrumbItem.tsx | 35 ++++-- src/breadcrumb/src/styles/index.cssr.ts | 100 +++++++++++------- src/breadcrumb/styles/light.ts | 15 ++- src/time/demos/zhCN/format.demo.vue | 2 +- 18 files changed, 187 insertions(+), 113 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 46b0fb3b6..e8457df70 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -13,6 +13,7 @@ module.exports = { files: ['*.vue', '*.js'], extends: ['plugin:vue/essential', '@vue/standard'], rules: { + 'vue/multiline-html-element-content-newline': 0, 'vue/multi-word-component-names': 0, 'vue/max-attributes-per-line': [ 2, diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index ace96c7e3..868b1f4ad 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -19,6 +19,7 @@ - `n-tag` adds background color in dark theme when `:bordered="false"`, closes [#1699](https://github.com/TuSimple/naive-ui/issues/1699). - `n-time-picker` adds `time-zone` prop, closes [#293](https://github.com/TuSimple/naive-ui/issues/293). - `n-time` adds `time-zone` prop. +- `n-breadcrumb-item` adds `clickable` prop. ## 2.29.1 diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 92f98c408..9c00d6af6 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -19,6 +19,7 @@ - `n-tag` 在暗色背景下 `:bordered="false"` 时增加背景颜色,关闭 [#1699](https://github.com/TuSimple/naive-ui/issues/1699) - `n-time-picker` 新增 `time-zone` 属性,关闭 [#293](https://github.com/TuSimple/naive-ui/issues/293) - `n-time` 新增 `time-zone` 属性 +- `n-breadcrumb-item` 新增 `clickable` 属性 ## 2.29.1 diff --git a/src/breadcrumb/demos/enUS/basic.demo.vue b/src/breadcrumb/demos/enUS/basic.demo.vue index 3207bd9d3..20bd11eb4 100644 --- a/src/breadcrumb/demos/enUS/basic.demo.vue +++ b/src/breadcrumb/demos/enUS/basic.demo.vue @@ -4,15 +4,11 @@ @@ -21,8 +17,10 @@ import { defineComponent } from 'vue' import { MdCash } from '@vicons/ionicons4' export default defineComponent({ - components: { - MdCash + setup () { + return { + MdCash + } } }) diff --git a/src/breadcrumb/demos/enUS/custom.demo.vue b/src/breadcrumb/demos/enUS/custom.demo.vue index eee35875b..179f42656 100644 --- a/src/breadcrumb/demos/enUS/custom.demo.vue +++ b/src/breadcrumb/demos/enUS/custom.demo.vue @@ -8,12 +8,16 @@ It is possible to pass a custom template when you want to customize the item lin - I'm ok +
+ I'm ok +
- I'm ok +
+ I'm ok +
@@ -49,3 +53,15 @@ export default defineComponent({ } }) + + diff --git a/src/breadcrumb/demos/enUS/index.demo-entry.md b/src/breadcrumb/demos/enUS/index.demo-entry.md index e85dd9f07..28ab599d2 100644 --- a/src/breadcrumb/demos/enUS/index.demo-entry.md +++ b/src/breadcrumb/demos/enUS/index.demo-entry.md @@ -21,10 +21,11 @@ separator-per-item.vue ### BreadcrumbItem Props -| Name | Type | Default | Description | -| --------- | -------- | ----------- | ------------------------- | -| separator | `string` | `undefined` | BreadcrumbItem separator. | -| href | `string` | `undefined` | BreadcrumbItem link. | +| Name | Type | Default | Description | Version | +| --- | --- | --- | --- | --- | +| clickable | `boolean` | `true` | Whether it's clickable. | NEXT_VERSION | +| separator | `string` | `undefined` | BreadcrumbItem separator. | | +| href | `string` | `undefined` | BreadcrumbItem link. | | ### Breadcrumb Slots diff --git a/src/breadcrumb/demos/enUS/separator-per-item.demo.vue b/src/breadcrumb/demos/enUS/separator-per-item.demo.vue index f4f823d69..fe0b9a45d 100644 --- a/src/breadcrumb/demos/enUS/separator-per-item.demo.vue +++ b/src/breadcrumb/demos/enUS/separator-per-item.demo.vue @@ -7,17 +7,13 @@ Use separator prop or separator slot to custom separator of an item. When both a diff --git a/src/breadcrumb/demos/enUS/separator.demo.vue b/src/breadcrumb/demos/enUS/separator.demo.vue index 8d47dada7..35462d0fa 100644 --- a/src/breadcrumb/demos/enUS/separator.demo.vue +++ b/src/breadcrumb/demos/enUS/separator.demo.vue @@ -7,14 +7,11 @@ Use separator prop to custom separator. diff --git a/src/breadcrumb/demos/zhCN/custom.demo.vue b/src/breadcrumb/demos/zhCN/custom.demo.vue index 28d2ebbd3..cf13b7128 100644 --- a/src/breadcrumb/demos/zhCN/custom.demo.vue +++ b/src/breadcrumb/demos/zhCN/custom.demo.vue @@ -8,12 +8,16 @@ - I'm ok +
+ I'm ok +
- I'm ok +
+ I'm ok +
@@ -49,3 +53,11 @@ export default defineComponent({ } }) + + diff --git a/src/breadcrumb/demos/zhCN/index.demo-entry.md b/src/breadcrumb/demos/zhCN/index.demo-entry.md index 55ff2d5e6..d15ebc8dd 100644 --- a/src/breadcrumb/demos/zhCN/index.demo-entry.md +++ b/src/breadcrumb/demos/zhCN/index.demo-entry.md @@ -21,9 +21,11 @@ separator-per-item.vue ### BreadcrumbItem Props -| 名称 | 类型 | 默认值 | 说明 | -| --------- | -------- | ------ | ---------------------- | -| separator | `string` | `'/'` | 面包屑子项之间的分隔符 | +| 名称 | 类型 | 默认值 | 说明 | 版本 | +| --------- | --------- | ----------- | ---------------------- | ------------ | +| clickable | `boolean` | `true` | 是否可点击 | NEXT_VERSION | +| href | `string` | `undefined` | 链接地址 | | +| separator | `string` | `'/'` | 面包屑子项之间的分隔符 | | ### Breadcrumb Slots diff --git a/src/breadcrumb/demos/zhCN/separator-per-item.demo.vue b/src/breadcrumb/demos/zhCN/separator-per-item.demo.vue index 4d5e2f144..673d2c170 100644 --- a/src/breadcrumb/demos/zhCN/separator-per-item.demo.vue +++ b/src/breadcrumb/demos/zhCN/separator-per-item.demo.vue @@ -7,17 +7,14 @@