Merge branch '3.5.x'

Author: CodeCasterX

framework/elsa/fit-elsa-react/src/components/common/JadePanelHeader.jsx

@@ -27,13 +27,14 @@ export const JadePanelHeader = ({text, tips, shapeStatus, onClick, editable = tr
     return (<>
         <div className='panel-header'>
             <span className='jade-panel-header-font'>{t(text)}</span>
-            <Popover
+            {tips && <Popover
               content={tips}
               align={{offset: [0, 3]}}
               overlayClassName={'jade-custom-popover'}
             >
-                <QuestionCircleOutlined className='jade-panel-header-popover-content'/>
+                <QuestionCircleOutlined className="jade-panel-header-popover-content"/>
             </Popover>
+            }
             {
                 editable ? (<>
                     <Button disabled={shapeStatus.disabled}
@@ -52,7 +53,7 @@ export const JadePanelHeader = ({text, tips, shapeStatus, onClick, editable = tr
 
 JadePanelHeader.propTypes = {
     text: PropTypes.string.isRequired,
-    tips: PropTypes.object.isRequired,
+    tips: PropTypes.object,
     shapeStatus: PropTypes.object.isRequired,
     onClick: PropTypes.func,
     editable: PropTypes.bool,

framework/elsa/fit-elsa-react/src/components/end/EndInputForm.jsx

@@ -9,7 +9,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ArrayUtil from '@/components/util/ArrayUtil.js';
 import {Checkbox, Collapse, Form} from 'antd';
-import {Trans, useTranslation} from 'react-i18next';
+import {useTranslation} from 'react-i18next';
 import {useDispatch} from '@/components/DefaultRoot.jsx';
 import {JadePanelHeader} from '@/components/common/JadePanelHeader.jsx';
 
@@ -26,10 +26,6 @@ const {Panel} = Collapse;
 const _EndInputForm = ({inputParams, shapeStatus}) => {
     const dispatch = useDispatch();
     const {t} = useTranslation();
-    const tips =
-        <div className={'jade-font-size'} style={{lineHeight: '1.2'}}>
-            <Trans i18nKey='endOutputPopover' components={{p: <p/>}}/>
-        </div>;
     const enableLog = inputParams.find(item => item.name === 'enableLog');
 
     // item被修改.
@@ -52,7 +48,7 @@ const _EndInputForm = ({inputParams, shapeStatus}) => {
     return (<>
         <Collapse bordered={false} className='jade-custom-collapse' defaultActiveKey={['Output variable']}>
             <Panel
-              header={<JadePanelHeader text={'output'} tips={tips} shapeStatus={shapeStatus} onClick={addItem}/>}
+              header={<JadePanelHeader text={'output'} shapeStatus={shapeStatus} onClick={addItem}/>}
               className='jade-panel'
               key='Output variable'
             >

framework/elsa/fit-elsa-react/src/components/end/OutputVariable.jsx

@@ -4,15 +4,14 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {Col, Collapse, Form, Popover, Row} from "antd";
-import React from "react";
-import {QuestionCircleOutlined} from '@ant-design/icons';
-import "./style.css";
-import {OutputVariableRow} from "@/components/end/OutputVariableRow.jsx";
-import {useDispatch} from "@/components/DefaultRoot.jsx";
-import PropTypes from "prop-types";
-import ArrayUtil from "@/components/util/ArrayUtil.js";
-import {Trans, useTranslation} from "react-i18next";
+import {Col, Collapse, Form, Row} from 'antd';
+import React from 'react';
+import './style.css';
+import {OutputVariableRow} from '@/components/end/OutputVariableRow.jsx';
+import {useDispatch} from '@/components/DefaultRoot.jsx';
+import PropTypes from 'prop-types';
+import ArrayUtil from '@/components/util/ArrayUtil.js';
+import {useTranslation} from 'react-i18next';
 
 const {Panel} = Collapse;
 
@@ -38,12 +37,6 @@ const _OutputVariable = ({inputParams, shapeStatus}) => {
         dispatch({type: "editOutputVariable", id: id, changes: changes});
     };
 
-
-    const tips =
-        <div className={"jade-font-size"} style={{lineHeight: "1.2"}}>
-            <Trans i18nKey="endOutputPopover" components={{p: <p/>}}/>
-        </div>;
-
     return (
         <div>
             <Collapse bordered={false} className="jade-custom-collapse"
@@ -55,13 +48,6 @@ const _OutputVariable = ({inputParams, shapeStatus}) => {
                         <div
                             style={{display: 'flex', alignItems: 'center', justifyContent: "flex-start"}}>
                             <span className="jade-panel-header-font">{t('output')}</span>
-                            <Popover
-                              content={tips}
-                              align={{offset: [0, 3]}}
-                              overlayClassName={'jade-custom-popover'}
-                            >
-                                <QuestionCircleOutlined className="jade-panel-header-popover-content"/>
-                            </Popover>
                         </div>
                     }
                     className="jade-panel"

framework/elsa/fit-elsa-react/src/en_US.json

@@ -111,7 +111,6 @@
   "llmOutputPopover": "Content generated after the foundation model is executed.",
   "modeSelect": "Mode",
   "directlyOutputTheResult": "Directly output result",
-  "endOutputPopover": "<p>These variables will be output after the bot calls the workflow. </p>\n<p>In variable return mode, the bot summarizes these variables and replies to the user.</p>\n<p> In direct answer mode, the bot replies only variables that can be used when the card is configured.</p>",
   "conditionBranch": "Condition Branch",
   "addBranch": "Add Branch",
   "compareObject": "Compared Object",

framework/elsa/fit-elsa-react/src/zh_CN.json

@@ -403,7 +403,6 @@
   "llmOutputPopover": "大模型运行完成后生成的内容。",
   "modeSelect": "模式选择",
   "directlyOutputTheResult": "直接输出结果",
-  "endOutputPopover": "<p>这些变量将在机器人完成工作流调用后输出。</p>\n<p>在“返回变量”模式下，这些变量将由机器人汇总并回复给用户；</p>\n<p>在“直接回答”模式下，机器人将只回复配置卡时可以使用的变量。</p>",
   "conditionBranch": "条件分支",
   "addBranch": "添加分支",
   "variable": "变量",