Skip to content

Commit

Permalink
Merge pull request #28 from TuGraph-family/main-whq
Browse files Browse the repository at this point in the history 
fix: 存储过程图标替换
  • Loading branch information
Moyee authored Sep 27, 2023
2 parents 19cb851 + b270594 commit 3526153
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 94 deletions.
99 changes: 53 additions & 46 deletions ...gins/src/components/studio/tugraph/domain-core/graph-construct/edit-nodes-edges/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type Prop = {
currentGraphName: string;
onRefreshSchema?: () => void;
onSwitch?: (onShow: () => void, onClose: () => void) => void;
onVisible?: (visible: boolean) => void;
};
type EditColumnsType<T> = ColumnsType & {
inputType?: string;
Expand All @@ -36,6 +37,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
currentGraphName,
onRefreshSchema,
onSwitch,
onVisible,
}) => {
const [form] = Form.useForm();
const {
Expand All @@ -62,18 +64,23 @@ export const EditNodesEdges: React.FC<Prop> = ({
useEffect(() => {
onSwitch?.(onShow, onClose);
}, []);

useEffect(() => {
onVisible?.(visible);
}, [visible]);

const propertyList = () => {
const attrPropertyNames = map(
filter(attrList, (attr) => !attr.optional),
(item) => item.name
filter(attrList, attr => !attr.optional),
item => item.name,
);
const indexPropertyNames = map(configList, (item) => item.propertyName);
const indexPropertyNames = map(configList, item => item.propertyName);
return map(
filter(
xor(attrPropertyNames, indexPropertyNames),
(item) => item !== undefined
item => item !== undefined,
),
(item) => ({ label: item, value: item })
item => ({ label: item, value: item }),
);
};
const operateEdit = (record: AttrData) => {
Expand All @@ -82,8 +89,8 @@ export const EditNodesEdges: React.FC<Prop> = ({
<Button
disabled={isPrimaryField(record.name) || false}
onClick={() => {
updateState((draft) => {
draft.attrList = map(attrList, (item) => {
updateState(draft => {
draft.attrList = map(attrList, item => {
if (record.id === item.id) {
return { ...item, disabled: false };
}
Expand Down Expand Up @@ -130,12 +137,12 @@ export const EditNodesEdges: React.FC<Prop> = ({
</Button>
<Button
onClick={() => {
updateState((draft) => {
updateState(draft => {
if (record.disabled !== undefined) {
const list = map(attrList, (item) => {
const list = map(attrList, item => {
if (item.id === record.id) {
return {
...find(currentAttrList, (attr) => attr.id === record.id),
...find(currentAttrList, attr => attr.id === record.id),
};
} else {
return item;
Expand All @@ -144,7 +151,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
draft.attrList = list;
} else {
draft.attrList = [
...filter(attrList, (item) => item.id !== record.id),
...filter(attrList, item => item.id !== record.id),
];
}
});
Expand All @@ -169,9 +176,9 @@ export const EditNodesEdges: React.FC<Prop> = ({
</Button>
<Button
onClick={() => {
updateState((draft) => {
updateState(draft => {
draft.configList = [
...configList.filter((item) => item.id !== record?.id),
...configList.filter(item => item.id !== record?.id),
];
});
}}
Expand Down Expand Up @@ -214,7 +221,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
return {
inputType: EditType.SELECT,
prop: {
options: map(data.nodes, (item) => ({
options: map(data.nodes, item => ({
label: item.labelName,
value: item.labelName,
})),
Expand All @@ -231,7 +238,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
return {
inputType: EditType.SELECT,
prop: {
options: map(data.nodes, (item) => ({
options: map(data.nodes, item => ({
label: item.labelName,
value: item.labelName,
})),
Expand Down Expand Up @@ -420,7 +427,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
const findLabelItem = (labelName: string) => {
return find(
type === 'node' ? data.nodes : data.edges,
(item) => item.labelName === labelName
item => item.labelName === labelName,
);
};
const isPrimaryField = (name: string) => {
Expand All @@ -433,20 +440,20 @@ export const EditNodesEdges: React.FC<Prop> = ({
labelType: type,
propertyNames: [record.name],
})
.then((res) => {
.then(res => {
if (res.success) {
message.success('属性删除成功');
updateState((draft) => {
updateState(draft => {
draft.attrList = [
...attrList.filter((item) => item.id !== record?.id),
...attrList.filter(item => item.id !== record?.id),
];
});
onRefreshSchema?.();
} else {
message.error('属性删除失败' + res.errorMessage);
}
})
.catch((res) => {
.catch(res => {
message.error('属性删除失败' + res.errorMessage);
});
};
Expand All @@ -459,12 +466,12 @@ export const EditNodesEdges: React.FC<Prop> = ({
{ name: record.name, type: record.type, optional: record.optional },
],
})
.then((res) => {
.then(res => {
if (res.success) {
message.success('属性修改成功');
updateState((draft) => {
updateState(draft => {
draft.attrList = [
...attrList.map((item) => {
...attrList.map(item => {
if (item.id === record?.id) {
return { ...item, disabled: true };
} else {
Expand All @@ -478,7 +485,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
message.error('属性修改失败' + res.errorMessage);
}
})
.catch((res) => {
.catch(res => {
message.error('属性修改失败' + res.errorMessage);
});
};
Expand All @@ -491,12 +498,12 @@ export const EditNodesEdges: React.FC<Prop> = ({
{ name: record.name, type: record.type, optional: record.optional },
],
})
.then((res) => {
.then(res => {
if (res.success) {
message.success('属性添加成功');
updateState((draft) => {
updateState(draft => {
draft.attrList = [
...attrList.map((item) => {
...attrList.map(item => {
if (item.id === record?.id) {
return { ...item, disabled: true };
} else {
Expand All @@ -510,7 +517,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
message.error('属性添加失败' + res.errorMessage);
}
})
.catch((res) => {
.catch(res => {
message.error('属性添加失败' + res.errorMessage);
});
};
Expand All @@ -521,12 +528,12 @@ export const EditNodesEdges: React.FC<Prop> = ({
labelName,
isUnique: record.isUnique,
})
.then((res) => {
.then(res => {
if (res.success) {
message.success('索引添加成功');
updateState((draft) => {
updateState(draft => {
draft.configList = [
...configList.map((item) => {
...configList.map(item => {
if (item.id === record?.id) {
return { ...item, disabled: true };
} else {
Expand All @@ -540,7 +547,7 @@ export const EditNodesEdges: React.FC<Prop> = ({
message.error('索引添加失败' + res.errorMessage);
}
})
.catch((res) => {
.catch(res => {
message.error('索引添加失败' + res.errorMessage);
});
};
Expand All @@ -550,47 +557,47 @@ export const EditNodesEdges: React.FC<Prop> = ({
graphName: currentGraphName,
labelName,
})
.then((res) => {
.then(res => {
if (res.success) {
message.success('索引删除成功');
updateState((draft) => {
updateState(draft => {
draft.configList = [
...configList.filter((item) => item.id !== record?.id),
...configList.filter(item => item.id !== record?.id),
];
});
onRefreshSchema?.();
} else {
message.error('索引删除失败' + res.errorMessage);
}
})
.catch((res) => {
.catch(res => {
message.error('索引删除失败' + res.errorMessage);
});
};
const addNodeAttr = () => {
updateState((draft) => {
updateState(draft => {
const list = [...attrList];
list.push({ id: uniqueId(`attr_`) });
draft.attrList = [...list];
});
};
const addNodeConfig = () => {
updateState((draft) => {
updateState(draft => {
const list = [...configList];
list.push({ id: uniqueId(`index_`), index: `#${configList.length + 1}` });
draft.configList = [...list];
});
};
useEffect(() => {
form.setFieldsValue({ name: labelName });
updateState((draft) => {
updateState(draft => {
const newAttrList = map(
findLabelItem(labelName)?.properties,
(item, index) => ({
...item,
id: uniqueId(`attr_`),
disabled: true,
})
}),
);
draft.attrList = [...newAttrList];
draft.currentAttrList = [...newAttrList];
Expand All @@ -604,11 +611,11 @@ export const EditNodesEdges: React.FC<Prop> = ({
disabled: true,
id: uniqueId(`index_`),
disabled: true,
})
}),
);
} else {
draft.startList = [
...map(findLabelItem(labelName)?.edgeConstraints, (item) => ({
...map(findLabelItem(labelName)?.edgeConstraints, item => ({
source: item[0],
target: item[1],
id: uniqueId(`edge_`),
Expand Down Expand Up @@ -670,8 +677,8 @@ export const EditNodesEdges: React.FC<Prop> = ({
columns={defaultColumns}
dataSource={attrList}
rowKey="id"
onChange={(newData) => {
updateState((draft) => {
onChange={newData => {
updateState(draft => {
draft.attrList = [...newData];
});
}}
Expand Down Expand Up @@ -708,8 +715,8 @@ export const EditNodesEdges: React.FC<Prop> = ({
columns={nodeConfigColumns}
dataSource={configList}
rowKey="id"
onChange={(newData) => {
updateState((draft) => {
onChange={newData => {
updateState(draft => {
draft.configList = [...newData];
});
}}
Expand Down
7 changes: 6 additions & 1 deletion .../components/@@plugins/src/components/studio/tugraph/domain-core/graph-construct/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ export const GraphConstruct = (props: PluginPorps) => {
<div
className={styles[`${PUBLIC_PERFIX_CLASS}-construct-canvas-layout`]}
style={{
right: visible ? 596 : 24,
right: visible ? 617 : 24,
}}
>
<GraphCanvasTools />
Expand All @@ -503,6 +503,11 @@ export const GraphConstruct = (props: PluginPorps) => {
draft.onEditClose = onClose;
});
}}
onVisible={visible => {
setState(draft => {
draft.visible = visible;
});
}}
/>
) : (
<AddNodesEdges
Expand Down
Loading

0 comments on commit 3526153

Please sign in to comment.