From 92e9beeac38cc7ad6dd942bb5891e6819abef33f Mon Sep 17 00:00:00 2001 From: AN <1983933789@qq.com> Date: Sat, 9 May 2026 18:16:02 +0800 Subject: [PATCH] =?UTF-8?q?optimize(projects):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=EF=BC=8C?= =?UTF-8?q?=E5=A1=AB=E5=85=8523:59:59=EF=BC=9B=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/template/modules/search.vue.vm | 18 ++++++-------- .../logininfor/modules/login-infor-search.vue | 1 + .../operlog/modules/oper-log-search.vue | 1 + .../system/config/modules/config-search.vue | 1 + src/views/system/oss/modules/oss-search.vue | 1 + src/views/system/role/modules/role-search.vue | 7 +++--- src/views/system/user/modules/user-search.vue | 1 + .../tool/gen/modules/gen-table-search.vue | 24 ++++++++++--------- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/docs/template/modules/search.vue.vm b/docs/template/modules/search.vue.vm index 26289a05..71e9b0cf 100644 --- a/docs/template/modules/search.vue.vm +++ b/docs/template/modules/search.vue.vm @@ -19,9 +19,12 @@ const { formRef, validate, restoreValidation } = useNaiveForm(); #foreach ($column in $columns) #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #set($AttrName = $column.javaField.substring(0,1).toUpperCase() + $column.javaField.substring(1)) + const dateRange${AttrName} = ref<[string, string] | null>(null); -#end#end + + #end +#end const model = defineModel('model', { required: true }); const defaultModel = jsonClone(toRaw(model.value)); @@ -57,15 +60,6 @@ async function reset() { async function search() { await validate(); -#foreach ($column in $columns) - #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) - if (dateRange${AttrName}.value?.length) { - model.value.params!.begin${AttrName} = dateRange${AttrName}.value[0]; - model.value.params!.end${AttrName} = dateRange${AttrName}.value[1]; - } - #end -#end emit('search'); } @@ -111,6 +105,8 @@ async function search() { type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" clearable + :default-time="['00:00:00', '23:59:59']" + @update:formatted-value="onDateRange${AttrName}Update" /> #else #end diff --git a/src/views/monitor/logininfor/modules/login-infor-search.vue b/src/views/monitor/logininfor/modules/login-infor-search.vue index 3913e37d..53a3cbd3 100644 --- a/src/views/monitor/logininfor/modules/login-infor-search.vue +++ b/src/views/monitor/logininfor/modules/login-infor-search.vue @@ -73,6 +73,7 @@ async function search() { type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" clearable + :default-time="['00:00:00', '23:59:59']" @update:formatted-value="onDateRangeLoginTimeUpdate" /> diff --git a/src/views/monitor/operlog/modules/oper-log-search.vue b/src/views/monitor/operlog/modules/oper-log-search.vue index 9fcca06f..661bbf9b 100644 --- a/src/views/monitor/operlog/modules/oper-log-search.vue +++ b/src/views/monitor/operlog/modules/oper-log-search.vue @@ -84,6 +84,7 @@ async function search() { type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" clearable + :default-time="['00:00:00', '23:59:59']" @update:formatted-value="onDateRangeOperTimeUpdate" /> diff --git a/src/views/system/config/modules/config-search.vue b/src/views/system/config/modules/config-search.vue index cb4df2f4..99de3fef 100644 --- a/src/views/system/config/modules/config-search.vue +++ b/src/views/system/config/modules/config-search.vue @@ -91,6 +91,7 @@ async function search() { type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" clearable + :default-time="['00:00:00', '23:59:59']" @update:formatted-value="onDateRangeCreateTimeUpdate" /> diff --git a/src/views/system/oss/modules/oss-search.vue b/src/views/system/oss/modules/oss-search.vue index 3a68b01b..1c107978 100644 --- a/src/views/system/oss/modules/oss-search.vue +++ b/src/views/system/oss/modules/oss-search.vue @@ -71,6 +71,7 @@ async function search() { type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" clearable + :default-time="['00:00:00', '23:59:59']" @update:formatted-value="onDateRangeCreateTimeUpdate" /> diff --git a/src/views/system/role/modules/role-search.vue b/src/views/system/role/modules/role-search.vue index d2c9ad40..c4e2bc51 100644 --- a/src/views/system/role/modules/role-search.vue +++ b/src/views/system/role/modules/role-search.vue @@ -70,11 +70,10 @@ async function search() { diff --git a/src/views/system/user/modules/user-search.vue b/src/views/system/user/modules/user-search.vue index 7ff8b3bb..50b0240e 100644 --- a/src/views/system/user/modules/user-search.vue +++ b/src/views/system/user/modules/user-search.vue @@ -91,6 +91,7 @@ async function search() { type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" clearable + :default-time="['00:00:00', '23:59:59']" @update:formatted-value="onDateRangeCreateTimeUpdate" /> diff --git a/src/views/tool/gen/modules/gen-table-search.vue b/src/views/tool/gen/modules/gen-table-search.vue index c2900a81..eafcd678 100644 --- a/src/views/tool/gen/modules/gen-table-search.vue +++ b/src/views/tool/gen/modules/gen-table-search.vue @@ -24,17 +24,18 @@ const { formRef, validate, restoreValidation } = useNaiveForm(); const model = defineModel('model', { required: true }); -const dateRange = ref<[string, string]>(); - -function onDateRangeUpdate(value: [string, string] | null) { - if (value?.length) { - model.value.params!.beginTime = value[0]; - model.value.params!.endTime = value[1]; - } -} +const dateRangeCreateTime = ref<[string, string] | null>(null); const defaultModel = jsonClone(toRaw(model.value)); +function onDateRangeCreateTimeUpdate(value: [string, string] | null) { + model.value.params = { + ...model.value.params, + beginTime: value?.[0], + endTime: value?.[1] + }; +} + function resetModel() { model.value.params!.beginTime = null; model.value.params!.endTime = null; @@ -70,11 +71,12 @@ async function search() {