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

Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox

Browse Source
This commit is contained in:
yyh
2026-02-09 18:43:04 +08:00
parent ef2fabc158 e0fcf33979
commit db0c527ce8
920 changed files with 4057 additions and 3430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/components/base/chat/embedded-chatbot/chat-wrapper.tsx
View File

@ -253,7 +253,7 @@ const ChatWrapper = () => {
background={appData?.site.icon_background}
imageUrl={appData?.site.icon_url}
/>
<div className="body-lg-regular grow rounded-2xl bg-chat-bubble-bg px-4 py-3 text-text-primary">
<div className="grow rounded-2xl bg-chat-bubble-bg px-4 py-3 text-text-primary body-lg-regular">
<Markdown content={welcomeMessage.content} />
<SuggestedQuestions item={welcomeMessage} />
</div>
@ -271,7 +271,7 @@ const ChatWrapper = () => {
imageUrl={appData?.site.icon_url}
/>
<div className="max-w-[768px] px-4">
<Markdown className="!body-2xl-regular !text-text-tertiary" content={welcomeMessage.content} />
<Markdown className="!text-text-tertiary !body-2xl-regular" content={welcomeMessage.content} />
</div>
</div>
)

4
web/app/components/base/chat/embedded-chatbot/header/index.tsx
View File

@ -93,7 +93,7 @@ const Header: FC<IHeaderProps> = ({
'flex shrink-0 items-center gap-1.5 px-2',
)}
>
<div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
<div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
{
systemFeatures.branding.enabled && systemFeatures.branding.workspace_logo
? <img src={systemFeatures.branding.workspace_logo} alt="logo" className="block h-5 w-auto" />
@ -147,7 +147,7 @@ const Header: FC<IHeaderProps> = ({
<div className="flex grow items-center space-x-3">
{customerIcon}
<div
className="system-md-semibold truncate"
className="truncate system-md-semibold"
style={CssTransform(theme?.colorFontOnHeaderStyle ?? '')}
>
{title}

2
web/app/components/base/chat/embedded-chatbot/index.tsx
View File

@ -81,7 +81,7 @@ const Chatbot = () => {
'flex shrink-0 items-center gap-1.5 px-2',
)}
>
<div className="system-2xs-medium-uppercase text-text-tertiary">{t('chat.poweredBy', { ns: 'share' })}</div>
<div className="text-text-tertiary system-2xs-medium-uppercase">{t('chat.poweredBy', { ns: 'share' })}</div>
{
systemFeatures.branding.enabled && systemFeatures.branding.workspace_logo
? <img src={systemFeatures.branding.workspace_logo} alt="logo" className="block h-5 w-auto" />

6
web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx
View File

@ -48,9 +48,9 @@ const InputsFormContent = ({ showTip }: Props) => {
<div key={form.variable} className="space-y-1">
{form.type !== InputVarType.checkbox && (
<div className="flex h-6 items-center gap-1">
<div className="system-md-semibold text-text-secondary">{form.label}</div>
<div className="text-text-secondary system-md-semibold">{form.label}</div>
{!form.required && (
<div className="system-xs-regular text-text-tertiary">{t('panel.optional', { ns: 'workflow' })}</div>
<div className="text-text-tertiary system-xs-regular">{t('panel.optional', { ns: 'workflow' })}</div>
)}
</div>
)}
@ -134,7 +134,7 @@ const InputsFormContent = ({ showTip }: Props) => {
</div>
))}
{showTip && (
<div className="system-xs-regular text-text-tertiary">{t('chat.chatFormTip', { ns: 'share' })}</div>
<div className="text-text-tertiary system-xs-regular">{t('chat.chatFormTip', { ns: 'share' })}</div>
)}
</div>
)

2
web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
View File

@ -47,7 +47,7 @@ const InputsFormNode = ({
)}
>
<Message3Fill className="h-6 w-6 shrink-0" />
<div className="system-xl-semibold grow text-text-secondary">{t('chat.chatSettingsTitle', { ns: 'share' })}</div>
<div className="grow text-text-secondary system-xl-semibold">{t('chat.chatSettingsTitle', { ns: 'share' })}</div>
{collapsed && (
<Button className="uppercase text-text-tertiary" size="small" variant="ghost" onClick={() => setCollapsed(false)}>{t('operation.edit', { ns: 'common' })}</Button>
)}

2
web/app/components/base/chat/embedded-chatbot/inputs-form/view-form-dropdown.tsx
View File

@ -37,7 +37,7 @@ const ViewFormDropdown = ({ iconColor }: Props) => {
<div className="w-[400px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg backdrop-blur-sm">
<div className="flex items-center gap-3 rounded-t-2xl border-b border-divider-subtle px-6 py-4">
<Message3Fill className="h-6 w-6 shrink-0" />
<div className="system-xl-semibold grow text-text-secondary">{t('chat.chatSettingsTitle', { ns: 'share' })}</div>
<div className="grow text-text-secondary system-xl-semibold">{t('chat.chatSettingsTitle', { ns: 'share' })}</div>
</div>
<div className="p-6">
<InputsFormContent />