Skip to content

B
bkunyun
Commit 6326745b authored by 吴永生#A02208's avatar 吴永生#A02208
Browse files
Options

feat: 命名修改

parent a1e043c4
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 44 deletions
src/views/Project/ProjectSubmitWork/ConfigForm/index.tsx
View file @ 6326745b
...@@ -20,11 +20,11 @@ type ConfigFormProps = { ...@@ -20,11 +20,11 @@ type ConfigFormProps = {
templateConfigInfo?: ITemplateConfig; templateConfigInfo?: ITemplateConfig;
setParameter: any; setParameter: any;
onRef?: React.Ref<any>; onRef?: React.Ref<any>;
setSelectedNodeId: (val: string) => void; setSelectedBatchNodeId: (val: string) => void;
}; };
const ConfigForm = (props: ConfigFormProps) => { const ConfigForm = (props: ConfigFormProps) => {
const { templateConfigInfo, setParameter, setSelectedNodeId } = props; const { templateConfigInfo, setParameter, setSelectedBatchNodeId } = props;
const [name, setName] = useState<string>(""); // 任务名称 const [name, setName] = useState<string>(""); // 任务名称
const [nameHelp, setNameHelp] = useState({ const [nameHelp, setNameHelp] = useState({
...@@ -212,8 +212,8 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -212,8 +212,8 @@ const ConfigForm = (props: ConfigFormProps) => {
<div className={styles.parameterContent}> <div className={styles.parameterContent}>
{parameter.domType.toLowerCase() === "file" && ( {parameter.domType.toLowerCase() === "file" && (
<MyInput <MyInput
onFocus={() => setSelectedNodeId(batchId || "")} onFocus={() => setSelectedBatchNodeId(batchId || "")}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
value={parameter.value || ""} value={parameter.value || ""}
InputProps={{ InputProps={{
endAdornment: ( endAdornment: (
...@@ -234,8 +234,8 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -234,8 +234,8 @@ const ConfigForm = (props: ConfigFormProps) => {
)} )}
{parameter.domType.toLowerCase() === "path" && ( {parameter.domType.toLowerCase() === "path" && (
<MyInput <MyInput
onFocus={() => setSelectedNodeId(batchId || "")} onFocus={() => setSelectedBatchNodeId(batchId || "")}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
value={parameter.value || ""} value={parameter.value || ""}
InputProps={{ InputProps={{
endAdornment: ( endAdornment: (
...@@ -256,8 +256,8 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -256,8 +256,8 @@ const ConfigForm = (props: ConfigFormProps) => {
)} )}
{parameter.domType.toLowerCase() === "dataset" && ( {parameter.domType.toLowerCase() === "dataset" && (
<MyInput <MyInput
onFocus={() => setSelectedNodeId(taskId)} onFocus={() => setSelectedBatchNodeId(taskId)}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
value={parameter.value || ""} value={parameter.value || ""}
InputProps={{ InputProps={{
endAdornment: ( endAdornment: (
...@@ -279,10 +279,10 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -279,10 +279,10 @@ const ConfigForm = (props: ConfigFormProps) => {
{parameter.domType.toLowerCase() === "input" && ( {parameter.domType.toLowerCase() === "input" && (
<MyInput <MyInput
onFocus={() => { onFocus={() => {
setSelectedNodeId(batchId || ""); setSelectedBatchNodeId(batchId || "");
console.log(batchId, "111"); console.log(batchId, "111");
}} }}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
value={parameter.value || ""} value={parameter.value || ""}
onChange={(e: any) => onChange={(e: any) =>
handleParameterChange(e, taskId, parameter.name || "") handleParameterChange(e, taskId, parameter.name || "")
...@@ -294,8 +294,8 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -294,8 +294,8 @@ const ConfigForm = (props: ConfigFormProps) => {
)} )}
{parameter.domType.toLowerCase() === "select" && ( {parameter.domType.toLowerCase() === "select" && (
<MySelect <MySelect
onFocus={() => setSelectedNodeId(batchId || "")} onFocus={() => setSelectedBatchNodeId(batchId || "")}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
value={parameter.value} value={parameter.value}
onChange={(e: any) => onChange={(e: any) =>
handleParameterChange(e, taskId, parameter.name || "") handleParameterChange(e, taskId, parameter.name || "")
...@@ -307,8 +307,8 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -307,8 +307,8 @@ const ConfigForm = (props: ConfigFormProps) => {
)} )}
{parameter.domType.toLowerCase() === "multipleselect" && ( {parameter.domType.toLowerCase() === "multipleselect" && (
<MySelect <MySelect
onFocus={() => setSelectedNodeId(batchId || "")} onFocus={() => setSelectedBatchNodeId(batchId || "")}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
value={parameter.value} value={parameter.value}
onChange={(e: any) => onChange={(e: any) =>
handleParameterChange(e, taskId, parameter.name || "") handleParameterChange(e, taskId, parameter.name || "")
...@@ -325,8 +325,8 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -325,8 +325,8 @@ const ConfigForm = (props: ConfigFormProps) => {
onChange={(e: any) => onChange={(e: any) =>
handleParameterChange(e, taskId, parameter.name || "") handleParameterChange(e, taskId, parameter.name || "")
} }
onFocus={() => setSelectedNodeId(batchId || "")} onFocus={() => setSelectedBatchNodeId(batchId || "")}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
options={optionsTransform(parameter.choices, "label")} options={optionsTransform(parameter.choices, "label")}
error={parameter.error || false} error={parameter.error || false}
helperText={parameter.helperText} helperText={parameter.helperText}
...@@ -347,8 +347,8 @@ const ConfigForm = (props: ConfigFormProps) => { ...@@ -347,8 +347,8 @@ const ConfigForm = (props: ConfigFormProps) => {
) )
} }
options={optionsTransform(parameter.choices, "label")} options={optionsTransform(parameter.choices, "label")}
onFocus={() => setSelectedNodeId(batchId || "")} onFocus={() => setSelectedBatchNodeId(batchId || "")}
onBlur={() => setSelectedNodeId("")} onBlur={() => setSelectedBatchNodeId("")}
error={parameter.error || false} error={parameter.error || false}
helperText={parameter.helperText} helperText={parameter.helperText}
></MyCheckBox> ></MyCheckBox>
......
src/views/Project/ProjectSubmitWork/WorkFlow/index.tsx
View file @ 6326745b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-21 15:25:25 * @Date: 2022-06-21 15:25:25
* @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com * @LastEditors: 吴永生#A02208 yongsheng.wu@wholion.com
* @LastEditTime: 2022-07-06 11:55:41 * @LastEditTime: 2022-07-12 14:09:20
* @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/WorkFlow/index.tsx * @FilePath: /bkunyun/src/views/Project/ProjectSubmitWork/WorkFlow/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -10,13 +10,20 @@ import Flow from "../../components/Flow"; ...@@ -10,13 +10,20 @@ import Flow from "../../components/Flow";
import { ITemplateConfig } from "../interface"; import { ITemplateConfig } from "../interface";
interface IProps { interface IProps {
templateConfigInfo?: ITemplateConfig; templateConfigInfo?: ITemplateConfig;
setSelectedNodeId?: (val:string) => void; setSelectedBatchNodeId?: (val: string) => void;
selectedNodeId?: string; selectedBatchNodeId?: string;
} }
const WorkFlow = (props: IProps) => { const WorkFlow = (props: IProps) => {
const { templateConfigInfo,setSelectedNodeId, selectedNodeId } = props; const { templateConfigInfo, setSelectedBatchNodeId, selectedBatchNodeId } =
return <Flow tasks={templateConfigInfo?.tasks} setSelectedNodeId={setSelectedNodeId} selectedNodeId={selectedNodeId}/>; props;
return (
<Flow
tasks={templateConfigInfo?.tasks}
setSelectedBatchNodeId={setSelectedBatchNodeId}
selectedBatchNodeId={selectedBatchNodeId}
/>
);
}; };
export default WorkFlow; export default WorkFlow;
src/views/Project/ProjectSubmitWork/index.tsx
View file @ 6326745b
...@@ -42,7 +42,7 @@ const ProjectSubmitWork = observer(() => { ...@@ -42,7 +42,7 @@ const ProjectSubmitWork = observer(() => {
let configFormRef: any = React.createRef(); let configFormRef: any = React.createRef();
/** 是否全屏 */ /** 是否全屏 */
const [fullScreenShow, setFullScreenShow] = useState<boolean>(false); const [fullScreenShow, setFullScreenShow] = useState<boolean>(false);
const [selectedNodeId, setSelectedNodeId] = useState<string>(""); const [selectedBatchNodeId, setSelectedBatchNodeId] = useState<string>("");
// 前往工作台 // 前往工作台
const goToWorkbench = (toWorkbenchList = false) => { const goToWorkbench = (toWorkbenchList = false) => {
...@@ -298,7 +298,7 @@ const ProjectSubmitWork = observer(() => { ...@@ -298,7 +298,7 @@ const ProjectSubmitWork = observer(() => {
onRef={configFormRef} onRef={configFormRef}
templateConfigInfo={templateConfigInfo} templateConfigInfo={templateConfigInfo}
setParameter={setParameter} setParameter={setParameter}
setSelectedNodeId={setSelectedNodeId} setSelectedBatchNodeId={setSelectedBatchNodeId}
/> />
</div> </div>
)} )}
...@@ -308,8 +308,8 @@ const ProjectSubmitWork = observer(() => { ...@@ -308,8 +308,8 @@ const ProjectSubmitWork = observer(() => {
> >
<WorkFlow <WorkFlow
templateConfigInfo={templateConfigInfo} templateConfigInfo={templateConfigInfo}
setSelectedNodeId={setSelectedNodeId} setSelectedBatchNodeId={setSelectedBatchNodeId}
selectedNodeId={selectedNodeId} selectedBatchNodeId={selectedBatchNodeId}
/> />
</div> </div>
</div> </div>
......
src/views/Project/components/Flow/index.tsx
View file @ 6326745b
...@@ -27,10 +27,10 @@ interface IProps extends ReactFlowProps { ...@@ -27,10 +27,10 @@ interface IProps extends ReactFlowProps {
tasks?: ITask[]; tasks?: ITask[];
/** 点击batch事件 */ /** 点击batch事件 */
onBatchClick?: (val: string) => void; onBatchClick?: (val: string) => void;
/** 设置选中节点id */ /** 设置选中的batch节点id */
setSelectedNodeId?: (val: string) => void; setSelectedBatchNodeId?: (val: string) => void;
/** 选中的节点id */ /** 选中的batch节点id */
selectedNodeId?: string; selectedBatchNodeId?: string;
/** 类型， edit为编辑类型 */ /** 类型， edit为编辑类型 */
type?: "edit" | "default"; type?: "edit" | "default";
/** 设置组件数据 组件为编辑状态使用 */ /** 设置组件数据 组件为编辑状态使用 */
...@@ -43,8 +43,8 @@ const Flow = (props: IProps) => { ...@@ -43,8 +43,8 @@ const Flow = (props: IProps) => {
const { const {
tasks, tasks,
onBatchClick, onBatchClick,
setSelectedNodeId, setSelectedBatchNodeId,
selectedNodeId, selectedBatchNodeId,
type: flowType = "default", type: flowType = "default",
setTasks, setTasks,
onFlowNodeClick, onFlowNodeClick,
...@@ -165,8 +165,8 @@ const Flow = (props: IProps) => { ...@@ -165,8 +165,8 @@ const Flow = (props: IProps) => {
/** 是否有流节点 */ /** 是否有流节点 */
isFlowNode: isFlowNode(item.id), isFlowNode: isFlowNode(item.id),
/** 选中状态 */ /** 选中状态 */
selectedStatus: selectedNodeId selectedStatus: selectedBatchNodeId
? selectedNodeId === item.id ? selectedBatchNodeId === item.id
: inSideNodeId === item.id, : inSideNodeId === item.id,
} }
: {}), : {}),
...@@ -199,7 +199,7 @@ const Flow = (props: IProps) => { ...@@ -199,7 +199,7 @@ const Flow = (props: IProps) => {
}, [ }, [
tasks, tasks,
isFlowNode, isFlowNode,
selectedNodeId, selectedBatchNodeId,
inSideNodeId, inSideNodeId,
nodesInputAndOutputStatus, nodesInputAndOutputStatus,
getBatchStyle, getBatchStyle,
...@@ -220,7 +220,9 @@ const Flow = (props: IProps) => { ...@@ -220,7 +220,9 @@ const Flow = (props: IProps) => {
}, []); }, []);
}); });
const a = val.map((item: ILine) => { const a = val.map((item: ILine) => {
const newSelectId = selectedNodeId ? selectedNodeId : inSideNodeId; const newSelectId = selectedBatchNodeId
? selectedBatchNodeId
: inSideNodeId;
return { return {
...item, ...item,
// type: "smoothstep", // type: "smoothstep",
...@@ -233,23 +235,23 @@ const Flow = (props: IProps) => { ...@@ -233,23 +235,23 @@ const Flow = (props: IProps) => {
}; };
}); });
return a; return a;
}, [inSideNodeId, selectedNodeId, tasks]); }, [inSideNodeId, selectedBatchNodeId, tasks]);
/** flowNode点击事件 */ /** flowNode点击事件 */
const onNodeClick = (e: any, node: Node) => { const onNodeClick = (e: any, node: Node) => {
tasks?.forEach((item) => { tasks?.forEach((item) => {
if (item.id === node.id) { if (item.id === node.id) {
if (item.parentNode) { if (item.parentNode) {
setSelectedNodeId setSelectedBatchNodeId
? setSelectedNodeId(item.parentNode) ? setSelectedBatchNodeId(item.parentNode)
: setInSideNodeId(item.parentNode); : setInSideNodeId(item.parentNode);
onBatchClick && onBatchClick(item.parentNode); onBatchClick && onBatchClick(item.parentNode);
document document
.getElementById(`point${item.parentNode}`) .getElementById(`point${item.parentNode}`)
?.scrollIntoView(true); ?.scrollIntoView(true);
} else { } else {
setSelectedNodeId setSelectedBatchNodeId
? setSelectedNodeId(node.id) ? setSelectedBatchNodeId(node.id)
: setInSideNodeId(node.id); : setInSideNodeId(node.id);
onBatchClick && onBatchClick(node.id || ""); onBatchClick && onBatchClick(node.id || "");
document.getElementById(`point${node.id}`)?.scrollIntoView(true); document.getElementById(`point${node.id}`)?.scrollIntoView(true);
...@@ -260,7 +262,7 @@ const Flow = (props: IProps) => { ...@@ -260,7 +262,7 @@ const Flow = (props: IProps) => {
}; };
const handlePaneClick = () => { const handlePaneClick = () => {
setSelectedNodeId ? setSelectedNodeId("") : setInSideNodeId(""); setSelectedBatchNodeId ? setSelectedBatchNodeId("") : setInSideNodeId("");
onBatchClick && onBatchClick(""); onBatchClick && onBatchClick("");
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment