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

feature(select): 【全部】选项文案需要支持自定义 #2208

Open
wants to merge 7 commits into
base: staging
Choose a base branch
from
Open

feature(select): 【全部】选项文案需要支持自定义 #2208

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
014f239
feature: upload组件预览事件提供文件列表数据
lhzzforever Nov 21, 2024
dd45776
fix: 自定义tag标签，标签内容中间有空格按enter保存后空格会被替换掉
lhzzforever Nov 22, 2024
d97a064
fix: 兼容tagInput的selectedTag是string或者object多种场景
lhzzforever Nov 22, 2024
bd32603
fix:兼容tagInput的selectedTag是string或者object多种场景
lhzzforever Nov 28, 2024
fd81d9e
Merge branch 'upstream/staging' into dev/develop_staging
lhzzforever Nov 28, 2024
87b8dcb
feature(select): 【全部】选项文案需要支持自定义
lhzzforever Dec 5, 2024
8c7d94e
merge: 合并主分支
lhzzforever Dec 13, 2024
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
8 changes: 3 additions & 5 deletions packages/tag-input/src/tag-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,8 @@ export default defineComponent({
}
return true;
};

const isObject = typeof item === 'object';
newValue = isObject ? item[saveKey] : item.trim();
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

企业微信截图_35d426cb-22be-472c-b9cf-7047b3edad3d

根据 type 已经可以确认值类型了，这个判断也可以加同时 type 看看是不是可以省略

// 自定义
if (type === 'custom') {
// 自定义时，如果配置分隔符可以一次性输入多个值
Expand All @@ -792,8 +793,6 @@ export default defineComponent({
isSelected = true;
}
} else {
const isObject = typeof item === 'object';
newValue = isObject ? item[saveKey] : item.trim();
// newValue = newValue.replace(/\s+/g, '');
if (!!newValue && !tagList.value.includes(newValue) && validateTag(newValue)) {
const localItem =
Expand All @@ -803,8 +802,7 @@ export default defineComponent({
}
}
} else if (item) {
newValue = item[saveKey];
if (newValue !== undefined && !tagList.value.includes(newValue)) {
if (!!newValue && !tagList.value.includes(newValue)) {
listState.selectedTagList.splice(targetIndex, 0, item);
isSelected = true;
}
Expand Down