From 279e095fbd584d589bbc379f4d5da1f7a28cadc9 Mon Sep 17 00:00:00 2001
From: noneAuth <wb-zqm915773@antgroup.com>
Date: Mon, 25 Mar 2024 15:28:20 +0800
Subject: [PATCH 1/5] fix: adding edges without restricting primary keys

---
 .../graph-construct/add-nodes-edges/index.tsx | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
index b591e305..9e0e0d59 100644
--- a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
+++ b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
@@ -38,14 +38,17 @@ export const AddNodesEdges: React.FC<Prop> = ({
   onVisible,
 }) => {
   const [form] = Form.useForm();
+
   const { visible, onShow, onClose } = useVisible({ defaultVisible: true });
-  const isNode = type === 'node';
+
   const [state, updateState] = useImmer<{
     startList: Array<StartData>;
     attrList: Array<AttrData>;
     configList: Array<IndexData>;
+    isNode: boolean;
   }>({
     startList: [],
+    isNode: true,
     attrList: [
       {
         id: 'primary-key',
@@ -64,7 +67,11 @@ export const AddNodesEdges: React.FC<Prop> = ({
   useEffect(() => {
     onVisible?.(visible);
   }, [visible]);
-
+  useEffect(() => {
+    updateState(draft => {
+      draft.isNode = type === 'node';
+    });
+  }, [type]);
   const propertyList = () => {
     const attrPropertyNames = map(
       filter(attrList, attr => !attr.optional && !attr.primaryField),
@@ -195,10 +202,11 @@ export const AddNodesEdges: React.FC<Prop> = ({
           inputType: EditType.SELECT,
           prop: {
             defaultValue: false,
-            disabled: record.primaryField,
+            disabled: state.isNode && record.primaryField,
             options: [
               {
-                label: record.primaryField ? '否（主键）' : '否',
+                label:
+                  state.isNode && record.primaryField ? '否（主键）' : '否',
                 value: false,
               },
               { label: '是', value: true },
@@ -212,7 +220,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
       dataIndex: 'operate',
       key: 'operate',
       render: (_, record: any) =>
-        record.primaryField ? (
+        state.isNode && record.primaryField ? (
           <Button
             disabled
             type="text"
@@ -423,7 +431,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
     >
       <div className={styles[`${PUBLIC_PERFIX_CLASS}-container-content`]}>
         <div className={styles[`${PUBLIC_PERFIX_CLASS}-container-header`]}>
-          <span> 添加{`${isNode ? '点' : '边'}`}类型</span>
+          <span> 添加{`${state.isNode ? '点' : '边'}`}类型</span>
           <div>
             <span style={{ marginRight: 4 }}>命令行建模</span>
             <a href="https://tugraph.antgroup.com/doc" target="_blank">
@@ -434,7 +442,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
         <div>
           <Form layout="vertical" form={form}>
             <Form.Item
-              label={`${isNode ? '点' : '边'}类型名称`}
+              label={`${state.isNode ? '点' : '边'}类型名称`}
               name={'name'}
               rules={[
                 {
@@ -443,7 +451,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
                     var reg = new RegExp('^[a-zA-Z0-9_\u4e00-\u9fa5]+$');
                     if (!value) {
                       return Promise.reject(
-                        `请填写${isNode ? '点' : '边'}类型名称！`,
+                        `请填写${state.isNode ? '点' : '边'}类型名称！`,
                       );
                     }
                     if (!reg.test(value)) {
@@ -459,7 +467,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
             >
               <Input
                 autoComplete="off"
-                placeholder={`请输入${isNode ? '点' : '边'}类型名称`}
+                placeholder={`请输入${state.isNode ? '点' : '边'}类型名称`}
                 className={styles[`${PUBLIC_PERFIX_CLASS}-container-name`]}
               />
             </Form.Item>
@@ -484,7 +492,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
             />
             {addButton(addNodeAttr)}
           </div>
-          {!isNode && (
+          {!state.isNode && (
             <div>
               <p className={styles[`${PUBLIC_PERFIX_CLASS}-container-title`]}>
                 <Tooltip title="如果不选择，则表示起点和终点可以为任意点类型">
@@ -510,7 +518,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
               {addButton(addEdge, '添加起点和终点')}
             </div>
           )}
-          {isNode && (
+          {state.isNode && (
             <div>
               <p className={styles[`${PUBLIC_PERFIX_CLASS}-container-title`]}>
                 索引列表

From 606c8ee5580e3351f0f514796e916609378ace69 Mon Sep 17 00:00:00 2001
From: noneAuth <wb-zqm915773@antgroup.com>
Date: Mon, 25 Mar 2024 16:27:57 +0800
Subject: [PATCH 2/5] fix: adding edges without restricting primary keys

---
 .../graph-construct/add-nodes-edges/index.tsx      | 14 ++++++++------
 client/src/constants/GI_EXPORT_FILES.ts            |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
index 9e0e0d59..4e271643 100644
--- a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
+++ b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
@@ -198,15 +198,15 @@ export const AddNodesEdges: React.FC<Prop> = ({
       key: 'optional',
       editable: true,
       editorConfig: (record: AttrData) => {
+        const isAllow = state.isNode && record.primaryField;
         return {
           inputType: EditType.SELECT,
           prop: {
             defaultValue: false,
-            disabled: state.isNode && record.primaryField,
+            disabled: isAllow,
             options: [
               {
-                label:
-                  state.isNode && record.primaryField ? '否（主键）' : '否',
+                label: isAllow ? '否（主键）' : '否',
                 value: false,
               },
               { label: '是', value: true },
@@ -219,8 +219,9 @@ export const AddNodesEdges: React.FC<Prop> = ({
       title: '操作',
       dataIndex: 'operate',
       key: 'operate',
-      render: (_, record: any) =>
-        state.isNode && record.primaryField ? (
+      render: (_, record: any) => {
+        const isAllow = state.isNode && record.primaryField;
+        return isAllow ? (
           <Button
             disabled
             type="text"
@@ -247,7 +248,8 @@ export const AddNodesEdges: React.FC<Prop> = ({
           >
             <a style={{ color: 'rgba(54,55,64,1)' }}>删除</a>
           </Popconfirm>
-        ),
+        );
+      },
     },
   ];
   const nodeConfigColumns: EditColumnsType<IndexData> = [
diff --git a/client/src/constants/GI_EXPORT_FILES.ts b/client/src/constants/GI_EXPORT_FILES.ts
index e82a43e1..90025ac8 100644
--- a/client/src/constants/GI_EXPORT_FILES.ts
+++ b/client/src/constants/GI_EXPORT_FILES.ts
@@ -1454,7 +1454,7 @@ export default {
     },
     GISDK: {
       name: '@antv/gi-sdk',
-      version: '2.4.20',
+      version: '2.4.21',
       url: 'https://gw.alipayobjects.com/os/lib/antv/gi-sdk/2.4.20/dist/index.min.js',
       global: 'GISDK',
     },

From 3a02b84ef0ef2bad9888ff3426de690ce79a41e8 Mon Sep 17 00:00:00 2001
From: noneAuth <wb-zqm915773@antgroup.com>
Date: Mon, 25 Mar 2024 16:28:52 +0800
Subject: [PATCH 3/5] fix: adding edges without restricting primary keys

---
 .../studio/domain-core/graph-construct/add-nodes-edges/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
index 4e271643..c77625bc 100644
--- a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
+++ b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
@@ -38,7 +38,6 @@ export const AddNodesEdges: React.FC<Prop> = ({
   onVisible,
 }) => {
   const [form] = Form.useForm();
-
   const { visible, onShow, onClose } = useVisible({ defaultVisible: true });
 
   const [state, updateState] = useImmer<{

From 28f6c15400fccee76b9be53d7ddf70a932f4c054 Mon Sep 17 00:00:00 2001
From: noneAuth <wb-zqm915773@antgroup.com>
Date: Mon, 25 Mar 2024 16:49:51 +0800
Subject: [PATCH 4/5] fix: adding edges without restricting primary keys

---
 .../graph-construct/add-nodes-edges/index.tsx          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
index c77625bc..1a485f28 100644
--- a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
+++ b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
@@ -30,6 +30,7 @@ interface EditColumnsType<T> extends ColumnsType<T> {
   };
   editable: boolean;
 }
+
 export const AddNodesEdges: React.FC<Prop> = ({
   type,
   data = [],
@@ -60,6 +61,9 @@ export const AddNodesEdges: React.FC<Prop> = ({
     configList: [],
   });
   const { startList, attrList, configList } = state;
+  const isAllow = (record: any): boolean => {
+    return (state?.isNode && record?.primaryField) || false;
+  };
   useEffect(() => {
     onSwitch?.(onShow, onClose);
   }, []);
@@ -197,7 +201,6 @@ export const AddNodesEdges: React.FC<Prop> = ({
       key: 'optional',
       editable: true,
       editorConfig: (record: AttrData) => {
-        const isAllow = state.isNode && record.primaryField;
         return {
           inputType: EditType.SELECT,
           prop: {
@@ -205,7 +208,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
             disabled: isAllow,
             options: [
               {
-                label: isAllow ? '否（主键）' : '否',
+                label: isAllow(record) ? '否（主键）' : '否',
                 value: false,
               },
               { label: '是', value: true },
@@ -219,8 +222,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
       dataIndex: 'operate',
       key: 'operate',
       render: (_, record: any) => {
-        const isAllow = state.isNode && record.primaryField;
-        return isAllow ? (
+        return isAllow(record) ? (
           <Button
             disabled
             type="text"

From f08cdff4334100aa63538f4da9f5bc4819282e62 Mon Sep 17 00:00:00 2001
From: noneAuth <wb-zqm915773@antgroup.com>
Date: Mon, 25 Mar 2024 16:53:24 +0800
Subject: [PATCH 5/5] fix: adding edges without restricting primary keys

---
 .../domain-core/graph-construct/add-nodes-edges/index.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
index 1a485f28..e21960bf 100644
--- a/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
+++ b/client/src/components/studio/domain-core/graph-construct/add-nodes-edges/index.tsx
@@ -62,7 +62,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
   });
   const { startList, attrList, configList } = state;
   const isAllow = (record: any): boolean => {
-    return (state?.isNode && record?.primaryField) || false;
+    return state?.isNode && record?.primaryField;
   };
   useEffect(() => {
     onSwitch?.(onShow, onClose);
@@ -205,7 +205,7 @@ export const AddNodesEdges: React.FC<Prop> = ({
           inputType: EditType.SELECT,
           prop: {
             defaultValue: false,
-            disabled: isAllow,
+            disabled: isAllow(record),
             options: [
               {
                 label: isAllow(record) ? '否（主键）' : '否',