mirrors/teable
1
0
Fork 0
mirror of https://github.com/teableio/teable synced 2024-11-23 07:51:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: user tag style (#843)

Browse Source 
* fix: user tag display

* fix: convert multiplevalue should delelte the filter item
This commit is contained in:
Mike 2024-08-19 13:50:18 +07:00 committed by GitHub
parent f27e398a97
commit f82bebdfc1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/nestjs-backend/src/features/field/field-calculate/field-converting.service.ts
View File

@ -1262,13 +1262,14 @@ export class FieldConvertingService {
return;
}
await this.convertSelectChoiceOps(views, tableId, fieldId, updateNameOptions, deleteOptions);
return;
}
// judge the operator is same groups or cellValueType is same, otherwise delete the filter
// judge the operator is same groups or cellValueType is same, otherwise delete the filter item
if (
newField.type !== oldField.type &&
!isEqual(oldOperators, newOperators) &&
oldField.cellValueType !== newField.cellValueType
(newField.type !== oldField.type && !isEqual(oldOperators, newOperators)) ||
oldField.cellValueType !== newField.cellValueType ||
oldField?.isMultipleCellValue !== newField?.isMultipleCellValue
) {
for (let i = 0; i < views.length; i++) {
const viewId = views[i].id;

4
packages/sdk/src/components/cell-value/cell-user/UserTag.tsx
View File

@ -13,9 +13,9 @@ export const UserTag = (props: IUserTag) => {
const { name, avatar, suffix, className } = props;
return (
<div className={cn('flex items-center text-sm flex-1 truncate', className)}>
<div className={cn('flex items-center text-sm', className)}>
<UserAvatar name={name} avatar={avatar} />
<div className="-ml-3 flex flex-1 items-center overflow-hidden rounded-[6px] bg-secondary pl-4 pr-2 text-secondary-foreground">
<div className="-ml-3 flex items-center overflow-hidden rounded-[6px] bg-secondary pl-4 pr-2 text-secondary-foreground">
<p className="flex-1 truncate" title={name}>
{name}
</p>

1
packages/sdk/src/components/filter/view-filter/component/FilterUserSelect.tsx
View File

@ -82,6 +82,7 @@ const FilterUserSelectBase = (props: IFilterUserBaseProps) => {
)
}
name={option.label}
className="flex-1 truncate"
/>
</div>
</div>