From 005e1999624e7e36cb26b2fe58abe7cb6f1d24ee Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 14:30:30 +0800 Subject: [PATCH 01/28] =?UTF-8?q?perf:=20=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E5=A4=8D=E5=88=B6/=E7=B2=98=E8=B4=B4icon=EF=BC=8Chover?= =?UTF-8?q?=E7=BB=99=E5=87=BAtooltips=20#1315?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/components/jb-edit/tag.vue | 11 +++++++++-- src/frontend/src/i18n/local.js | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/components/jb-edit/tag.vue b/src/frontend/src/components/jb-edit/tag.vue index e2482ee49c..59686fc49c 100644 --- a/src/frontend/src/components/jb-edit/tag.vue +++ b/src/frontend/src/components/jb-edit/tag.vue @@ -40,8 +40,15 @@ class="tag-shortcurt-box" @click.stop="">
- - + +
diff --git a/src/frontend/src/i18n/local.js b/src/frontend/src/i18n/local.js index 2d7eef3c34..949eea44b3 100644 --- a/src/frontend/src/i18n/local.js +++ b/src/frontend/src/i18n/local.js @@ -557,5 +557,7 @@ export default { 立即查看: 'here', 了解更多细节: '', 管理脚本各个版本的内容和状态: 'Manage the versions of script', + 复制: 'Copy', + 粘贴: 'Paste', }; From ab558ed2d87e20857cd53c3bb7f782c5fad99119 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 14:44:40 +0800 Subject: [PATCH 02/28] =?UTF-8?q?perf:=20=E4=B8=8A=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=BA=94=E8=AF=A5=E6=98=AF=E4=B8=AA=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E6=8C=89=E9=92=AE=20#1306?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/list/components/batch-edit-gobal-variable/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/index.vue b/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/index.vue index 37caa6f812..f193d55e29 100644 --- a/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/index.vue +++ b/src/frontend/src/views/task-manage/common/plan/list/components/batch-edit-gobal-variable/index.vue @@ -88,7 +88,6 @@ {{ $t('template.提交') }} {{ $t('template.上一步') }} From 79b2bb77a731143c41f1ca21df2c3cd2f162b250 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 14:47:44 +0800 Subject: [PATCH 03/28] =?UTF-8?q?bugfix:=20=E6=A0=87=E7=82=B9=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7=E7=BA=A0=E6=AD=A3=20#1296?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/global-setting/index/pages/notify-manage.vue | 2 +- src/frontend/src/views/global-setting/local.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/views/global-setting/index/pages/notify-manage.vue b/src/frontend/src/views/global-setting/index/pages/notify-manage.vue index 70a372333c..95b1da6388 100644 --- a/src/frontend/src/views/global-setting/index/pages/notify-manage.vue +++ b/src/frontend/src/views/global-setting/index/pages/notify-manage.vue @@ -110,7 +110,7 @@ this.backlistConfig = { width: 202, placement: 'top', - content: I18n.t('setting.「通讯黑名单」的人员将不会接收到任何来自作业平台的消息'), + content: I18n.t('setting.“通讯黑名单”的人员将不会接收到任何来自作业平台的消息'), }; this.fetchAllChannelConfig(); this.fetchAllUserBlacklist(); diff --git a/src/frontend/src/views/global-setting/local.js b/src/frontend/src/views/global-setting/local.js index 59c1fe68e9..a65604f84b 100644 --- a/src/frontend/src/views/global-setting/local.js +++ b/src/frontend/src/views/global-setting/local.js @@ -42,7 +42,7 @@ export default { 账号命名规则保存成功: 'Naming Rules change has been saved.', 用户可选择的通知渠道: 'User-selectable notification type', 通讯黑名单: 'Ban List', - '「通讯黑名单」的人员将不会接收到任何来自作业平台的消息': 'The user in ban-list will not able to select.', + '“通讯黑名单”的人员将不会接收到任何来自作业平台的消息': 'The user in ban-list will not able to select.', 保存通知渠道失败: 'Saving notification type failed...', 保存黑名单失败: 'Saving Ban-list failed...', 保存成功: 'The change has been saved.', From b3b23f556c133ba056fdfae555b127f1455aca4d Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 14:57:30 +0800 Subject: [PATCH 04/28] =?UTF-8?q?bugfix:=20=E9=80=89=E7=94=A8=E2=80=9C?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=84=9A=E6=9C=AC=E2=80=9D=E6=88=96=E2=80=9C?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=84=9A=E6=9C=AC=E2=80=9D=E6=97=B6=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E4=B8=AD=E9=AB=98=E5=8D=B1=E8=AF=AD=E5=8F=A5=E7=9A=84?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=EF=BC=8C=E8=A6=81=E5=92=8C=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=9A=84=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= =?UTF-8?q?=20#1294?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/strategy/script-content.vue | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/frontend/src/components/task-step/script/strategy/script-content.vue b/src/frontend/src/components/task-step/script/strategy/script-content.vue index 7825898172..3fb539f661 100644 --- a/src/frontend/src/components/task-step/script/strategy/script-content.vue +++ b/src/frontend/src/components/task-step/script/strategy/script-content.vue @@ -96,30 +96,31 @@ handler (newData) { this.isReadonly = newData[this.scriptSourceField] !== TaskStepModel.scriptStep.TYPE_SOURCE_LOCAL; this.lang = formatScriptTypeValue(newData[this.languageField]); - if (this.isReadonly) { - this.rules = []; - } else { - this.rules = [ - { - required: true, - message: I18n.t('脚本内容必填'), - trigger: 'change', - }, - { - validator: value => ScriptManageService.getScriptValidation({ - content: value, - scriptType: newData[this.languageField], - }).then((data) => { - // 高危语句报错状态需要全局保存 - const dangerousContent = _.find(data, _ => _.isDangerous); - this.$store.commit('setScriptCheckError', dangerousContent); - return true; - }), - message: I18n.t('脚本内容检测失败'), - trigger: 'blur', - }, - ]; + + const rules = [ + { + validator: value => ScriptManageService.getScriptValidation({ + content: value, + scriptType: newData[this.languageField], + }).then((data) => { + // 高危语句报错状态需要全局保存 + const dangerousContent = _.find(data, _ => _.isDangerous); + this.$store.commit('setScriptCheckError', dangerousContent); + return true; + }), + message: I18n.t('脚本内容检测失败'), + trigger: 'blur', + }, + ]; + + if (!this.isReadonly) { + rules.unshift({ + required: true, + message: I18n.t('脚本内容必填'), + trigger: 'change', + }); } + this.rules = rules; }, deep: true, immediate: true, From 603a789a2ea51cca3a4a23b5fbc06dda90fc452e Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 15:01:45 +0800 Subject: [PATCH 05/28] =?UTF-8?q?bugfix:=20job=E4=B8=AA=E6=80=A7=E5=8C=96-?= =?UTF-8?q?-=E8=84=9A=E6=9C=AC=E6=A8=A1=E6=9D=BFbat=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=90=8E=E5=88=87=E6=8D=A2tab=E5=9B=9E=E6=9D=A5=E4=BC=9A?= =?UTF-8?q?=E5=8F=98=E4=B8=BA=E4=B9=B1=E7=A0=81=20#1293?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/views/script-template/index/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/views/script-template/index/index.vue b/src/frontend/src/views/script-template/index/index.vue index 30f2c0929e..b4992f8c32 100644 --- a/src/frontend/src/views/script-template/index/index.vue +++ b/src/frontend/src/views/script-template/index/index.vue @@ -229,7 +229,7 @@ scriptContent: this.scriptContent, }).then(() => { window.changeConfirm = false; - this.templateMap[this.scriptLanguage] = this.scriptLanguage; + this.templateMap[this.scriptLanguage] = this.scriptContent; this.messageSuccess(I18n.t('scriptTemplate.保存成功')); }) .finally(() => { From 3118f2bdc11ed40da593ac1c57bb1bb773ebdb42 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 15:05:21 +0800 Subject: [PATCH 06/28] =?UTF-8?q?bugfix:=20=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=9A=84icon=E7=82=B9=E5=87=BB=E5=90=8E?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=B6=88=E5=A4=B1=20#1295?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/App.vue | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue index 6395e901dc..ed478eb385 100644 --- a/src/frontend/src/App.vue +++ b/src/frontend/src/App.vue @@ -34,7 +34,8 @@ + :arrow="false" + :tippy-options="{ hideOnClick: false }">
- +
@@ -68,7 +73,10 @@
{{ $t('问题反馈') }}
- +
{{ currentUser.username }} From 0cab9ec3712f46049f283d1abb7e5f281db03fa7 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 16:24:31 +0800 Subject: [PATCH 07/28] =?UTF-8?q?bugfix:=20=E5=BC=95=E5=AF=BC=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=A1=88=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20#1297?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/i18n/local.js | 6 +++++- src/frontend/src/views/business-permission.vue | 14 +++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/i18n/local.js b/src/frontend/src/i18n/local.js index 949eea44b3..63f1d4d8b6 100644 --- a/src/frontend/src/i18n/local.js +++ b/src/frontend/src/i18n/local.js @@ -528,7 +528,11 @@ export default { '作业平台的核心功能包括面向服务器操作系统的命令执行、文件分发，以及将多个操作组合成作业流程，并支持设置定时执行。': 'The core functions of the Job include command execution for server operating systems, file distribution, and combining multiple operations into job processes, and support for setting up timed execution.', 申请业务权限: 'Apply Business Permission', '申请已有业务权限 / 创建新的业务': 'Apply for business permission or Create one', - '不同团队在作业平台上的资源以“业务”分隔，而“业务”是统一由配置平台进行创建和管理的，你可以选择 申请已有业务的权限，亦或是 新建 一个全新的业务。': 'The resources of different teams on the job platform are separated by "Business", which is created and managed by the CMDB platform, and you can choose to request the permission of an existing business or create a new one.', + '不同团队在作业平台上的资源以“业务”分隔，而“业务”是统一由配置平台进行创建和管理的，你可以选择': 'The resources of different teams on the job platform are separated by "Business", which is created and managed by the CMDB platform, and you can choose to ', + 申请已有业务的权限: 'Apply Business Permission', + '，亦或是': ' or ', + ' 新建 ': 'create now.', + '一个全新的业务。': '', 开始使用作业平台: 'Getting Started with Job', 作业平台的目标服务器信息同样来自: 'The target host of the job platform also comes from the ', 配置平台: 'CMDB', diff --git a/src/frontend/src/views/business-permission.vue b/src/frontend/src/views/business-permission.vue index 7269ebca38..2573f1e306 100644 --- a/src/frontend/src/views/business-permission.vue +++ b/src/frontend/src/views/business-permission.vue @@ -59,7 +59,19 @@
{{ $t('申请已有业务权限 / 创建新的业务') }}
-
{{ $t('不同团队在作业平台上的资源以“业务”分隔，而“业务”是统一由配置平台进行创建和管理的，你可以选择 申请已有业务的权限，亦或是 新建 一个全新的业务。') }}
+
+ {{ $t('不同团队在作业平台上的资源以“业务”分隔，而“业务”是统一由配置平台进行创建和管理的，你可以选择') }} + + {{ $t('申请已有业务的权限') }} + + {{ $t('，亦或是') }} + + {{ $t('新建') }} + + {{ $t('一个全新的业务。') }} +
From 3c4efc5b449b05b32523d46a4c90784ef7a8fc18 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 16:30:39 +0800 Subject: [PATCH 08/28] =?UTF-8?q?bugfix:=20=E6=96=87=E6=A1=A3=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=E9=94=99=E8=AF=AF=20#1298?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/views/business-permission.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/src/views/business-permission.vue b/src/frontend/src/views/business-permission.vue index 2573f1e306..f42b38d93a 100644 --- a/src/frontend/src/views/business-permission.vue +++ b/src/frontend/src/views/business-permission.vue @@ -115,7 +115,7 @@
{{ $t('了解更多关于作业平台产品的功能介绍，点击前往') }} {{ $t('产品文档') }} From 60f93c0a343089651a059b57785cb6b4f1ba20f7 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Wed, 21 Sep 2022 16:55:10 +0800 Subject: [PATCH 09/28] =?UTF-8?q?perf:=20=E7=BC=96=E8=BE=91=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=96=B9=E6=A1=88=E7=9A=84=E5=90=8D=E7=A7=B0=EF=BC=8C?= =?UTF-8?q?=E7=A9=BA=E9=97=B4=E5=A4=AA=E5=B0=8F=E4=BA=86=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E6=88=90=E5=92=8C=E6=96=B0=E5=BB=BA=E7=9A=84=E4=B8=80=E8=87=B4?= =?UTF-8?q?=20#1300?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/plan/components/edit-title.vue | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/frontend/src/views/task-manage/common/plan/components/edit-title.vue b/src/frontend/src/views/task-manage/common/plan/components/edit-title.vue index 2f524ec62f..818979013c 100644 --- a/src/frontend/src/views/task-manage/common/plan/components/edit-title.vue +++ b/src/frontend/src/views/task-manage/common/plan/components/edit-title.vue @@ -20,7 +20,6 @@ enter-trigger :maxlength="60" behavior="simplicity" - @input="handleInput" @submit="handleSubmit" /> + diff --git a/src/frontend/src/views/script-manage/sync-confirm/index.vue b/src/frontend/src/views/script-manage/sync-confirm/index.vue index b7ccdec9fd..5f4b7674a2 100644 --- a/src/frontend/src/views/script-manage/sync-confirm/index.vue +++ b/src/frontend/src/views/script-manage/sync-confirm/index.vue @@ -114,7 +114,7 @@ - Date: Thu, 22 Sep 2022 16:16:13 +0800 Subject: [PATCH 21/28] =?UTF-8?q?perf:=20=E4=B8=8D=E8=AE=BA=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E8=A2=AB=E5=BC=95=E7=94=A8=EF=BC=8C=E5=8D=B3=E4=BD=BF?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=9A=84=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=B9=9F?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=BF=99=E4=B8=AA=EF=BC=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=20#1314?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/views/script-manage/common/detail/index.vue | 3 ++- src/frontend/src/views/script-manage/local.js | 2 +- src/frontend/src/views/script-manage/version/index.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/frontend/src/views/script-manage/common/detail/index.vue b/src/frontend/src/views/script-manage/common/detail/index.vue index 015417134f..a0fb4cdf71 100644 --- a/src/frontend/src/views/script-manage/common/detail/index.vue +++ b/src/frontend/src/views/script-manage/common/detail/index.vue @@ -133,7 +133,7 @@ v-if="!publicScript && scriptInfo.isOnline" key="sync" class="mr10" - :tippy-tips="!scriptInfo.syncEnabled ? $t('script.所有关联作业模板已是当前版本') : ''"> + :tippy-tips="!scriptInfo.syncEnabled ? $t('script.暂无关联作业，或已是当前版本。') : ''"> { window.removeEventListener('resize', this.init); diff --git a/src/frontend/src/views/script-manage/local.js b/src/frontend/src/views/script-manage/local.js index cf8d229c8c..e098b17a80 100644 --- a/src/frontend/src/views/script-manage/local.js +++ b/src/frontend/src/views/script-manage/local.js @@ -139,7 +139,7 @@ export default { 未上线: 'Stand-by', 已下线: 'Offline', 已禁用: 'Banned', - 所有关联作业模板已是当前版本: 'Associated Job Templates are already using current version', + '暂无关联作业，或已是当前版本。': 'No associated jobs, or it\'s already using current version.', '部分作业模板同步失败，请留意': 'Some of Job Template is sync failed', 同步至: 'Update to', 将覆盖其它条件: 'override other conditions', diff --git a/src/frontend/src/views/script-manage/version/index.vue b/src/frontend/src/views/script-manage/version/index.vue index 9aa95657fd..2b498e1154 100644 --- a/src/frontend/src/views/script-manage/version/index.vue +++ b/src/frontend/src/views/script-manage/version/index.vue @@ -223,7 +223,7 @@ + :tippy-tips="!row.syncEnabled ? $t('script.暂无关联作业，或已是当前版本。') : ''"> Date: Thu, 22 Sep 2022 16:19:03 +0800 Subject: [PATCH 22/28] =?UTF-8?q?bugfix:=20=E6=94=AF=E6=8C=81=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E5=85=B3=E9=94=AE=E5=AD=97=EF=BC=8C=E4=BD=86=E7=94=A8?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=85=B3=E9=94=AE=E5=AD=97=EF=BC=8C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=90=9C=E7=B4=A2=E5=87=BA=E6=9D=A5=20#1313?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/jb-search-select/search-select/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/components/jb-search-select/search-select/index.vue b/src/frontend/src/components/jb-search-select/search-select/index.vue index ece815f2b2..b90bfbe962 100644 --- a/src/frontend/src/components/jb-search-select/search-select/index.vue +++ b/src/frontend/src/components/jb-search-select/search-select/index.vue @@ -65,12 +65,12 @@ @input="handleInputChange" @keydown="handleInputKeydown" />
-
{{ inputTips }} -
+
-->
Date: Thu, 22 Sep 2022 16:25:09 +0800 Subject: [PATCH 23/28] =?UTF-8?q?bugfix:=20=E8=8F=9C=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=87=8D=E5=A4=8D=E4=BA=86=20#1320?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/layout-new.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/src/layout-new.vue b/src/frontend/src/layout-new.vue index c5bc575aec..0609c7eb24 100644 --- a/src/frontend/src/layout-new.vue +++ b/src/frontend/src/layout-new.vue @@ -203,11 +203,11 @@
{{ $t('安全.menuGroup') }}
{{ $t('安全.flodTitle') }}
- + {{ $t('高危语句规则') }} - + {{ $t('检测记录') }} From 79001180a964cd33d7249810d528838f61bbd35f Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Thu, 22 Sep 2022 16:46:16 +0800 Subject: [PATCH 24/28] =?UTF-8?q?perf:=20=E7=82=B9=E5=87=BB=20=E5=8E=BB?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=AD=A5=E9=AA=A4=E7=9A=84=E7=8A=B6=E6=80=81=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E6=8A=8A=E8=84=9A=E6=9C=AC=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E6=8B=89=E5=B1=95=E5=BC=80=20#1316?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/strategy/script-source-of-template.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/frontend/src/components/task-step/script/strategy/script-source-of-template.vue b/src/frontend/src/components/task-step/script/strategy/script-source-of-template.vue index b5420ab8ce..47e97622f6 100644 --- a/src/frontend/src/components/task-step/script/strategy/script-source-of-template.vue +++ b/src/frontend/src/components/task-step/script/strategy/script-source-of-template.vue @@ -59,6 +59,7 @@ 1 && !this.hasShowScriptSelect) { + setTimeout(() => { + this.hasShowScriptSelect = true; + this.$refs.scriptSelect.$el.querySelector('.bk-select-name').click(); + }, 30); + } + }, }, created () { this.scriptListMemo = []; @@ -257,6 +267,8 @@ this.initScriptContent(); this.fetchScriptList(); this.fetchPublicScriptList(); + + this.hasShowScriptSelect = false; }, methods: { /** From 1b9f14dc99379c302e83d29bc7bd55fe4b44f468 Mon Sep 17 00:00:00 2001 From: hLinx <327159425@qq.com> Date: Thu, 22 Sep 2022 16:58:42 +0800 Subject: [PATCH 25/28] =?UTF-8?q?perf:=20=E8=84=9A=E6=9C=AC=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E8=84=9A=E6=9C=AC=E8=AF=AD=E8=A8=80=E7=9A=84?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=90=8D=E7=A7=B0=E7=9A=84=E5=AD=97=E5=85=B8=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=20#1317?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/frontend/src/views/account-manage/index/index.vue | 10 +++++----- src/frontend/src/views/cron-job/list/index.vue | 6 +++--- .../src/views/file-manage/file-source-list/index.vue | 4 ++-- src/frontend/src/views/script-manage/list/index.vue | 8 ++++---- src/frontend/src/views/tag-manage/index/index.vue | 2 +- .../ticket-manage/list/components/related-ticket.vue | 4 ++-- src/frontend/src/views/ticket-manage/list/index.vue | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/frontend/src/views/account-manage/index/index.vue b/src/frontend/src/views/account-manage/index/index.vue index 092696d169..314f2cf433 100644 --- a/src/frontend/src/views/account-manage/index/index.vue +++ b/src/frontend/src/views/account-manage/index/index.vue @@ -56,7 +56,7 @@ label="ID" prop="id" key="id" - sortable + sortable="custom" width="80" align="left" />