From ab7c33c82a65c3252742b1965ee33f2aa1e91e72 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 13 Jul 2021 12:13:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BC=96=E8=BE=91=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=A4=A7=E6=95=88=E6=9E=9C=E7=AD=89=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V14__update_function.sql | 4 ++ .../components/canvas/components/Toolbar.vue | 12 ++-- .../canvas/custom-component/UserView.vue | 6 +- frontend/src/icons/svg/warn-tre.svg | 2 +- frontend/src/styles/deicon/demo_index.html | 52 +++++++++++++++++- frontend/src/styles/deicon/iconfont.css | 14 ++++- frontend/src/styles/deicon/iconfont.js | 2 +- frontend/src/styles/deicon/iconfont.json | 14 +++++ frontend/src/styles/deicon/iconfont.ttf | Bin 10116 -> 10836 bytes frontend/src/styles/deicon/iconfont.woff | Bin 6284 -> 6724 bytes frontend/src/styles/deicon/iconfont.woff2 | Bin 5168 -> 5552 bytes 11 files changed, 91 insertions(+), 15 deletions(-) diff --git a/backend/src/main/resources/db/migration/V14__update_function.sql b/backend/src/main/resources/db/migration/V14__update_function.sql index 7e5fc2d6ee..dde16205a2 100644 --- a/backend/src/main/resources/db/migration/V14__update_function.sql +++ b/backend/src/main/resources/db/migration/V14__update_function.sql @@ -1,3 +1,5 @@ +DROP FUNCTION IF EXISTS `GET_CHART_VIEW_COPY_NAME`; +delimiter ;; CREATE FUNCTION `GET_CHART_VIEW_COPY_NAME`(chartId varchar(255)) RETURNS varchar(255) CHARSET utf8 READS SQL DATA BEGIN @@ -24,3 +26,5 @@ and REPLACE(name,chartName,'') REGEXP '-copy\\(([0-9])+\\)$' and name like CONCA RETURN concat(chartName,'-copy(',chartNameCount,')'); END +;; +delimiter ; diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index f803e923ff..7d5f866d4f 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -64,10 +64,14 @@ -
- - {{ $t('panel.panel_save_warn_tips') }} -
+ + + + + + {{ $t('panel.panel_save_warn_tips') }} + +
{{ $t('panel.do_not_save') }} {{ $t('panel.cancel') }} diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index 843aff6059..78759575d0 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -1,6 +1,6 @@