diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 32718a94d1..00c687e3b4 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: false +blank_issues_enabled: true contact_links: - name: Create new issue url: https://vuecomponent.github.io/issue-helper/ diff --git a/README-zh_CN.md b/README-zh_CN.md index c672231073..05a8f70302 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -73,6 +73,7 @@ $ yarn add ant-design-vue | [vue-dash-event](https://github.com/vueComponent/vue-dash-event) | 在 DOM 模板中,您可以使用 ant-design-vue 组件的自定义事件(camelCase) | | [@formily/antdv](https://github.com/formilyjs/antdv) | 这是一个结合了 Formily 和 ant-design-vue 的组件库 | | [@ant-design-vue/nuxt](https://github.com/vueComponent/ant-design-vue-nuxt) | ant-design-vue 的 nuxt 模块扩展 | +| [ant-design-x-vue](https://github.com/wzc520pyfm/ant-design-x-vue) | 基于 Ant Design X 设计规范的 Vue AI 界面解决方案 | ## 问答 diff --git a/README.md b/README.md index 853c16791b..3bc3fb0fc3 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ If you are in a bad network environment, you can try other registries and tools | [vue-dash-event](https://github.com/vueComponent/vue-dash-event) | The library function, implemented in the DOM template, can use the custom event of the ant-design-vue component (camelCase) | | [@formily/antdv](https://github.com/formilyjs/antdv) | The Library with Formily and ant-design-vue | | [@ant-design-vue/nuxt](https://github.com/vueComponent/ant-design-vue-nuxt) | A nuxt module for ant-design-vue | +| [ant-design-x-vue](https://github.com/wzc520pyfm/ant-design-x-vue) | A Vue AI interface solutions base on the Ant Design X design specification | ## Donation diff --git a/components/input/index.en-US.md b/components/input/index.en-US.md index a57cd983c2..aa5837ea2b 100644 --- a/components/input/index.en-US.md +++ b/components/input/index.en-US.md @@ -29,7 +29,7 @@ A basic widget for getting the user input is a text field. Keyboard and mouse ca | id | The ID for input | string | | | | maxlength | max length | number | | 1.5.0 | | prefix | The prefix icon for the Input. | string\|slot | | | -| showCount | Whether show text count | boolean | false | 3.0 | +| showCount | Whether show text count | boolean \| { formatter: (info: { value: string, count: number, maxLength?: number }) => string | false | 3.0 | | status | Set validation status | 'error' \| 'warning' | - | 3.3.0 | | size | The size of the input box. Note: in the context of a form, the `middle` size is used. Available: `large` `middle` `small` | string | - | | | suffix | The suffix icon for the Input. | string\|slot | | | @@ -52,7 +52,7 @@ A basic widget for getting the user input is a text field. Keyboard and mouse ca | allowClear | allow to remove input content with clear icon | boolean | | 1.5.0 | | | autosize | Height autosize feature, can be set to `true | false`or an object`{ minRows: 2, maxRows: 6 }` | boolean\|object | false | | | defaultValue | The initial input content | string | | | | -| showCount | Whether show text count | boolean | false | | | +| showCount | Whether show text count | boolean \| { formatter: (info: { value: string, count: number, maxLength?: number }) => string | false | | | | value(v-model) | The input content value | string | | | | ### TextArea Events diff --git a/components/input/index.zh-CN.md b/components/input/index.zh-CN.md index 06489389d4..45e103f9e6 100644 --- a/components/input/index.zh-CN.md +++ b/components/input/index.zh-CN.md @@ -30,7 +30,7 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*sBqqTatJ-AkAAA | id | 输入框的 id | string | | | | maxlength | 最大长度 | number | | 1.5.0 | | prefix | 带有前缀图标的 input | string\|slot | | | -| showCount | 是否展示字数 | boolean | false | 3.0 | +| showCount | 是否展示字数 | boolean \| { formatter: (info: { value: string, count: number, maxLength?: number }) => string } | false | 3.0 | | status | 设置校验状态 | 'error' \| 'warning' | - | 3.3.0 | | size | 控件大小。注:标准表单内的输入框大小限制为 `middle`。可选 `large` `middle` `small` | string | - | | | suffix | 带有后缀图标的 input | string\|slot | | | @@ -53,7 +53,7 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*sBqqTatJ-AkAAA | allowClear | 可以点击清除图标删除内容 | boolean | | 1.5.0 | | | autosize | 自适应内容高度,可设置为 `true | false` 或对象:`{ minRows: 2, maxRows: 6 }` | boolean\|object | false | | | defaultValue | 输入框默认内容 | string | | | | -| showCount | 是否展示字数 | boolean | false | | | +_| showCount | 是否展示字数 | boolean \| { formatter: (info: { value: string, count: number, maxLength?: number }) => string } | false | | |_ | value(v-model) | 输入框内容 | string | | | | ### TextArea 事件 diff --git a/components/mentions/demo/placement.vue b/components/mentions/demo/placement.vue index e2bbb07b74..da0b87c571 100644 --- a/components/mentions/demo/placement.vue +++ b/components/mentions/demo/placement.vue @@ -3,7 +3,7 @@ order: 4 title: zh-CN: 向上展开 - en-US: Placemen + en-US: Placement --- ## zh-CN diff --git a/components/select/index.en-US.md b/components/select/index.en-US.md index 136217e541..4dda321cd0 100644 --- a/components/select/index.en-US.md +++ b/components/select/index.en-US.md @@ -63,7 +63,7 @@ Select component to select value from options. | searchValue | The current input "search" text | string | - | | | showArrow | Whether to show the drop-down arrow | boolean | single:true, multiple:false | | | showSearch | Whether select is searchable | boolean | single:false, multiple:true | | -| size | Size of Select input. `default` `large` `small` | string | default | | +| size | Size of Select input. `middle` `large` `small` | string | middle | | | status | Set validation status | 'error' \| 'warning' | - | 3.3.0 | | suffixIcon | The custom suffix icon | VNode \| slot | - | | | tagRender | Customize tag render, only applies when `mode` is set to `multiple` or `tags` | slot \| (props) => any | - | | diff --git a/components/select/index.zh-CN.md b/components/select/index.zh-CN.md index 7f748d9b53..bb8be2a133 100644 --- a/components/select/index.zh-CN.md +++ b/components/select/index.zh-CN.md @@ -63,7 +63,7 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*5oPiTqPxGAUAAA | searchValue | 控制搜索文本 | string | - | | | showArrow | 是否显示下拉小箭头 | boolean | 单选为 true,多选为 false | | | showSearch | 配置是否可搜索 | boolean | 单选为 false,多选为 true | | -| size | 选择框大小,可选 `large` `small` | string | default | | +| size | 选择框大小,可选 `middle` `large` `small` | string | middle | | | status | 设置校验状态 | 'error' \| 'warning' | - | 3.3.0 | | suffixIcon | 自定义的选择框后缀图标 | VNode \| slot | - | | | tagRender | 自定义 tag 内容 render,仅在 `mode` 为 `multiple` 或 `tags` 时生效 | slot \| (props) => any | - | 3.0 | diff --git a/components/select/style/multiple.ts b/components/select/style/multiple.ts index 70e4aba00b..ee38f0b8e7 100644 --- a/components/select/style/multiple.ts +++ b/components/select/style/multiple.ts @@ -213,7 +213,7 @@ export default function genMultipleStyle(token: SelectToken): CSSInterpolation { [`${componentCls}-multiple${componentCls}-sm`]: { [`${componentCls}-selection-placeholder`]: { insetInlineStart: token.controlPaddingHorizontalSM - token.lineWidth, - insetInlineEnd: 'auto', + insetInlineEnd: token.controlPaddingHorizontalSM - token.lineWidth, }, // https://github.com/ant-design/ant-design/issues/29559 diff --git a/components/table/demo/ajax.vue b/components/table/demo/ajax.vue index 3531b7fbc8..724fdf9085 100644 --- a/components/table/demo/ajax.vue +++ b/components/table/demo/ajax.vue @@ -79,8 +79,9 @@ type APIResult = { }[]; }; -const queryData = (params: APIParams) => { - return axios.get('https://randomuser.me/api?noinfo', { params }); +const queryData = async (params: APIParams) => { + const res = await axios.get('https://randomuser.me/api?noinfo', { params }) + return res.data.results; }; const { @@ -90,7 +91,6 @@ const { current, pageSize, } = usePagination(queryData, { - formatResult: res => res.data.results, pagination: { currentKey: 'page', pageSizeKey: 'results', diff --git a/components/tabs/index.en-US.md b/components/tabs/index.en-US.md index a904080487..fcd1dd31e5 100644 --- a/components/tabs/index.en-US.md +++ b/components/tabs/index.en-US.md @@ -24,6 +24,7 @@ Ant Design has 3 types of Tabs for different situations. | --- | --- | --- | --- | --- | | activeKey(v-model) | Current TabPane's key | string | - | | | animated | Whether to change tabs with animation. Only works while tabPosition=`"top"` \| `"bottom"` | boolean \| {inkBar:boolean, tabPane:boolean} | `true`, `false` when `type="card"` | | +| centered | Whether to display the labels in the center | boolean | false | 3.0 | | destroyInactiveTabPane | Whether destroy inactive TabPane when change tab | boolean | false | | | hideAdd | Hide plus icon or not. Only works while `type="editable-card"` | boolean | `false` | } | | size | preset tab bar size | `large` \| `middle` \| `small` | `middle` | | diff --git a/components/typography/index.zh-CN.md b/components/typography/index.zh-CN.md index 30d47163fe..fae1af19a9 100644 --- a/components/typography/index.zh-CN.md +++ b/components/typography/index.zh-CN.md @@ -72,11 +72,11 @@ coverDark: https://mdn.alipayobjects.com/huamei_7uahnr/afts/img/A*LT2jR41Uj2EAAA | --- | --- | --- | --- | --- | | copyableIcon | 自定义拷贝图标 | `{ copied: boolean }` | `copied ? : ` | | | copyableTooltip | 自定义提示文案,当 `copyable.tooltip = false` 时关闭 | `{ copied: boolean }` | `copied ? '复制成功' : '复制'` | | +| editableEnterIcon | 在编辑段中自定义“enter”图标 | `{className: string}` | `` | 3.0 | | editableIcon | 自定义编辑图标 | - | <EditOutlined /> | | | editableTooltip | 自定义提示文本,当 `editable.tooltip = false` 时关闭 | - | `编辑` | | | ellipsisSymbol | 自定义展开描述文案 | - | - | | | ellipsisTooltip | 省略时,展示提示信息 | - | - | | -| enterEnterIcon | 在编辑段中自定义“enter”图标 | `{className: string}` | `` | 3.0 | ### copyable diff --git a/components/vc-trigger/Popup/Mask.tsx b/components/vc-trigger/Popup/Mask.tsx index 71cdea066c..3ef72bad15 100644 --- a/components/vc-trigger/Popup/Mask.tsx +++ b/components/vc-trigger/Popup/Mask.tsx @@ -30,7 +30,7 @@ export default function Mask(props: MaskProps) { return ( -
+
); } diff --git a/package.json b/package.json index 7e370cdf73..2fb91f6466 100644 --- a/package.json +++ b/package.json @@ -262,7 +262,7 @@ "vue-i18n": "^9.1.7", "vue-infinite-scroll": "^2.0.2", "vue-loader": "^17.0.0", - "vue-request": "^1.0.2", + "vue-request": "^2.0.4", "vue-router": "^4.0.0", "vue-style-loader": "^4.1.2", "vue-tsc": "^1.0.6", diff --git a/site/src/components/antdv-token-previewer/ColorPanel.tsx b/site/src/components/antdv-token-previewer/ColorPanel.tsx index aa7e3fc923..b341ee99f0 100644 --- a/site/src/components/antdv-token-previewer/ColorPanel.tsx +++ b/site/src/components/antdv-token-previewer/ColorPanel.tsx @@ -2,10 +2,11 @@ import type { InputProps } from 'ant-design-vue'; import { ConfigProvider, Input, InputNumber, Select, theme } from 'ant-design-vue'; import classNames from 'ant-design-vue/es/_util/classNames'; import type { PropType } from 'vue'; -import { defineComponent, watchEffect, watch, computed, toRefs, ref } from 'vue'; +import { defineComponent, watchEffect, computed, toRefs, ref } from 'vue'; import { HexColorPicker, RgbaColorPicker } from '../vue-colorful'; import tinycolor from 'tinycolor2'; import makeStyle from './utils/makeStyle'; +import type { ValueType } from 'ant-design-vue/es/input-number/src/utils/MiniDecimal'; const { useToken } = theme; @@ -168,24 +169,42 @@ const RgbColorInput = defineComponent({ setup(props) { const { value, alpha } = toRefs(props); - watch(value, val => { - props.onChange(val); - }); - + const handleChange = (val: ValueType, key: 'r' | 'g' | 'b' | 'a') => { + value.value[key] = val; + props.onChange(value.value); + }; return () => { return (
- + handleChange(val, 'r')} + />
R
- + handleChange(val, 'g')} + />
G
- + handleChange(val, 'b')} + />
B
{alpha.value && ( @@ -195,7 +214,8 @@ const RgbColorInput = defineComponent({ max={1} step={0.01} size="small" - v-model={[value.value.a, 'value']} + value={value.value.a} + onChange={val => handleChange(val, 'a')} />
A
diff --git a/site/src/theme/static/common.less b/site/src/theme/static/common.less index e4b59fc2f8..6d11901e70 100644 --- a/site/src/theme/static/common.less +++ b/site/src/theme/static/common.less @@ -2,7 +2,6 @@ html { &.rtl { direction: rtl; } - scroll-behavior: smooth; } body { pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy