From a7d3fc21f4fd011841a08f143f3f0bbaa83280fd Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 18 Jan 2024 10:21:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90-=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E7=9A=84=E7=A9=BA=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/visualized/data/dataset/form/index.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue index 35ede323db..1a2903c342 100644 --- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue +++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue @@ -212,6 +212,18 @@ const dfsName = (arr, id) => { return name } +const dfsChild = arr => { + return arr.filter(ele => { + if (ele.leaf) { + return true + } + if (!!ele.children?.length) { + ele.children = dfsChild(ele.children || []) + } + return !!ele.children?.length + }) +} + const getDsName = (id: string) => { return dfsName(state.dataSourceList, id) } @@ -860,9 +872,9 @@ const getDatasource = () => { getDatasourceList().then(res => { const _list = (res as unknown as DataSource[]) || [] if (_list && _list.length > 0 && _list[0].id === '0') { - state.dataSourceList = _list[0].children + state.dataSourceList = dfsChild(_list[0].children) } else { - state.dataSourceList = _list + state.dataSourceList = dfsChild(_list) } }) } From 36de38b5dbc609b8f1c9cded3268ef1c9d232730 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 18 Jan 2024 10:25:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A3=8E?= =?UTF-8?q?=E6=A0=BC-=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=EF=BC=8C?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=A4=A7=E5=B0=8F12px?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/components/dashboard/DbCanvasAttr.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue index 544a0ac828..7a338ebfa8 100644 --- a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue +++ b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue @@ -164,6 +164,7 @@ const saveSelfSubject = () => { position: absolute; top: 4px; right: 4px; + font-size: 12px; } } From 889114198314c352e1ffd4d56c0470c9c26b1296 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 18 Jan 2024 10:33:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E6=8C=89=E9=92=AE=20=E8=B7=9D?= =?UTF-8?q?=E7=A6=BB=E5=BA=95=E9=83=A8=E9=97=B4=E8=B7=9D=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template-market/component/TemplateMarketV2Item.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue index 9de51114a8..fae06963d9 100644 --- a/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue +++ b/core/core-frontend/src/views/template-market/component/TemplateMarketV2Item.vue @@ -124,6 +124,8 @@ const templateInnerPreview = e => { .template-button { justify-content: center; width: 100%; + padding-bottom: 8px; + display: none; } .bottom-area { @@ -149,6 +151,11 @@ const templateInnerPreview = e => { color: deepskyblue; cursor: pointer; } +.testcase-template:hover { + .template-button { + display: block; + } +} .create-area { bottom: -38px !important; }