From ef9918cee24f3ca76dad75e72300fa73fe93885b Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Wed, 10 Jul 2024 17:29:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E6=89=93=E5=BC=80F12=E5=90=8E?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E4=BC=9A=E6=8A=8A=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E7=9B=96=E4=BD=8F=E4=B8=94=E5=A4=9A=E6=AC=A1=E5=B1=95?=
 =?UTF-8?q?=E5=BC=80=E4=BE=A7=E8=BE=B9=E6=A0=8F=E4=BC=9A=E6=97=A0=E9=99=90?=
 =?UTF-8?q?=E5=BB=B6=E4=BC=B8=20#3111=20#=20Reviewed,=20transaction=20id:?=
 =?UTF-8?q?=2017769?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/site-frame/index.vue       | 22 ++++---------------
 src/frontend/src/layout-new.vue               | 10 +++++++--
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/frontend/src/components/site-frame/index.vue b/src/frontend/src/components/site-frame/index.vue
index db844ba3b7..06eacf1be5 100644
--- a/src/frontend/src/components/site-frame/index.vue
+++ b/src/frontend/src/components/site-frame/index.vue
@@ -90,13 +90,13 @@
 <script>
   import _ from 'lodash';
 
-  import { getOffset } from '@/utils/assist';
-
   const PAGE_MIN_WIDTH = 1366;
   const PAGE_MIDDLE_WIDTH = 1920;
   const SIDE_LEFT_EXPAND_SMALL_WIDTH = 220;
   const SIDE_LEFT_EXPAND_BIG_WIDTH = 280;
   const SIDE_LEFT_INEXPAND_WIDTH = 60;
+  const SITE_HEADER_HEIGHT = 52;
+  const CONTENT_HEADER_HEIGHT = 52;
 
 
   export default {
@@ -113,8 +113,6 @@
         isSideHover: false,
         pageWidth: PAGE_MIN_WIDTH,
         sideLeftExpandWidth: 0,
-        sideOffsetTop: 0,
-        contentOffsetTop: 0,
       };
     },
     computed: {
@@ -127,7 +125,7 @@
         };
       },
       sideStyles() {
-        const height = `calc(100vh - ${this.sideOffsetTop}px)`;
+        const height = `calc(100vh - ${SITE_HEADER_HEIGHT}px - var(--notice-height))`;
         if (this.isSideHover) {
           return {
             width: `${this.sideLeftExpandWidth}px`,
@@ -149,7 +147,7 @@
       scrollStyles() {
         return {
           width: `calc(100vw - ${this.realSideWidth}px)`,
-          height: `calc(100vh - ${this.contentOffsetTop}px)`,
+          height: `calc(100vh - ${SITE_HEADER_HEIGHT}px - ${CONTENT_HEADER_HEIGHT}px - var(--notice-height))`,
         };
       },
       contentStyles() {
@@ -177,20 +175,8 @@
       const resizeHandler = _.throttle(this.init, 100);
       window.addEventListener('resize', resizeHandler);
 
-      const observer = new MutationObserver(_.throttle(() => {
-        this.sideOffsetTop = getOffset(this.$refs.side).top;
-        this.contentOffsetTop = getOffset(this.$refs.contentScroll.$el).top;
-      }, 100));
-      observer.observe(this.$refs.root, {
-        subtree: true,
-        childList: true,
-        attributeName: true,
-        characterData: true,
-      });
       this.$once('hook:beforeDestroy', () => {
         window.removeEventListener('resize', resizeHandler);
-        observer.takeRecords();
-        observer.disconnect();
       });
     },
     methods: {
diff --git a/src/frontend/src/layout-new.vue b/src/frontend/src/layout-new.vue
index 42bc0ae9dd..f3090c231d 100644
--- a/src/frontend/src/layout-new.vue
+++ b/src/frontend/src/layout-new.vue
@@ -26,10 +26,11 @@
 -->
 
 <template>
-  <div>
+  <div :style="{'--notice-height': isShowBKNotice ? '40px' : '0px'}">
     <notice-component
       v-if="isEnableBKNotice"
-      :api-url="noticApiUrl" />
+      :api-url="noticApiUrl"
+      @show-alert-change="showNoticChange" />
     <site-frame
       :side-fixed="isFrameSideFixed"
       @on-side-expand="handleSideExpandChange"
@@ -311,6 +312,7 @@
   const routerTitle = ref('');
   const isEnableFeatureFileManage = ref(false);
   const isEnableBKNotice = ref(false);
+  const isShowBKNotice = ref(false);
 
   const route = useRoute();
   const router = useRouter();
@@ -365,6 +367,10 @@
   const handleSideExpandChange = (sideExpand) => {
     isSideExpand.value = sideExpand;
   };
+
+  const showNoticChange = (value) => {
+    isShowBKNotice.value = value;
+  };
   /**
    * @desc 跳转路由
    * @param {String} routerName 跳转的路由名

From 3206e485cf1c349e41efa6cb1755851d238e6589 Mon Sep 17 00:00:00 2001
From: jsonwan <jsonwan@tencent.com>
Date: Mon, 14 Oct 2024 14:32:34 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=20#3245?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CronJobServiceImpl.java      | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java
index 40d0ed1cef..02d527f202 100644
--- a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java
+++ b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java
@@ -221,6 +221,8 @@ public CronJobInfoDTO createCronJobInfo(String username, CronJobInfoDTO cronJobI
         checkCronJobPlanOrScript(cronJobInfo);
         saveSnapShotForHostVaiableValue(cronJobInfo);
 
+        // 有执行方案运行权限，才能用该执行方案创建定时任务
+        authExecuteTask(cronJobInfo);
         cronJobInfo.setCreateTime(DateUtils.currentTimeSeconds());
         cronJobInfo.setEnable(false);
 
@@ -253,23 +255,11 @@ public CronJobInfoDTO updateCronJobInfo(String username, CronJobInfoDTO cronJobI
         processCronJobVariableValueMask(cronJobInfo);
 
         if (cronJobInfo.getEnable()) {
-            try {
-                List<ServiceTaskVariable> taskVariables = null;
-                if (CollectionUtils.isNotEmpty(cronJobInfo.getVariableValue())) {
-                    taskVariables =
-                        cronJobInfo.getVariableValue().parallelStream()
-                            .map(CronJobVariableDTO::toServiceTaskVariable).collect(Collectors.toList());
-                }
-                executeTaskService.authExecuteTask(cronJobInfo.getAppId(), cronJobInfo.getTaskPlanId(),
-                    cronJobInfo.getId(), cronJobInfo.getName(), taskVariables, cronJobInfo.getLastModifyUser());
-                if (cronJobDAO.updateCronJobById(cronJobInfo)) {
-                    informAllToAddJobToQuartz(cronJobInfo.getAppId(), cronJobInfo.getId());
-                } else {
-                    throw new InternalException(ErrorCode.UPDATE_CRON_JOB_FAILED);
-                }
-            } catch (TaskExecuteAuthFailedException e) {
-                log.error("Error while pre auth cron execute!", e);
-                throw e;
+            authExecuteTask(cronJobInfo);
+            if (cronJobDAO.updateCronJobById(cronJobInfo)) {
+                informAllToAddJobToQuartz(cronJobInfo.getAppId(), cronJobInfo.getId());
+            } else {
+                throw new InternalException(ErrorCode.UPDATE_CRON_JOB_FAILED);
             }
         } else {
             if (cronJobDAO.updateCronJobById(cronJobInfo)) {
@@ -289,6 +279,22 @@ public CronJobInfoDTO updateCronJobInfo(String username, CronJobInfoDTO cronJobI
         return updateCron;
     }
 
+    private void authExecuteTask(CronJobInfoDTO cronJobInfo){
+        try {
+            List<ServiceTaskVariable> taskVariables = null;
+            if (CollectionUtils.isNotEmpty(cronJobInfo.getVariableValue())) {
+                taskVariables =
+                    cronJobInfo.getVariableValue().parallelStream()
+                        .map(CronJobVariableDTO::toServiceTaskVariable).collect(Collectors.toList());
+            }
+            executeTaskService.authExecuteTask(cronJobInfo.getAppId(), cronJobInfo.getTaskPlanId(),
+                cronJobInfo.getId(), cronJobInfo.getName(), taskVariables, cronJobInfo.getLastModifyUser());
+        } catch (TaskExecuteAuthFailedException e) {
+            log.error("Error while pre auth cron execute!", e);
+            throw e;
+        }
+    }
+
     /**
      * 保存定时任务主机变量中的IP等快照信息
      *

From 706d1d074b67d23a63dcb3293c039d328b2b8102 Mon Sep 17 00:00:00 2001
From: jsonwan <jsonwan@tencent.com>
Date: Mon, 14 Oct 2024 14:32:34 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=20#3245?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CronJobServiceImpl.java      | 40 +++++++++++--------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java
index 4cf29eaecf..78526aedaa 100644
--- a/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java
+++ b/src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobServiceImpl.java
@@ -217,6 +217,8 @@ public CronJobInfoDTO createCronJobInfo(String username, CronJobInfoDTO cronJobI
         checkCronJobPlanOrScript(cronJobInfo);
         saveSnapShotForHostVaiableValue(cronJobInfo);
 
+        // 有执行方案运行权限，才能用该执行方案创建定时任务
+        authExecuteTask(cronJobInfo);
         cronJobInfo.setCreateTime(DateUtils.currentTimeSeconds());
         cronJobInfo.setEnable(false);
 
@@ -250,23 +252,11 @@ public CronJobInfoDTO updateCronJobInfo(String username, CronJobInfoDTO cronJobI
         processCronJobVariableValueMask(cronJobInfo);
 
         if (cronJobInfo.getEnable()) {
-            try {
-                List<ServiceTaskVariable> taskVariables = null;
-                if (CollectionUtils.isNotEmpty(cronJobInfo.getVariableValue())) {
-                    taskVariables =
-                        cronJobInfo.getVariableValue().parallelStream()
-                            .map(CronJobVariableDTO::toServiceTaskVariable).collect(Collectors.toList());
-                }
-                executeTaskService.authExecuteTask(cronJobInfo.getAppId(), cronJobInfo.getTaskPlanId(),
-                    cronJobInfo.getId(), cronJobInfo.getName(), taskVariables, cronJobInfo.getLastModifyUser());
-                if (cronJobDAO.updateCronJobById(cronJobInfo)) {
-                    informAllToAddJobToQuartz(cronJobInfo.getAppId(), cronJobInfo.getId());
-                } else {
-                    throw new InternalException(ErrorCode.UPDATE_CRON_JOB_FAILED);
-                }
-            } catch (TaskExecuteAuthFailedException e) {
-                log.error("Error while pre auth cron execute!", e);
-                throw e;
+            authExecuteTask(cronJobInfo);
+            if (cronJobDAO.updateCronJobById(cronJobInfo)) {
+                informAllToAddJobToQuartz(cronJobInfo.getAppId(), cronJobInfo.getId());
+            } else {
+                throw new InternalException(ErrorCode.UPDATE_CRON_JOB_FAILED);
             }
         } else {
             if (cronJobDAO.updateCronJobById(cronJobInfo)) {
@@ -286,6 +276,22 @@ public CronJobInfoDTO updateCronJobInfo(String username, CronJobInfoDTO cronJobI
         return updateCron;
     }
 
+    private void authExecuteTask(CronJobInfoDTO cronJobInfo){
+        try {
+            List<ServiceTaskVariable> taskVariables = null;
+            if (CollectionUtils.isNotEmpty(cronJobInfo.getVariableValue())) {
+                taskVariables =
+                    cronJobInfo.getVariableValue().parallelStream()
+                        .map(CronJobVariableDTO::toServiceTaskVariable).collect(Collectors.toList());
+            }
+            executeTaskService.authExecuteTask(cronJobInfo.getAppId(), cronJobInfo.getTaskPlanId(),
+                cronJobInfo.getId(), cronJobInfo.getName(), taskVariables, cronJobInfo.getLastModifyUser());
+        } catch (TaskExecuteAuthFailedException e) {
+            log.error("Error while pre auth cron execute!", e);
+            throw e;
+        }
+    }
+
     /**
      * 保存定时任务主机变量中的IP等快照信息
      *

From d0389a1389c019c652f0cef0d86143604ab71bf2 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Mon, 14 Oct 2024 14:58:27 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E8=84=9A=E6=9C=AC=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E6=97=A5=E5=BF=97=E4=BB=BB=E5=8A=A1=E8=B7=B3=E5=8A=A8?=
 =?UTF-8?q?=20#3248?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../execution-info/components/script-log.vue   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue b/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue
index 40653dd4bd..c3f17666ff 100644
--- a/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue
+++ b/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue
@@ -234,9 +234,6 @@
             this.$nextTick(() => {
               this.editor.setValue(logContent);
               this.editor.clearSelection();
-              setTimeout(() => {
-                document.body.querySelector('.ace_layer.ace_text-layer').appendChild(this.$refs.aiExtendTool);
-              }, 1000);
             });
             // 当前主机执行结束
             if (!finished) {
@@ -250,7 +247,7 @@
       fetchAiConfig() {
         AiService.fetchConfig()
           .then((data) => {
-            this.isAiEnable = data.enable;
+            this.isAiEnable = data.enabled;
           });
       },
       initEditor() {
@@ -280,8 +277,17 @@
           } = editor.renderer.layerConfig;
           this.isWillAutoScroll = height + scrollTop + 30 >= maxHeight;
         });
+        editorSession.on('changeScrollTop', () => {
+          console.log('editorSession = scroll');
+        });
+
+        console.log('editor = init', editor);
         this.editor = editor;
 
+        setTimeout(() => {
+          document.body.querySelector('.ace_content').appendChild(this.$refs.aiExtendTool);
+        }, 1000);
+
         this.$once('hook:beforeDestroy', () => {
           editor.destroy();
           editor.container.remove();
@@ -339,6 +345,7 @@
         this.editor.scrollToLine(Infinity);
       },
       handleMouseUp(event) {
+        console.log('handleMouseUphandleMouseUphandleMouseUp', this.isAiEnable);
         if (!this.isAiEnable) {
           return;
         }
@@ -347,7 +354,8 @@
             this.aiExtendToolStyle = {};
             return;
           }
-          const containerEle = document.body.querySelector('.ace_layer.ace_text-layer');
+          console.log('handleMouseUphandleMouseUphandleMouseUp');
+          const containerEle = document.body.querySelector('.ace_content');
           const {
             left: contentBoxLeft,
             top: contentBoxTop,

From 89ca2b8f49c19b58c64ed04e19ade4e9b6d4a89b Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Tue, 15 Oct 2024 10:59:48 +0800
Subject: [PATCH 5/6] Merge branch '3.8_local' into 3.9.x_local # Reviewed,
 transaction id: 20641


From 61d2741c357fba611439c4ad68d86e0640a12675 Mon Sep 17 00:00:00 2001
From: hLinx <327159425@qq.com>
Date: Thu, 17 Oct 2024 10:17:24 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E8=84=9A=E6=9C=AC=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=AD=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E6=97=A5=E5=BF=97=E4=BB=BB=E5=8A=A1=E8=B7=B3=E5=8A=A8?=
 =?UTF-8?q?=20#3248=20#=20Reviewed,=20transaction=20id:=2021014?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/src/components/jb-ai/index.vue   |  2 +-
 .../execution-info/components/script-log.vue  | 39 ++++++++-----------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/frontend/src/components/jb-ai/index.vue b/src/frontend/src/components/jb-ai/index.vue
index 83f8c138e2..12349e11f8 100644
--- a/src/frontend/src/components/jb-ai/index.vue
+++ b/src/frontend/src/components/jb-ai/index.vue
@@ -185,7 +185,7 @@
       transition: all .1s ease-in-out;
 
       &.active{
-        transform: translateX(29px);
+        transform: translateX(39px);
       }
 
       &:hover{
diff --git a/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue b/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue
index c3f17666ff..a4c7c76ef2 100644
--- a/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue
+++ b/src/frontend/src/views/executive-history/step-detail/components/execution-info/components/script-log.vue
@@ -195,19 +195,14 @@
     },
     mounted() {
       this.initEditor();
-      const handleHideAiExtendTool = () => {
-        this.aiExtendToolStyle = {};
-      };
-      document.body.addEventListener('mousedown', handleHideAiExtendTool);
-      this.$once('hook:beforeDestroy', () => {
-        document.body.removeEventListener('mousedown', handleHideAiExtendTool);
-      });
+      this.initAiHelper();
     },
     methods: {
       /**
        * @desc 获取脚本日志
        */
       fetchLogContent() {
+        console.log('taskExecuteDetail = ', this.taskExecuteDetail);
         if (!this.taskExecuteDetail.executeObject) {
           this.isLoading = false;
           if (this.editor) {
@@ -277,22 +272,23 @@
           } = editor.renderer.layerConfig;
           this.isWillAutoScroll = height + scrollTop + 30 >= maxHeight;
         });
-        editorSession.on('changeScrollTop', () => {
-          console.log('editorSession = scroll');
-        });
 
-        console.log('editor = init', editor);
         this.editor = editor;
-
-        setTimeout(() => {
-          document.body.querySelector('.ace_content').appendChild(this.$refs.aiExtendTool);
-        }, 1000);
-
         this.$once('hook:beforeDestroy', () => {
           editor.destroy();
           editor.container.remove();
         });
       },
+      initAiHelper() {
+        const handleHideAiExtendTool = () => {
+          this.aiExtendToolStyle = {};
+        };
+
+        document.body.addEventListener('mousedown', handleHideAiExtendTool);
+        this.$once('hook:beforeDestroy', () => {
+          document.body.removeEventListener('mousedown', handleHideAiExtendTool);
+        });
+      },
       /**
        * @desc 外部调用
        */
@@ -326,6 +322,7 @@
       autoScrollTimeout() {
         if (this.isWillAutoScroll && !this.isLoading) {
           this.handleScrollBottom();
+          return;
         }
         setTimeout(() => {
           this.autoScrollTimer = this.autoScrollTimeout();
@@ -345,7 +342,6 @@
         this.editor.scrollToLine(Infinity);
       },
       handleMouseUp(event) {
-        console.log('handleMouseUphandleMouseUphandleMouseUp', this.isAiEnable);
         if (!this.isAiEnable) {
           return;
         }
@@ -354,18 +350,15 @@
             this.aiExtendToolStyle = {};
             return;
           }
-          console.log('handleMouseUphandleMouseUphandleMouseUp');
-          const containerEle = document.body.querySelector('.ace_content');
           const {
             left: contentBoxLeft,
             top: contentBoxTop,
-          } = getOffset(containerEle);
+          } = getOffset(this.$refs.contentBox);
 
-          const [transformY] = containerEle.style.transform.match(/([\d]+)[^\d]+$/);
           const { pageX, pageY } = event;
           this.aiExtendToolStyle = {
             display: 'flex',
-            top: `${Math.max(pageY - 40 - contentBoxTop + parseInt(transformY, 10), 8)}px`,
+            top: `${Math.max(pageY - 40 - contentBoxTop, 8)}px`,
             left: `${Math.max(pageX + 4 - contentBoxLeft, 8)}px`,
           };
         });
@@ -523,7 +516,7 @@
   }
 
   .ai-extend-tool{
-    position: fixed;
+    position: absolute;
     z-index: 1000;
     display: none;
     width: 32px;