Ver Fonte

Merge pull request #158 from czhen-zilliz/refine-advanced-search

fix: Refine advanced search
ryjiang há 4 anos atrás
pai
commit
2c6265466d
1 ficheiros alterados com 13 adições e 12 exclusões
  1. 13 12
      client/src/components/advancedSearch/Dialog.tsx

+ 13 - 12
client/src/components/advancedSearch/Dialog.tsx

@@ -42,6 +42,8 @@ const AdvancedDialog = (props: DialogProps) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   }, []);
 
 
+  const shouldSowPlaceholder: boolean = !isLegal || !filterExpression;
+
   return (
   return (
     <>
     <>
       <Dialog
       <Dialog
@@ -65,17 +67,17 @@ const AdvancedDialog = (props: DialogProps) => {
             <CloseIcon />
             <CloseIcon />
           </IconButton>
           </IconButton>
         </DialogTitle>
         </DialogTitle>
+        <div
+          className={`${classes.expResult} ${
+            shouldSowPlaceholder && 'disable-exp'
+          }`}
+        >
+          {`${shouldSowPlaceholder ? 'Filter Expression' : filterExpression}`}
+          {!shouldSowPlaceholder && (
+            <CopyBtn label="copy expression" value={filterExpression} />
+          )}
+        </div>
         <DialogContent>
         <DialogContent>
-          <div
-            className={`${classes.expResult} ${
-              !isLegal && 'disable-exp'
-            } testcopy`}
-          >
-            {`${isLegal ? filterExpression : 'Filter Expression'}`}
-            {isLegal && (
-              <CopyBtn label="copy expression" value={filterExpression} />
-            )}
-          </div>
           <div className={classes.expWrapper}>
           <div className={classes.expWrapper}>
             <ConditionGroup
             <ConditionGroup
               fields={fields}
               fields={fields}
@@ -198,9 +200,8 @@ const useStyles = makeStyles((theme: Theme) =>
       justifyContent: 'space-between',
       justifyContent: 'space-between',
       alignItems: 'center',
       alignItems: 'center',
       minHeight: '40px',
       minHeight: '40px',
-      marginBottom: '16px',
+      margin: '8px 32px',
       padding: '0 16px',
       padding: '0 16px',
-      fontFamily: 'Source Code Pro',
       fontStyle: 'normal',
       fontStyle: 'normal',
       fontWeight: 'normal',
       fontWeight: 'normal',
       fontSize: '16px',
       fontSize: '16px',