outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'chore/infrastructure-upgrade2' into deploy/dev

Browse Source
This commit is contained in:
Joel 2025-03-21 11:33:13 +08:00
commit 49d71f9935
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/base/emoji-picker/Inner.tsx
View File

@ -72,7 +72,7 @@ const EmojiPickerInner: FC<IEmojiPickerInnerProps> = ({
return <div className={cn(className)}> return <div className={cn(className)}>
<div className='flex w-full flex-col items-center px-3 pb-2'> <div className='flex w-full flex-col items-center px-3 pb-2'>
<div className="relative w-full"> <div className="relative w-full">
<div className="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3"> <div className="pointer-events-none absolute inset-y-0 left-0 z-10 flex items-center pl-3">
<MagnifyingGlassIcon className="h-5 w-5 text-text-quaternary" aria-hidden="true" /> <MagnifyingGlassIcon className="h-5 w-5 text-text-quaternary" aria-hidden="true" />
</div> </div>
<Input <Input

2
web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx
View File

@ -194,7 +194,7 @@ function Form<
)} )}
{tooltipContent} {tooltipContent}
</div> </div>
<div className={`grid-cols- grid${options?.length} gap-3`}> <div className={cn('grid gap-3', `grid-cols-${options?.length}`)}>
{options.filter((option) => { {options.filter((option) => {
if (option.show_on.length) if (option.show_on.length)
return option.show_on.every(showOnItem => value[showOnItem.variable] === showOnItem.value) return option.show_on.every(showOnItem => value[showOnItem.variable] === showOnItem.value)

2
web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-selector.tsx
View File

@ -32,7 +32,7 @@ const Selector: FC<SelectorProps> = ({
return ( return (
<Popover className='relative'> <Popover className='relative'>
<PopoverButton> <PopoverButton as='div'>
{ {
({ open }) => ( ({ open }) => (
<Button className={cn( <Button className={cn(

2
web/eslint.config.mjs
View File

@ -195,9 +195,9 @@ export default combine(
'tailwindcss/no-custom-classname': 'off', 'tailwindcss/no-custom-classname': 'off',
'tailwindcss/no-unnecessary-arbitrary-value': 'off', 'tailwindcss/no-unnecessary-arbitrary-value': 'off',
'tailwindcss/no-arbitrary-value': 'off',
'tailwindcss/classnames-order': 'warn', 'tailwindcss/classnames-order': 'warn',
'tailwindcss/enforces-negative-arbitrary-values': 'warn', 'tailwindcss/enforces-negative-arbitrary-values': 'warn',
'tailwindcss/no-arbitrary-value': 'warn',
'tailwindcss/migration-from-tailwind-2': 'warn', 'tailwindcss/migration-from-tailwind-2': 'warn',
}, },
}, },