From ed55854e351865c40602c77140b131362ecacf5a Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 22 Aug 2022 23:59:57 -0400 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E5=99=A8):=20=E6=95=B0=E5=AD=97=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=A0=87=E9=A2=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/dataease/DeOutWidget.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue index fe349cd352..b1c3bd26e5 100644 --- a/frontend/src/components/dataease/DeOutWidget.vue +++ b/frontend/src/components/dataease/DeOutWidget.vue @@ -157,6 +157,13 @@ export default { alignItems: 'center' } } + + if (vertical !== 'top' && this.element.component === 'de-number-range') { + if (!this.titleStyle) { + this.titleStyle = {} + } + this.titleStyle.marginTop = '-20px' + } }, getCondition() { if (this.$refs && this.$refs['deOutWidget'] && this.$refs['deOutWidget'].getCondition) { From 46d6973fd840dd45d3473744439f08cabe511900 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 23 Aug 2022 00:36:58 -0400 Subject: [PATCH 2/3] =?UTF-8?q?style(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E8=8F=9C=E5=8D=95=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/icons/svg/display-setting.svg | 1 + frontend/src/icons/svg/plugins-new.svg | 1 + frontend/src/icons/svg/sys-param.svg | 1 + frontend/src/icons/svg/sys-setting.svg | 1 + 4 files changed, 4 insertions(+) create mode 100644 frontend/src/icons/svg/display-setting.svg create mode 100644 frontend/src/icons/svg/plugins-new.svg create mode 100644 frontend/src/icons/svg/sys-param.svg create mode 100644 frontend/src/icons/svg/sys-setting.svg diff --git a/frontend/src/icons/svg/display-setting.svg b/frontend/src/icons/svg/display-setting.svg new file mode 100644 index 0000000000..3f590542f8 --- /dev/null +++ b/frontend/src/icons/svg/display-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/plugins-new.svg b/frontend/src/icons/svg/plugins-new.svg new file mode 100644 index 0000000000..8dcbb26a29 --- /dev/null +++ b/frontend/src/icons/svg/plugins-new.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/sys-param.svg b/frontend/src/icons/svg/sys-param.svg new file mode 100644 index 0000000000..f6c6f02c94 --- /dev/null +++ b/frontend/src/icons/svg/sys-param.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/icons/svg/sys-setting.svg b/frontend/src/icons/svg/sys-setting.svg new file mode 100644 index 0000000000..171c06129c --- /dev/null +++ b/frontend/src/icons/svg/sys-setting.svg @@ -0,0 +1 @@ + \ No newline at end of file From a889f92d8768c90418e906577842c7a0759c87f6 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 23 Aug 2022 12:40:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86):=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V39__1.14.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/resources/db/migration/V39__1.14.sql b/backend/src/main/resources/db/migration/V39__1.14.sql index bf26183ab8..e1fba79f28 100644 --- a/backend/src/main/resources/db/migration/V39__1.14.sql +++ b/backend/src/main/resources/db/migration/V39__1.14.sql @@ -35,3 +35,9 @@ CREATE TABLE IF NOT EXISTS `sys_param_assist` ( ALTER TABLE `sys_task_email` MODIFY COLUMN `view_ids` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '关联视图' AFTER `task_id`; +BEGIN; +update `sys_menu` set icon = 'plugins-new' where `menu_id` = 101; +update `sys_menu` set icon = 'sys-setting' where `menu_id` = 700; +update `sys_menu` set icon = 'sys-param' where `menu_id` = 6; +update `sys_menu` set icon = 'display-setting' where `menu_id` = 710; +COMMIT; \ No newline at end of file