From 8ddcb0db467b52afa1a1b5e99e1dced13cef26a3 Mon Sep 17 00:00:00 2001 From: zhangpingchuan <228939628@qq.com> Date: Tue, 2 Jan 2024 18:48:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=20=20=E4=BF=AE=E5=A4=8D=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E7=BB=84=E9=9A=90=E8=97=8F=E9=A1=B9=E6=9C=AA=E9=9A=90?= =?UTF-8?q?=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/drtab/drtab.tsx | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/control/drtab/drtab.tsx b/src/control/drtab/drtab.tsx index 74368b4fd..b7db9a2ab 100644 --- a/src/control/drtab/drtab.tsx +++ b/src/control/drtab/drtab.tsx @@ -40,14 +40,16 @@ export const DRTabControl = defineComponent({ onTabChange={this.handleTabChange} > {drTabPages.map(tab => { - return ( - - ); + if (!tab.hidden) { + return ( + + ); + } })} )} -- Gitee From 84b0c09083795de0c0d2fa284a9855b3c11f4a0b Mon Sep 17 00:00:00 2001 From: zhangpingchuan <228939628@qq.com> Date: Tue, 2 Jan 2024 18:49:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8Dhtml=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=9C=AA=E9=80=82=E9=85=8D=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E8=89=B2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/html/wang-editor/wang-editor.scss | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/editor/html/wang-editor/wang-editor.scss b/src/editor/html/wang-editor/wang-editor.scss index 8b658b3ed..8ee272944 100644 --- a/src/editor/html/wang-editor/wang-editor.scss +++ b/src/editor/html/wang-editor/wang-editor.scss @@ -9,15 +9,15 @@ $html: ( width: 100%; height: 100%; - @include b(html-content){ + @include b(html-content) { display: flex; flex-direction: column; height: 100%; } - @include b(html-editor){ + @include b(html-editor) { height: getCssVar('html', 'height') !important; - padding: 0;; + padding: 0; overflow-y: scroll; border: 1px solid getCssVar(color, border); } @@ -29,7 +29,7 @@ $html: ( --w-e-textarea-slight-color: #{getCssVar(color, text, 1)}; --w-e-textarea-slight-bg-color: #{getCssVar(color, bg, 1)}; --w-e-textarea-selected-border-color: #{getCssVar(color, border)}; - --w-e-textarea-handler-bg-color: #{getCssVar(color, primary)};; + --w-e-textarea-handler-bg-color: #{getCssVar(color, primary)}; --w-e-toolbar-color: #{getCssVar(color, text, 0)}; --w-e-toolbar-bg-color: #{getCssVar(color, bg, 1)}; --w-e-toolbar-active-color: #{getCssVar(color, text, 0)}; @@ -47,6 +47,11 @@ $html: ( .w-e-full-screen-container { z-index: 9999; } + .w-e-scroll { + > div { + background-color: getCssVar(color, bg, 0); + } + } } @include b('html-editor-readonly') { @include b('html-toolbar') { @@ -147,5 +152,3 @@ $html: ( height: 68px; margin-top: 0; } - - -- Gitee From 161fe8c1e0df8c90c5a65aaddedeb11e891ad96c Mon Sep 17 00:00:00 2001 From: zhangpingchuan <228939628@qq.com> Date: Tue, 2 Jan 2024 18:50:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=88=97=E4=BB=A3=E7=A0=81=E8=A1=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=8D=A2=E8=A1=8C=E6=A0=B7=E5=BC=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grid-column/grid-field-column/grid-field-column.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/control/grid/grid-column/grid-field-column/grid-field-column.scss b/src/control/grid/grid-column/grid-field-column/grid-field-column.scss index b906843ec..395612512 100644 --- a/src/control/grid/grid-column/grid-field-column/grid-field-column.scss +++ b/src/control/grid/grid-column/grid-field-column/grid-field-column.scss @@ -49,6 +49,14 @@ $grid-field-column: (cell-padding: getCssVar(spacing, tight), @include when(has-action) { justify-content: space-between; } + + .#{bem(code-list, item)} { + display: flex; + align-items: center; + .#{bem(icon)} { + display: inline-flex; + } + } } @include b(grid-field-column-text-container) { -- Gitee From a9b4337d3e33a75837b6969996e6acefe02ed296 Mon Sep 17 00:00:00 2001 From: zhangpingchuan <228939628@qq.com> Date: Tue, 2 Jan 2024 19:20:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"fix:=20=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=97=E4=BB=A3=E7=A0=81=E8=A1=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E6=A0=87=E6=8D=A2=E8=A1=8C=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 161fe8c1e0df8c90c5a65aaddedeb11e891ad96c. --- .../grid-column/grid-field-column/grid-field-column.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/control/grid/grid-column/grid-field-column/grid-field-column.scss b/src/control/grid/grid-column/grid-field-column/grid-field-column.scss index 395612512..b906843ec 100644 --- a/src/control/grid/grid-column/grid-field-column/grid-field-column.scss +++ b/src/control/grid/grid-column/grid-field-column/grid-field-column.scss @@ -49,14 +49,6 @@ $grid-field-column: (cell-padding: getCssVar(spacing, tight), @include when(has-action) { justify-content: space-between; } - - .#{bem(code-list, item)} { - display: flex; - align-items: center; - .#{bem(icon)} { - display: inline-flex; - } - } } @include b(grid-field-column-text-container) { -- Gitee