diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java index 7194cb02a3..3f1b7e1df1 100644 --- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java +++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java @@ -90,6 +90,6 @@ public class MenuManage { } private boolean isXpackMenu(CoreMenu coreMenu) { - return coreMenu.getId().equals(7L) || coreMenu.getPid().equals(7L) || coreMenu.getId().equals(14L) || coreMenu.getId().equals(15L) || coreMenu.getPid().equals(15L); + return coreMenu.getId().equals(7L) || coreMenu.getPid().equals(7L) || coreMenu.getId().equals(14L) || coreMenu.getId().equals(17L) || coreMenu.getId().equals(18L); } } diff --git a/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql index 9ec38d6de1..bdf29384ad 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.0__core_ddl.sql @@ -81,7 +81,8 @@ VALUES (1, 0, 2, 'workbranch', 'workbranch', 1, NULL, '/workbranch', 0, 1, 1), (6, 4, 2, 'datasource', 'visualized/data/datasource', 2, NULL, '/datasource', 0, 1, 1), (11, 0, 2, 'dataset-form', 'visualized/data/dataset/form', 7, NULL, '/dataset-form', 1, 0, 0), (12, 0, 2, 'datasource-form', 'visualized/data/datasource/form', 7, NULL, '/ds-form', 1, 0, 0), - (13, 0, 2, 'about', 'about', 7, NULL, '/about', 1, 1, 0); + (15, 0, 1, 'sys-setting', NULL, 6, NULL, '/sys-setting', 1, 1, 0), + (16, 15, 2, 'parameter', 'system/parameter', 1, 'sys-parameter', '/parameter', 0, 1, 0); DROP TABLE IF EXISTS `core_dataset_group`; diff --git a/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql index cf60237cda..71d01a9b7b 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.0__core_ddl.sql @@ -81,7 +81,9 @@ VALUES (1, 0, 2, 'workbranch', 'workbranch', 1, NULL, '/workbranch', 0, 1, 1), (5, 4, 2, 'dataset', 'visualized/data/dataset', 1, NULL, '/dataset', 0, 1, 1), (6, 4, 2, 'datasource', 'visualized/data/datasource', 2, NULL, '/datasource', 0, 1, 1), (11, 0, 2, 'dataset-form', 'visualized/data/dataset/form', 7, NULL, '/dataset-form', 1, 0, 0), - (12, 0, 2, 'datasource-form', 'visualized/data/datasource/form', 7, NULL, '/ds-form', 1, 0, 0); + (12, 0, 2, 'datasource-form', 'visualized/data/datasource/form', 7, NULL, '/ds-form', 1, 0, 0), + (15, 0, 1, 'sys-setting', NULL, 6, NULL, '/sys-setting', 1, 1, 0), + (16, 15, 2, 'parameter', 'system/parameter', 1, 'sys-parameter', '/parameter', 0, 1, 0); UNLOCK TABLES; diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 75596471e6..6ff9d226b4 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -31,7 +31,7 @@ i18n_union_field_can_not_empty=\u5173\u8054\u5B57\u6BB5\u4E0D\u80FD\u4E3A\u7A7A i18n_table_duplicate=\u76F8\u540C\u8282\u70B9\u9700\u91CD\u65B0\u62D6\u5165\u624D\u80FD\u7EE7\u7EED\u65B0\u5EFA\u6570\u636E\u96C6 i18n_no_column_permission=\u6CA1\u6709\u5217\u6743\u9650 i18n_fetch_error=SQL\u6267\u884C\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u8868\u3001\u5B57\u6BB5\u3001\u5173\u8054\u5173\u7CFB\u7B49\u4FE1\u606F\u662F\u5426\u6B63\u786E\u5E76\u91CD\u65B0\u7F16\u8F91\u3002 -i18n_no_datasource_permission=\u65e0\u6570\u636e\u6e90\u8bbf\u95ee\u6743\u9650 +i18n_no_datasource_permission=\u65E0\u6570\u636E\u6E90\u8BBF\u95EE\u6743\u9650 i18n_field_circular_ref=\u5B57\u6BB5\u5B58\u5728\u5FAA\u73AF\u5F15\u7528 @@ -51,4 +51,5 @@ i18n_login_name_pwd_err=\u7528\u6237\u540D\u6216\u5BC6\u7801\u9519\u8BEF i18n_error_login_type=\u767B\u5F55\u7C7B\u578B\u9519\u8BEF i18n_schema_is_empty=schema \u4E3A\u7A7A\uFF01 i18n_table_name_repeat=\u540D\u79F0\u91CD\u590D: -i18n_sql_not_empty=sql \u4e0d\u80fd\u4e3a\u7a7a +i18n_sql_not_empty=sql \u4E0D\u80FD\u4E3A\u7A7A +i18n_menu.parameter=\u7CFB\u7EDF\u53C2\u6570 diff --git a/core/core-frontend/src/assets/svg/sys-parameter.svg b/core/core-frontend/src/assets/svg/sys-parameter.svg new file mode 100644 index 0000000000..40404d0bd3 --- /dev/null +++ b/core/core-frontend/src/assets/svg/sys-parameter.svg @@ -0,0 +1,4 @@ + + + + diff --git a/core/core-frontend/src/layout/components/AccountOperator.vue b/core/core-frontend/src/layout/components/AccountOperator.vue index be1168cc88..b46eb1e67f 100644 --- a/core/core-frontend/src/layout/components/AccountOperator.vue +++ b/core/core-frontend/src/layout/components/AccountOperator.vue @@ -65,6 +65,10 @@ const openLanguage = () => { const openPopover = () => { unref(popoverRef).popperRef?.delayHide?.() } + +if (uid.value === '1') { + linkLoaded([{ id: 4, link: '/sys-setting/parameter', label: t('commons.system_setting') }]) +} + diff --git a/core/core-frontend/src/views/system/parameter/map/Geometry.vue b/core/core-frontend/src/views/system/parameter/map/Geometry.vue new file mode 100644 index 0000000000..4ff89855f6 --- /dev/null +++ b/core/core-frontend/src/views/system/parameter/map/Geometry.vue @@ -0,0 +1,145 @@ + + + + + diff --git a/core/core-frontend/src/views/system/parameter/map/MapSetting.vue b/core/core-frontend/src/views/system/parameter/map/MapSetting.vue new file mode 100644 index 0000000000..e8c49255fa --- /dev/null +++ b/core/core-frontend/src/views/system/parameter/map/MapSetting.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/core/core-frontend/src/views/system/parameter/map/OnlineMap.vue b/core/core-frontend/src/views/system/parameter/map/OnlineMap.vue new file mode 100644 index 0000000000..b09f1bdc83 --- /dev/null +++ b/core/core-frontend/src/views/system/parameter/map/OnlineMap.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/de-xpack b/de-xpack index 0a8337cd2b..1ca8187376 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 0a8337cd2b6ea435977c22614c2a24bc9460c6c9 +Subproject commit 1ca8187376d058b65d163dbad52ff6159ca024f3