ngskcloud
/
gcgj-dify-1.7.0
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 073ed54bb0 into bb33335dd4

Browse Source
pull/21192/merge
Anton Kovalev 7 months ago committed by GitHub
parent bb33335dd4 073ed54bb0
commit 74c425d940
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
23 changed files with 81 additions and 8 deletions
Show Stats Download Patch File Download Diff File

28
web/app/components/app/configuration/config-var/config-modal/index.tsx
Unescape Escape View File

@ -20,6 +20,7 @@ import FileUploadSetting from '@/app/components/workflow/nodes/_base/components/
import Checkbox from '@/app/components/base/checkbox'
import { DEFAULT_FILE_UPLOAD_SETTING } from '@/app/components/workflow/constants'
import { DEFAULT_VALUE_MAX_LEN } from '@/config'
import { SimpleSelect } from '@/app/components/base/select'
const TEXT_MAX_LENGTH = 256
@ -234,9 +235,30 @@ const ConfigModal: FC<IConfigModalProps> = ({
)}
{type === InputVarType.select && (
<Field title={t('appDebug.variableConfig.options')}>
<ConfigSelect options={options || []} onChange={handlePayloadChange('options')} />
</Field>
<>
<Field title={t('appDebug.variableConfig.options')}>
<ConfigSelect options={options || []} onChange={handlePayloadChange('options')} />
</Field>
{options && options.length > 0 && (
<Field title={t('appDebug.variableConfig.defaultValue')}>
<SimpleSelect
key={`default-select-${options.join('-')}`}
className="w-full"
items={[
{ value: '', name: t('appDebug.variableConfig.noDefaultValue') },
...options.filter(opt => opt.trim() !== '').map(option => ({
value: option,
name: option,
})),
]}
defaultValue={tempPayload.default || ''}
onSelect={item => handlePayloadChange('default')(item.value === '' ? undefined : item.value)}
placeholder={t('appDebug.variableConfig.selectDefaultValue')}
allowSearch={false}
/>
</Field>
)}
</>
)}
{[InputVarType.singleFile, InputVarType.multiFiles].includes(type) && (

2
web/app/components/base/chat/chat-with-history/hooks.tsx
Unescape Escape View File

@ -211,7 +211,7 @@ export const useChatWithHistory = (installedAppInfo?: InstalledApp) => {
const isInputInOptions = item.select.options.includes(initInputs[item.select.variable])
return {
...item.select,
default: (isInputInOptions ? initInputs[item.select.variable] : undefined) || item.default,
default: (isInputInOptions ? initInputs[item.select.variable] : undefined) || item.select.default,
type: 'select',
}
}

2
web/app/components/base/chat/chat-with-history/inputs-form/content.tsx
Unescape Escape View File

@ -73,7 +73,7 @@ const InputsFormContent = ({ showTip }: Props) => {
{form.type === InputVarType.select && (
<PortalSelect
popupClassName='w-[200px]'
value={inputsFormValue?.[form.variable]}
value={inputsFormValue?.[form.variable] ?? form.default ?? ''}
items={form.options.map((option: string) => ({ value: option, name: option }))}
onSelect={item => handleFormChange(form.variable, item.value as string)}
placeholder={form.label}

2
web/app/components/base/chat/embedded-chatbot/hooks.tsx
Unescape Escape View File

@ -199,7 +199,7 @@ export const useEmbeddedChatbot = () => {
const isInputInOptions = item.select.options.includes(initInputs[item.select.variable])
return {
...item.select,
default: (isInputInOptions ? initInputs[item.select.variable] : undefined) || item.default,
default: (isInputInOptions ? initInputs[item.select.variable] : undefined) || item.select.default,
type: 'select',
}
}

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

@ -73,7 +73,7 @@ const InputsFormContent = ({ showTip }: Props) => {
{form.type === InputVarType.select && (
<PortalSelect
popupClassName='w-[200px]'
value={inputsFormValue?.[form.variable]}
value={inputsFormValue?.[form.variable] ?? form.default ?? ''}
items={form.options.map((option: string) => ({ value: option, name: option }))}
onSelect={item => handleFormChange(form.variable, item.value as string)}
placeholder={form.label}

2
web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
Unescape Escape View File

@ -158,7 +158,7 @@ const FormItem: FC<Props> = ({
type === InputVarType.select && (
<Select
className="w-full"
defaultValue={value || ''}
defaultValue={value || payload.default || ''}
items={payload.options?.map(option => ({ name: option, value: option })) || []}
onSelect={i => onChange(i.value)}
allowSearch={false}

3
web/i18n/de-DE/app-debug.ts
Unescape Escape View File

@ -261,6 +261,9 @@ const translation = {
options: 'Optionen',
addOption: 'Option hinzufügen',
apiBasedVar: 'API-basierte Variable',
defaultValue: 'Standardwert',
noDefaultValue: 'Kein Standardwert',
selectDefaultValue: 'Standardwert auswählen',
},
vision: {
name: 'Vision',

3
web/i18n/en-US/app-debug.ts
Unescape Escape View File

@ -404,6 +404,9 @@ const translation = {
atLeastOneOption: 'At least one option is required',
optionRepeat: 'Has repeat options',
},
'defaultValue': 'Default value',
'noDefaultValue': 'No default value',
'selectDefaultValue': 'Select default value',
},
vision: {
name: 'Vision',

3
web/i18n/es-ES/app-debug.ts
Unescape Escape View File

@ -288,6 +288,9 @@ const translation = {
atLeastOneOption: 'Se requiere al menos una opción',
optionRepeat: 'Hay opciones repetidas',
},
'defaultValue': 'Valor predeterminado',
'noDefaultValue': 'Sin valor predeterminado',
'selectDefaultValue': 'Seleccionar valor predeterminado',
},
vision: {
name: 'Visión',

3
web/i18n/fr-FR/app-debug.ts
Unescape Escape View File

@ -276,6 +276,9 @@ const translation = {
atLeastOneOption: 'At least one option is required',
optionRepeat: 'Has repeat options',
},
'defaultValue': 'Valeur par défaut',
'noDefaultValue': 'Aucune valeur par défaut',
'selectDefaultValue': 'Sélectionner la valeur par défaut',
},
vision: {
name: 'Vision',

3
web/i18n/hi-IN/app-debug.ts
Unescape Escape View File

@ -320,6 +320,9 @@ const translation = {
atLeastOneOption: 'कम से कम एक विकल्प आवश्यक है',
optionRepeat: 'विकल्प दोहराए गए हैं',
},
'defaultValue': 'डिफ़ॉल्ट मान',
'noDefaultValue': 'कोई डिफ़ॉल्ट मान नहीं',
'selectDefaultValue': 'डिफ़ॉल्ट मान चुनें',
},
vision: {
name: 'विजन',

3
web/i18n/it-IT/app-debug.ts
Unescape Escape View File

@ -322,6 +322,9 @@ const translation = {
atLeastOneOption: 'È richiesta almeno un\'opzione',
optionRepeat: 'Ci sono opzioni ripetute',
},
'defaultValue': 'Valore predefinito',
'noDefaultValue': 'Nessun valore predefinito',
'selectDefaultValue': 'Seleziona valore predefinito',
},
vision: {
name: 'Visione',

3
web/i18n/ja-JP/app-debug.ts
Unescape Escape View File

@ -392,6 +392,9 @@ const translation = {
atLeastOneOption: '少なくとも 1 つのオプションが必要です',
optionRepeat: '繰り返しオプションがあります',
},
'defaultValue': 'デフォルト値',
'noDefaultValue': 'デフォルト値なし',
'selectDefaultValue': 'デフォルト値を選択',
},
vision: {
name: 'ビジョン',

3
web/i18n/ko-KR/app-debug.ts
Unescape Escape View File

@ -287,6 +287,9 @@ const translation = {
atLeastOneOption: '적어도 하나의 옵션이 필요합니다',
optionRepeat: '옵션이 중복되어 있습니다',
},
'defaultValue': '기본값',
'noDefaultValue': '기본값 없음',
'selectDefaultValue': '기본값 선택',
},
vision: {
name: '비전',

3
web/i18n/pl-PL/app-debug.ts
Unescape Escape View File

@ -317,6 +317,9 @@ const translation = {
atLeastOneOption: 'Wymagana jest co najmniej jedna opcja',
optionRepeat: 'Powtarzają się opcje',
},
'defaultValue': 'Wartość domyślna',
'noDefaultValue': 'Brak wartości domyślnej',
'selectDefaultValue': 'Wybierz wartość domyślną',
},
vision: {
name: 'Wizja',

3
web/i18n/pt-BR/app-debug.ts
Unescape Escape View File

@ -293,6 +293,9 @@ const translation = {
atLeastOneOption: 'Pelo menos uma opção é obrigatória',
optionRepeat: 'Tem opções repetidas',
},
'defaultValue': 'Valor padrão',
'noDefaultValue': 'Nenhum valor padrão',
'selectDefaultValue': 'Selecionar valor padrão',
},
vision: {
name: 'Visão',

3
web/i18n/ro-RO/app-debug.ts
Unescape Escape View File

@ -293,6 +293,9 @@ const translation = {
atLeastOneOption: 'Este necesară cel puțin o opțiune',
optionRepeat: 'Există opțiuni repetate',
},
'defaultValue': 'Valoare implicită',
'noDefaultValue': 'Fără valoare implicită',
'selectDefaultValue': 'Selectați valoarea implicită',
},
vision: {
name: 'Viziune',

3
web/i18n/ru-RU/app-debug.ts
Unescape Escape View File

@ -329,6 +329,9 @@ const translation = {
atLeastOneOption: 'Требуется хотя бы один вариант',
optionRepeat: 'Есть повторяющиеся варианты',
},
'defaultValue': 'Значение по умолчанию',
'noDefaultValue': 'Без значения по умолчанию',
'selectDefaultValue': 'Выберите значение по умолчанию',
},
vision: {
name: 'Зрение',

3
web/i18n/tr-TR/app-debug.ts
Unescape Escape View File

@ -329,6 +329,9 @@ const translation = {
atLeastOneOption: 'En az bir seçenek gereklidir',
optionRepeat: 'Yinelenen seçenekler var',
},
defaultValue: 'Varsayılan değer',
noDefaultValue: 'Varsayılan değer yok',
selectDefaultValue: 'Varsayılan değer seç',
},
vision: {
name: 'Görüş',

3
web/i18n/uk-UA/app-debug.ts
Unescape Escape View File

@ -287,6 +287,9 @@ const translation = {
atLeastOneOption: 'Потрібно щонайменше одну опцію',
optionRepeat: 'Є повторні опції',
},
'defaultValue': 'Значення за замовчуванням',
'noDefaultValue': 'Без значення за замовчуванням',
'selectDefaultValue': 'Обрати значення за замовчуванням',
},
vision: {
name: 'Зображення', // Vision

3
web/i18n/vi-VN/app-debug.ts
Unescape Escape View File

@ -287,6 +287,9 @@ const translation = {
atLeastOneOption: 'Cần ít nhất một tùy chọn',
optionRepeat: 'Có các tùy chọn trùng lặp',
},
'defaultValue': 'Giá trị mặc định',
'noDefaultValue': 'Không có giá trị mặc định',
'selectDefaultValue': 'Chọn giá trị mặc định',
},
vision: {
name: 'Thị giác',

3
web/i18n/zh-Hans/app-debug.ts
Unescape Escape View File

@ -394,6 +394,9 @@ const translation = {
atLeastOneOption: '至少需要一个选项',
optionRepeat: '选项不能重复',
},
'defaultValue': '默认值',
'noDefaultValue': '无默认值',
'selectDefaultValue': '选择默认值',
},
vision: {
name: '视觉',

3
web/i18n/zh-Hant/app-debug.ts
Unescape Escape View File

@ -272,6 +272,9 @@ const translation = {
atLeastOneOption: '至少需要一個選項',
optionRepeat: '選項不能重複',
},
'defaultValue': '預設值',
'noDefaultValue': '無預設值',
'selectDefaultValue': '選擇預設值',
},
vision: {
name: '視覺',

Write Preview
Loading…
Cancel
Save