From ae451b71df35f9c37ac0066d32fb4de78cda62e1 Mon Sep 17 00:00:00 2001 From: bqy_fe <1743369777@qq.com> Date: Sun, 14 Aug 2022 09:04:17 +0800 Subject: [PATCH 01/50] feat(props-util): [filterEmpty] support handle nested fragment (#5890) --- components/_util/props-util/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/_util/props-util/index.js b/components/_util/props-util/index.js index 49d54cd24..d67820cd9 100644 --- a/components/_util/props-util/index.js +++ b/components/_util/props-util/index.js @@ -361,8 +361,8 @@ export function filterEmpty(children = []) { children.forEach(child => { if (Array.isArray(child)) { res.push(...child); - } else if (child.type === Fragment) { - res.push(...child.children); + } else if (child?.type === Fragment) { + res.push(...filterEmpty(child.children)); } else { res.push(child); } From 2a3798e9b4aa684c7cb4b46d1cf2b2bd2f250904 Mon Sep 17 00:00:00 2001 From: bqy_fe <1743369777@qq.com> Date: Mon, 22 Aug 2022 08:59:35 +0800 Subject: [PATCH 02/50] docs(form): fix typo (#5896) --- components/form/index.en-US.md | 2 +- components/form/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md index 674b32243..0f71cbadf 100644 --- a/components/form/index.en-US.md +++ b/components/form/index.en-US.md @@ -111,7 +111,7 @@ But it also has some disadvantages: ``` -As above Form.Item does not know whether to collect `name="a"` or `name=`b\`\`, you can solve this kind of problem in the following two ways: +As above Form.Item does not know whether to collect `name="a"` or `name="b"`, you can solve this kind of problem in the following two ways: The first is to use multiple `a-form-item`: diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md index 29f79c85e..a59ac13e8 100644 --- a/components/form/index.zh-CN.md +++ b/components/form/index.zh-CN.md @@ -110,7 +110,7 @@ cover: https://gw.alipayobjects.com/zos/alicdn/ORmcdeaoO/Form.svg ``` -如上 Form.Item 并不知道需要收集 `name="a"` 还是 `name=`b\`\`，你可以通过如下三种方式去解决此类问题： +如上 Form.Item 并不知道需要收集 `name="a"` 还是 `name="b"`，你可以通过如下三种方式去解决此类问题： 第一种，使用多个 `a-form-item`: From 6feda7be81c38de1a43d7fb52fe9dffec1a2212a Mon Sep 17 00:00:00 2001 From: Airene Fang Date: Thu, 25 Aug 2022 11:07:49 +0800 Subject: [PATCH 03/50] fix generate web-types.json bug (#5674) set the wrong default value by parse md table error. --- antd-tools/generator-types/src/parser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antd-tools/generator-types/src/parser.ts b/antd-tools/generator-types/src/parser.ts index a09bc250d..964b09516 100644 --- a/antd-tools/generator-types/src/parser.ts +++ b/antd-tools/generator-types/src/parser.ts @@ -25,7 +25,7 @@ function readLine(input: string) { } function splitTableLine(line: string) { - line = line.replace('\\|', 'JOIN'); + line = line.replace(/\\\|/g, 'JOIN'); const items = line.split('|').map(item => item.trim().replace('JOIN', '|')); From b53a5de6dc308918b105dfbf459cd71e3ad54c22 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 1 Sep 2022 10:43:28 +0800 Subject: [PATCH 04/50] doc: add jeecg sponsors --- README-zh_CN.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README-zh_CN.md b/README-zh_CN.md index 79e32e814..7e209e324 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -86,7 +86,7 @@ ant-design-vue 是 MIT 协议的开源项目。为了项目能够更好的持续 Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/ant-design-vue#sponsor)] - + ## Backers diff --git a/README.md b/README.md index 00762a174..f9f558b15 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ ant-design-vue is an MIT-licensed open source project. In order to achieve bette Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/ant-design-vue#sponsor)] - + ## [More Sponsor (From Patreon、alipay、wechat、paypal...)](https://github.com/vueComponent/ant-design-vue/blob/master/BACKERS.md) From 00422ac77b9dc2cc249d54e6ffd554b11f598b76 Mon Sep 17 00:00:00 2001 From: Peritot Chan Date: Thu, 1 Sep 2022 11:03:29 +0800 Subject: [PATCH 05/50] fix: config provider theme active color not same in variable.less (#5929) --- components/config-provider/cssVariables.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/config-provider/cssVariables.tsx b/components/config-provider/cssVariables.tsx index 471b61492..4d1140e1f 100644 --- a/components/config-provider/cssVariables.tsx +++ b/components/config-provider/cssVariables.tsx @@ -28,7 +28,7 @@ export function registerTheme(globalPrefixCls: string, theme: Theme) { variables[`${type}-color`] = formatColor(baseColor); variables[`${type}-color-disabled`] = colorPalettes[1]; variables[`${type}-color-hover`] = colorPalettes[4]; - variables[`${type}-color-active`] = colorPalettes[7]; + variables[`${type}-color-active`] = colorPalettes[6]; variables[`${type}-color-outline`] = baseColor.clone().setAlpha(0.2).toRgbString(); variables[`${type}-color-deprecated-bg`] = colorPalettes[1]; variables[`${type}-color-deprecated-border`] = colorPalettes[3]; From 187f3b8c079486c8064cfbbc8ea5389383c1a575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=88=9C=E5=B2=B3?= <1277952981@qq.com> Date: Thu, 1 Sep 2022 14:03:53 +0800 Subject: [PATCH 06/50] fix: fix table container z-index (#5786) --- components/table/style/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/table/style/index.less b/components/table/style/index.less index 2974f34c6..1f200c719 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -642,7 +642,7 @@ position: absolute; top: 0; bottom: 0; - z-index: 1; + z-index: @zindex-table-fixed; width: 30px; transition: box-shadow 0.3s; content: ''; From d48cd8ef57d9a9b31a387a5efbd1cf5c9f05ea12 Mon Sep 17 00:00:00 2001 From: atom <76482041+atom-git@users.noreply.github.com> Date: Thu, 1 Sep 2022 14:09:07 +0800 Subject: [PATCH 07/50] feat: copyable stopPropagation #5746 (#5769) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 分离copyable按钮动作，不再冒泡至父级组件 * Update interactive.vue Co-authored-by: tangjinzhou <415800467@qq.com> --- components/typography/Base.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/typography/Base.tsx b/components/typography/Base.tsx index 2650871ec..d4761ff57 100644 --- a/components/typography/Base.tsx +++ b/components/typography/Base.tsx @@ -233,6 +233,7 @@ const Base = defineComponent({ // ================ Copy ================ function onCopyClick(e: MouseEvent) { e.preventDefault(); + e.stopPropagation(); const { copyable } = props; const copyConfig = { From 0f11e4ecd42a658fd1756f52445260acb2bcc83b Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 1 Sep 2022 16:11:01 +0800 Subject: [PATCH 08/50] fix: descriptionsItem labelStyle not work, close #5920 --- components/descriptions/Row.tsx | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/components/descriptions/Row.tsx b/components/descriptions/Row.tsx index 0f0e7055c..a2c1820a5 100644 --- a/components/descriptions/Row.tsx +++ b/components/descriptions/Row.tsx @@ -1,8 +1,7 @@ import Cell from './Cell'; import { getSlot, getClass, getStyle } from '../_util/props-util'; -import type { FunctionalComponent, VNode } from 'vue'; +import type { CSSProperties, FunctionalComponent, VNode } from 'vue'; import { inject, ref } from 'vue'; -import type { DescriptionsContextProp } from './index'; import { descriptionsContext } from './index'; interface CellConfig { @@ -32,29 +31,29 @@ const Row: FunctionalComponent = props => { showContent, labelStyle: rootLabelStyle, contentStyle: rootContentStyle, - }: CellConfig & DescriptionsContextProp, + }: CellConfig & { labelStyle?: CSSProperties; contentStyle?: CSSProperties }, ) => { return items.map((item, index) => { + const itemProps = item.props || {}; const { prefixCls: itemPrefixCls = prefixCls, span = 1, - labelStyle, - contentStyle, + labelStyle = itemProps['label-style'], + contentStyle = itemProps['content-style'], label = (item.children as any)?.label?.(), - } = item.props || {}; + } = itemProps; const children = getSlot(item); const className = getClass(item); const style = getStyle(item); const { key } = item; - if (typeof component === 'string') { return ( = props => { = props => { = props => { component: 'th', type: 'label', showLabel: true, - labelStyle, - contentStyle, + labelStyle: labelStyle.value, + contentStyle: contentStyle.value, })} @@ -114,8 +113,8 @@ const Row: FunctionalComponent = props => { component: 'td', type: 'content', showContent: true, - labelStyle, - contentStyle, + labelStyle: labelStyle.value, + contentStyle: contentStyle.value, })} @@ -129,8 +128,8 @@ const Row: FunctionalComponent = props => { type: 'item', showLabel: true, showContent: true, - labelStyle, - contentStyle, + labelStyle: labelStyle.value, + contentStyle: contentStyle.value, })} ); From 1177c336cba4ca6f227d528484601e31f584e543 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Fri, 2 Sep 2022 14:37:20 +0800 Subject: [PATCH 09/50] doc: add jeecg sponser --- site/src/layouts/Footer.vue | 15 ++++++++------- site/src/vueDocs/sponsor.en-US.md | 2 +- site/src/vueDocs/sponsor.zh-CN.md | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/site/src/layouts/Footer.vue b/site/src/layouts/Footer.vue index baf9b6a74..1fa5a0467 100644 --- a/site/src/layouts/Footer.vue +++ b/site/src/layouts/Footer.vue @@ -63,6 +63,9 @@

{{ isCN ? '友情链接' : 'Links' }}

+
+ Jeecg +
Vue
@@ -75,9 +78,6 @@ -
- 砰砰鱼 -
@@ -114,17 +114,18 @@ diff --git a/components/cascader/demo/tagRender.vue b/components/cascader/demo/tagRender.vue new file mode 100644 index 000000000..3052c3445 --- /dev/null +++ b/components/cascader/demo/tagRender.vue @@ -0,0 +1,91 @@ + +--- +order: 10 +title: + zh-CN: 自定义 tag 内容 + en-US: The custom tag +--- + + + + + diff --git a/components/cascader/index.tsx b/components/cascader/index.tsx index 44ba2625b..9328736c8 100644 --- a/components/cascader/index.tsx +++ b/components/cascader/index.tsx @@ -281,6 +281,7 @@ const Cascader = defineComponent({ ...slots, checkable: () => , }} + tagRender={props.tagRender || slots.tagRender} displayRender={props.displayRender || slots.displayRender} maxTagPlaceholder={props.maxTagPlaceholder || slots.maxTagPlaceholder} showArrow={props.showArrow} From 8318b731b461df73ffd97406dec4cc3adcb520a5 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Mon, 26 Sep 2022 22:15:38 +0800 Subject: [PATCH 19/50] docs: update add accept info, close #5986 --- components/upload/index.en-US.md | 6 +++++- components/upload/index.zh-CN.md | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/components/upload/index.en-US.md b/components/upload/index.en-US.md index 760340835..6d45f8304 100644 --- a/components/upload/index.en-US.md +++ b/components/upload/index.en-US.md @@ -44,7 +44,7 @@ Uploading is the process of publishing information (web pages, text, pictures, v | previewIcon | custom preview icon | v-slot:iconRender="{file: UploadFile}" | - | 3.0 | | | progress | Custom progress bar | [ProgressProps](/components/progress/#API) (support `type="line"` only) | { strokeWidth: 2, showInfo: false } | 3.0 | | | removeIcon | custom remove icon | v-slot:iconRender="{file: UploadFile}" | - | 3.0 | | -| showUploadList | Whether to show default upload list, could be an object to specify `showPreviewIcon`, `showRemoveIcon` and `showDownloadIcon` individually | Boolean or { showPreviewIcon?: boolean, showRemoveIcon?: boolean, showDownloadIcon?: boolean } | true | showDownloadIcon(3.0) | | +| showUploadList | Whether to show default upload list, could be an object to specify `showPreviewIcon`, `showRemoveIcon` and `showDownloadIcon` individually | Boolean or { showPreviewIcon?: boolean, showRemoveIcon?: boolean, showDownloadIcon?: boolean } | true | showDownloadIcon(3.0) | | | supportServerRender | Need to be turned on while the server side is rendering. | boolean | false | | | | withCredentials | ajax upload with cookie sent | boolean | false | | | @@ -110,6 +110,10 @@ When uploading state change, it returns: - You can consult [jQuery-File-Upload](https://github.com/blueimp/jQuery-File-Upload/wiki#server-side) about how to implement server side upload interface. - There is a mock example of [express](https://github.com/react-component/upload/blob/master/server.js) in rc-upload. +### How to select albums or folders on mobile devices? + +You can set `:accept="null"` + ### I want to display download links. Please set property `url` of each item in `fileList` to control content of link. diff --git a/components/upload/index.zh-CN.md b/components/upload/index.zh-CN.md index ea55e6603..5f9fb5a6a 100644 --- a/components/upload/index.zh-CN.md +++ b/components/upload/index.zh-CN.md @@ -110,6 +110,10 @@ cover: https://gw.alipayobjects.com/zos/alicdn/QaeBt_ZMg/Upload.svg - 服务端上传接口实现可以参考 [jQuery-File-Upload](https://github.com/blueimp/jQuery-File-Upload/wiki#server-side)。 - 如果要做本地 mock 可以参考这个 [express 的例子](https://github.com/react-component/upload/blob/master/server.js)。 +### 手机设备如何选择相册或文件夹？ + +你可以设置 `:accept="null"` + ### 如何显示下载链接？ 请使用 fileList 属性设置数组项的 url 属性进行展示控制。 From 714a6f4764b030916ccf883edd561bd9dd0f419c Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 27 Sep 2022 10:49:49 +0800 Subject: [PATCH 20/50] fix: transfer delete error, close #5975 --- components/transfer/ListBody.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/transfer/ListBody.tsx b/components/transfer/ListBody.tsx index 0423abc01..0136bf207 100644 --- a/components/transfer/ListBody.tsx +++ b/components/transfer/ListBody.tsx @@ -55,7 +55,7 @@ const ListBody = defineComponent({ }; const handleItemRemove = (item: TransferItem) => { - emit('itemRemove', item.key); + emit('itemRemove', [item.key]); }; const handleScroll = (e: Event) => { From 23a83688947020342f3f579d0c334e13e3046b9c Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Wed, 28 Sep 2022 13:54:45 +0800 Subject: [PATCH 21/50] docs: fix site error, close #5993 --- package.json | 5 +++-- tsconfig.json | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 88ff7ea4c..e4b719331 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,7 @@ "@types/postcss-load-config": "^2.0.1", "@typescript-eslint/eslint-plugin": "^5.4.0", "@typescript-eslint/parser": "^5.4.0", + "@vitejs/plugin-legacy": "^2.2.0", "@vitejs/plugin-vue": "^3.0.0", "@vitejs/plugin-vue-jsx": "^2.0.0", "@vue/babel-plugin-jsx": "^1.0.0", @@ -256,13 +257,13 @@ "vue-eslint-parser": "^8.0.0", "vue-i18n": "^9.1.7", "vue-infinite-scroll": "^2.0.2", - "vue-loader": "^16.1.1", + "vue-loader": "^17.0.0", "vue-request": "^1.0.2", "vue-router": "^4.0.0", "vue-server-renderer": "^2.6.11", "vue-style-loader": "^4.1.2", "vue-tsc": "^0.34.15", - "vuex": "^4.0.0-beta.2", + "vuex": "^4.0.0", "webpack": "^5.0.0", "webpack-bundle-analyzer": "^4.4.2", "webpack-cli": "^4.6.0", diff --git a/tsconfig.json b/tsconfig.json index bd9ecb7a1..7b8e0b492 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,7 +14,8 @@ "noUnusedParameters": true, "noUnusedLocals": true, "noImplicitAny": false, - "target": "es6", + "target": "esnext", + "module": "esnext", "skipLibCheck": true, "allowJs": true, "importsNotUsedAsValues": "preserve" From 775e48d428f68ad343e4950a3520858b78c578e8 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 4 Oct 2022 11:15:12 +0800 Subject: [PATCH 22/50] fix: table fixed shadow error, close #5996 --- components/vc-table/Table.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/components/vc-table/Table.tsx b/components/vc-table/Table.tsx index 2574d8b57..6259cb138 100644 --- a/components/vc-table/Table.tsx +++ b/components/vc-table/Table.tsx @@ -490,11 +490,15 @@ export default defineComponent>({ }, 100); }; - watch([horizonScroll, () => props.data, () => props.columns], () => { - if (horizonScroll.value) { - triggerOnScroll(); - } - }); + watch( + [horizonScroll, () => props.data, () => props.columns], + () => { + if (horizonScroll.value) { + triggerOnScroll(); + } + }, + { flush: 'post' }, + ); const [scrollbarSize, setScrollbarSize] = useState(0); useProvideSticky(); From af756de1f35e0bed9d834f09a6af98bc0f2b333d Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Tue, 4 Oct 2022 14:50:15 +0800 Subject: [PATCH 23/50] test: update snap --- .../__tests__/__snapshots__/demo.test.js.snap | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/components/cascader/__tests__/__snapshots__/demo.test.js.snap b/components/cascader/__tests__/__snapshots__/demo.test.js.snap index 67102bc6b..9cee6bb7b 100644 --- a/components/cascader/__tests__/__snapshots__/demo.test.js.snap +++ b/components/cascader/__tests__/__snapshots__/demo.test.js.snap @@ -166,3 +166,21 @@ exports[`renders ./components/cascader/demo/suffix.vue correctly 1`] = ` `; + +exports[`renders ./components/cascader/demo/tagRender.vue correctly 1`] = ` +
+ + +
+
+ +
+
+
+ +
Please select +
+ + +
+`; From aea54ac7ad4c578690454506f25cd5cb7a6963c3 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 8 Oct 2022 14:26:21 +0800 Subject: [PATCH 24/50] fix: defaultXXX error in fieldNames, close #6007 --- components/tree/DirectoryTree.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/tree/DirectoryTree.tsx b/components/tree/DirectoryTree.tsx index b34f7a095..12704f593 100644 --- a/components/tree/DirectoryTree.tsx +++ b/components/tree/DirectoryTree.tsx @@ -79,7 +79,7 @@ export default defineComponent({ const lastSelectedKey = ref(); const cachedSelectedKeys = ref(); - + const fieldNames = computed(() => fillFieldNames(props.fieldNames)); const treeRef = ref(); expose({ selectedKeys: computed(() => treeRef.value?.selectedKeys), @@ -90,7 +90,9 @@ export default defineComponent({ expandedKeys: computed(() => treeRef.value?.expandedKeys), }); const getInitExpandedKeys = () => { - const { keyEntities } = convertDataToEntities(treeData.value); + const { keyEntities } = convertDataToEntities(treeData.value, { + fieldNames: fieldNames.value, + }); let initExpandedKeys: any; @@ -181,7 +183,6 @@ export default defineComponent({ emit('doubleclick', event, node); emit('dblclick', event, node); }; - const fieldNames = computed(() => fillFieldNames(props.fieldNames)); const onSelect = ( keys: Key[], event: { From 7923c25e4f743938feeda6190eba6a0db11bf60e Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 8 Oct 2022 14:36:33 +0800 Subject: [PATCH 25/50] release 3.2.13 --- CHANGELOG.en-US.md | 13 +++++++++++++ CHANGELOG.zh-CN.md | 13 +++++++++++++ package.json | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 80945b556..3a4f0c991 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -10,6 +10,19 @@ --- +## 3.2.13 + +`2022-10-08` + +- 🌟 Support Vue 3 upgrade tool `@vue/compat` [#5973](https://github.com/vueComponent/ant-design-vue/issues/5973) +- 🌟 Cascader add tagRender slot [#5954](https://github.com/vueComponent/ant-design-vue/issues/5954) +- 🐞 Fix image flickering issue when Image preview is closed [#5955](https://github.com/vueComponent/ant-design-vue/issues/5955) +- 🐞 Fix Tag close icon style display misplaced [#5956](https://github.com/vueComponent/ant-design-vue/issues/5956) +- 🐞 Fix Table loading property ts type error [#5964](https://github.com/vueComponent/ant-design-vue/issues/5964) +- 🐞 Fix Transfer deletion exception [#5975](https://github.com/vueComponent/ant-design-vue/issues/5975) +- 🐞 Fix the scroll shadow display issue of Table fixed column [#5996](https://github.com/vueComponent/ant-design-vue/issues/5996) +- 🐞 Fix DirectoryTree's default expansion failure issue when customizing fieldNames [#6007](https://github.com/vueComponent/ant-design-vue/issues/6007) + ## 3.2.12 `2022-09-02` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 248ced739..232902e4c 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -10,6 +10,19 @@ --- +## 3.2.13 + +`2022-10-08` + +- 🌟 支持 Vue 3 升级工具 `@vue/compat` [#5973](https://github.com/vueComponent/ant-design-vue/issues/5973) +- 🌟 Cascader 添加 tagRender 插槽 [#5954](https://github.com/vueComponent/ant-design-vue/issues/5954) +- 🐞 修复 Image 预览关闭时，图片闪动问题 [#5955](https://github.com/vueComponent/ant-design-vue/issues/5955) +- 🐞 修复 Tag 关闭图标样式显示错位 [#5956](https://github.com/vueComponent/ant-design-vue/issues/5956) +- 🐞 修复 Table loading 属性 ts 类型错误 [#5964](https://github.com/vueComponent/ant-design-vue/issues/5964) +- 🐞 修复 Transfer 删除异常问题 [#5975](https://github.com/vueComponent/ant-design-vue/issues/5975) +- 🐞 修复 Table 固定列的滚动阴影显示问题 [#5996](https://github.com/vueComponent/ant-design-vue/issues/5996) +- 🐞 修复 DirectoryTree 在自定义 fieldNames 时，默认展开失效问题 [#6007](https://github.com/vueComponent/ant-design-vue/issues/6007) + ## 3.2.12 `2022-09-02` diff --git a/package.json b/package.json index e4b719331..b8e5ff0a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-vue", - "version": "3.2.12", + "version": "3.2.13", "title": "Ant Design Vue", "description": "An enterprise-class UI design language and Vue-based implementation", "keywords": [ From bc5dc845ac5dac402a56ccaa8e8c7276e8f5d977 Mon Sep 17 00:00:00 2001 From: 24min <948615201@qq.com> Date: Wed, 12 Oct 2022 22:40:12 +0800 Subject: [PATCH 26/50] docs: remove one of openFileDialogOnClick props in docs (#6019) --- components/upload/index.en-US.md | 1 - components/upload/index.zh-CN.md | 1 - 2 files changed, 2 deletions(-) diff --git a/components/upload/index.en-US.md b/components/upload/index.en-US.md index 6d45f8304..910480abd 100644 --- a/components/upload/index.en-US.md +++ b/components/upload/index.en-US.md @@ -38,7 +38,6 @@ Uploading is the process of publishing information (web pages, text, pictures, v | method | http method of upload request | string | `post` | 1.5.0 | | | multiple | Whether to support selected multiple file. `IE10+` supported. You can select multiple files with CTRL holding down while multiple is set to be true | boolean | false | | | | name | The name of uploading file | string | `file` | | | -| openFileDialogOnClick | click open file dialog | boolean | true | | | | openFileDialogOnClick | Click open file dialog | boolean | true | 3.0 | | | previewFile | Customize preview file logic | (file: File \| Blob) => Promise<dataURL: string> | - | 1.5.0 | | | previewIcon | custom preview icon | v-slot:iconRender="{file: UploadFile}" | - | 3.0 | | diff --git a/components/upload/index.zh-CN.md b/components/upload/index.zh-CN.md index 5f9fb5a6a..5fea7076f 100644 --- a/components/upload/index.zh-CN.md +++ b/components/upload/index.zh-CN.md @@ -38,7 +38,6 @@ cover: https://gw.alipayobjects.com/zos/alicdn/QaeBt_ZMg/Upload.svg | method | 上传请求的 http method | string | `post` | 1.5.0 | | | multiple | 是否支持多选文件，`ie10+` 支持。开启后按住 ctrl 可选择多个文件。 | boolean | false | | | | name | 发到后台的文件参数名 | string | `file` | | | -| openFileDialogOnClick | 点击打开文件对话框 | boolean | true | | | | openFileDialogOnClick | 点击打开文件对话框 | boolean | true | 3.0 | | | previewFile | 自定义文件预览逻辑 | (file: File \| Blob) => Promise<dataURL: string> | 无 | 1.5.0 | | | previewIcon | 自定义预览 icon | v-slot:iconRender="{file: UploadFile}" | - | 3.0 | | From d7f78435c178209061197113aa178a2d96db4e90 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 13 Oct 2022 09:35:04 +0800 Subject: [PATCH 27/50] chore: update vue tsc --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8e5ff0a4..5712c5086 100644 --- a/package.json +++ b/package.json @@ -262,7 +262,7 @@ "vue-router": "^4.0.0", "vue-server-renderer": "^2.6.11", "vue-style-loader": "^4.1.2", - "vue-tsc": "^0.34.15", + "vue-tsc": "^1.0.6", "vuex": "^4.0.0", "webpack": "^5.0.0", "webpack-bundle-analyzer": "^4.4.2", From d0eebf37912287f673c72446cf6170e19a2e70dc Mon Sep 17 00:00:00 2001 From: lyn <76365499@qq.com> Date: Fri, 21 Oct 2022 14:36:33 +0800 Subject: [PATCH 28/50] docs: Update index.en-US.md (#6040) --- components/config-provider/index.en-US.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/config-provider/index.en-US.md b/components/config-provider/index.en-US.md index bbf89aa2c..ddb3ea1a6 100644 --- a/components/config-provider/index.en-US.md +++ b/components/config-provider/index.en-US.md @@ -59,7 +59,7 @@ Some components use dynamic style to support wave effect. You can config `csp` p | locale | language package setting, you can find the packages in [ant-design-vue/es/locale](http://unpkg.com/ant-design-vue/es/locale/) | object | - | 1.5.0 | | pageHeader | Unify the ghost of pageHeader ,Ref [pageHeader]\(<(/components/page-header)> | { ghost:boolean } | 'true' | 1.5.0 | | prefixCls | set prefix class | string | ant | | -| renderEmpty | set empty content of components. Ref [Empty](/components/empty/) | slot-scope \| Function(componentName: string): ReactNode | - | | +| renderEmpty | set empty content of components. Ref [Empty](/components/empty/) | slot-scope \| Function(componentName: string): VNode | - | | | space | Set Space `size`, ref [Space](/components/space) | { size: `small` \| `middle` \| `large` \| `number` } | - | 3.0 | | transformCellText | Table data can be changed again before rendering. The default configuration of general user empty data. | Function({ text, column, record, index }) => any | - | 1.5.4 | | virtual | Disable virtual scroll when set to false | boolean | true | 3.0 | From a69a7ff82adbe444ca9fead8fbde7bbbb5efa002 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=8C=AA?= <2668923029@qq.com> Date: Fri, 21 Oct 2022 14:38:10 +0800 Subject: [PATCH 29/50] fix: Style variables describe error , close #6009 (#6027) Co-authored-by: wanjun.shi --- site/src/vueDocs/customize-theme.en-US.md | 2 +- site/src/vueDocs/customize-theme.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/vueDocs/customize-theme.en-US.md b/site/src/vueDocs/customize-theme.en-US.md index 3a921184a..fe4550da5 100644 --- a/site/src/vueDocs/customize-theme.en-US.md +++ b/site/src/vueDocs/customize-theme.en-US.md @@ -23,7 +23,7 @@ There are some major variables below, all less variables could be found in [Defa @text-color: rgba(0, 0, 0, 0.85); // major text color @text-color-secondary: rgba(0, 0, 0, 0.45); // secondary text color @disabled-color: rgba(0, 0, 0, 0.25); // disable state color -@border-radius-base: 4px; // major border radius +@border-radius-base: 2px; // major border radius @border-color-base: #d9d9d9; // major border color @box-shadow-base: 0 2px 8px rgba(0, 0, 0, 0.15); // major shadow for layers ``` diff --git a/site/src/vueDocs/customize-theme.zh-CN.md b/site/src/vueDocs/customize-theme.zh-CN.md index f8fbcf8d7..4a471975c 100644 --- a/site/src/vueDocs/customize-theme.zh-CN.md +++ b/site/src/vueDocs/customize-theme.zh-CN.md @@ -23,7 +23,7 @@ antd 的样式使用了 [Less](http://lesscss.org/) 作为开发语言，并定 @text-color: rgba(0, 0, 0, 0.65); // 主文本色 @text-color-secondary: rgba(0, 0, 0, 0.45); // 次文本色 @disabled-color: rgba(0, 0, 0, 0.25); // 失效色 -@border-radius-base: 4px; // 组件/浮层圆角 +@border-radius-base: 2px; // 组件/浮层圆角 @border-color-base: #d9d9d9; // 边框色 @box-shadow-base: 0 2px 8px rgba(0, 0, 0, 0.15); // 浮层阴影 ``` From 4201c923b524539227f97ddcd1464c3103e25a53 Mon Sep 17 00:00:00 2001 From: Li kang <89369648+yixiangbudao@users.noreply.github.com> Date: Fri, 21 Oct 2022 14:38:57 +0800 Subject: [PATCH 30/50] docs(Badge) Change the description of the text attribute of the Badge component document (#6012) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 更改Badge组件文档text属性说明 * 更改Avatar组件文档crossOrigin属性说明 Co-authored-by: 吴亚丹 --- components/avatar/index.en-US.md | 2 +- components/avatar/index.zh-CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/avatar/index.en-US.md b/components/avatar/index.en-US.md index cdf8f23a1..90bdf08fc 100644 --- a/components/avatar/index.en-US.md +++ b/components/avatar/index.en-US.md @@ -14,7 +14,7 @@ Avatars can be used to represent people or objects. It supports images, `Icon`s, | Property | Description | Type | Default | Version | | --- | --- | --- | --- | --- | | alt | This attribute defines the alternative text describing the image | string | - | | -| crossOrigin | CORS settings attributes | `'anonymous'` \| `'use-credentials'` \| `''` | - | 3.0 | +| crossOrigin | cors settings attributes | `'anonymous'` \| `'use-credentials'` \| `''` | - | 3.0 | | draggable | Whether the picture is allowed to be dragged | boolean \| `'true'` \| `'false'` | - | 2.2.0 | | gap | Letter type unit distance between left and right sides | number | 4 | 2.2.0 | | icon | the `Icon` type for an icon avatar, see `Icon` Component | VNode \| slot | - | | diff --git a/components/avatar/index.zh-CN.md b/components/avatar/index.zh-CN.md index a5a0aaff8..4eae59b5b 100644 --- a/components/avatar/index.zh-CN.md +++ b/components/avatar/index.zh-CN.md @@ -19,7 +19,7 @@ cover: https://gw.alipayobjects.com/zos/antfincdn/aBcnbw68hP/Avatar.svg | 参数 | 说明 | 类型 | 默认值 | 版本 | | --- | --- | --- | --- | --- | | alt | 图像无法显示时的替代文本 | string | - | | -| crossOrigin | CORS 属性设置 | `'anonymous'` \| `'use-credentials'` \| `''` | - | 3.0 | +| crossOrigin | cors 属性设置 | `'anonymous'` \| `'use-credentials'` \| `''` | - | 3.0 | | draggable | 图片是否允许拖动 | boolean \| `'true'` \| `'false'` | - | 2.2.0 | | gap | 字符类型距离左右两侧边界单位像素 | number | 4 | 2.2.0 | | icon | 设置头像的图标类型，可设为 Icon 的 `type` 或 VNode | VNode \| slot | - | | From e10b659aac82c38d5072761a938eb74c0ec7b4d2 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 27 Oct 2022 11:20:00 +0800 Subject: [PATCH 31/50] docs: add survey --- site/index.html | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/site/index.html b/site/index.html index c48101c01..4f74ad425 100644 --- a/site/index.html +++ b/site/index.html @@ -62,27 +62,25 @@ gtag('config', 'UA-151755889-1'); - - +
+ From 2a30de162c0e34b6e1d8719bb885961c2a219b63 Mon Sep 17 00:00:00 2001 From: Remx Xu <2011150269@email.szu.edu.cn> Date: Fri, 28 Oct 2022 08:58:35 +0800 Subject: [PATCH 32/50] fix typo (#6047) --- components/form/demo/customized-form-controls.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/form/demo/customized-form-controls.vue b/components/form/demo/customized-form-controls.vue index 203fd1fc3..9d8f9f23c 100644 --- a/components/form/demo/customized-form-controls.vue +++ b/components/form/demo/customized-form-controls.vue @@ -28,7 +28,7 @@ Controls must injects `useInjectFormItemContext` and calls the corresponding met diff --git a/site/src/layouts/Menu.vue b/site/src/layouts/Menu.vue index afb5027f7..dded6def7 100644 --- a/site/src/layouts/Menu.vue +++ b/site/src/layouts/Menu.vue @@ -10,6 +10,29 @@ {{ isZhCN ? '组件总览' : 'Components Overview' }} + + + + Surely Table + + + + + Surely Form + + + +