Merge branch 'dev' of https://github.com/EDEAI/NexusAI into dev

lhpaijuyingli · Dec 12, 2024 · a7fb7c4 · a7fb7c4
2 parents a54449c + d47886c
commit a7fb7c4
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 19 deletions.
diff --git a/web/src/components/WorkFlow/nodes/RunPanel.tsx b/web/src/components/WorkFlow/nodes/RunPanel.tsx
@@ -63,7 +63,6 @@ export default memo(() => {
         setTabKey('4');
     };
 
-
     useUpdateEffect(() => {
         // setLoading(false);
 
@@ -207,7 +206,7 @@ export default memo(() => {
                         if (nodeInfo.status == 3 || (nodeInfo.status == 2 && item?.children)) {
                             return (
                                 <div className="flex flex-col gap-2">
-                                     {nodeInfo?.prompt_data?.length > 0 && (
+                                    {nodeInfo?.prompt_data?.length > 0 && (
                                         <div className="h-80">
                                             <CodeEditor
                                                 language="python3"
@@ -358,18 +357,13 @@ export default memo(() => {
                             );
                         }
                         if (nodeInfo?.status == 0) {
-
                         }
                         if (nodeInfo?.status == 1) {
-
                         }
                         if (nodeInfo?.status == 2) {
-
-
                             return <LoadingOutlined />;
                         }
                         if (nodeInfo?.status == 3) {
-
                             return (
                                 <>
                                     <span>
@@ -384,7 +378,6 @@ export default memo(() => {
                                 </>
                             );
                         } else if (nodeInfo?.status == 4) {
-
                             return <span className="text-red-500">ERROR</span>;
                         }
 
@@ -512,9 +505,7 @@ const InputContent = memo(({ onRunResult, loading }: InputContentProps) => {
     const run = async value => {
         const findEnd = nodes.find(x => x.type == BlockEnum.End);
         if (!findEnd) {
-            return message.error(
-                intl.formatMessage({ id: 'workflow.notEnd', defaultMessage: '' }),
-            );
+            return message.error(intl.formatMessage({ id: 'workflow.notEnd', defaultMessage: '' }));
         }
 
         setSubmitLoading(true);
@@ -639,7 +630,7 @@ const InputContent = memo(({ onRunResult, loading }: InputContentProps) => {
                             return (
                                 <ProFormDigit
                                     key={index}
-                                    label={item.createVar.display_name||item.createVar.name}
+                                    label={item.createVar.display_name || item.createVar.name}
                                     name={item.createVar.name}
                                     required={item.createVar.required}
                                     rules={[
@@ -656,7 +647,7 @@ const InputContent = memo(({ onRunResult, loading }: InputContentProps) => {
                         return (
                             <ProFormTextArea
                                 key={index}
-                                label={item.createVar.display_name||item.createVar.name}
+                                label={item.createVar.display_name || item.createVar.name}
                                 name={item.createVar.name}
                                 required={item.createVar.required}
                                 rules={[
@@ -667,7 +658,7 @@ const InputContent = memo(({ onRunResult, loading }: InputContentProps) => {
                                 ]}
                             ></ProFormTextArea>
                         );
-                    })}
+                })}
                 {nodes[0]?.data?.requires_upload && (
                     <div>
                         <Typography.Title level={5}>

diff --git a/web/src/locales/en-US/workflow.ts b/web/src/locales/en-US/workflow.ts
@@ -247,4 +247,7 @@ export default {
     'workflow.vars.variableNameExists': 'Variable name already exists',
     'workflow.vars.displayName': 'Display Name',
     'workflow.vars.isRequired': 'Is Required',
+
+    'workflow.needHumanConfirm': 'Need human confirmation',
+    'workflow.noHumanConfirm': 'Human confirmation processed',
 };
diff --git a/web/src/locales/zh-CN/pages.ts b/web/src/locales/zh-CN/pages.ts
@@ -2,7 +2,7 @@
  * @LastEditors: biz
  */
 export default {
-    'pages.layouts.userLayout.title': 'NexusAI-人工智能平台',
+    'pages.layouts.userLayout.title': 'NexusAI-人机协作共生',
     'pages.login.accountLogin.tab': '账户密码登录',
     'pages.login.accountLogin.errorMessage': '邮箱或密码错误，请重试！',
     'pages.login.failure': '登录失败，请重试！',

diff --git a/web/src/locales/zh-CN/workflow.ts b/web/src/locales/zh-CN/workflow.ts
@@ -238,5 +238,13 @@ export default {
     "workflow.vars.variableNamePattern": "变量名称只能包含字母、数字和下划线",
     "workflow.vars.variableNameExists": "变量名称已存在",
     "workflow.vars.displayName": "显示名称",
-    "workflow.vars.isRequired": "是否必填"
+    "workflow.vars.isRequired": "是否必填",
+
+    "workflow.needHumanConfirm":"需要人工确认",
+    "workflow.noHumanConfirm":"已处理人工确认"
+
+
+
+
+
 };
diff --git a/web/src/pages/WorkSpace/components/Backlogs.tsx b/web/src/pages/WorkSpace/components/Backlogs.tsx
@@ -3,13 +3,17 @@
  */
 import { getBacklogsList } from '@/api/workflow';
 import useUserStore from '@/store/user';
-import { SwapRightOutlined } from '@ant-design/icons';
+import {
+    CheckCircleOutlined,
+    ExclamationCircleOutlined,
+    SwapRightOutlined,
+} from '@ant-design/icons';
 import { usePagination, useSessionStorageState, useUpdateEffect } from 'ahooks';
 
 import Headportrait from '@/components/headportrait';
 import { headportrait } from '@/utils/useUser';
 import { useIntl } from '@umijs/max';
-import { Empty, Spin } from 'antd';
+import { Empty, Spin, Tooltip } from 'antd';
 import { useRef } from 'react';
 import { Title } from './TableTitle';
 export default () => {
@@ -91,7 +95,7 @@ export default () => {
                                     Image={headportrait('single', item.icon)}
                                     // icon={`/icons/creation/${WORKFLOW_ICON.WorkFlow}.svg`}
                                 ></Headportrait>
-                                <div className="flex flex-col gap-1 truncate">
+                                <div className="flex flex-col gap-1 truncate flex-1">
                                     <div>
                                         <span>{item.app_name}</span> <SwapRightOutlined />
                                         <span className="text-[#1B64F3]">{item.node_name}</span>
@@ -100,6 +104,25 @@ export default () => {
                                         {item.app_run_name}
                                     </div>
                                 </div>
+                                <div>
+                                    {item.need_human_confirm ? (
+                                        <Tooltip
+                                            title={intl.formatMessage({
+                                                id: 'workflow.needHumanConfirm',
+                                            })}
+                                        >
+                                            <ExclamationCircleOutlined className="text-[#1B64F3]" />
+                                        </Tooltip>
+                                    ) : (
+                                        <Tooltip
+                                            title={intl.formatMessage({
+                                                id: 'workflow.noHumanConfirm',
+                                            })}
+                                        >
+                                            <CheckCircleOutlined className="text-[#808183]" />
+                                        </Tooltip>
+                                    )}
+                                </div>
                             </div>
                         );
                     })}