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