From 7607b755694ecc05c1e58e0f8e864992ec6d65ae Mon Sep 17 00:00:00 2001 From: ShineKOT <1917095344@qq.com> Date: Fri, 25 Apr 2025 14:06:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=88=87=E6=8D=A2=E6=97=B6=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/x6-design-view/x6-design-view.engine.ts | 2 ++ .../src/views/dnd-design-view/dnd-design-view.engine.ts | 2 ++ .../er-design/src/views/er-design-view/er-design-view.engine.ts | 2 ++ .../views/er-draft-design-view/er-draft-design-view.engine.ts | 2 ++ .../src/views/panel-design-base/panel-design-base.engine.ts | 2 ++ 5 files changed, 10 insertions(+) diff --git a/packages/antv-x6-design/src/views/x6-design-view/x6-design-view.engine.ts b/packages/antv-x6-design/src/views/x6-design-view/x6-design-view.engine.ts index 7b7e4309..c07f7425 100644 --- a/packages/antv-x6-design/src/views/x6-design-view/x6-design-view.engine.ts +++ b/packages/antv-x6-design/src/views/x6-design-view/x6-design-view.engine.ts @@ -243,7 +243,9 @@ export class X6DesignViewEngine extends DEMainViewEngine { const navPosIndex = panelItems.nav_pos_index as any; if (navPosIndex.navTabs && navPosIndex.state?.currentKey) { const key = navPosIndex.state.currentKey; + const viewKey = `${this.view.model.codeName}-${this.view.id}`; navPosIndex.navTabs.updateViewInfo?.(key, { + viewKey, caption: this.view.model.caption, sysImage: this.view.model.sysImage, }); diff --git a/packages/dnd-design/src/views/dnd-design-view/dnd-design-view.engine.ts b/packages/dnd-design/src/views/dnd-design-view/dnd-design-view.engine.ts index b3d40804..58deee6f 100644 --- a/packages/dnd-design/src/views/dnd-design-view/dnd-design-view.engine.ts +++ b/packages/dnd-design/src/views/dnd-design-view/dnd-design-view.engine.ts @@ -231,7 +231,9 @@ export class DndDesignViewEngine extends DEMainViewEngine { const navPosIndex = panelItems.nav_pos_index as any; if (navPosIndex.navTabs && navPosIndex.state?.currentKey) { const key = navPosIndex.state.currentKey; + const viewKey = `${this.view.model.codeName}-${this.view.id}`; navPosIndex.navTabs.updateViewInfo?.(key, { + viewKey, caption: this.view.model.caption, sysImage: this.view.model.sysImage, }); diff --git a/packages/er-design/src/views/er-design-view/er-design-view.engine.ts b/packages/er-design/src/views/er-design-view/er-design-view.engine.ts index d4cf83eb..3643642a 100644 --- a/packages/er-design/src/views/er-design-view/er-design-view.engine.ts +++ b/packages/er-design/src/views/er-design-view/er-design-view.engine.ts @@ -265,7 +265,9 @@ export class ERDesignViewEngine extends DEMainViewEngine { const navPosIndex = panelItems.nav_pos_index as any; if (navPosIndex.navTabs && navPosIndex.state?.currentKey) { const key = navPosIndex.state.currentKey; + const viewKey = `${this.view.model.codeName}-${this.view.id}`; navPosIndex.navTabs.updateViewInfo?.(key, { + viewKey, caption: this.view.model.caption, sysImage: this.view.model.sysImage, }); diff --git a/packages/er-design/src/views/er-draft-design-view/er-draft-design-view.engine.ts b/packages/er-design/src/views/er-draft-design-view/er-draft-design-view.engine.ts index 1c3898c1..525a01ab 100644 --- a/packages/er-design/src/views/er-draft-design-view/er-draft-design-view.engine.ts +++ b/packages/er-design/src/views/er-draft-design-view/er-draft-design-view.engine.ts @@ -275,7 +275,9 @@ export class ERDraftDesignViewEngine extends DEMainViewEngine { const navPosIndex = panelItems.nav_pos_index as any; if (navPosIndex.navTabs && navPosIndex.state?.currentKey) { const key = navPosIndex.state.currentKey; + const viewKey = `${this.view.model.codeName}-${this.view.id}`; navPosIndex.navTabs.updateViewInfo?.(key, { + viewKey, caption: this.view.model.caption, sysImage: this.view.model.sysImage, }); diff --git a/packages/panel-design/src/views/panel-design-base/panel-design-base.engine.ts b/packages/panel-design/src/views/panel-design-base/panel-design-base.engine.ts index 3727b46f..737dff4b 100644 --- a/packages/panel-design/src/views/panel-design-base/panel-design-base.engine.ts +++ b/packages/panel-design/src/views/panel-design-base/panel-design-base.engine.ts @@ -333,7 +333,9 @@ export class PanelDesignViewEngine extends DEMainViewEngine { const navPosIndex = panelItems.nav_pos_index as any; if (navPosIndex.navTabs && navPosIndex.state?.currentKey) { const key = navPosIndex.state.currentKey; + const viewKey = `${this.view.model.codeName}-${this.view.id}`; navPosIndex.navTabs.updateViewInfo?.(key, { + viewKey, caption: this.view.model.caption, sysImage: this.view.model.sysImage, }); -- Gitee From f251076b4611351e060b686672690460bef9dad7 Mon Sep 17 00:00:00 2001 From: ShineKOT <1917095344@qq.com> Date: Fri, 25 Apr 2025 15:54:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?styles:=20=E6=9B=B4=E6=96=B0=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=90=9C=E7=B4=A2=E4=B8=8B=E6=8B=89=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/studio-theme/src/theme/studio-dark/app.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/studio-theme/src/theme/studio-dark/app.scss b/packages/studio-theme/src/theme/studio-dark/app.scss index cf3f6ee3..94d01e4f 100644 --- a/packages/studio-theme/src/theme/studio-dark/app.scss +++ b/packages/studio-theme/src/theme/studio-dark/app.scss @@ -201,8 +201,8 @@ @include e(popper) { border: 1px solid getCssVar(color, border) !important; } - @include e(virtual-list) { - width: 750px; - } + } + .#{bem(global-search, virtual-list)} { + width: 750px; } } \ No newline at end of file -- Gitee