fix(packages): 修复时间筛选未重置问题,调整search.vue.vm模板文件

This commit is contained in:
AN
2026-05-08 18:12:26 +08:00
parent 3198ea4cd3
commit e0c3062302
7 changed files with 59 additions and 55 deletions
+13
View File
@@ -26,6 +26,19 @@ const model = defineModel<Api.$ModuleName.${BusinessName}SearchParams>('model',
const defaultModel = jsonClone(toRaw(model.value));
#foreach ($column in $columns)
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
function onDateRange${AttrName}Update(value: [string, string] | null) {
model.value.params = {
...model.value.params,
begin${AttrName}: value?.[0],
end${AttrName}: value?.[1]
};
}
#end
#end
function resetModel() {
#foreach ($column in $columns)
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
@@ -16,17 +16,18 @@ const emit = defineEmits<Emits>();
const { formRef, validate, restoreValidation } = useNaiveForm();
const dateRangeLoginTime = ref<[string, string] | null>(null);
const model = defineModel<Api.Monitor.LoginInforSearchParams>('model', { required: true });
const defaultModel = jsonClone(toRaw(model.value));
const dateRangeLoginTime = ref<[string, string] | null>(null);
function onDateRangeLoginTimeUpdate(value: [string, string] | null) {
if (value?.length) {
model.value.params!.beginTime = value[0];
model.value.params!.endTime = value[1];
}
model.value.params = {
...model.value.params,
beginTime: value?.[0],
endTime: value?.[1]
};
}
function resetModel() {
@@ -16,17 +16,18 @@ const emit = defineEmits<Emits>();
const { formRef, validate, restoreValidation } = useNaiveForm();
const dateRangeOperTime = ref<[string, string] | null>(null);
const model = defineModel<Api.Monitor.OperLogSearchParams>('model', { required: true });
const defaultModel = jsonClone(toRaw(model.value));
const dateRangeOperTime = ref<[string, string] | null>(null);
function onDateRangeOperTimeUpdate(value: [string, string] | null) {
if (value?.length) {
model.value.params!.beginTime = value[0];
model.value.params!.endTime = value[1];
}
model.value.params = {
...model.value.params,
beginTime: value?.[0],
endTime: value?.[1]
};
}
function resetModel() {
@@ -16,20 +16,18 @@ const emit = defineEmits<Emits>();
const { formRef, validate, restoreValidation } = useNaiveForm();
const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.ConfigSearchParams>('model', { required: true });
const defaultModel = jsonClone(toRaw(model.value));
const dateRangeCreateTime = ref<[string, string] | null>(null);
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
model.value.params = {
...model.value.params,
beginTime: value?.[0],
endTime: value?.[1]
};
}
function resetModel() {
+7 -9
View File
@@ -16,20 +16,18 @@ const emit = defineEmits<Emits>();
const { formRef, validate, restoreValidation } = useNaiveForm();
const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.OssSearchParams>('model', { required: true });
const defaultModel = jsonClone(toRaw(model.value));
const dateRangeCreateTime = ref<[string, string] | null>(null);
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
model.value.params = {
...model.value.params,
beginTime: value?.[0],
endTime: value?.[1]
};
}
function resetModel() {
+11 -16
View File
@@ -2,7 +2,6 @@
import { ref, toRaw } from 'vue';
import { jsonClone } from '@sa/utils';
import { useNaiveForm } from '@/hooks/common/form';
import { useDict } from '@/hooks/business/dict';
import { $t } from '@/locales';
defineOptions({
@@ -17,22 +16,18 @@ const emit = defineEmits<Emits>();
const { formRef, validate, restoreValidation } = useNaiveForm();
const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.RoleSearchParams>('model', { required: true });
const defaultModel = jsonClone(toRaw(model.value));
const { options: sysNormalDisableOptions } = useDict('sys_normal_disable', false);
const dateRangeCreateTime = ref<[string, string] | null>(null);
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
model.value.params = {
...model.value.params,
beginTime: value?.[0],
endTime: value?.[1]
};
}
function resetModel() {
@@ -59,16 +54,16 @@ async function search() {
<NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
<NGrid responsive="screen" item-responsive>
<NFormItemGi span="24 s:12 m:6" label="角色名称" path="roleName" class="pr-24px">
<NInput v-model:value="model.roleName" placeholder="请输入角色名称" />
<NInput v-model:value="model.roleName" :placeholder="$t('page.system.role.form.roleName.required')" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="权限字符" path="roleKey" class="pr-24px">
<NInput v-model:value="model.roleKey" placeholder="请输入权限字符" />
<NInput v-model:value="model.roleKey" :placeholder="$t('page.system.role.form.roleKey.required')" />
</NFormItemGi>
<NFormItemGi span="24 s:12 m:6" label="角色状态" path="status" class="pr-24px">
<NSelect
<DictSelect
v-model:value="model.status"
placeholder="请选择角色状态"
:options="sysNormalDisableOptions"
:placeholder="$t('page.system.role.form.status.required')"
dict-code="sys_normal_disable"
clearable
/>
</NFormItemGi>
@@ -18,20 +18,18 @@ const emit = defineEmits<Emits>();
const { formRef, validate, restoreValidation } = useNaiveForm();
const dateRangeCreateTime = ref<[string, string] | null>(null);
const model = defineModel<Api.System.UserSearchParams>('model', { required: true });
const defaultModel = jsonClone(toRaw(model.value));
const dateRangeCreateTime = ref<[string, string] | null>(null);
function onDateRangeCreateTimeUpdate(value: [string, string] | null) {
const params = model.value.params!;
if (value && value.length === 2) {
[params.beginTime, params.endTime] = value;
} else {
params.beginTime = undefined;
params.endTime = undefined;
}
model.value.params = {
...model.value.params,
beginTime: value?.[0],
endTime: value?.[1]
};
}
function resetModel() {