Skip to content

Commit dccd874

Browse files
committed
Merge branch 'release'
2 parents a48ec29 + 0ffca2b commit dccd874

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

app-engine/frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"@fit-elsa/elsa-core": "file:../../../fit-framework/framework/elsa/fit-elsa",
6565
"@fit-elsa/elsa-react": "file:../../../fit-framework/framework/elsa/fit-elsa-react",
6666
"antd": "4.24.13",
67-
"axios": "1.7.4",
67+
"axios": "1.8.2",
6868
"dayjs": "1.11.10",
6969
"echarts": "5.4.3",
7070
"echarts-for-react": "3.0.2",
@@ -83,7 +83,7 @@
8383
"react-router": "5.3.4",
8484
"react-router-dom": "5.3.4",
8585
"redux": "4.2.1",
86-
"tinymce": "6.8.4",
86+
"tinymce": "7.2.0",
8787
"xss": "1.0.15"
8888
}
8989
}

app-engine/frontend/src/components/timeLine/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ const TimeLineFc = (props) => {
6767
setTimeList([]);
6868
setPage(1);
6969
hasMoreRef.current = true;
70+
elsaReadOnlyRef.current = true;
7071
window.agent?.readOnly();
7172

7273
Promise.all([

app-engine/frontend/src/pages/components/header.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,9 @@ const ChoreographyHead = (props) => {
164164

165165
// 实时保存数据
166166
const updateGraph = async () => {
167+
if (preview) {
168+
return;
169+
}
167170
const currentApp = cloneDeep(appInfo);
168171
currentApp.flowGraph.appearance = window.agent.serialize();
169172
await updateFlowInfo(tenantId, appId, currentApp.flowGraph);

app-engine/frontend/src/pages/configForm/configUi/components/inspiration-list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const InspirationList = (props) => {
2929
}
3030
return (<span className='right'>
3131
<img src={EditImg} alt="" onClick={() => clickInspiration(item)} className={inspirationValues?.showInspiration ? '' : 'not-allowed'} />
32-
<img src={DeleteImg} alt="" onClick={() => handleDelete(item.id)} className={inspirationValues?.showInspiration ? '' : 'not-allowed'} />
32+
<img src={DeleteImg} alt="" onClick={() => handleDelete(item)} className={inspirationValues?.showInspiration ? '' : 'not-allowed'} />
3333
</span>);
3434
};
3535

common/dependency/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<postgresql.version>42.7.2</postgresql.version>
4949
<okhttp.version>4.12.0</okhttp.version>
5050
<retrofit2.version>2.10.0</retrofit2.version>
51-
<poi.version>5.2.5</poi.version>
51+
<poi.version>5.4.0</poi.version>
5252
<redisson.version>3.25.2</redisson.version>
5353
<caffeine.version>2.9.3</caffeine.version>
5454
<pdfbox.version>2.0.30</pdfbox.version>

0 commit comments

Comments
 (0)