From aa6536aa31243176b8fc3f7ac65ad047e92ebe50 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 19 Dec 2022 17:09:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=80=E7=BC=98=E5=85=B3=E7=B3=BB=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V46__1.18.sql | 5 ++++ .../resources/i18n/messages_en_US.properties | 1 + .../resources/i18n/messages_zh_CN.properties | 1 + .../resources/i18n/messages_zh_TW.properties | 1 + frontend/src/icons/svg/sys-relationship.svg | 1 + .../src/views/system/relationship/index.vue | 24 +++++++++++++++++++ 6 files changed, 33 insertions(+) create mode 100644 frontend/src/icons/svg/sys-relationship.svg create mode 100644 frontend/src/views/system/relationship/index.vue diff --git a/backend/src/main/resources/db/migration/V46__1.18.sql b/backend/src/main/resources/db/migration/V46__1.18.sql index e3ae313c56..8753a29162 100644 --- a/backend/src/main/resources/db/migration/V46__1.18.sql +++ b/backend/src/main/resources/db/migration/V46__1.18.sql @@ -8,3 +8,8 @@ WHERE `id` = 'system_1'; ALTER TABLE `sys_task` ADD COLUMN `status` tinyint(1) NULL DEFAULT 1 COMMENT '运行状态' AFTER `create_time`; + + +INSERT INTO `dataease`.`sys_menu` (`menu_id`, `pid`, `sub_count`, `type`, `title`, `name`, `component`, `menu_sort`, `icon`, `path`, `i_frame`, `cache`, `hidden`, `permission`) VALUES (1100, 1, 0, 1, '血缘关系', 'sys-relationship', 'system/relationship/index', 1002, 'sys-relationship', 'relationship', 0, 0, 0, 'relationship:read'); + +UPDATE `sys_menu` SET `menu_sort` = 1003 WHERE (`menu_id` = 101); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 375af2fc78..1b815bb37e 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -259,4 +259,5 @@ I18N_LOG_FORMAT_PREFIX=With authority of %s\u3010%s\u3011 \u7F16\u8F91\u8BB0\u5F55=Edit record \u5220\u9664\u8BB0\u5F55=Delete record \u6C34\u5370\u7BA1\u7406=Watermark +\u8840\u7F18\u5173\u7CFB=Relationship diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index c1a7f7fb66..188ff1523f 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -259,5 +259,6 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650 \u7F16\u8F91\u8BB0\u5F55=\u7F16\u8F91\u8BB0\u5F55 \u5220\u9664\u8BB0\u5F55=\u5220\u9664\u8BB0\u5F55 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 +\u8840\u7F18\u5173\u7CFB=\u8840\u7F18\u5173\u7CFB diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 116f5f4533..1301d7a0c0 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -255,3 +255,4 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6B0A\u9650 \u7F16\u8F91\u8BB0\u5F55=\u7DE8\u8F2F\u8A18\u9304 \u5220\u9664\u8BB0\u5F55=\u522A\u9664\u8A18\u9304 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 +\u8840\u7F18\u5173\u7CFB=\u8840\u7DE3\u95DC\u7CFB diff --git a/frontend/src/icons/svg/sys-relationship.svg b/frontend/src/icons/svg/sys-relationship.svg new file mode 100644 index 0000000000..ec0619f3c7 --- /dev/null +++ b/frontend/src/icons/svg/sys-relationship.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/views/system/relationship/index.vue b/frontend/src/views/system/relationship/index.vue new file mode 100644 index 0000000000..1cb6132949 --- /dev/null +++ b/frontend/src/views/system/relationship/index.vue @@ -0,0 +1,24 @@ + +