diff --git a/core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java b/core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java index 462cfb6a13..c914ff7946 100644 --- a/core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java +++ b/core/core-backend/src/main/java/io/dataease/system/server/SysParameterServer.java @@ -74,6 +74,9 @@ public class SysParameterServer implements SysParameterApi { if (StringUtils.isNotBlank(settingItemVO.getPkey()) && settingItemVO.getPkey().equalsIgnoreCase(XpackSettingConstants.DEFAULT_SORT) && StringUtils.isNotBlank(settingItemVO.getPval())) { map.put(XpackSettingConstants.DEFAULT_SORT, settingItemVO.getPval()); } + if (StringUtils.isNotBlank(settingItemVO.getPkey()) && settingItemVO.getPkey().equalsIgnoreCase(XpackSettingConstants.DEFAULT_OPEN) && StringUtils.isNotBlank(settingItemVO.getPval())) { + map.put(XpackSettingConstants.DEFAULT_OPEN, settingItemVO.getPval()); + } } return map; } diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql index 036684523c..7005cfbdc8 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql @@ -1,2 +1,5 @@ INSERT INTO `core_sys_setting`(`id`, `pkey`, `pval`, `type`, `sort`) VALUES (1048232869488627719, 'basic.defaultSort', '1', 'text', 13); + +INSERT INTO `core_sys_setting`(`id`, `pkey`, `pval`, `type`, `sort`) +VALUES (1048232869488627719, 'basic.defaultOpen', '1', 'text', 14); diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql index 60b271c0d5..ba5a9f42d6 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql @@ -1,6 +1,9 @@ INSERT INTO `core_sys_setting`(`id`, `pkey`, `pval`, `type`, `sort`) VALUES (1048232869488627719, 'basic.defaultSort', '1', 'text', 13); +INSERT INTO `core_sys_setting`(`id`, `pkey`, `pval`, `type`, `sort`) +VALUES (1048232869488627719, 'basic.defaultOpen', '0', 'text', 14); + INSERT INTO `core_menu` VALUES (70, 0, 1, 'msg', NULL, 200, NULL, '/msg', 1, 1, 0); -UPDATE `xpack_setting_authentication` set `synced` = 0 where `name` = 'oidc' or name = 'cas'; \ No newline at end of file +UPDATE `xpack_setting_authentication` set `synced` = 0 where `name` = 'oidc' or name = 'cas'; diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 4ba47e5925..a32bd0d644 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -3073,6 +3073,10 @@ export default { name_asc: '按名稱升序', name_desc: '按名稱降序' }, + open_opt: { + new_page: '新頁面打開', + local_page: '當前頁面打開' + }, setting_email: { title: '郵件設置', host: 'SMTP主機', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index fd44bb988f..e11b40b7fb 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -3082,6 +3082,10 @@ export default { name_asc: '按名称升序', name_desc: '按名称降序' }, + open_opt: { + new_page: '新页面打开', + local_page: '当前页面打开' + }, setting_email: { title: '邮件设置', host: 'SMTP主机', diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue index e80736b2c4..3ff3cacba5 100644 --- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue +++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue @@ -41,6 +41,10 @@ const state = reactive({ { value: '1', label: t('resource_sort.time_desc') }, { value: '2', label: t('resource_sort.name_asc') }, { value: '3', label: t('resource_sort.name_desc') } + ], + openOptions: [ + { value: '0', label: t('open_opt.new_page') }, + { value: '1', label: t('open_opt.local_page') } ] }) @@ -125,11 +129,12 @@ const closeLoading = () => { loadingInstance.value?.close() } -const edit = (list, orgOptions, roleOptions, loginOptions, sortOptions) => { +const edit = (list, orgOptions, roleOptions, loginOptions, sortOptions, openOptions) => { state.orgOptions = orgOptions || [] state.roleOptions = roleOptions || [] state.loginOptions = loginOptions || [] state.sortOptions = sortOptions || [] + state.openOptions = openOptions || [] state.settingList = list.map(item => { const pkey = item.pkey if (pkey === 'basic.logLiveTime' || pkey === 'basic.thresholdLogLiveTime') { @@ -358,6 +363,13 @@ defineExpose({ +