by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: follow官方handleRangeTimeValue更新

Browse Source
This commit is contained in:
dap 2025-01-15 23:24:06 +08:00
parent 9b68aacc27
commit 11dba43d83
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
apps/web-antd/src/utils/file/download.ts
View File

@ -4,6 +4,7 @@ import { $t } from '@vben/locales';
import { cloneDeep, formatDate } from '@vben/utils'; import { cloneDeep, formatDate } from '@vben/utils';
import { message } from 'ant-design-vue'; import { message } from 'ant-design-vue';
import { isFunction } from 'lodash-es';
import { dataURLtoBlob, urlToBase64 } from './base64Conver'; import { dataURLtoBlob, urlToBase64 } from './base64Conver';
@ -54,37 +55,42 @@ function handleRangeTimeValue(
fieldMappingTime.forEach( fieldMappingTime.forEach(
([field, [startTimeKey, endTimeKey], format = 'YYYY-MM-DD']) => { ([field, [startTimeKey, endTimeKey], format = 'YYYY-MM-DD']) => {
if ( if (startTimeKey && endTimeKey && values[field] === null) {
values[field] === null &&
values[startTimeKey] &&
values[endTimeKey]
) {
Reflect.deleteProperty(values, startTimeKey); Reflect.deleteProperty(values, startTimeKey);
Reflect.deleteProperty(values, endTimeKey); Reflect.deleteProperty(values, endTimeKey);
return; // delete values[startTimeKey];
// delete values[endTimeKey];
} }
if (!values[field]) { if (!values[field]) {
Reflect.deleteProperty(values, field); Reflect.deleteProperty(values, field);
// delete values[field];
return; return;
} }
const [startTime, endTime] = values[field]; const [startTime, endTime] = values[field];
const [startTimeFormat, endTimeFormat] = Array.isArray(format) if (format === null) {
? format values[startTimeKey] = startTime;
: [format, format]; values[endTimeKey] = endTime;
} else if (isFunction(format)) {
values[startTimeKey] = startTime values[startTimeKey] = format(startTime, startTimeKey);
? formatDate(startTime, startTimeFormat) values[endTimeKey] = format(endTime, endTimeKey);
: undefined; } else {
values[endTimeKey] = endTime const [startTimeFormat, endTimeFormat] = Array.isArray(format)
? formatDate(endTime, endTimeFormat) ? format
: undefined; : [format, format];
values[startTimeKey] = startTime
? formatDate(startTime, startTimeFormat)
: undefined;
values[endTimeKey] = endTime
? formatDate(endTime, endTimeFormat)
: undefined;
}
// delete values[field];
Reflect.deleteProperty(values, field); Reflect.deleteProperty(values, field);
}, },
); );
return values; return values;
} }