From 7e482f798c0142bce1866f84676cb40210f9638a Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Sun, 19 Jan 2025 23:13:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=81=B6=E5=8F=91=E6=80=A7?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E6=BB=9A=E5=8A=A8=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/core/acme-client/src/axios.js | 1 + packages/plugins/plugin-lib/src/common/index.ts | 8 +++++++- .../certd/pipeline/pipeline/component/task-view/index.vue | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/core/acme-client/src/axios.js b/packages/core/acme-client/src/axios.js index 0c5491ea..a562bffc 100644 --- a/packages/core/acme-client/src/axios.js +++ b/packages/core/acme-client/src/axios.js @@ -126,6 +126,7 @@ instance.interceptors.response.use(null, async (error) => { /* Wait and retry the request */ await new Promise((resolve) => { setTimeout(resolve, (retryAfter * 1000)); }); + log(`Retrying request to URL ${config.url}`); return instance(config); } } diff --git a/packages/plugins/plugin-lib/src/common/index.ts b/packages/plugins/plugin-lib/src/common/index.ts index e79acb78..64592c40 100644 --- a/packages/plugins/plugin-lib/src/common/index.ts +++ b/packages/plugins/plugin-lib/src/common/index.ts @@ -46,7 +46,13 @@ export function createRemoteSelectInputDefine(opts?: { const type = opts?.type || "plugin"; const watches = opts?.watches || []; const helper = opts?.helper || "请选择"; - const mode = opts?.mode || "tags"; + let mode = "tags"; + if (opts.multi === false) { + mode = undefined; + } else { + mode = opts?.mode ?? "tags"; + } + const item = { title, component: { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue index 302cfba1..d7c7f9b7 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue @@ -89,7 +89,11 @@ export default { return; } //判断当前是否在底部 - const isBottom = el ? el.scrollHeight - el.scrollTop === el.clientHeight : true; + let isBottom = true; + if (el) { + isBottom = el.scrollHeight - el.scrollTop - el.clientHeight < 5; + console.log("isBottom", isBottom, el.scrollHeight, el.scrollTop, el.clientHeight); + } await nextTick(); el = document.querySelector(`.pi-task-view-logs.id-${node.node.id}`); //如果在底部则滚动到底部