From 0d34ee96d6c2efeb447c758b3296f2e422538cff Mon Sep 17 00:00:00 2001
From: Nut He <18328704+hetao92@users.noreply.github.com>
Date: Fri, 16 Jun 2023 15:34:40 +0800
Subject: [PATCH] fix: fix some issues #568 & #572 & 578

---
 app/components/CodeMirror/index.tsx                | 14 +++++++-------
 app/pages/Schema/SpaceCreate/CreateForm.tsx        |  3 ++-
 .../SketchConfigHeader/ApplySpacePopover.tsx       |  3 +++
 server/api/studio/pkg/filestore/sftpstore.go       |  5 ++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/components/CodeMirror/index.tsx b/app/components/CodeMirror/index.tsx
index 26c865e9..22502979 100644
--- a/app/components/CodeMirror/index.tsx
+++ b/app/components/CodeMirror/index.tsx
@@ -124,13 +124,13 @@ export default class ReactCodeMirror extends React.PureComponent<IProps, any> {
   };
 
   codemirrorValueChange = (doc, change) => {
-    const line = change.from.line;
-    const lineInfo = doc?.lineInfo(line);
-    if (lineInfo?.text?.startsWith('//') || lineInfo?.text?.startsWith('#')) {
-      doc.addLineClass(line, 'wrap', 'notes');
-    } else if(lineInfo?.wrapClass === 'notes') {
-      doc.removeLineClass(line, 'wrap', 'notes');
-    }
+    doc.eachLine(line => {
+      if(line.text.startsWith('//') || line.text.startsWith('#')) {
+        doc.addLineClass(line, 'wrap', 'notes');
+      } else if (line.wrapClass === 'notes') {
+        doc.removeLineClass(line, 'wrap', 'notes');
+      }
+    });
     if (change.origin !== 'setValue') {
       if (this.props.onChange) {
         this.props.onChange(doc.getValue());
diff --git a/app/pages/Schema/SpaceCreate/CreateForm.tsx b/app/pages/Schema/SpaceCreate/CreateForm.tsx
index bc3c07ad..ed99e277 100644
--- a/app/pages/Schema/SpaceCreate/CreateForm.tsx
+++ b/app/pages/Schema/SpaceCreate/CreateForm.tsx
@@ -5,6 +5,7 @@ import { nameRulesFn, numberRulesFn, replicaRulesFn, stringByteRulesFn } from '@
 import { useI18n } from '@vesoft-inc/i18n';
 import { DEFAULT_PARTITION_NUM } from '@app/utils/constant';
 import styles from './index.module.less';
+import { observer } from 'mobx-react-lite';
 const Option = Select.Option;
 
 
@@ -127,4 +128,4 @@ const CreateForm = (props: IProps) => {
   );
 };
 
-export default CreateForm;
+export default observer(CreateForm);
diff --git a/app/pages/SketchModeling/SketchConfigHeader/ApplySpacePopover.tsx b/app/pages/SketchModeling/SketchConfigHeader/ApplySpacePopover.tsx
index c52e586b..fb6cc017 100644
--- a/app/pages/SketchModeling/SketchConfigHeader/ApplySpacePopover.tsx
+++ b/app/pages/SketchModeling/SketchConfigHeader/ApplySpacePopover.tsx
@@ -68,6 +68,9 @@ const PopoverContent = (props: IContentProps) => {
     sketchModel
   } = useStore();
   const { getMachineNumber, getSpaces, updateSpaceInfo } = schema;
+  useEffect(() => {
+    getMachineNumber();
+  }, []);
   const handleChangeMode = useCallback(async (e: any) => {
     const { value } = e.target;
     setMode(value);
diff --git a/server/api/studio/pkg/filestore/sftpstore.go b/server/api/studio/pkg/filestore/sftpstore.go
index ca911e69..1489b88e 100644
--- a/server/api/studio/pkg/filestore/sftpstore.go
+++ b/server/api/studio/pkg/filestore/sftpstore.go
@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
-	"os/user"
 	"strings"
 
 	"github.com/pkg/sftp"
@@ -93,12 +92,12 @@ func (s *SftpStore) ReadFile(path string, startLine ...int) ([]string, error) {
 
 func (s *SftpStore) ListFiles(dir string) ([]FileConfig, error) {
 	var files []FileConfig
+	var err error
 	if dir == "" {
-		user, err := user.Lookup(s.Username)
+		dir, err = s.SftpClient.Getwd()
 		if err != nil {
 			return nil, err
 		}
-		dir = user.HomeDir
 	}
 
 	_files, err := s.SftpClient.ReadDir(dir)