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 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) { 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