From 3003d67c4f537c39c58b135e6103e0572f5f3b6f Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Fri, 24 Jun 2022 11:23:36 +0800 Subject: [PATCH 1/7] release 3.2.8 --- CHANGELOG.en-US.md | 13 ++++++++++++- CHANGELOG.zh-CN.md | 11 +++++++++++ package.json | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index a53187e90..27db33789 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -10,6 +10,17 @@ --- +## 3.2.8 + +`2022-06-24` + +- 🌟 Image add scroll wheel to zoom in and out [#5703](https://github.com/vueComponent/ant-design-vue/issues/5703) +- 🌟 ConfigProvider.config added getPopupContainer [62dc24](https://github.com/vueComponent/ant-design-vue/commit/62dc2402f37c0ca0514f5b8fbb363247f0216bb2) +- 🐞 Upload tooltip does not show issues [#5714](https://github.com/vueComponent/ant-design-vue/issues/5714) +- 🐞 Row gutter property type error [#5725](https://github.com/vueComponent/ant-design-vue/issues/5725) +- 🐞 Whether Typography is editable or not, the state is not reset after switching [#5743](https://github.com/vueComponent/ant-design-vue/issues/5743) +- 🐞 In DirectoryTree multi-selection mode, a single node should be selected when clicking (multi-selection only selects multiple nodes when pressing ctrl and shift keys) [#5732](https://github.com/vueComponent/ant-design-vue/ issues/5732) + ## 3.2.7 `2022-06-13` @@ -461,7 +472,7 @@ Github：[https://github.com/surely-vue/table] - 🐞 Fix the problem that TreeSelect selectable and checkable cannot be closed [#4838](https://github.com/vueComponent/ant-design-vue/issues/4838) - 🐞 Fix the problem that Tabs cannot be scrolled on the mobile terminal [#4828](https://github.com/vueComponent/ant-design-vue/issues/4828) - 🐞 Fix InputNumber does not trigger inspection under form [#4831](https://github.com/vueComponent/ant-design-vue/issues/4831) -- 🐞 Fix that when Select uses `` to build a node, the automatic word segmentation fails [#4844](https://github.com/vueComponent/ant-design-vue/issues/4844) +- 🐞 Fix that when Select uses `\` to build a node, the automatic word segmentation fails [#4844](https://github.com/vueComponent/ant-design-vue/issues/4844) ## 3.0.0-alpha.8 diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 90a34e6d4..c31011059 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -10,6 +10,17 @@ --- +## 3.2.8 + +`2022-06-24` + +- 🌟 Image 新增滚轮放大缩小 [#5703](https://github.com/vueComponent/ant-design-vue/issues/5703) +- 🌟 ConfigProvider.config 新增 getPopupContainer [62dc24](https://github.com/vueComponent/ant-design-vue/commit/62dc2402f37c0ca0514f5b8fbb363247f0216bb2) +- 🐞 Upload tooltip 不展示问题 [#5714](https://github.com/vueComponent/ant-design-vue/issues/5714) +- 🐞 Row gutter 属性类型错误 [#5725](https://github.com/vueComponent/ant-design-vue/issues/5725) +- 🐞 Typography 是否可编辑切换后，状态未重置问题 [#5743](https://github.com/vueComponent/ant-design-vue/issues/5743) +- 🐞 DirectoryTree 多选模式下，点击时应该选中单个节点(多选只有配合 ctrl、shift 按键时选中多个节点) [#5732](https://github.com/vueComponent/ant-design-vue/issues/5732) + ## 3.2.7 `2022-06-13` diff --git a/package.json b/package.json index 63f10e4c2..730f28be1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-vue", - "version": "3.2.7", + "version": "3.2.8", "title": "Ant Design Vue", "description": "An enterprise-class UI design language and Vue-based implementation", "keywords": [ From 8a659da84fb8c44620fa279d9d6d73d6bd93d1f7 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 25 Jun 2022 09:29:02 +0800 Subject: [PATCH 2/7] fix: select fash --- components/_util/transition.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/_util/transition.tsx b/components/_util/transition.tsx index 4071cffd2..f65451b58 100644 --- a/components/_util/transition.tsx +++ b/components/_util/transition.tsx @@ -41,7 +41,7 @@ export const getTransitionProps = (transitionName: string, opt: TransitionProps enterActiveClass: `${transitionName}-enter ${transitionName}-enter-prepare`, enterToClass: `${transitionName}-enter ${transitionName}-enter-active`, leaveFromClass: ` ${transitionName}-leave`, - leaveActiveClass: `${transitionName}-leave`, + leaveActiveClass: `${transitionName}-leave ${transitionName}-leave-active`, leaveToClass: `${transitionName}-leave ${transitionName}-leave-active`, ...opt, } From 4c0f6f586584b7ca5dedb9c5c27eacd4ff73f049 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 25 Jun 2022 09:42:30 +0800 Subject: [PATCH 3/7] release 3.2.9 --- CHANGELOG.en-US.md | 6 ++++++ CHANGELOG.zh-CN.md | 6 ++++++ package.json | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 27db33789..d46dde261 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -10,6 +10,12 @@ --- +## 3.2.9 + +`2022-06-25` + +- 🐞 Fix the flickering problem when the Select edge position is closed [8a659d](https://github.com/vueComponent/ant-design-vue/commit/8a659da84fb8c44620fa279d9d6d73d6bd93d1f7) + ## 3.2.8 `2022-06-24` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index c31011059..b35e4cb2c 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -10,6 +10,12 @@ --- +## 3.2.9 + +`2022-06-25` + +- 🐞 修复 Select 边缘位置关闭时闪动问题 [8a659d](https://github.com/vueComponent/ant-design-vue/commit/8a659da84fb8c44620fa279d9d6d73d6bd93d1f7) + ## 3.2.8 `2022-06-24` diff --git a/package.json b/package.json index 730f28be1..8f11afcef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-vue", - "version": "3.2.8", + "version": "3.2.9", "title": "Ant Design Vue", "description": "An enterprise-class UI design language and Vue-based implementation", "keywords": [ From d94fe1c0b22bc8875408cee21cddad488068ed1c Mon Sep 17 00:00:00 2001 From: zhengqbbb <40693636+Zhengqbbb@users.noreply.github.com> Date: Mon, 27 Jun 2022 14:18:30 +0800 Subject: [PATCH 4/7] chore: use `czg` commitizen adapter (#5750) --- package.json | 7 +++++++ scripts/commitizen.js | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 scripts/commitizen.js diff --git a/package.json b/package.json index 8f11afcef..6954a0334 100644 --- a/package.json +++ b/package.json @@ -149,6 +149,7 @@ "cross-env": "^7.0.0", "css-loader": "^5.0.0", "css-minimizer-webpack-plugin": "^3.0.0", + "cz-git": "^1.3.8", "date-fns": "^2.24.0", "diacritics": "^1.3.0", "docsearch.js": "^2.6.3", @@ -298,5 +299,11 @@ "tags": "vetur/tags.json", "attributes": "vetur/attributes.json" }, + "config": { + "commitizen": { + "path": "node_modules/cz-git", + "czConfig": "./scripts/commitizen.js" + } + }, "web-types": "vetur/web-types.json" } diff --git a/scripts/commitizen.js b/scripts/commitizen.js new file mode 100644 index 000000000..a5f9b82e4 --- /dev/null +++ b/scripts/commitizen.js @@ -0,0 +1,25 @@ +'use strict'; + +const { execSync } = require('child_process'); +const fg = require('fast-glob'); + +const components = fg.sync('*', { cwd: 'components', onlyDirectories: true }); +// precomputed scope +const scopeComplete = execSync('git status --porcelain || true') + .toString() + .trim() + .split('\n') + .find(r => ~r.indexOf('M ')) + ?.replace(/(\/)/g, '%%') + ?.match(/components%%((\w|-)*)/)?.[1]; + +/** @type {import('cz-git').CommitizenGitOptions} */ +module.exports = { + scopes: ['site', 'util', 'script', 'tool', ...components], + scopeFilters: ['__tests__', '_util'], + customScopesAlign: !scopeComplete ? 'top' : 'bottom', + defaultScope: scopeComplete, + maxHeaderLength: 100, + allowEmptyIssuePrefixs: false, + allowCustomIssuePrefixs: false, +}; From f672f873dc4f820e3ce530829c0d8dda73d04d8c Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 30 Jun 2022 10:36:33 +0800 Subject: [PATCH 5/7] fix: table ellipsis title not work, close #5755 --- components/vc-table/Cell/index.tsx | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/components/vc-table/Cell/index.tsx b/components/vc-table/Cell/index.tsx index 43172ae79..5e35f0a55 100644 --- a/components/vc-table/Cell/index.tsx +++ b/components/vc-table/Cell/index.tsx @@ -1,7 +1,12 @@ import classNames from '../../_util/classNames'; -import { flattenChildren, isValidElement, parseStyleText } from '../../_util/props-util'; -import type { CSSProperties } from 'vue'; -import { computed, defineComponent, isVNode, renderSlot } from 'vue'; +import { + filterEmpty, + flattenChildren, + isValidElement, + parseStyleText, +} from '../../_util/props-util'; +import type { CSSProperties, VNodeArrayChildren } from 'vue'; +import { Text, computed, defineComponent, isVNode, renderSlot } from 'vue'; import type { DataIndex, @@ -145,6 +150,18 @@ export default defineComponent({ additionalProps?.onMouseleave?.(event); }; + const getTitle = (vnodes: VNodeArrayChildren) => { + const vnode = filterEmpty(vnodes)[0]; + if (isVNode(vnode)) { + if (vnode.type === Text) { + return vnode.children; + } else { + return Array.isArray(vnode.children) ? getTitle(vnode.children) : undefined; + } + } else { + return vnode; + } + }; return () => { const { prefixCls, @@ -298,8 +315,8 @@ export default defineComponent({ if (ellipsisConfig && (ellipsisConfig.showTitle || rowType === 'header')) { if (typeof childNode === 'string' || typeof childNode === 'number') { title = childNode.toString(); - } else if (isVNode(childNode) && typeof childNode.children === 'string') { - title = childNode.children; + } else if (isVNode(childNode)) { + title = getTitle([childNode]); } } From a2690a2d45721d3bae5ddb49d1f408b2512bb505 Mon Sep 17 00:00:00 2001 From: WD Date: Fri, 1 Jul 2022 13:51:21 +0800 Subject: [PATCH 6/7] chore: upgrade vitejs to the latest release version (#5760) --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6954a0334..ce3b2362a 100644 --- a/package.json +++ b/package.json @@ -118,8 +118,8 @@ "@types/postcss-load-config": "^2.0.1", "@typescript-eslint/eslint-plugin": "^5.4.0", "@typescript-eslint/parser": "^5.4.0", - "@vitejs/plugin-vue": "^1.2.4", - "@vitejs/plugin-vue-jsx": "^1.1.6", + "@vitejs/plugin-vue": "^2.3.3", + "@vitejs/plugin-vue-jsx": "^1.3.10", "@vue/babel-plugin-jsx": "^1.0.0", "@vue/cli-plugin-eslint": "^5.0.0-0", "@vue/compiler-sfc": "^3.2.0", @@ -241,7 +241,7 @@ "typescript": "~4.5.2", "umi-request": "^1.3.5", "url-loader": "^3.0.0", - "vite": "^2.3.8", + "vite": "^2.9.13", "vue": "^3.2.0", "vue-antd-md-loader": "^1.2.1-beta.1", "vue-clipboard2": "0.3.3", From 7999a2fef6090444d30e077e4194d72c717f023c Mon Sep 17 00:00:00 2001 From: tys1128 Date: Fri, 1 Jul 2022 13:52:20 +0800 Subject: [PATCH 7/7] fix: add boolean type to autosize prop (#5766) Co-authored-by: oaktian --- components/input/inputProps.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/input/inputProps.ts b/components/input/inputProps.ts index 19933f45c..01f9a7509 100644 --- a/components/input/inputProps.ts +++ b/components/input/inputProps.ts @@ -93,8 +93,8 @@ export interface ShowCountProps { const textAreaProps = () => ({ ...omit(inputProps(), ['prefix', 'addonBefore', 'addonAfter', 'suffix']), rows: Number, - autosize: { type: [Boolean, Object] as PropType, default: undefined }, - autoSize: { type: [Boolean, Object] as PropType, default: undefined }, + autosize: { type: [Boolean, Object] as PropType, default: undefined }, + autoSize: { type: [Boolean, Object] as PropType, default: undefined }, onResize: { type: Function as PropType<(size: { width: number; height: number }) => void> }, onCompositionstart: Function as PropType, onCompositionend: Function as PropType,