Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(pro:tag-select): tag data remove confirm should be configuarable #1905

Merged
merged 1 commit into from
Apr 24, 2024
Merged

fix(pro:tag-select): tag data remove confirm should be configuarable #1905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/pro/tag-select/docs/Api.zh.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
| `dataEditable` | 标签数据是否可以编辑 | `boolean` | `true` | - | 配置true则可以在下拉面板的选项末尾点击编辑图标进行编辑 |
| `disabled` | 是否禁用 | `boolean` | `false` | - | - |
| `confirmBeforeSelect` | 是否在选择标签之后需要确认 | `boolean \| 'force'` | `false` | - | 配置true或者force时，选择标签后会弹出一个浮层进行确定或者取消，配置force则强制必须确定或者取消才能进行下一步 |
| `confirmBeforeDataRemove` | 是否在删除标签数据时需要确认 | `boolean` | `false` | - | 配置true时，删除标签数据会弹出一个弹窗进行确定或者取消 |
| `createdTagDataModifier` | 修改创建的标签数据 | `(data: TagSelectData) => TagSelectData` | - | - | 标签创建时，会随机选择一个内置的颜色，可以通过该函数修改内部创建的数据 |
| `maxTags` | 选择框内展示的标签最大数量 | `number \| 'responsive'` | `Number.MAX_SAFE_INTEGER` | - | - |
| `tagsLimit` | 可以选择的标签最大数量 | `number` | `Number.MAX_SAFE_INTEGER` | - | - |
Expand Down
6 changes: 6 additions & 0 deletions packages/pro/tag-select/src/composables/useRemoveConfirm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ export function useRemoveConfirm(
return Promise.resolve(false)
}

if (!props.confirmBeforeDataRemove) {
removeData(data)
handleRemove(data.key)
return Promise.resolve(true)
}

setLocked(true)
setDataToRemove(data)
setModalVisible(true)
Expand Down
1 change: 1 addition & 0 deletions packages/pro/tag-select/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const proTagSelectProps = {
dataEditable: { type: Boolean, default: true },
disabled: { type: Boolean, default: false },
confirmBeforeSelect: { type: [Boolean, String] as PropType<boolean | 'force'>, default: false },
confirmBeforeDataRemove: { type: Boolean, default: true },
maxTags: { type: [Number, String] as PropType<number | 'responsive'>, default: Number.MAX_SAFE_INTEGER },
tagsLimit: { type: Number, default: Number.MAX_SAFE_INTEGER },
tagDataLimit: { type: Number, default: Number.MAX_SAFE_INTEGER },
Expand Down