Skip to content

Commit 7f0fe17

Browse files
Angelii@lisuwen.lsw
authored andcommitted
repo-sync-2024-05-20T19:45:15+0800
1 parent e53691a commit 7f0fe17

File tree

5 files changed

+51
-11
lines changed

5 files changed

+51
-11
lines changed

apps/platform/src/modules/component-config/config-item-render/custom-render/case-when-render/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { PlusCircleFilled, DeleteOutlined } from '@ant-design/icons';
2+
import { useDeepCompareEffect } from 'ahooks';
23
import { Button, Divider, Form, Input, Select, Switch } from 'antd';
34
import { parse } from 'query-string';
45
import { useEffect, useState, useMemo } from 'react';
@@ -119,7 +120,7 @@ export const CaseWhenRender = (prop: { node: AtomicConfigNode }) => {
119120
const { search } = useLocation();
120121
const { projectId, dagId } = parse(search) as { projectId: string; dagId: string };
121122

122-
useEffect(() => {
123+
useDeepCompareEffect(() => {
123124
const getTables = async () => {
124125
const dataTableList: IDataTable[] = [];
125126

apps/platform/src/modules/component-config/config-item-render/custom-render/groupby-render/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { DeleteOutlined } from '@ant-design/icons';
2+
import { useDeepCompareEffect } from 'ahooks';
23
import { Form, Space, Select, Button, Input } from 'antd';
34
import classnames from 'classnames';
45
import { parse } from 'query-string';
@@ -57,7 +58,7 @@ export const GroupByRender = (prop: { node: AtomicConfigNode }) => {
5758
const [tables, setTables] = useState<IDataTable[]>([]);
5859
const [outputTables, setOutputTables] = useState<IOutputDataTable[]>([]);
5960

60-
useEffect(() => {
61+
useDeepCompareEffect(() => {
6162
const getTables = async () => {
6263
const dataTableList: IDataTable[] = [];
6364
const { search } = window.location;

apps/platform/src/modules/component-config/config-item-render/custom-render/linear-model-parameters-modification/table/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import { LinearModelParamsModificationsRenderView } from '..';
99
import styles from '../index.less';
1010
import type { ParametersDatum } from '../types';
1111

12-
const MIN_FLOAT32 = -3.40282347e38;
13-
const MAX_FLOAT32 = 3.40282347e38;
12+
const MIN_FLOAT32 = -3.4e38;
13+
const MAX_FLOAT32 = 3.4e38;
1414

1515
type FormInstance<T> = GetRef<typeof Form<T>>;
1616

apps/platform/src/modules/data-table-add/add-http-data/http-data-add.view.tsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import {
22
DeleteOutlined,
33
DownloadOutlined,
44
PlusOutlined,
5+
QuestionCircleOutlined,
56
UploadOutlined,
67
} from '@ant-design/icons';
78
import {
@@ -12,21 +13,21 @@ import {
1213
Input,
1314
Select,
1415
Space,
16+
Tooltip,
1517
Upload,
1618
message,
1719
} from 'antd';
1820
import { Drawer } from 'antd';
21+
import { parse } from 'query-string';
1922
import { useEffect, useRef } from 'react';
2023
import { CSVLink } from 'react-csv';
21-
import { createFeatureDatasource } from '@/services/secretpad/FeatureDatasourceController';
2224

25+
import { createFeatureDatasource } from '@/services/secretpad/FeatureDatasourceController';
2326
import { Model, useModel } from '@/util/valtio-helper';
2427

2528
import { analysisCsv } from '../component/upload-table/util';
2629

2730
import styles from './index.less';
28-
import { parse } from 'query-string';
29-
import { flushSync } from 'react-dom';
3031

3132
const downloadData = [
3233
{ 特征名称: 'id1', 特征类型: 'string', 特征描述: '' },
@@ -204,7 +205,13 @@ export const HttpDataAddDrawer = ({
204205
</Space>
205206
}
206207
>
207-
<div className={styles.titleSheet}>数据表类型:http数据源</div>
208+
<div className={styles.titleSheet}>
209+
数据表类型
210+
<Tooltip title="http数据源通常用于模型发布环节,用于在线服务调用">
211+
<QuestionCircleOutlined style={{ margin: 4 }} />
212+
</Tooltip>
213+
:http数据源
214+
</div>
208215
<CSVLink filename="示例文件.csv" data={downloadData} ref={csvRef} />
209216
<Form form={form} layout="vertical" autoComplete="off" requiredMark="optional">
210217
<Form.Item

apps/platform/src/modules/main-dag/graph-request-service.tsx

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { GraphModel, GraphNode } from '@secretflow/dag';
2-
import { NodeStatus } from '@secretflow/dag';
2+
import { ActionType, NodeStatus } from '@secretflow/dag';
33
import { DefaultRequestService } from '@secretflow/dag';
44
import { Emitter } from '@secretflow/utils';
55
import { message, Image as AntdImage } from 'antd';
@@ -33,6 +33,7 @@ import { getModel } from '@/util/valtio-helper';
3333
import type { User } from '../login/login.service';
3434
import { LoginService } from '../login/login.service';
3535

36+
import mainDag from './dag';
3637
import type { IGraphEdgeType, IGraphNodeType } from './graph.protocol';
3738
import { nodeStatus } from './util';
3839

@@ -168,6 +169,7 @@ export class GraphRequestService extends DefaultRequestService {
168169
}
169170

170171
const { nodes, edges } = data;
172+
171173
const convertedNodes = nodes?.map((n) => {
172174
const { graphNodeId, status, codeName, ...options } = n;
173175
const configs =
@@ -185,7 +187,6 @@ export class GraphRequestService extends DefaultRequestService {
185187
if (graphNodeStatus === NodeStatus.default && !isFinished) {
186188
graphNodeStatus = NodeStatus.unfinished;
187189
}
188-
189190
return {
190191
...options,
191192
codeName,
@@ -222,7 +223,7 @@ export class GraphRequestService extends DefaultRequestService {
222223
const { mode } = parse(window.location.search);
223224
const nodes = await Promise.all(
224225
n.map(async (i) => {
225-
const { id, codeName, nodeDef, ...restNodes } = i;
226+
const { id, codeName, nodeDef, styles, ...restNodes } = i;
226227
const config = this.componentConfigRegistry.getComponentConfig(
227228
codeName,
228229
mode as ComputeMode,
@@ -250,6 +251,17 @@ export class GraphRequestService extends DefaultRequestService {
250251
}
251252
return newNodeDef;
252253
};
254+
255+
const getNewStyles = () => {
256+
if (mlTrainCodeNames.includes(codeName as string)) {
257+
return {
258+
...styles,
259+
isContinueRun: true,
260+
};
261+
}
262+
return styles;
263+
};
264+
253265
return id
254266
? {
255267
...restNodes,
@@ -258,11 +270,30 @@ export class GraphRequestService extends DefaultRequestService {
258270
inputs: [],
259271
outputs: outputPorts,
260272
nodeDef: getNewNodeDef(),
273+
styles: getNewStyles(),
261274
}
262275
: i;
263276
}),
264277
);
265278

279+
// 更新节点样式
280+
const styledNodes = (
281+
nodes as {
282+
graphNodeId: string;
283+
styles?: {
284+
isContinueRun?: boolean;
285+
isOpaque?: boolean;
286+
isHighlighted: boolean;
287+
};
288+
}[]
289+
)?.map(({ graphNodeId, styles }) => {
290+
return {
291+
nodeId: graphNodeId,
292+
styles,
293+
};
294+
});
295+
mainDag.graphManager.executeAction(ActionType.changeStyles, styledNodes);
296+
266297
const edges = e.map((i) => {
267298
const { id, ...restEdges } = i;
268299
const { sourceAnchor, target, targetAnchor } = i;

0 commit comments

Comments
 (0)