Skip to content

Commit

Permalink
fix(pro:tag-select): tag data remove confirm should be configuarable (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
sallerli1 authored Apr 24, 2024
1 parent d80987d commit 659b1f7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions packages/pro/tag-select/docs/Api.zh.md
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
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
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

0 comments on commit 659b1f7

Please sign in to comment.