Browse Source

Feat: Fixed the issue where the prompt menu content was hidden #3221 (#8530)

### What problem does this PR solve?

Feat: Fixed the issue where the prompt menu content was hidden #3221

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
tags/v0.20.0
balibabu 4 months ago
parent
commit
5a2099a1c7
No account linked to committer's email address

+ 13
- 0
web/package-lock.json View File

@@ -89,6 +89,7 @@
"remark-math": "^6.0.0",
"sonner": "^1.7.4",
"tailwind-merge": "^2.5.4",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss-animate": "^1.0.7",
"umi": "^4.0.90",
"umi-request": "^1.4.0",
@@ -31293,6 +31294,18 @@
"url": "https://github.com/sponsors/dcastil"
}
},
"node_modules/tailwind-scrollbar": {
"version": "3.1.0",
"resolved": "https://registry.npmmirror.com/tailwind-scrollbar/-/tailwind-scrollbar-3.1.0.tgz",
"integrity": "sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==",
"license": "MIT",
"engines": {
"node": ">=12.13.0"
},
"peerDependencies": {
"tailwindcss": "3.x"
}
},
"node_modules/tailwindcss": {
"version": "3.4.14",
"resolved": "https://registry.npmmirror.com/tailwindcss/-/tailwindcss-3.4.14.tgz",

+ 1
- 0
web/package.json View File

@@ -100,6 +100,7 @@
"remark-math": "^6.0.0",
"sonner": "^1.7.4",
"tailwind-merge": "^2.5.4",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss-animate": "^1.0.7",
"umi": "^4.0.90",
"umi-request": "^1.4.0",

+ 2
- 1
web/src/pages/agent/constant.tsx View File

@@ -723,7 +723,7 @@ export const initialStringTransformValues = {
method: StringTransformMethod.Merge,
split_ref: '',
script: '',
delimiters: [],
delimiters: [StringTransformDelimiter.Comma],
outputs: {
result: {
type: 'string',
@@ -851,6 +851,7 @@ export const RestrictedUpstreamMap = {
[Operator.WaitingDialogue]: [Operator.Begin],
[Operator.Agent]: [Operator.Begin],
[Operator.TavilySearch]: [Operator.Begin],
[Operator.StringTransform]: [Operator.Begin],
};

export const NodeMap = {

+ 1
- 3
web/src/pages/agent/form/components/prompt-editor/variable-picker-plugin.tsx View File

@@ -67,7 +67,6 @@ function VariablePickerMenuItem({
option: VariableOption | VariableInnerOption,
) => void;
}) {
console.info('xxxx');
return (
<li
key={option.key}
@@ -245,11 +244,10 @@ export default function VariablePickerMenuPlugin({
options={buildNextOptions()}
menuRenderFn={(anchorElementRef, { selectOptionAndCleanUp }) => {
const nextOptions = buildNextOptions();
console.log('🚀 ~ nextOptions:', nextOptions);
return anchorElementRef.current && nextOptions.length
? ReactDOM.createPortal(
<div className="typeahead-popover w-[200px] p-2">
<ul>
<ul className="overflow-y-auto !scrollbar-thin overflow-x-hidden">
{nextOptions.map((option, i: number) => (
<VariablePickerMenuItem
index={i}

+ 11
- 5
web/src/pages/agent/form/string-transform-form/use-values.ts View File

@@ -6,20 +6,26 @@ import {
StringTransformMethod,
} from '../../constant';

function transferDelimiters(formData: typeof initialStringTransformValues) {
return formData.method === StringTransformMethod.Merge
? formData.delimiters[0]
: formData.delimiters;
}

export function useValues(node?: RAGFlowNodeType) {
const values = useMemo(() => {
const formData = node?.data?.form;

if (isEmpty(formData)) {
return initialStringTransformValues;
return {
...initialStringTransformValues,
delimiters: transferDelimiters(formData),
};
}

return {
...formData,
delimiters:
formData.method === StringTransformMethod.Merge
? formData.delimiters[0]
: formData.delimiters,
delimiters: transferDelimiters(formData),
};
}, [node?.data?.form]);


+ 5
- 1
web/tailwind.config.js View File

@@ -219,5 +219,9 @@ module.exports = {
},
},
},
plugins: [require('tailwindcss-animate'), require('@tailwindcss/line-clamp')],
plugins: [
require('tailwindcss-animate'),
require('@tailwindcss/line-clamp'),
require('tailwind-scrollbar'),
],
};

Loading…
Cancel
Save