From af2913eedf29c91b8f9e2e5d26aad45435641b41 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 23 Oct 2024 17:25:37 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?= =?UTF-8?q?=E8=AD=A6-=E8=A7=86=E5=9B=BE=E6=9C=AA=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=96=87=E6=A1=88=E5=8F=8A=E6=96=B0=E5=9B=BE=E8=A1=A8=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/zh-CN.ts | 3 ++- .../src/views/chart/components/editor/editor-senior/Senior.vue | 1 + de-xpack | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index bb3610a05c..b5a7fedf26 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2971,6 +2971,7 @@ export default { grid: '告警列表', record: '检测记录', module_name: '阈值告警', - setting: '阈值告警设置' + setting: '阈值告警设置', + no_view_tip: '请在设置阈值告警前先保存' } } diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue index 3402d0905f..ac98da5158 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue @@ -320,6 +320,7 @@ const removeJumpSenior = () => { v-if="chart.id" :chart="chart" :themes="themes" + :is-screen="dvInfo.type === 'dataV'" jsname="L2NvbXBvbmVudC90aHJlc2hvbGQtd2FybmluZy9TZW5pb3JIYW5kbGVy" /> diff --git a/de-xpack b/de-xpack index 11504f43bc..02b3837850 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 11504f43bc9189c389b73650e020bd38336db9a3 +Subproject commit 02b383785002bc45b040ac1dc9bd5fa749d6a429