From 5eefb53ef6105615339e115f818787045f8ba922 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 30 Jan 2024 18:46:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E6=97=A5=E5=BF=97=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/zh-CN.ts | 3 ++- .../system/parameter/basic/BasicEdit.vue | 27 ++++++++++++++++++- .../system/parameter/basic/BasicInfo.vue | 1 - de-xpack | 2 +- .../setting/api/PerSettingApi.java | 5 ++++ .../constant/XpackSettingConstants.java | 1 + .../io/dataease/utils/SystemSettingUtils.java | 2 +- 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index c05b5b2057..fbb30aba60 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2133,7 +2133,8 @@ export default { autoCreateUser: '第三方自动创建用户', dsIntervalTime: '数据源检测时间间隔', dsExecuteTime: '数据源检测频率', - frontTimeOut: '请求超时时间（秒）' + frontTimeOut: '请求超时时间（秒）', + logLiveTime: '日志保留时间（天）' }, template_manage: { name_already_exists_type: '分类名称已存在', 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 be9875c849..f992312be3 100644 --- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue +++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue @@ -102,6 +102,15 @@ const closeLoading = () => { const edit = list => { state.settingList = list.map(item => { const pkey = item.pkey + if (pkey === 'basic.logLiveTime') { + rule[pkey.split('.')[1]] = [ + { + required: true, + message: t('common.require'), + trigger: ['blur', 'change'] + } + ] + } item['label'] = `setting_${pkey}` item['pkey'] = pkey.split('.')[1] let pval = item.pval @@ -171,13 +180,26 @@ defineExpose({ v-model="state.form.frontTimeOut" autocomplete="off" step-strictly - class="text-left" + class="text-left edit-all-line" :min="1" :placeholder="t('common.inputText')" controls-position="right" type="number" /> +
+ +
@@ -215,6 +237,9 @@ defineExpose({ .is-error { margin-bottom: 40px !important; } + .edit-all-line { + width: 552px !important; + } } .setting-hidden-item { display: none !important; diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue index 91c30d073d..4c89aee153 100644 --- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue +++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue @@ -45,7 +45,6 @@ const search = cb => { item.pval = item.pval } item.pkey = 'setting_' + item.pkey - console.log(item.pkey) state.templateList.push(item) } cb && cb() diff --git a/de-xpack b/de-xpack index a177d2aafe..f57ed3cd02 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit a177d2aafe0a2dc871fc4b8d202ebc4edbb75f6a +Subproject commit f57ed3cd02aee601d47a755a44358ced6c504b5e diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java index 6244cae083..c90ab08465 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/setting/api/PerSettingApi.java @@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,4 +23,8 @@ public interface PerSettingApi { @Operation(summary = "保存设置") @PostMapping("/baisc/save") void saveBasic(@RequestBody List settings); + + @Hidden + @GetMapping("/baisc/single/{key}") + String singleValue(@PathVariable("key") String key); } diff --git a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java b/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java index 6b8b760a6d..dc99d7a94a 100644 --- a/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java +++ b/sdk/common/src/main/java/io/dataease/constant/XpackSettingConstants.java @@ -3,5 +3,6 @@ package io.dataease.constant; public class XpackSettingConstants { public static final String AUTO_CREATE_USER = "basic.autoCreateUser"; + public static final String LOG_LIVE_TIME = "basic.logLiveTime"; public static final String Front_Time_Out = "basic.frontTimeOut"; } diff --git a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java b/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java index 9629897394..9c9f699d90 100644 --- a/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java +++ b/sdk/common/src/main/java/io/dataease/utils/SystemSettingUtils.java @@ -8,7 +8,7 @@ public class SystemSettingUtils { public static boolean xpackSetting(String pkey) { - List xpackSettingList = List.of(XpackSettingConstants.AUTO_CREATE_USER); + List xpackSettingList = List.of(XpackSettingConstants.AUTO_CREATE_USER, XpackSettingConstants.LOG_LIVE_TIME); return xpackSettingList.contains(pkey); } }