From 1e76535ca61f853f2a8c3c5f0659e1d5b1f97bcc Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 29 Feb 2024 17:11:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=84=9A=E6=9C=AC=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=81=AE=E6=8C=A1?=
 =?UTF-8?q?=E4=BA=86=E5=AD=97=E7=AC=A6=20#2786=20#=20Reviewed,=20transacti?=
 =?UTF-8?q?on=20id:=203475?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                       | 3 +++
 src/frontend/package.json                        | 2 +-
 src/frontend/src/components/ace-editor/index.vue | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 72e96c54e4..6e836bdc4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,6 @@ support-files/dependJarLists/
 **/*.DS_Store
 .codecc
 build.yml
+
+
+pre-*-bkcodeai
diff --git a/src/frontend/package.json b/src/frontend/package.json
index a1b754f0bd..8cc441bbb5 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -20,7 +20,7 @@
     "@blueking/user-selector": "1.0.11",
     "@vue/babel-preset-jsx": "1.4.0",
     "@vue/composition-api": "1.7.2",
-    "ace-builds": "1.31.2",
+    "ace-builds": "1.32.6",
     "axios": "1.6.2",
     "bk-magic-vue": "2.5.8-beta.6",
     "core-js": "3.33.2",
diff --git a/src/frontend/src/components/ace-editor/index.vue b/src/frontend/src/components/ace-editor/index.vue
index f856d08fa8..8cdb969379 100644
--- a/src/frontend/src/components/ace-editor/index.vue
+++ b/src/frontend/src/components/ace-editor/index.vue
@@ -480,8 +480,6 @@
           autoScrollEditorIntoView: true,
           copyWithEmptySelection: true,
           useElasticTabstops: true,
-          printMarginColumn: true,
-          printMargin: 80,
           scrollPastEnd: 0.2,
         });
         editor.setTheme('ace/theme/monokai');
@@ -489,6 +487,8 @@
         editor.$blockScrolling = Infinity;
         editor.setReadOnly(this.readonly);
 
+        editor.renderer.setScrollMargin(0, 0, 0, 30);
+
         editor.on('change', () => {
           this.content = editor.getValue();
           const content = Base64.encode(this.content);