opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: sub variable trigger

This commit is contained in:
Joel 2024-08-21 11:07:13 +08:00
parent 9a23cd08d8
commit b3b87b3e4c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app/components/base/select/index.tsx
View File

@ -204,9 +204,9 @@ const SimpleSelect: FC<ISelectProps> = ({
}}
>
<div className={classNames('relative h-9', wrapperClassName)}>
<Listbox.Button className={classNames(`flex items-center w-full h-full rounded-lg border-0 bg-gray-100 pl-3 pr-10 sm:text-sm sm:leading-6 focus-visible:outline-none focus-visible:bg-gray-200 group-hover:bg-gray-200 ${disabled ? 'cursor-not-allowed' : 'cursor-pointer'}`, className)}>
{renderTrigger ? renderTrigger(selectedItem) : <span className={classNames('block truncate text-left', !selectedItem?.name && 'text-gray-400')}>{selectedItem?.name ?? localPlaceholder}</span>}
{!renderTrigger && (
{renderTrigger ? <Listbox.Button className='w-full'>{renderTrigger(selectedItem)}</Listbox.Button> : <span className={classNames('block truncate text-left', !selectedItem?.name && 'text-gray-400')}>{selectedItem?.name ?? localPlaceholder}</span>}
{!renderTrigger && (
<Listbox.Button className={classNames(`flex items-center w-full h-full rounded-lg border-0 bg-gray-100 pl-3 pr-10 sm:text-sm sm:leading-6 focus-visible:outline-none focus-visible:bg-gray-200 group-hover:bg-gray-200 ${disabled ? 'cursor-not-allowed' : 'cursor-pointer'}`, className)}>
<span className="absolute inset-y-0 right-0 flex items-center pr-2">
{selectedItem
? (
@ -227,8 +227,9 @@ const SimpleSelect: FC<ISelectProps> = ({
/>
)}
</span>
)}
</Listbox.Button>
</Listbox.Button>
)}
{!disabled && (
<Transition
as={Fragment}

6
web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
View File

@ -6,7 +6,6 @@ import {
import { useTranslation } from 'react-i18next'
import { RiDeleteBinLine } from '@remixicon/react'
import produce from 'immer'
import { XMarkIcon } from '@heroicons/react/20/solid'
import type { VarType as NumberVarType } from '../../../tool/types'
import type {
Condition,
@ -170,12 +169,11 @@ const ConditionItem = ({
onSelect={item => handleSubVarKeyChange(item.value as string)}
renderTrigger={item => (
item
? <div className='flex items-center'>
<div className='flex px-1.5 items-center h-6 rounded-md border-[0.5px] border-components-panel-border-subtle bg-components-badge-white-to-dark shadow-xs text-text-accent'>
? <div className='flex justify-start cursor-pointer'>
<div className='inline-flex px-1.5 items-center h-6 rounded-md border-[0.5px] border-components-panel-border-subtle bg-components-badge-white-to-dark shadow-xs text-text-accent'>
<Variable02 className='w-3.5 h-3.5 text-text-accent' />
<div className='ml-0.5 system-xs-medium'>{item?.name}</div>
</div>
<XMarkIcon className='ml-0.5 w-3.5 h-3.5 text-gray-400' onClick={() => handleSubVarKeyChange('')} />
</div>
: <div className='text-gray-300 system-xs-medium'>{t('common.placeholder.select')}</div>
)}