From 5f0e59ba0d82f1bc7eff05ea109cbffc954faf1c Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Mon, 12 Aug 2024 19:06:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=85=A8=E5=B1=8F=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=A8=E5=B1=8F=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/util/fullscreen/fullscreen-util.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/fullscreen/fullscreen-util.ts b/src/util/fullscreen/fullscreen-util.ts index ef954473..0a1c0d03 100644 --- a/src/util/fullscreen/fullscreen-util.ts +++ b/src/util/fullscreen/fullscreen-util.ts @@ -18,6 +18,14 @@ export class FullscreenUtil { */ constructor() {} + /** + * 是否全屏状态 + * + * @type {boolean} + * @memberof FullscreenUtil + */ + public isFullScreen: boolean = false; + /** * 全屏样式 * @author fzh @@ -38,6 +46,7 @@ export class FullscreenUtil { } if (!document.fullscreenElement && div) { div.requestFullscreen(); + this.isFullScreen = true; if (this.FullscreenClass) { div.classList.toggle(this.FullscreenClass); } @@ -61,5 +70,6 @@ export class FullscreenUtil { */ public closeElementFullscreen(): void { document.exitFullscreen(); + this.isFullScreen = false; } } -- Gitee From 3f84cb72dd7ecce0c89ebdaa0e36d41dacc817f2 Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Mon, 12 Aug 2024 19:30:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E6=9B=B4=E6=96=B0=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E6=90=9C=E7=B4=A2=E6=A1=86=E9=BB=98=E8=AE=A4=E9=AB=98?= =?UTF-8?q?=E4=BA=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel-index-view-search/panel-index-view-search.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/panel-component/panel-index-view-search/panel-index-view-search.scss b/src/panel-component/panel-index-view-search/panel-index-view-search.scss index b65c8365..16825162 100644 --- a/src/panel-component/panel-index-view-search/panel-index-view-search.scss +++ b/src/panel-component/panel-index-view-search/panel-index-view-search.scss @@ -12,6 +12,9 @@ $panel-index-view-search: ( height: 100%; .el-input__wrapper{ + background-color: getCssVar(panel-index-view-search, bg-color); + box-shadow: 0 0 0 1px var(--el-input-hover-border-color) inset; + .el-input__prefix{ color: getCssVar(panel-index-view-search, text-color); } @@ -24,8 +27,6 @@ $panel-index-view-search: ( } } - background-color: getCssVar(panel-index-view-search, bg-color); - } } -- Gitee From 89ace6e13c7fe66333607e0fcf0d3b5ddbb4713b Mon Sep 17 00:00:00 2001 From: jianglinjun Date: Mon, 12 Aug 2024 19:32:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E5=9C=A8=E5=85=A8=E5=B1=8F=E6=97=B6=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=8D=E6=9F=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/chart/chart.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/control/chart/chart.tsx b/src/control/chart/chart.tsx index 38bdd789..aac32181 100644 --- a/src/control/chart/chart.tsx +++ b/src/control/chart/chart.tsx @@ -145,7 +145,8 @@ const ChartControl = defineComponent({ // 开启数据反查,重写chart的click事件 chart.on('click', (params: IData) => { const serieModel = c.computedClickSerieModel(params); - if (!serieModel) { + if (!serieModel || ibiz.fullscreenUtil.isFullScreen) { + // 序列模型不存在或者全屏状态,不显示反查按钮 return; } const tempDrill = drillDetails.find((item: IData) => { -- Gitee