Skip to content

Commit 261d33e

Browse files
committed
Merge branch '1.3.x'
2 parents 061dc7c + 0d73ae0 commit 261d33e

File tree

7 files changed

+24
-21
lines changed

7 files changed

+24
-21
lines changed

README.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -216,20 +216,6 @@ fit debug
216216
217217
- 环境要求:node.js >= 20
218218
219-
- ELSA 框架编译产物:参考 [ELSA](https://github.com/ModelEngine-Group/fit-framework/blob/main/framework/elsa/README.md) 的编译构建章节
220-
221-
**修改 ELSA 依赖地址**
222-
223-
进入目录 `app-platform/frontend` ,搜索 `package.json` 文件的 ELSA 依赖地址:
224-
225-
```
226-
"dependencies": {
227-
"@fit-elsa/elsa-core": "file:${fitElsaCoreUrl}",
228-
"@fit-elsa/elsa-react": "file:${fitElsaReactUrl}",
229-
```
230-
231-
将 `${fitElsaCoreUrl}` 和 `${fitElsaReactUrl}` 分别改成 `ELSA` 框架编译产物 `fit-elsa-core` 和 `fit-react` 的目录地址即可。
232-
233219
**修改代理文件**
234220
235221
修改 `app-platform/frontend` 目录下的 `proxy.config.json` 文件,可以修改需要访问的后端地址。如本地后端地址是 `http://127.0.0.1:8080` 。可以按照如下示例配置:
@@ -267,6 +253,23 @@ npm run build:single
267253
```
268254
npm run start
269255
```
256+
257+
### 联调ELSA配置
258+
259+
- ELSA 框架编译产物:参考 [ELSA](https://github.com/ModelEngine-Group/fit-framework/blob/main/framework/elsa/README.md) 的编译构建章节
260+
261+
**修改 ELSA 依赖地址**
262+
263+
进入目录 `app-platform/frontend` ,搜索 `package.json` 文件的 ELSA 依赖地址:
264+
265+
```
266+
"dependencies": {
267+
"@fit-elsa/elsa-core": "file:${fitElsaCoreUrl}",
268+
"@fit-elsa/agent-flow": "file:${fitElsaReactUrl}",
269+
```
270+
271+
`${fitElsaCoreUrl}``${fitElsaReactUrl}` 分别改成 `ELSA` 框架编译产物 `fit-elsa-core``fit-react` 的目录地址即可。
272+
270273
---------
271274
## 快速开始
272275

frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
"ajv": "8.17.1"
6262
},
6363
"dependencies": {
64-
"@fit-elsa/elsa-core": "file:../../fit-framework/framework/elsa/fit-elsa",
65-
"@fit-elsa/elsa-react": "file:../../fit-framework/framework/elsa/fit-elsa-react",
64+
"@fit-elsa/elsa": "1.0.2",
65+
"@fit-elsa/agent-flow": "1.0.0-alpha.6",
6666
"antd": "4.24.13",
6767
"axios": "1.8.2",
6868
"dayjs": "1.11.10",

frontend/src/pages/addFlow/components/elsa-stage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import React, { useEffect, useCallback, useState, useRef, useImperativeHandle, useContext } from 'react';
88
import { Button, Alert, Spin } from 'antd';
99
import { useParams } from 'react-router-dom';
10-
import { JadeFlow } from '@fit-elsa/elsa-react';
10+
import { JadeFlow } from '@fit-elsa/agent-flow';
1111
import { validate } from '../utils';
1212
import AddKnowledge from '../../configForm/configUi/components/add-knowledge';
1313
import HuggingFaceModal from './hugging-face-modal';

frontend/src/pages/components/edit-modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { APP_TYPE, APP_BUILT_TYPE, APP_BUILT_CLASSIFICATION } from './common/com
1818
import { useTranslation } from 'react-i18next';
1919
import { findConfigItem, getConfigValue } from '@/shared/utils/common';
2020
import { convertImgPath } from '@/common/util';
21-
import { createGraphOperator } from '@fit-elsa/elsa-react';
21+
import { createGraphOperator } from '@fit-elsa/agent-flow';
2222
import { pick, isEmpty } from 'lodash';
2323
import assistant from '@/assets/images/appdevelop/assistant.png';
2424
import agent from '@/assets/images/appdevelop/agent.png';

frontend/src/pages/components/header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { Message } from "@/shared/utils/message";
1818
import { setAppInfo, setValidateInfo } from '@/store/appInfo/appInfo';
1919
import { getCheckList, exportApp, updateAppInfo, updateFlowInfo } from '@/shared/http/aipp';
2020
import { convertImgPath } from '@/common/util';
21-
import { createGraphOperator } from '@fit-elsa/elsa-react';
21+
import { createGraphOperator } from '@fit-elsa/agent-flow';
2222
import { get, cloneDeep } from 'lodash';
2323
import TimeLineDrawer from '@/components/timeLine';
2424
import PublishModal from './publish-modal';

frontend/src/pages/configForm/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import './index.scoped.scss';
1313
import './configUi/index.scoped.scss';
1414
import { setConfigData } from '@/store/appConfig/config';
1515
import { getConfigValue } from '@/shared/utils/common';
16-
import { createGraphOperator } from '@fit-elsa/elsa-react';
16+
import { createGraphOperator } from '@fit-elsa/agent-flow';
1717

1818
const ConfigForm = (props) => {
1919
const {

frontend/src/pages/detailFlow/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import React, { useEffect, useState } from 'react';
88
import { LeftArrowIcon } from '@/assets/icon';
99
import { useParams } from 'react-router-dom';
1010
import { getAppInfo } from '@/shared/http/aipp';
11-
import { JadeFlow } from '@fit-elsa/elsa-react';
11+
import { JadeFlow } from '@fit-elsa/agent-flow';
1212
import { configMap } from '../addFlow/config';
1313
import i18n from '../../locale/i18n';
1414
import './index.scss';

0 commit comments

Comments
 (0)