Merge branch 'main' into dev1

tusen-ai · Aug 7, 2021 · c2b5858 · c2b5858
2 parents 5ebfc90 + 3d5daa5
commit c2b5858
Show file tree

Hide file tree

Showing 251 changed files with 3,753 additions and 1,163 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,13 +1,108 @@
 # CHANGELOG
 
+## Pending
+
 ### Feats
 
+- `n-message-provider` add `closable` props, closes [#795](https://github.com/TuSimple/naive-ui/issues/795).
 - `n-layout` add `sider-placement` prop, closes [#566](https://github.com/TuSimple/naive-ui/issues/566).
 
+### Fixes
+
+- Fix `n-avatar`'s scale value is incorrect while use v-show, closes [#779](https://github.com/TuSimple/naive-ui/issues/779).
+- Fix `n-menu` show a blue background when click the menu on mobile phone, closes [#799](https://github.com/TuSimple/naive-ui/issues/799).
+- Fix `n-select` filterable select breaks, closes [#510](https://github.com/TuSimple/naive-ui/issues/510).
+
+## 2.16.1 (2020-08-06)
+
+### Feats
+
+- `n-loading-bar` add `loading-bar-style` props, closes [#457](https://github.com/TuSimple/naive-ui/issues/457).
+- `n-button` add `text-color` prop.
+- `n-form` export `FormValidationError` type.
+- `n-popconfirm` support not show action components, closes [#770](https://github.com/TuSimple/naive-ui/issues/770).
+
+### Fixes
+
+- Fix `n-slider` loss floating point decimal precision, closes [#751](https://github.com/TuSimple/naive-ui/issues/751).
+- Fix `n-data-table` `onUpdatePage` and `onUpdatePageSize` not triggered while using jsx.
+- Fix `n-progress`'s `percentage` prop default value doesn't work with different types.
+- Fix `n-select` hide close icon when option is disabled.
+- Fix `n-modal` can't be closed when using custom content, closes [#788](https://github.com/TuSimple/naive-ui/issues/788).
+
+## 2.16.0 (2021-08-02)
+
+### Breaking Changes
+
+- `useLoadingBar`'s `finish` method won't work if no `start` is called.
+- `n-input`'s `type='input'` is renamed to `type='text'`.
+
+### Feats
+
+- `n-scrollbar` add `scrollbarWidth`, `scrollbarHeight` and `scrollbarBorderRadius` common theme variables, closes [#649](https://github.com/TuSimple/naive-ui/issues/649).
+- `n-menu` doesn't should icon placeholder when `render-icon` returns falsy value, closes [#722](https://github.com/TuSimple/naive-ui/issues/722).
+- `n-menu` add `render-extra` prop.
+- `n-select` add `on-clear` prop.
+- `n-form` add `disabled` prop, closes [#538](https://github.com/TuSimple/naive-ui/issues/538).
+- `n-dynamic-tags` add `max` prop.
+
+### Fixes
+
+- Fix `n-dropdown` click exception when using v-for.
+- Fix `n-modal` cannot customize classes when use preset, closes [#744](https://github.com/TuSimple/naive-ui/issues/744).
+- Fix `n-cascader` menu width shifts in virtual scroll mode, closes [#728](https://github.com/TuSimple/naive-ui/issues/728).
+
+## 2.15.11 (2021-07-29)
+
+### Fixes
+
+- Fix `n-data-table` pagination's error.
+
+## 2.15.10 (2021-07-29)
+
+### Feats
+
+- `n-pagination` adds `prev` and `next` slots, ref [#648](https://github.com/TuSimple/naive-ui/issues/648).
+- `n-tag` add `color` prop, closes [#693](https://github.com/TuSimple/naive-ui/issues/693).
+- `n-dynamic-tags` add `color`, closes [#693](https://github.com/TuSimple/naive-ui/issues/693).
+- `n-time-picker` optimization the now button logic, closes [#401](https://github.com/TuSimple/naive-ui/issues/401).
+- `n-pagination` `PaginationInfo` add `itemCount` prop, closes [#585](https://github.com/TuSimple/naive-ui/issues/585).
+- `n-select` add `on-clear` prop.
+
+### Fixes
+
+- Fix `n-message`'s `destroyAll` method doesn't work.
+- Fix `n-timeline`'s header slot is invalid when using alone.
+- Fix `n-select` incorrect style when props has `disabled` and `filterable`, closes [#698](https://github.com/TuSimple/naive-ui/issues/698).
+- Fix `n-upload` operation buttons displayed when has `file-list` & `disabled` props, closes [#668](https://github.com/TuSimple/naive-ui/issues/668).
+
+## 2.15.9 (2021-07-28)
+
+### Feats
+
+- `n-message` add `destroyAll` method.
+- `n-input-number` add `prefix`, `suffix` slots, closes [#609](https://github.com/TuSimple/naive-ui/issues/609).
+
+### Fixes
+
+- Fix `n-message` options' `duration` prop doesn't work.
+
+## 2.15.8 (2021-07-27)
+
+### Feats
+
+- `n-menu` add `expand-icon` prop, closes [#414](https://github.com/TuSimple/naive-ui/issues/414).
+- `n-descriptions`, `n-descriptions-item` add `label-style` and `content-style` props, closes [#536](https://github.com/TuSimple/naive-ui/issues/536).
+
+### Fixes
+
+- Fix `n-data-table` the style penetration of the `n-spin`, closes [#663](https://github.com/TuSimple/naive-ui/issues/663).
+
 ## 2.15.7 (2021-07-25)
 
 ### Feats
 
+- `n-dropdown` add `show-arrow` prop, closes [#647](https://github.com/TuSimple/naive-ui/issues/647).
 - `n-time-picker` add `actions` prop, closes [#401](https://github.com/TuSimple/naive-ui/issues/401).
 - `n-mention` add `render-label` prop.
 - `n-switch` add `checked`, `unchecked` slots.
@@ -81,7 +176,7 @@
 - Fix `n-select` placeholder transition.
 - Fix `n-loading-bar` `useLoadingBar`'s return type can be undefined.
 - Fix `n-tag`'s `type` prop add `primary` type.
-- Fix `n-dynamic-tag`'s `type` prop add `primary` type.
+- Fix `n-dynamic-tags`'s `type` prop add `primary` type.
 
 ## 2.15.4 (2021-07-09)
 

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -1,13 +1,107 @@
 # CHANGELOG
 
+## Pending
+
 ### Feats
 
+- `n-message-provider` 新增 `closable` 属性，关闭 [#795](https://github.com/TuSimple/naive-ui/issues/795)
 - `n-layout` 增加 `sider-placement` 属性，关闭 [#566](https://github.com/TuSimple/naive-ui/issues/566)
 
+### Fixes
+
+- 修复 `n-avatar` 的缩放在使用 `v-show` 时不正确，关闭 [#779](https://github.com/TuSimple/naive-ui/issues/779)
+- 修复 `n-menu` 在手机端点击菜单的时候出现蓝色背景问题，关闭 [#799](https://github.com/TuSimple/naive-ui/issues/799)
+- 修复 `n-select` 可过滤的选择器失效，关闭 [#510](https://github.com/TuSimple/naive-ui/issues/510)
+
+## 2.16.1 (2020-08-06)
+
+### Feats
+
+- `n-loading-bar` 新增 `loading-bar-style` 属性，关闭 [#457](https://github.com/TuSimple/naive-ui/issues/457)
+- `n-button` 新增 `text-color` 属性
+- `n-form` 导出 `FormValidationError` 类型
+- `n-popconfirm` 支持不显示操作组件，关闭 [#770](https://github.com/TuSimple/naive-ui/issues/770)
+
+### Fixes
+
+- 修复 `n-slider` 丢失浮点数小数精度，关闭 [#751](https://github.com/TuSimple/naive-ui/issues/751)
+- 修复 `n-data-table` `onUpdatePage` 和 `onUpdatePageSize` 在使用 jsx 时不触发的问题
+- 修复 `n-progress` 的 `percentage` 属性默认值不能适应多种类型
+- 修复 `n-select` 当选项禁用时未隐藏关闭图标
+- 修复 `n-modal` 使用自定义内容无法正常关闭，关闭 [#788](https://github.com/TuSimple/naive-ui/issues/788)
+
+## 2.16.0 (2021-08-02)
+
+### Breaking Changes
+
+- `useLoadingBar` 中 `finish` 方法只有在调用过 `start` 后才生效
+- `n-input` 的 `type='input'` 被重命名为 `type='text'`
+
+### Feats
+
+- `n-scrollbar` 增加 `scrollbarWidth`、`scrollbarHeight` 和　`scrollbarBorderRadius`　公共主题变量，关闭 [#649](https://github.com/TuSimple/naive-ui/issues/649)
+- `n-menu` 在 `render-icon` 返回 falsy 值的时候不渲染 icon 的占位符，关闭 [#722](https://github.com/TuSimple/naive-ui/issues/722)
+- `n-menu` 新增 `render-extra` 属性
+- `n-select` 新增 `on-clear` 属性
+- `n-form` 增加 `disabled` 属性，关闭 [#538](https://github.com/TuSimple/naive-ui/issues/538)
+- `n-dynamic-tags` 新增 `max` 属性
+
+### Fixes
+
+- 修复 `n-dropdown` 循环渲染时点击异常
+- 修复 `n-modal` 使用预设时无法自定义类，关闭 [#744](https://github.com/TuSimple/naive-ui/issues/744)
+- 修复 `n-cascader` 的菜单虚拟滚动时宽度展示不一致问题，关闭 [#728](https://github.com/TuSimple/naive-ui/issues/728)
+
+## 2.15.11 (2021-07-29)
+
+### Fixes
+
+- 修复 `n-data-table` pagination 的报错
+
+## 2.15.10 (2021-07-29)
+
+### Feats
+
+- `n-pagination` 新增 `prev`、`next` 插槽，有关 [#648](https://github.com/TuSimple/naive-ui/issues/648)
+- `n-tag` 新增 `color`，关闭 [#693](https://github.com/TuSimple/naive-ui/issues/693)
+- `n-dynamic-tags` 新增 `color`，关闭 [#693](https://github.com/TuSimple/naive-ui/issues/693)
+- `n-time-picker` 优化 now 按钮的逻辑，关闭 [#401](https://github.com/TuSimple/naive-ui/issues/401)
+- `n-pagination` `PaginationInfo` 增加 `itemCount` 属性，关闭 [#585](https://github.com/TuSimple/naive-ui/issues/585)
+
+### Fixes
+
+- 修复 `n-message` 的 `destroyAll` 方法不生效
+- 修复 `n-timeline` 的 header slot 单独使用无效的问题
+- 修复 `n-select` 当属性是 `disabled` 和 `filterable` 时样式错误, 关闭 [#698](https://github.com/TuSimple/naive-ui/issues/698)
+- 修复 `n-upload` 拥有 `file-list` & `disabled` 属性时操作按钮仍然显示，关闭 [#668](https://github.com/TuSimple/naive-ui/issues/668)
+
+## 2.15.9 (2021-07-28)
+
+### Feats
+
+- `n-message` 增加 `destroyAll` 方法
+- `n-input-number` 增加 `prefix`、`suffix` slots, 关闭 [#609](https://github.com/TuSimple/naive-ui/issues/609)
+
+### Fixes
+
+- 修复 `n-message` 的 options 中 `duration` 配置无效
+
+## 2.15.8 (2021-07-27)
+
+### Feats
+
+- `n-menu` 新增 `expand-icon` 属性, 关闭 [#414](https://github.com/TuSimple/naive-ui/issues/414)
+- `n-descriptions`，`n-descriptions-item` 增加 `label-style` 和 `content-style` 属性，关闭 [#536](https://github.com/TuSimple/naive-ui/issues/536)
+
+### Fixes
+
+- 修复 `n-data-table` `n-spin`的样式穿透问题，关闭 [#663](https://github.com/TuSimple/naive-ui/issues/663)
+
 ## 2.15.7 (2021-07-25)
 
 ### Feats
 
+- `n-dropdown` 选项新增 `show-arrow`属性，关闭 [#647](https://github.com/TuSimple/naive-ui/issues/647)
 - `n-time-picker` 增加 `actions` 属性, 关闭 [#401](https://github.com/TuSimple/naive-ui/issues/401)
 - `n-mention` 新增 `render-label` 属性
 - `n-switch` 增加 `checked`、`unchecked` 插槽
@@ -81,7 +175,7 @@
 - 修复 `n-select` placeholder transition
 - 修复 `n-loading-bar` `useLoadingBar` 返回类型可能为 undefined
 - 修复 `n-tag` 的 `type` 增加 `primary`　类型
-- 修复 `n-dynamic-tag` 的 `type` 增加 `primary`　类型
+- 修复 `n-dynamic-tags` 的 `type` 增加 `primary`　类型
 
 ## 2.15.4 (2021-07-09)
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,6 +39,8 @@ npm run build:site
 - Don't add period `。` in any description in Chinese API tables (and any log of changelogs).
 - Add space bewteen Chinese and Latin charactors.
 - Don't use Chinese punctuation in English docs.
+- Don't write changelogs in a released version.
+- When rebase the branch, pay attention to whether it is placed in the released version.
 
 For Example:
 
@@ -61,6 +63,18 @@ Chinese Changelog:
 
 Space bewteen Chinese and Latin charactors:
 星之 star 卡比 kirby
+
+Changelog position:
+
+# CHANGELOG
+
+## Pending
+
+### Feats
+
+your changelog
+
+### Fixes
 ```
 
 # 贡献代码
@@ -104,6 +118,8 @@ npm run build:site
 - 不要在中文 API 表和中文的变更日志中加句号
 - 在每一个中文和拉丁字母（数字）之间要加空格
 - 不要在英文文档中使用中文标点
+- 不要写在已经发布的版本中
+- rebase 分支时注意是否放到已发布的版本中
 
 例如:
 
@@ -126,4 +142,16 @@ Chinese Changelog:
 
 中英文之间要加空格：
 星之 star 卡比 kirby
+
+Changelog 位置：
+
+# CHANGELOG
+
+## Pending
+
+### Feats
+
+你的 changelog
+
+### Fixes
 ```
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "naive-ui",
-  "version": "2.15.7",
+  "version": "2.16.1",
   "description": "A Vue 3 Component Library. Fairly Complete, Customizable Themes, Uses TypeScript, Not Too Slow",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -72,9 +72,9 @@
     "@types/jest": "^26.0.20",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
-    "@vicons/fluent": "^0.10.0",
-    "@vicons/ionicons4": "^0.10.0",
-    "@vicons/ionicons5": "^0.10.0",
+    "@vicons/fluent": "^0.11.0",
+    "@vicons/ionicons4": "^0.11.0",
+    "@vicons/ionicons5": "^0.11.0",
     "@vitejs/plugin-vue": "^1.2.1",
     "@vue/compiler-sfc": "^3.0.10",
     "@vue/eslint-config-standard": "^6.0.0",
@@ -93,7 +93,7 @@
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-markdown": "^2.0.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
+    "eslint-plugin-promise": "^5.1.0",
     "eslint-plugin-standard": "^5.0.0",
     "eslint-plugin-vue": "^7.6.0",
     "express": "^4.17.1",

diff --git a/src/_internal/selection/src/Selection.tsx b/src/_internal/selection/src/Selection.tsx
@@ -505,7 +505,7 @@ export default defineComponent({
           ) : (
             <NTag
               size={size}
-              closable
+              closable={!option.disabled}
               disabled={disabled}
               internalStopClickPropagation
               onClose={() => this.handleDeleteOption(option)}

diff --git a/src/_internal/selection/src/styles/index.cssr.ts b/src/_internal/selection/src/styles/index.cssr.ts
@@ -196,6 +196,9 @@ export default c([
         cE('input', `
           cursor: not-allowed;
           color: var(--text-color-disabled);
+        `),
+        cE('render-label', `
+          color: var(--text-color-disabled);
         `)
       ]),
       cB('base-selection-tags', `