From 7dac4702c868a2a83bb14af205b4beb706ebc59d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 23 Sep 2021 15:30:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BFtabs?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Editor/ComponentWrapper.vue | 1 + .../canvas/components/Editor/SettingMenu.vue | 4 + .../canvas/components/Editor/index.vue | 2 +- .../canvas/custom-component/component-list.js | 7 + .../src/components/widget/DeWidget/DeTabs.vue | 164 +++++++++++------- 5 files changed, 112 insertions(+), 66 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index b789d127d8..0652e2b47a 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -24,6 +24,7 @@ :out-style="config.style" :style="getComponentStyleDefault(config.style)" :prop-value="config.propValue" + :is-edit="false" :element="config" :search-count="searchCount" /> diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue index a7c2c2a277..6972fcbb89 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue @@ -12,6 +12,7 @@ {{ $t('panel.upComponent') }} {{ $t('panel.downComponent') }} {{ $t('panel.linkage_setting') }} + 新增Tab @@ -137,6 +138,9 @@ export default { getViewLinkageGather(requestInfo).then(rsp => { this.$store.commit('setLinkageInfo', rsp.data) }) + }, + addTab() { + bus.$emit('add-new-tab') } } } diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue index 0065e5f052..54b1489995 100644 --- a/frontend/src/components/canvas/components/Editor/index.vue +++ b/frontend/src/components/canvas/components/Editor/index.vue @@ -630,7 +630,7 @@ export default { this.$refs.wrapperChild[index].openChartDetailsDialog() }, resizestop(index, item) { - if (item.type === 'view') { + if (item.type === 'view' || item.type === 'de-tabs') { this.$refs.wrapperChild[index].chartResize() } } diff --git a/frontend/src/components/canvas/custom-component/component-list.js b/frontend/src/components/canvas/custom-component/component-list.js index 4b7903ce00..f000f45bf3 100644 --- a/frontend/src/components/canvas/custom-component/component-list.js +++ b/frontend/src/components/canvas/custom-component/component-list.js @@ -162,6 +162,13 @@ const list = [ borderColor: '#000000', backgroundColor: '#ffffff', borderRadius: 0 + }, + options: { + tabList: [{ + title: 'Tab1', + name: '1', + content: null + }] } }, { diff --git a/frontend/src/components/widget/DeWidget/DeTabs.vue b/frontend/src/components/widget/DeWidget/DeTabs.vue index 8e20216a3c..399b9a89b4 100644 --- a/frontend/src/components/widget/DeWidget/DeTabs.vue +++ b/frontend/src/components/widget/DeWidget/DeTabs.vue @@ -1,37 +1,41 @@