mirror of
https://gitee.com/nicefold/seewis-soybean-plus.git
synced 2026-10-14 03:52:28 +08:00
optimize(projects): 优化搜索时间范围,填充23:59:59;优化代码模板,去除冗余代码。
This commit is contained in:
Vendored
+7
-11
@@ -19,9 +19,12 @@ const { formRef, validate, restoreValidation } = useNaiveForm();
|
|||||||
|
|
||||||
#foreach ($column in $columns)
|
#foreach ($column in $columns)
|
||||||
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
|
#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);
|
const dateRange${AttrName} = ref<[string, string] | null>(null);
|
||||||
#end#end
|
|
||||||
|
#end
|
||||||
|
#end
|
||||||
const model = defineModel<Api.$ModuleName.${BusinessName}SearchParams>('model', { required: true });
|
const model = defineModel<Api.$ModuleName.${BusinessName}SearchParams>('model', { required: true });
|
||||||
|
|
||||||
const defaultModel = jsonClone(toRaw(model.value));
|
const defaultModel = jsonClone(toRaw(model.value));
|
||||||
@@ -57,15 +60,6 @@ async function reset() {
|
|||||||
|
|
||||||
async function search() {
|
async function search() {
|
||||||
await validate();
|
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');
|
emit('search');
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -111,6 +105,8 @@ async function search() {
|
|||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
|
@update:formatted-value="onDateRange${AttrName}Update"
|
||||||
/>
|
/>
|
||||||
#else <NInput v-model:value="model.$column.javaField" placeholder="请输入$column.columnComment" />
|
#else <NInput v-model:value="model.$column.javaField" placeholder="请输入$column.columnComment" />
|
||||||
#end
|
#end
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ async function search() {
|
|||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
@update:formatted-value="onDateRangeLoginTimeUpdate"
|
@update:formatted-value="onDateRangeLoginTimeUpdate"
|
||||||
/>
|
/>
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ async function search() {
|
|||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
@update:formatted-value="onDateRangeOperTimeUpdate"
|
@update:formatted-value="onDateRangeOperTimeUpdate"
|
||||||
/>
|
/>
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ async function search() {
|
|||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
||||||
/>
|
/>
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ async function search() {
|
|||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
||||||
/>
|
/>
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
|
|||||||
@@ -70,11 +70,10 @@ async function search() {
|
|||||||
<NFormItemGi span="24 s:12 m:6" label="创建时间" path="createTime" class="pr-24px">
|
<NFormItemGi span="24 s:12 m:6" label="创建时间" path="createTime" class="pr-24px">
|
||||||
<NDatePicker
|
<NDatePicker
|
||||||
v-model:formatted-value="dateRangeCreateTime"
|
v-model:formatted-value="dateRangeCreateTime"
|
||||||
update-value-on-close
|
type="datetimerange"
|
||||||
class="w-full"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
type="daterange"
|
|
||||||
value-format="yyyy-MM-dd"
|
|
||||||
clearable
|
clearable
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
||||||
/>
|
/>
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ async function search() {
|
|||||||
type="datetimerange"
|
type="datetimerange"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
clearable
|
clearable
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
||||||
/>
|
/>
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
|
|||||||
@@ -24,17 +24,18 @@ const { formRef, validate, restoreValidation } = useNaiveForm();
|
|||||||
|
|
||||||
const model = defineModel<Api.Tool.GenTableSearchParams>('model', { required: true });
|
const model = defineModel<Api.Tool.GenTableSearchParams>('model', { required: true });
|
||||||
|
|
||||||
const dateRange = ref<[string, string]>();
|
const dateRangeCreateTime = ref<[string, string] | null>(null);
|
||||||
|
|
||||||
function onDateRangeUpdate(value: [string, string] | null) {
|
|
||||||
if (value?.length) {
|
|
||||||
model.value.params!.beginTime = value[0];
|
|
||||||
model.value.params!.endTime = value[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const defaultModel = jsonClone(toRaw(model.value));
|
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() {
|
function resetModel() {
|
||||||
model.value.params!.beginTime = null;
|
model.value.params!.beginTime = null;
|
||||||
model.value.params!.endTime = null;
|
model.value.params!.endTime = null;
|
||||||
@@ -70,11 +71,12 @@ async function search() {
|
|||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
<NFormItemGi span="24 s:12 m:6" label="创建时间" label-width="auto" class="pr-24px">
|
<NFormItemGi span="24 s:12 m:6" label="创建时间" label-width="auto" class="pr-24px">
|
||||||
<NDatePicker
|
<NDatePicker
|
||||||
v-model:formatted-value="dateRange"
|
v-model:formatted-value="dateRangeCreateTime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
type="daterange"
|
type="datetimerange"
|
||||||
clearable
|
clearable
|
||||||
@update:formatted-value="onDateRangeUpdate"
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
|
@update:formatted-value="onDateRangeCreateTimeUpdate"
|
||||||
/>
|
/>
|
||||||
</NFormItemGi>
|
</NFormItemGi>
|
||||||
<NFormItemGi :show-feedback="false" span="24" class="pb-6px pr-24px">
|
<NFormItemGi :show-feedback="false" span="24" class="pb-6px pr-24px">
|
||||||
|
|||||||
Reference in New Issue
Block a user