diff --git a/src/control/chart/chart.tsx b/src/control/chart/chart.tsx index 38bdd7892d15ebc5114242641591929b45e78028..aac321812bd78acf2de5ea939abcbb9ceee2892f 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) => { 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 b65c836560b42bf101a071a3f3faaaf4628782db..16825162e7665e8726844e40144045cc19f2b14d 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); - } } diff --git a/src/util/fullscreen/fullscreen-util.ts b/src/util/fullscreen/fullscreen-util.ts index ef954473987ec75c294e16506feffcad5c390ce8..0a1c0d03b2d48090dfd93096190e546801940a53 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; } }