From d641d717537cf2b5c912771e6da813e602b66e2f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Fri, 30 Jul 2021 10:23:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BAexcel=E4=B8=AD=E4=B8=8D=E9=9C=80=E8=A6=81=E5=90=88?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/custom-component/UserViewDialog.vue | 2 +- frontend/src/views/chart/components/table/TableNormal.vue | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserViewDialog.vue b/frontend/src/components/canvas/custom-component/UserViewDialog.vue index d1a3c2cce3..53425cf324 100644 --- a/frontend/src/components/canvas/custom-component/UserViewDialog.vue +++ b/frontend/src/components/canvas/custom-component/UserViewDialog.vue @@ -5,7 +5,7 @@ - + diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index ebd6734bfe..0b1e0a6e83 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -12,7 +12,7 @@ :row-style="getRowStyle" class="table-class" :class="chart.id" - show-summary + :show-summary="showSummary" :summary-method="summaryMethod" > Date: Thu, 29 Jul 2021 18:00:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=99=90=E5=88=B6=E5=9C=A850=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/list/EditPanel/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue index 6f53ecb6f5..0aca7f717e 100644 --- a/frontend/src/views/panel/list/EditPanel/index.vue +++ b/frontend/src/views/panel/list/EditPanel/index.vue @@ -133,6 +133,13 @@ export default { this.$warning(this.$t('chart.name_can_not_empty')) return false } + + debugger + if (this.editPanel.panelInfo.name.length > 50) { + this.$warning(this.$t('commons.char_can_not_more_50')) + return false + } + if (!this.editPanel.panelInfo.panelData && this.editPanel.optType === 'new' && this.inputType === 'copy') { this.$warning(this.$t('chart.template_can_not_empty')) return false