Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix: correct schedule trigger labels and theme colors (#42665)

yyh4ee809516112
diff --git a/web/app/components/base/date-and-time-picker/time-picker/index.tsx b/web/app/components/base/date-and-time-picker/time-picker/index.tsx
index db2e82b9c98..5b76c54c73b 100644
--- a/web/app/components/base/date-and-time-picker/time-picker/index.tsx
+++ b/web/app/components/base/date-and-time-picker/time-picker/index.tsx
@@ -18,6 +18,7 @@ const to24Hour = (hour12: string, period: Period) => {
}
const TimePicker = ({
+ id,
value,
timezone,
placeholder,
@@ -200,6 +201,7 @@ const TimePicker = ({
return (
<input
+ id={id}
className="flex-1 cursor-pointer appearance-none truncate bg-transparent p-1 system-xs-regular text-components-input-text-filled outline-hidden select-none placeholder:text-components-input-text-placeholder"
readOnly
value={open ? '' : displayValue}
diff --git a/web/app/components/base/date-and-time-picker/types.ts b/web/app/components/base/date-and-time-picker/types.ts
index 080acbc3ad0..9ac351daad5 100644
--- a/web/app/components/base/date-and-time-picker/types.ts
+++ b/web/app/components/base/date-and-time-picker/types.ts
@@ -62,6 +62,7 @@ export type TriggerParams = {
onClick: (e: React.MouseEvent) => void
}
export type TimePickerProps = {
+ id?: string
value: Dayjs | string | undefined
timezone?: string
placeholder?: string
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx
index 9daac325b26..91470c231eb 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx
@@ -58,11 +58,13 @@ const FrequencySelector = ({ frequency, onChange }: FrequencySelectorProps) => {
value={frequency}
onValueChange={handleFrequencyChange}
>
- <SelectLabel className="sr-only">{fieldLabel}</SelectLabel>
- <SelectTrigger className="w-full py-2">
- {selectedFrequency?.name ??
- t(($) => $['nodes.triggerSchedule.selectFrequency'], { ns: 'workflow' })}
- </SelectTrigger>
+ <div className="flex flex-col gap-2">
+ <SelectLabel className="py-0 text-xs">{fieldLabel}</SelectLabel>
+ <SelectTrigger className="w-full py-2">
+ {selectedFrequency?.name ??
+ t(($) => $['nodes.triggerSchedule.selectFrequency'], { ns: 'workflow' })}
+ </SelectTrigger>
+ </div>
<SelectContent>
<SelectGroup>
<SelectGroupLabel>{groupLabel}</SelectGroupLabel>
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
index 7254de1f316..911338b4a3f 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
@@ -92,7 +92,7 @@ const MonthlyDaysSelector = ({ selectedDays, onChange }: MonthlyDaysSelectorProp
{/* Warning message for day 31 - aligned with grid */}
{selectedDays?.includes(31) && (
<div className="mt-1.5 grid grid-cols-7 gap-1.5">
- <div className="col-span-7 text-xs text-gray-500">
+ <div className="col-span-7 text-xs text-text-tertiary">
{t(($) => $['nodes.triggerSchedule.lastDayTooltip'], { ns: 'workflow' })}
</div>
</div>
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx
index 05aae1a1dc6..fcf8b3b8ff3 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx
@@ -18,9 +18,9 @@ const NextExecutionTimes = ({ data }: NextExecutionTimesProps) => {
return (
<div className="space-y-2">
- <label className="block text-xs font-medium text-gray-500">
+ <div className="text-xs font-medium text-text-secondary">
{t(($) => $['nodes.triggerSchedule.nextExecutionTimes'], { ns: 'workflow' })}
- </label>
+ </div>
<div className="flex min-h-20 flex-col rounded-xl bg-components-input-bg-normal py-2">
{executionTimes.map((time, index) => (
<div key={index} className="flex items-baseline text-xs">
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx
index 3b93cfbc76d..915003679ad 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/on-minute-selector.tsx
@@ -18,8 +18,15 @@ const OnMinuteSelector = ({ value = 0, onChange }: OnMinuteSelectorProps) => {
const { t } = useTranslation()
return (
- <Slider className="block" value={value} min={0} max={59} step={1} onValueChange={onChange}>
- <SliderLabel className="mb-2 block py-0 text-xs font-medium text-gray-500">
+ <Slider
+ className="flex flex-col gap-2"
+ value={value}
+ min={0}
+ max={59}
+ step={1}
+ onValueChange={onChange}
+ >
+ <SliderLabel className="py-0 text-xs">
{t(($) => $['nodes.triggerSchedule.onMinute'], { ns: 'workflow' })}
</SliderLabel>
<div className="relative flex h-8 items-center rounded-lg bg-components-input-bg-normal">
diff --git a/web/app/components/workflow/nodes/trigger-schedule/panel.tsx b/web/app/components/workflow/nodes/trigger-schedule/panel.tsx
index 838e4d740e5..eab5622adf3 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/panel.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/panel.tsx
@@ -1,11 +1,12 @@
import type { FC } from 'react'
import type { ScheduleTriggerNodeType } from './types'
import type { NodePanelProps } from '@/app/components/workflow/types'
+import { Field, FieldLabel } from '@langgenius/dify-ui/field'
import { Input } from '@langgenius/dify-ui/input'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
import TimePicker from '@/app/components/base/date-and-time-picker/time-picker'
-import Field from '@/app/components/workflow/nodes/_base/components/field'
+import WorkflowField from '@/app/components/workflow/nodes/_base/components/field'
import FrequencySelector from './components/frequency-selector'
import ModeToggle from './components/mode-toggle'
import MonthlyDaysSelector from './components/monthly-days-selector'
@@ -18,7 +19,7 @@ const i18nPrefix = 'nodes.triggerSchedule'
const Panel: FC<NodePanelProps<ScheduleTriggerNodeType>> = ({ id, data }) => {
const { t } = useTranslation()
- const cronExpressionId = React.useId()
+ const timeInputId = React.useId()
const {
inputs,
setInputs,
@@ -33,7 +34,7 @@ const Panel: FC<NodePanelProps<ScheduleTriggerNodeType>> = ({ id, data }) => {
return (
<div className="mt-2">
<div className="space-y-4 px-4 pt-2 pb-3">
- <Field
+ <WorkflowField
title={t(($) => $[`${i18nPrefix}.title`], { ns: 'workflow' })}
operations={<ModeToggle mode={inputs.mode} onChange={handleModeChange} />}
>
@@ -41,15 +42,10 @@ const Panel: FC<NodePanelProps<ScheduleTriggerNodeType>> = ({ id, data }) => {
{inputs.mode === 'visual' && (
<div className="space-y-3">
<div className="grid grid-cols-3 gap-3">
- <div>
- <label className="mb-2 block text-xs font-medium text-gray-500">
- {t(($) => $['nodes.triggerSchedule.frequencyLabel'], { ns: 'workflow' })}
- </label>
- <FrequencySelector
- frequency={inputs.frequency || 'daily'}
- onChange={handleFrequencyChange}
- />
- </div>
+ <FrequencySelector
+ frequency={inputs.frequency || 'daily'}
+ onChange={handleFrequencyChange}
+ />
<div className="col-span-2">
{inputs.frequency === 'hourly' ? (
<OnMinuteSelector
@@ -58,10 +54,14 @@ const Panel: FC<NodePanelProps<ScheduleTriggerNodeType>> = ({ id, data }) => {
/>
) : (
<>
- <label className="mb-2 block text-xs font-medium text-gray-500">
+ <label
+ htmlFor={timeInputId}
+ className="mb-2 block text-xs font-medium text-text-secondary"
+ >
{t(($) => $['nodes.triggerSchedule.time'], { ns: 'workflow' })}
</label>
<TimePicker
+ id={timeInputId}
notClearable={true}
timezone={inputs.timezone}
value={inputs.visual_config?.time || '12:00 AM'}
@@ -111,26 +111,20 @@ const Panel: FC<NodePanelProps<ScheduleTriggerNodeType>> = ({ id, data }) => {
)}
{inputs.mode === 'cron' && (
- <div className="space-y-2">
- <div>
- <label
- htmlFor={cronExpressionId}
- className="mb-2 block text-xs font-medium text-gray-500"
- >
- {t(($) => $['nodes.triggerSchedule.cronExpression'], { ns: 'workflow' })}
- </label>
- <Input
- id={cronExpressionId}
- value={inputs.cron_expression || ''}
- onValueChange={(value) => handleCronExpressionChange(value)}
- placeholder="0 0 * * *"
- className="font-mono"
- />
- </div>
- </div>
+ <Field className="gap-2">
+ <FieldLabel className="py-0 text-xs">
+ {t(($) => $['nodes.triggerSchedule.cronExpression'], { ns: 'workflow' })}
+ </FieldLabel>
+ <Input
+ value={inputs.cron_expression || ''}
+ onValueChange={(value) => handleCronExpressionChange(value)}
+ placeholder="0 0 * * *"
+ className="font-mono"
+ />
+ </Field>
)}
</div>
- </Field>
+ </WorkflowField>
<div className="border-t border-divider-subtle"></div>