youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-04 17:38:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/parent-child-retrieval

Browse Source
This commit is contained in:
NFish
2024-12-17 10:46:17 +08:00
parent 493ec06e95 56cfdce453
commit 84641b6fd6
31 changed files with 364 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/components/base/app-icon/index.tsx
View File

@ -3,7 +3,6 @@
import type { FC } from 'react'
import { init } from 'emoji-mart'
import data from '@emoji-mart/data'
import Image from 'next/image'
import { cva } from 'class-variance-authority'
import type { AppIconType } from '@/types/app'
import classNames from '@/utils/classnames'
@ -62,7 +61,8 @@ const AppIcon: FC<AppIconProps> = ({
onClick={onClick}
>
{isValidImageIcon
? <Image src={imageUrl} className="w-full h-full" alt="app icon" />
// eslint-disable-next-line @next/next/no-img-element
? <img src={imageUrl} className="w-full h-full" alt="app icon" />
: (innerIcon || ((icon && icon !== '') ? <em-emoji id={icon} /> : <em-emoji id='🤖' />))
}
</span>

5
web/app/components/base/checkbox/index.tsx
View File

@ -1,6 +1,6 @@
import { RiCheckLine } from '@remixicon/react'
import cn from '@/utils/classnames'
import s from './index.module.css'
type CheckboxProps = {
checked?: boolean
@ -10,14 +10,13 @@ type CheckboxProps = {
mixed?: boolean
}
const Checkbox = ({ checked, onCheck, className, disabled, mixed }: CheckboxProps) => {
const Checkbox = ({ checked, onCheck, className, disabled }: CheckboxProps) => {
if (!checked) {
return (
<div
className={cn(
'w-4 h-4 rounded-[4px] bg-components-checkbox-bg-unchecked border border-components-checkbox-border hover:bg-components-checkbox-bg-unchecked-hover hover:border-components-checkbox-border-hover shadow-xs cursor-pointer',
disabled && 'border-components-checkbox-border-disabled bg-components-checkbox-bg-disabled hover:border-components-checkbox-border-disabled hover:bg-components-checkbox-bg-disabled cursor-not-allowed',
mixed && s.mixed,
className,
)}
onClick={() => {

2
web/app/components/base/drawer/index.tsx
View File

@ -51,7 +51,7 @@ export default function Drawer({
<Dialog.Overlay
className={cn('z-40 fixed inset-0', mask && 'bg-black bg-opacity-30')}
/>
<div className={cn('relative z-50 flex flex-col justify-between bg-components-panel-bg w-full max-w-sm p-6 overflow-hidden text-left align-middle shadow-xl shadow-shadow-shadow-5', panelClassname)}>
<div className={cn('relative z-50 flex flex-col justify-between bg-background-body w-full max-w-sm p-6 overflow-hidden text-left align-middle shadow-xl', panelClassname)}>
<>
{title && <Dialog.Title
as="h3"

2
web/app/components/base/toast/index.tsx
View File

@ -130,7 +130,7 @@ Toast.notify = ({
root.render(
<ToastContext.Provider value={{
notify: () => { },
notify: () => {},
close: () => {
if (holder) {
root.unmount()