From 065177188a5d066ae7c6c3b2b048a283517bee4e Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 27 Oct 2022 17:36:30 +0800 Subject: [PATCH 1/7] =?UTF-8?q?perf(=E5=9C=B0=E5=9B=BE):=20=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E9=85=8D=E8=89=B2=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/GradientColorSelector/base.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/GradientColorSelector/base.js b/frontend/src/components/GradientColorSelector/base.js index bf88a65f75..e5b98d9fc2 100644 --- a/frontend/src/components/GradientColorSelector/base.js +++ b/frontend/src/components/GradientColorSelector/base.js @@ -39,7 +39,7 @@ export const colorCases = [ { name: i18n.t('chart.color_gentle'), value: 'gentle', - colors: ['#5b9bd5', '#ed7d31', '#70ad47', '#ffc000', '#4472c4', '#91d024', '#b235e6', '#02ae75', '#5b9bd5'] + colors: ['#5b9bd5', '#ed7d31', '#70ad47', '#ffc000', '#4472c4', '#91d024', '#b235e6', '#02ae75', '#003F78'] }, { name: i18n.t('chart.color_technology'), @@ -59,7 +59,7 @@ export const colorCases = [ { name: i18n.t('chart.color_fresh'), value: 'fresh', - colors: ['#5f9b3c', '#75c24b', '#83d65f', '#aacf53', '#c7dc68', '#d8e698', '#e0ebaf', '#bbc8e6', '#e5e5e5'] + colors: ['#e5e5e5', '#bbc8e6', '#e0ebaf', '#d8e698', '#c7dc68', '#aacf53', '#83d65f', '#75c24b', '#5f9b3c'] }, { name: i18n.t('chart.color_energy'), @@ -79,7 +79,7 @@ export const colorCases = [ { name: i18n.t('chart.color_spiritual'), value: 'spiritual', - colors: ['#00a3af', '#4da798', '#57baaa', '#62d0bd', '#6ee4d0', '#86e7d6', '#aeede1', '#bde1e6', '#e5e5e5'] + colors: ['#e5e5e5', '#bde1e6', '#aeede1', '#86e7d6', '#6ee4d0', '#62d0bd', '#57baaa', '#4da798', '#00a3af'] } ] From 0d679277562dddcdcbb92a274464341801bdb347 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 27 Oct 2022 18:29:56 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/ComponentWrapper.vue | 1 + .../canvas/components/Editor/PreviewMobile.vue | 5 +++++ .../PanelStyle/BackgroundSelector.vue | 2 +- .../views/panel/list/common/PanelDetailInfo.vue | 14 -------------- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 50407a9c93..827e3d692b 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -10,6 +10,7 @@ :source-element="sourceConfig" :terminal="terminal" :element="config" + :canvas-id="canvasId" :show-position="showPosition" @showViewDetails="showViewDetails" /> diff --git a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue index 5a5eac8c9d..7305826280 100644 --- a/frontend/src/components/canvas/components/Editor/PreviewMobile.vue +++ b/frontend/src/components/canvas/components/Editor/PreviewMobile.vue @@ -27,6 +27,7 @@ export default { name: 'PanelDetailInfo', - props: { - type: { - type: String, - required: true - }, - data: { - type: Object, - required: true - }, - tabStatus: { - type: Boolean, - required: true - } - }, data() { return { tabActive: 'chart', From 60205b25ed9d9a8c44a60df9bb3b0c9a94fc215e Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 27 Oct 2022 19:22:45 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix(=E5=9C=B0=E5=9B=BE):=20=E6=9C=AA?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=A0=87=E7=AD=BE=E4=BD=86=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E4=BA=86=E6=8F=90=E7=A4=BA=E4=BA=8C=E8=80=85=E4=BC=9A=E8=A2=AB?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=A7=A6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/chart.js | 4 +++- frontend/src/views/chart/chart/map/map.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index c79e0ae12d..1a9a2cd68a 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -889,7 +889,9 @@ export const BASE_MAP = { }, emphasis: { - + label: { + show: false + } } } } diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js index ead8013c8f..65ae8ff0d9 100644 --- a/frontend/src/views/chart/chart/map/map.js +++ b/frontend/src/views/chart/chart/map/map.js @@ -95,6 +95,7 @@ export function baseMapOption(chart_option, chart, themeStyle, curAreaCode) { chart_option.series[0].label.shadowBlur = 2 chart_option.series[0].label.showdowColor = customAttr.label.shadowColor } + chart_option.series[0].itemStyle.emphasis.label.show = customAttr.label.show } const valueArr = chart.data.series[0].data // visualMap From 05c220c5d3a1755c246f0b4281e9e56e7b595fa7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 27 Oct 2022 20:46:55 +0800 Subject: [PATCH 4/7] =?UTF-8?q?refactor:=20=E5=A4=8D=E5=88=B6=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=E5=B0=86=E7=84=A6=E7=82=B9=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E5=88=B0=E6=96=B0=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/store/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index f75bc770f1..cb392e68eb 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -259,6 +259,7 @@ const data = { } else { state.componentData.push(component) } + this.commit('setCurComponent', { component: component, index: index ? index : state.componentData.length - 1 }) }, removeViewFilter(state, componentId) { state.componentData = state.componentData.map(item => { From 89828c7f8d5de9772e77116c8d73950382f41c2a Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 27 Oct 2022 21:02:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E7=94=BB=E5=B8=83=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/Editor/Preview.vue | 9 ++++++--- frontend/src/views/panel/edit/index.vue | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 3f36a04261..ef6cba429d 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -27,7 +27,7 @@ v-else-if="componentDataShow && componentDataShow.length===0" class="custom-position" > - {{ $t('panel.panelNull') }} + {{ $t('panel.panelNull') }}
Date: Thu, 27 Oct 2022 21:12:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=80=89=E9=A1=B9Larksuite=E6=94=B9=E4=B8=BALark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/login/index.vue b/frontend/src/views/login/index.vue index 6765a686eb..7902435789 100644 --- a/frontend/src/views/login/index.vue +++ b/frontend/src/views/login/index.vue @@ -79,7 +79,7 @@ v-if="loginTypes.includes(7)" :label="7" size="mini" - >Larksuite + >Lark From b4bf37b0636e10f391d29a7d32612f48c4d83f6c Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 27 Oct 2022 21:20:13 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E8=87=AA=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=90=8D=E7=A7=B0=20#3445?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/panel/list/EditPanel/index.vue | 62 +++++++++++-------- frontend/src/views/panel/list/PanelList.vue | 3 + 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue index a6daca3789..03a5e89aee 100644 --- a/frontend/src/views/panel/list/EditPanel/index.vue +++ b/frontend/src/views/panel/list/EditPanel/index.vue @@ -8,16 +8,19 @@ {{ $t('panel.custom') }} + > {{ $t('panel.custom') }} + {{ $t('panel.import_template') }} + >{{ $t('panel.import_template') }} + {{ $t('panel.copy_template') }} + >{{ $t('panel.copy_template') }} + {{ $t('panel.upload_template') }} + >{{ $t('panel.upload_template') }} + {{ $t('commons.cancel') }} + >{{ $t('commons.cancel') }} + {{ $t('commons.confirm') }} + >{{ $t('commons.confirm') }} + @@ -234,7 +240,7 @@ export default { showClose: true }) this.loading = false - this.$emit('closeEditPanelDialog', response.data) + this.$emit('closeEditPanelDialog', { id: response.data, name: this.editPanel.panelInfo.name }) }).catch(() => { this.loading = false }) @@ -265,34 +271,38 @@ export default { diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue index 671f996f94..1ff274d29f 100644 --- a/frontend/src/views/panel/list/PanelList.vue +++ b/frontend/src/views/panel/list/PanelList.vue @@ -645,6 +645,9 @@ export default { if (panelInfo) { this.defaultTree() this.tree() + if (this.editPanel.optType === 'rename' && panelInfo.id === this.$store.state.panel.panelInfo.id) { + this.$store.state.panel.panelInfo.name = panelInfo.name + } // 默认展开 同时点击 新增的节点 if ( panelInfo &&