feat: show error msg when json parse failed #24

Signed-off-by: seven <[email protected]>
geek-fun · Mar 22, 2024 · 46fdf90 · 46fdf90
1 parent 6610a57
commit 46fdf90
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 15 deletions.
diff --git a/src/lang/enUS.ts b/src/lang/enUS.ts
@@ -50,6 +50,7 @@ export const enUS = {
   },
   editor: {
     establishedRequired: 'Select a DB instance before execute actions',
+    invalidJson: 'Invalid JSON format',
   },
   history: {
     empty: 'No history yet',

diff --git a/src/lang/zhCN.ts b/src/lang/zhCN.ts
@@ -50,6 +50,7 @@ export const zhCN = {
   },
   editor: {
     establishedRequired: '请选择执行操作的数据库实例',
+    invalidJson: '无效的 JSON 格式',
   },
   history: {
     empty: '无历史记录',

diff --git a/src/views/editor/index.vue b/src/views/editor/index.vue
@@ -189,21 +189,33 @@ const setupQueryEditor = (code: string) => {
     language: 'search',
   });
 
-  autoIndentCmdId = queryEditor.addCommand(0, (ctx, args) => {
-    if (args) {
-      const { startLineNumber, endLineNumber } = args as {
-        startLineNumber: number;
-        endLineNumber: number;
-      };
+  autoIndentCmdId = queryEditor.addCommand(
+    0,
+    (
+      ctx,
+      args:
+        | {
+            startLineNumber: number;
+            endLineNumber: number;
+          }
+        | undefined,
+    ) => {
+      if (!args) {
+        return;
+      }
       const model = queryEditor?.getModel();
+      if (!model) {
+        return;
+      }
 
-      if (model) {
-        const content = model.getValueInRange({
-          startLineNumber,
-          startColumn: 1,
-          endLineNumber: endLineNumber,
-          endColumn: model.getLineLength(endLineNumber) + 1,
-        });
+      const { startLineNumber, endLineNumber } = args;
+      const content = model.getValueInRange({
+        startLineNumber,
+        startColumn: 1,
+        endLineNumber: endLineNumber,
+        endColumn: model.getLineLength(endLineNumber) + 1,
+      });
+      try {
         const formatted = JSON.stringify(JSON.parse(content), null, 2);
         model.pushEditOperations(
           [],
@@ -220,9 +232,15 @@ const setupQueryEditor = (code: string) => {
           ],
           inverseEditOperations => [],
         );
+      } catch (err) {
+        message.error(lang.t('editor.invalidJson'), {
+          closable: true,
+          keepAliveOnHover: true,
+        });
+        return;
       }
-    }
-  });
+    },
+  );
 
   queryEditor.onMouseDown(({ event, target }) => {
     if (