fix: fix issue (#446)

* fix: fix issue * mod: code review
vesoft-inc · Feb 6, 2023 · 89e2c06 · 89e2c06
1 parent acec597
commit 89e2c06
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/app/pages/SketchModeling/Plugins/Tooltip/index.tsx b/app/pages/SketchModeling/Plugins/Tooltip/index.tsx
@@ -39,7 +39,7 @@ const Tooltip = observer(function Tooltip() {
   const {
     data: { type, name, properties = [], fill, strokeColor },
   } = data;
-  if(!name && !properties.length) {
+  if(!container || (!name && !properties.length)) {
     return null;
   }
   const { left, top } = tooltip;

diff --git a/app/pages/SketchModeling/SketchConfigHeader/ApplySpacePopover.tsx b/app/pages/SketchModeling/SketchConfigHeader/ApplySpacePopover.tsx
@@ -79,15 +79,8 @@ const PopoverContent = (props: IContentProps) => {
   }, []);
 
   const switchSpaceAndApply = useCallback(async (space, schemaInfo) => {
-    const err = await schema.switchSpace(space, true);
-    if (!err) {
-      batchApplySchema(schemaInfo);
-    } else if (err && err.toLowerCase().includes('spacenotfound')) {
-      setTimeout(() => switchSpaceAndApply(space, schemaInfo), 1200);
-    } else {
-      setLoading(false);
-      return;
-    }
+    await schema.switchSpace(space);
+    batchApplySchema(space, schemaInfo);
   }, []);
 
   const handleConfirm = useCallback(() => {
@@ -117,7 +110,7 @@ const PopoverContent = (props: IContentProps) => {
           return;
         }
         setLoading(true);
-        batchApplySchema(schemaInfo);
+        batchApplySchema(space, schemaInfo);
         trackEvent('sketch', 'batch_apply_sketch');
       }
     });
@@ -171,16 +164,23 @@ const PopoverContent = (props: IContentProps) => {
     return res;
   }, []);
 
-  const batchApplySchema = useCallback(async (schema) => {
+  const batchApplySchema = useCallback(async (space, schema) => {
     const { tags, edges } = schema;
     const gql = tags.map(tag => getCreateGql(tag)).concat(edges.map(edge => getCreateGql(edge))).join(';');
-    const { code } = await sketchModel.batchApply(gql);
-    setLoading(false);
+    const { code, message: errMsg } = await sketchModel.batchApply(gql, space);
     if(code === 0) {
+      setLoading(false);
       message.success(intl.get('schema.createSuccess'));
       setTimeout(() => {
         history.push('/schema/tag/list');
       }, 600);
+      return;
+    }
+    if (errMsg && errMsg.toLowerCase().includes('spacenotfound')) {
+      setTimeout(() => batchApplySchema(space, schema), 3000);
+    } else {
+      setLoading(false);
+      message.warning(errMsg);
     }
   }, []);
   return (
@@ -215,7 +215,7 @@ const PopoverContent = (props: IContentProps) => {
         </Form>
       )}
       <div className={styles.formFooter}>
-        <Button onClick={close}>{intl.get('common.cancel')}</Button>
+        <Button disabled={loading} onClick={close}>{intl.get('common.cancel')}</Button>
         <Button type="primary" onClick={handleConfirm} loading={loading}>
           {intl.get('common.confirm')}
         </Button>
@@ -252,7 +252,6 @@ export default observer(function ApplySpacePopover() {
       arrowPointAtCenter={true}
       trigger="click"
       open={open}
-      destroyTooltipOnHide={true}
       onOpenChange={open => !open && setOpen(false)}
     >
       <Button type="primary" onClick={handleOpen} disabled={disabled}>

diff --git a/app/stores/sketchModel.ts b/app/stores/sketchModel.ts
@@ -401,9 +401,9 @@ export class SketchStore {
     });
   };
 
-  batchApply = async (gql) => {
-    const { code, data } = await service.execNGQL({ gql });
-    return { code, data };
+  batchApply = async (gql, space) => {
+    const { code, data, message } = await service.execNGQL({ gql, space }, { noTip: true });
+    return { code, data, message };
   };
 
   deleteElement = (type) => {