@tachybase/client 1.6.18 → 1.6.19

package/es/filter-provider/utils.d.ts

@@ -1,6 +1,7 @@
 import { Schema } from '@tachybase/schema';
 import { FilterTarget } from '../block-provider/hooks';
 import { Collection_deprecated, CollectionFieldOptions_deprecated, FieldOptions, useCollection_deprecated } from '../collection-manager';
+import { type DatePickerRangeValueMode, type DatePickerRangeValueSource } from '../schema-component/antd/date-picker/util';
 import { DataBlock } from './FilterProvider';
 export declare enum FilterBlockType {
     FORM = 0,
@@ -23,6 +24,9 @@ export declare const getSupportFieldsByForeignKey: (filterBlockCollection: Retur
 export declare const useSupportedBlocks: (filterBlockType: FilterBlockType) => DataBlock[];
 type NormalizeDateBetweenOptions = {
     useDefaultDateBoundary?: boolean;
+    valueMode?: DatePickerRangeValueMode;
+    valueSource?: DatePickerRangeValueSource;
+    preferDateBoundaryFallback?: boolean;
 };
 export declare const normalizeDateBetweenValue: (value: any[], options?: NormalizeDateBetweenOptions) => any[];
 export declare const shouldUseDefaultDateBoundary: (fieldSchema?: any) => boolean;

package/es/filter-provider/utils.mjs

@@ -6,6 +6,7 @@ import lodash from "lodash";
 import { findFilterTargets } from "../block-provider/hooks/index.mjs";
 import { useCollectionManager_deprecated, useCollection_deprecated } from "../collection-manager/index.mjs";
 import { removeNullCondition } from "../schema-component/index.mjs";
+import { isDatePickerDefaultRangeBoundaryValue, resolveDatePickerRangeValueInfo } from "../schema-component/antd/date-picker/util.mjs";
 import { findFilterOperators, getDefaultFilterOperatorValue } from "../schema-component/antd/form-item/SchemaSettingOptions.mjs";
 import { useFilterBlock } from "./FilterProvider.mjs";
 import { getFilterSourceDefaultFilter } from "./incomingFilterFromSources.mjs";
@@ -88,32 +89,41 @@ const resolveFilterOperator = function(schema, path) {
     if (!operatorList.length || !fieldSchema) return;
     return getDefaultFilterOperatorValue(fieldSchema, operatorList);
 };
+const getDatePickerComponent = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
+};
+const getDatePickerShowTime = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
+};
 const isDateOnlyString = (value)=>'string' == typeof value && /^\d{4}-\d{2}-\d{2}$/.test(value);
 const hasExplicitTime = (value)=>'string' == typeof value && /[T\s]\d{2}:\d{2}/.test(value);
-const isDefaultDateBoundaryValue = (value, boundary)=>{
-    if (isDateOnlyString(value)) return true;
-    if ('string' != typeof value) return false;
-    const match = value.match(/^\d{4}-\d{2}-\d{2}[T\s](\d{2}:\d{2}:\d{2})(?:\.\d{3})?(?:Z|[+-]\d\d:\d\d)?$/);
-    if (!match) return false;
-    return 'start' === boundary ? '00:00:00' === match[1] : '23:59:59' === match[1];
-};
-const normalizeDefaultDateBoundaryInput = (value)=>{
+const normalizeLocalDateBoundaryInput = (value)=>{
     if ('string' != typeof value) return value;
     return value.replace(/Z$/, '').replace(/[+-]\d\d:\d\d$/, '');
 };
 const normalizeDateBetweenBoundary = function(value, boundary) {
     let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
-    const rawValue = options.useDefaultDateBoundary ? normalizeDefaultDateBoundaryInput(value) : value;
-    const m = dayjs(rawValue);
+    const m = dayjs(value);
     if (!m.isValid()) return value;
-    if (!options.useDefaultDateBoundary && hasExplicitTime(rawValue) && !isDateOnlyString(rawValue)) return m.toISOString();
+    if (isDateOnlyString(value)) return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
+    if ('date' === options.valueMode) {
+        if ('retained-local-date-boundary' === options.valueSource) return m.toISOString();
+        const localBoundary = dayjs(normalizeLocalDateBoundaryInput(value));
+        return ('start' === boundary ? localBoundary.startOf('day') : localBoundary.endOf('day')).toISOString();
+    }
+    if (hasExplicitTime(value)) return m.toISOString();
+    if (!options.useDefaultDateBoundary) return m.toISOString();
     return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
 };
-const shouldApplyDefaultDateBoundary = function(start, end) {
-    let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
+const shouldApplyDefaultDateBoundary = function(start, end, value) {
+    let options = arguments.length > 3 && void 0 !== arguments[3] ? arguments[3] : {};
+    if ('datetime' === options.valueMode) return false;
+    if ('date' === options.valueMode) return true;
     if (!options.useDefaultDateBoundary) return false;
     if (isDateOnlyString(start) || isDateOnlyString(end)) return true;
-    return isDefaultDateBoundaryValue(start, 'start') && isDefaultDateBoundaryValue(end, 'end');
+    return options.preferDateBoundaryFallback && 'date' === options.valueMode && isDatePickerDefaultRangeBoundaryValue(start, 'start') && isDatePickerDefaultRangeBoundaryValue(end, 'end');
 };
 const normalizeDateBetweenValue = function(value) {
     let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
@@ -123,19 +133,14 @@ const normalizeDateBetweenValue = function(value) {
     const end = 1 === normalized.length ? normalized[0] : normalized[normalized.length - 1];
     const boundaryOptions = {
         ...options,
-        useDefaultDateBoundary: shouldApplyDefaultDateBoundary(start, end, options)
+        useDefaultDateBoundary: shouldApplyDefaultDateBoundary(start, end, value, options)
     };
     return [
         normalizeDateBetweenBoundary(start, 'start', boundaryOptions),
         normalizeDateBetweenBoundary(end, 'end', boundaryOptions)
     ];
 };
-const shouldUseDefaultDateBoundary = (fieldSchema)=>{
-    var _fieldSchema_xcomponentprops;
-    if (!fieldSchema) return false;
-    const component = fieldSchema['x-component'] || (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
-    return 'DatePicker.RangePicker' === component;
-};
+const shouldUseDefaultDateBoundary = (fieldSchema)=>'DatePicker.RangePicker' === getDatePickerComponent(fieldSchema);
 const transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = findFilterOperators(fieldSchema);
     values = flatten(values, {
@@ -177,8 +182,16 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operator) {
                 if (Array.isArray(value)) {
+                    const valueInfo = resolveDatePickerRangeValueInfo(value, {
+                        component: getDatePickerComponent(currentFieldSchema),
+                        showTime: getDatePickerShowTime(currentFieldSchema),
+                        preferDateBoundaryFallback: shouldUseDefaultDateBoundary(currentFieldSchema)
+                    });
                     value = normalizeDateBetweenValue(value, {
-                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema)
+                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema),
+                        valueMode: valueInfo.mode,
+                        valueSource: valueInfo.source,
+                        preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
                     });
                     if (!value) return null;
                 }

package/es/schema-component/antd/date-picker/util.d.ts

@@ -4,7 +4,25 @@ export interface Moment2strOptions {
     gmt?: boolean;
     utc?: boolean;
     picker?: 'year' | 'month' | 'week' | 'quarter';
+    value?: any;
+    component?: string;
 }
+export declare const DATE_PICKER_RANGE_VALUE_MODE: unique symbol;
+export type DatePickerRangeValueMode = 'date' | 'datetime';
+export type DatePickerRangeValueSource = 'metadata' | 'schema' | 'retained-date-boundary' | 'retained-local-date-boundary' | 'unknown';
+export interface DatePickerRangeValueInfo {
+    mode?: DatePickerRangeValueMode;
+    source: DatePickerRangeValueSource;
+}
+export declare const getRangeValueMode: (value: any) => DatePickerRangeValueMode | undefined;
+export declare const markRangeValueMode: (value: any[], mode: DatePickerRangeValueMode) => any[];
+export declare const isDatePickerDefaultRangeBoundaryValue: (value: any, boundary: "start" | "end") => boolean;
+export declare const isDatePickerDefaultRangeBoundaryPair: (value: any) => boolean;
+export declare const resolveDatePickerRangeValueInfo: (value: any, options?: {
+    showTime?: boolean;
+    component?: string;
+    preferDateBoundaryFallback?: boolean;
+}) => DatePickerRangeValueInfo;
 export declare const normalizeDatePickerParseOptions: (options?: Moment2strOptions) => Moment2strOptions;
 export declare const moment2str: (value?: Dayjs | null, options?: Moment2strOptions) => any;
 export declare const mapDatePicker: () => (props: any) => any;

package/es/schema-component/antd/date-picker/util.mjs

@@ -20,9 +20,63 @@ const toLocalByPicker = (value, picker)=>{
     if (!value || !dayjs.isDayjs(value)) return value;
     return toStringByPicker(value, picker, 'local');
 };
+const DATE_PICKER_RANGE_VALUE_MODE = Symbol.for('tachybase.datePicker.rangeValueMode');
+const getRangeValueMode = (value)=>Array.isArray(value) ? value[DATE_PICKER_RANGE_VALUE_MODE] : void 0;
+const markRangeValueMode = (value, mode)=>{
+    Object.defineProperty(value, DATE_PICKER_RANGE_VALUE_MODE, {
+        configurable: true,
+        enumerable: false,
+        value: mode
+    });
+    return value;
+};
+const isDatePickerDefaultRangeBoundaryValue = (value, boundary)=>{
+    if ('string' != typeof value) return false;
+    const match = value.match(/^\d{4}-\d{2}-\d{2}[T\s](\d{2}:\d{2}:\d{2})(?:\.\d{3})?(?:Z|[+-]\d\d:\d\d)?$/);
+    if (!match) return false;
+    return 'start' === boundary ? '00:00:00' === match[1] : '23:59:59' === match[1];
+};
+const isDatePickerDefaultRangeBoundaryPair = (value)=>Array.isArray(value) && value.length >= 2 && isDatePickerDefaultRangeBoundaryValue(value[0], 'start') && isDatePickerDefaultRangeBoundaryValue(value[value.length - 1], 'end');
+const isDatePickerLocalRangeBoundaryValue = (value, boundary)=>{
+    const m = dayjs(value);
+    if (!m.isValid()) return false;
+    return 'start' === boundary ? '00:00:00' === m.format('HH:mm:ss') : '23:59:59' === m.format('HH:mm:ss');
+};
+const isDatePickerRetainedLocalBoundaryPair = (value)=>Array.isArray(value) && value.length >= 2 && isDatePickerLocalRangeBoundaryValue(value[0], 'start') && isDatePickerLocalRangeBoundaryValue(value[value.length - 1], 'end');
+const resolveDatePickerRangeValueInfo = function(value) {
+    let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
+    const metadataMode = getRangeValueMode(value);
+    if (metadataMode) return {
+        mode: metadataMode,
+        source: 'metadata'
+    };
+    if ('DatePicker.RangePicker' === options.component && !options.showTime) return {
+        mode: 'date',
+        source: 'schema'
+    };
+    if (options.preferDateBoundaryFallback && options.showTime && isDatePickerRetainedLocalBoundaryPair(value)) return {
+        mode: 'date',
+        source: 'retained-local-date-boundary'
+    };
+    if (options.preferDateBoundaryFallback && isDatePickerDefaultRangeBoundaryPair(value)) return {
+        mode: 'date',
+        source: 'retained-date-boundary'
+    };
+    return {
+        source: 'unknown'
+    };
+};
 const normalizeDatePickerParseOptions = function() {
     let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
-    if (false === options.utc || options.showTime || 'boolean' == typeof options.gmt || options.picker) return options;
+    if (false === options.utc || 'boolean' == typeof options.gmt || options.picker) return options;
+    const rangeValueInfo = resolveDatePickerRangeValueInfo(options.value, {
+        component: options.component,
+        showTime: options.showTime,
+        preferDateBoundaryFallback: 'DatePicker.RangePicker' === options.component
+    });
+    if (options.showTime) {
+        if ('date' !== rangeValueInfo.mode || 'retained-local-date-boundary' === rangeValueInfo.source) return options;
+    }
     return {
         ...options,
         gmt: true
@@ -64,12 +118,15 @@ const mapRangePicker = function() {
         return {
             ...props,
             format: format,
-            value: str2moment(props.value, normalizeDatePickerParseOptions(props)),
+            value: str2moment(props.value, normalizeDatePickerParseOptions({
+                ...props,
+                component: 'DatePicker.RangePicker'
+            })),
             onChange: (value)=>{
-                if (onChange) onChange(value ? [
+                if (onChange) onChange(value ? markRangeValueMode([
                     moment2str(getRangeStart(value[0], props), props),
                     moment2str(getRangeEnd(value[1], props), props)
-                ] : []);
+                ], props.showTime ? 'datetime' : 'date') : []);
             }
         };
     };
@@ -198,4 +255,4 @@ const getDateExact = ()=>({
         tomorrowLocal: ()=>dayjs().add(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
         tomorrowDate: ()=>dayjs().add(1, 'day').format('YYYY-MM-DD')
     });
-export { getDateExact, getDateRanges, mapDatePicker, mapRangePicker, moment2str, normalizeDatePickerParseOptions };
+export { DATE_PICKER_RANGE_VALUE_MODE, getDateExact, getDateRanges, getRangeValueMode, isDatePickerDefaultRangeBoundaryPair, isDatePickerDefaultRangeBoundaryValue, mapDatePicker, mapRangePicker, markRangeValueMode, moment2str, normalizeDatePickerParseOptions, resolveDatePickerRangeValueInfo };

package/es/schema-component/antd/filter/useFilterActionProps.mjs

@@ -6,6 +6,7 @@ import { useBlockRequestContext } from "../../../block-provider/index.mjs";
 import { useCollectionManager_deprecated, useCollection_deprecated } from "../../../collection-manager/index.mjs";
 import { FILTER_OPERATORS_WITH_ARRAY_VALUES, mergeFilter, normalizeDateBetweenValue, shouldUseDefaultDateBoundary } from "../../../filter-provider/utils.mjs";
 import { useDataLoadingMode } from "../../../modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.mjs";
+import { resolveDatePickerRangeValueInfo } from "../date-picker/util.mjs";
 import { hasDuplicateKeys } from "./utils.mjs";
 const useGetFilterOptions = ()=>{
     const { getCollectionFields } = useCollectionManager_deprecated();
@@ -107,7 +108,9 @@ const useFilterFieldOptions = (fields)=>{
 };
 const isEmpty = (obj)=>Array.isArray(obj) && 0 === obj.length || obj && 0 === Object.keys(obj).length && Object.getPrototypeOf(obj) === Object.prototype;
 const CUSTOM_FILTER_VARIABLE_REGEXP = /^\{\{\$nFilter\.([^}]+)\}\}$/;
-const getCustomFilterValue = (items, key)=>{
+const getCustomFilterValue = function(items, key) {
+    let rawItems = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
+    if (rawItems && key in rawItems) return rawItems[key];
     if (key in items) return items[key];
     const arrayItems = Object.keys(items).filter((itemKey)=>itemKey.startsWith("".concat(key, ".")) && /^\d+$/.test(itemKey.slice(key.length + 1))).sort((a, b)=>Number(a.slice(key.length + 1)) - Number(b.slice(key.length + 1))).map((itemKey)=>items[itemKey]);
     return arrayItems.length ? arrayItems : void 0;
@@ -132,18 +135,37 @@ const findCustomFieldSchema = (schema, key)=>{
     }
     return null;
 };
+const getDatePickerComponent = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
+};
+const getDatePickerShowTime = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
+};
 const expandArrayValueFilter = function(filterSchemaItem, filterKey, value, customFlat) {
     let options = arguments.length > 4 && void 0 !== arguments[4] ? arguments[4] : {};
     const pathParts = filterKey.split('.');
     const operator = pathParts.pop();
     if ('$dateBetween' === operator && Array.isArray(value)) {
-        filterSchemaItem[filterKey] = normalizeDateBetweenValue(value, options);
+        const valueInfo = resolveDatePickerRangeValueInfo(value, {
+            component: options.component,
+            showTime: options.showTime,
+            preferDateBoundaryFallback: options.useDefaultDateBoundary
+        });
+        filterSchemaItem[filterKey] = normalizeDateBetweenValue(value, {
+            useDefaultDateBoundary: options.useDefaultDateBoundary,
+            valueMode: valueInfo.mode,
+            valueSource: valueInfo.source,
+            preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
+        });
         return;
     }
     if (!Array.isArray(value) || FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator || '')) {
         filterSchemaItem[filterKey] = value;
         return;
     }
+    if (0 === value.length) return void delete filterSchemaItem[filterKey];
     let branchEndIndex = -1;
     for(let index = pathParts.length - 2; index >= 0; index--)if ([
         '$and',
@@ -176,8 +198,10 @@ const getCustomCondition = function(filter, fieldSchema) {
             const match = 'string' == typeof filterSchemaItem[filterKey] && filterSchemaItem[filterKey].match(CUSTOM_FILTER_VARIABLE_REGEXP);
             if (!match) continue;
             const customFieldSchema = findCustomFieldSchema(fieldSchema, match[1]);
-            expandArrayValueFilter(filterSchemaItem, filterKey, getCustomFilterValue(items, match[1]), customFlat, {
-                useDefaultDateBoundary: shouldUseDefaultDateBoundary(customFieldSchema)
+            expandArrayValueFilter(filterSchemaItem, filterKey, getCustomFilterValue(items, match[1], filter || {}), customFlat, {
+                useDefaultDateBoundary: shouldUseDefaultDateBoundary(customFieldSchema),
+                component: getDatePickerComponent(customFieldSchema),
+                showTime: getDatePickerShowTime(customFieldSchema)
             });
         }
         for(const item in filterSchemaItem)if (!filterSchemaItem[item] || filterSchemaItem[item].includes('$nFilter')) delete filterSchemaItem[item];

package/lib/filter-provider/utils.js

@@ -58,6 +58,7 @@ var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodas
 const index_js_namespaceObject = require("../block-provider/hooks/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../collection-manager/index.js");
 const external_schema_component_index_js_namespaceObject = require("../schema-component/index.js");
+const util_js_namespaceObject = require("../schema-component/antd/date-picker/util.js");
 const SchemaSettingOptions_js_namespaceObject = require("../schema-component/antd/form-item/SchemaSettingOptions.js");
 const external_FilterProvider_js_namespaceObject = require("./FilterProvider.js");
 const external_incomingFilterFromSources_js_namespaceObject = require("./incomingFilterFromSources.js");
@@ -140,32 +141,41 @@ const resolveFilterOperator = function(schema, path) {
     if (!operatorList.length || !fieldSchema) return;
     return (0, SchemaSettingOptions_js_namespaceObject.getDefaultFilterOperatorValue)(fieldSchema, operatorList);
 };
+const getDatePickerComponent = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
+};
+const getDatePickerShowTime = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
+};
 const isDateOnlyString = (value)=>'string' == typeof value && /^\d{4}-\d{2}-\d{2}$/.test(value);
 const hasExplicitTime = (value)=>'string' == typeof value && /[T\s]\d{2}:\d{2}/.test(value);
-const isDefaultDateBoundaryValue = (value, boundary)=>{
-    if (isDateOnlyString(value)) return true;
-    if ('string' != typeof value) return false;
-    const match = value.match(/^\d{4}-\d{2}-\d{2}[T\s](\d{2}:\d{2}:\d{2})(?:\.\d{3})?(?:Z|[+-]\d\d:\d\d)?$/);
-    if (!match) return false;
-    return 'start' === boundary ? '00:00:00' === match[1] : '23:59:59' === match[1];
-};
-const normalizeDefaultDateBoundaryInput = (value)=>{
+const normalizeLocalDateBoundaryInput = (value)=>{
     if ('string' != typeof value) return value;
     return value.replace(/Z$/, '').replace(/[+-]\d\d:\d\d$/, '');
 };
 const normalizeDateBetweenBoundary = function(value, boundary) {
     let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
-    const rawValue = options.useDefaultDateBoundary ? normalizeDefaultDateBoundaryInput(value) : value;
-    const m = external_dayjs_default()(rawValue);
+    const m = external_dayjs_default()(value);
     if (!m.isValid()) return value;
-    if (!options.useDefaultDateBoundary && hasExplicitTime(rawValue) && !isDateOnlyString(rawValue)) return m.toISOString();
+    if (isDateOnlyString(value)) return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
+    if ('date' === options.valueMode) {
+        if ('retained-local-date-boundary' === options.valueSource) return m.toISOString();
+        const localBoundary = external_dayjs_default()(normalizeLocalDateBoundaryInput(value));
+        return ('start' === boundary ? localBoundary.startOf('day') : localBoundary.endOf('day')).toISOString();
+    }
+    if (hasExplicitTime(value)) return m.toISOString();
+    if (!options.useDefaultDateBoundary) return m.toISOString();
     return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
 };
-const shouldApplyDefaultDateBoundary = function(start, end) {
-    let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
+const shouldApplyDefaultDateBoundary = function(start, end, value) {
+    let options = arguments.length > 3 && void 0 !== arguments[3] ? arguments[3] : {};
+    if ('datetime' === options.valueMode) return false;
+    if ('date' === options.valueMode) return true;
     if (!options.useDefaultDateBoundary) return false;
     if (isDateOnlyString(start) || isDateOnlyString(end)) return true;
-    return isDefaultDateBoundaryValue(start, 'start') && isDefaultDateBoundaryValue(end, 'end');
+    return options.preferDateBoundaryFallback && 'date' === options.valueMode && (0, util_js_namespaceObject.isDatePickerDefaultRangeBoundaryValue)(start, 'start') && (0, util_js_namespaceObject.isDatePickerDefaultRangeBoundaryValue)(end, 'end');
 };
 const normalizeDateBetweenValue = function(value) {
     let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
@@ -175,19 +185,14 @@ const normalizeDateBetweenValue = function(value) {
     const end = 1 === normalized.length ? normalized[0] : normalized[normalized.length - 1];
     const boundaryOptions = {
         ...options,
-        useDefaultDateBoundary: shouldApplyDefaultDateBoundary(start, end, options)
+        useDefaultDateBoundary: shouldApplyDefaultDateBoundary(start, end, value, options)
     };
     return [
         normalizeDateBetweenBoundary(start, 'start', boundaryOptions),
         normalizeDateBetweenBoundary(end, 'end', boundaryOptions)
     ];
 };
-const shouldUseDefaultDateBoundary = (fieldSchema)=>{
-    var _fieldSchema_xcomponentprops;
-    if (!fieldSchema) return false;
-    const component = fieldSchema['x-component'] || (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
-    return 'DatePicker.RangePicker' === component;
-};
+const shouldUseDefaultDateBoundary = (fieldSchema)=>'DatePicker.RangePicker' === getDatePickerComponent(fieldSchema);
 const transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = (0, SchemaSettingOptions_js_namespaceObject.findFilterOperators)(fieldSchema);
     values = (0, client_namespaceObject.flatten)(values, {
@@ -229,8 +234,16 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operator) {
                 if (Array.isArray(value)) {
+                    const valueInfo = (0, util_js_namespaceObject.resolveDatePickerRangeValueInfo)(value, {
+                        component: getDatePickerComponent(currentFieldSchema),
+                        showTime: getDatePickerShowTime(currentFieldSchema),
+                        preferDateBoundaryFallback: shouldUseDefaultDateBoundary(currentFieldSchema)
+                    });
                     value = normalizeDateBetweenValue(value, {
-                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema)
+                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema),
+                        valueMode: valueInfo.mode,
+                        valueSource: valueInfo.source,
+                        preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
                     });
                     if (!value) return null;
                 }

package/lib/schema-component/antd/date-picker/util.js

@@ -33,11 +33,17 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
+    getRangeValueMode: ()=>getRangeValueMode,
     mapRangePicker: ()=>mapRangePicker,
-    moment2str: ()=>moment2str,
+    isDatePickerDefaultRangeBoundaryValue: ()=>isDatePickerDefaultRangeBoundaryValue,
     mapDatePicker: ()=>mapDatePicker,
     normalizeDatePickerParseOptions: ()=>normalizeDatePickerParseOptions,
+    resolveDatePickerRangeValueInfo: ()=>resolveDatePickerRangeValueInfo,
+    markRangeValueMode: ()=>markRangeValueMode,
+    moment2str: ()=>moment2str,
+    DATE_PICKER_RANGE_VALUE_MODE: ()=>DATE_PICKER_RANGE_VALUE_MODE,
     getDateExact: ()=>getDateExact,
+    isDatePickerDefaultRangeBoundaryPair: ()=>isDatePickerDefaultRangeBoundaryPair,
     getDateRanges: ()=>getDateRanges
 });
 const client_namespaceObject = require("@tego/client");
@@ -63,9 +69,63 @@ const toLocalByPicker = (value, picker)=>{
     if (!value || !external_dayjs_default().isDayjs(value)) return value;
     return toStringByPicker(value, picker, 'local');
 };
+const DATE_PICKER_RANGE_VALUE_MODE = Symbol.for('tachybase.datePicker.rangeValueMode');
+const getRangeValueMode = (value)=>Array.isArray(value) ? value[DATE_PICKER_RANGE_VALUE_MODE] : void 0;
+const markRangeValueMode = (value, mode)=>{
+    Object.defineProperty(value, DATE_PICKER_RANGE_VALUE_MODE, {
+        configurable: true,
+        enumerable: false,
+        value: mode
+    });
+    return value;
+};
+const isDatePickerDefaultRangeBoundaryValue = (value, boundary)=>{
+    if ('string' != typeof value) return false;
+    const match = value.match(/^\d{4}-\d{2}-\d{2}[T\s](\d{2}:\d{2}:\d{2})(?:\.\d{3})?(?:Z|[+-]\d\d:\d\d)?$/);
+    if (!match) return false;
+    return 'start' === boundary ? '00:00:00' === match[1] : '23:59:59' === match[1];
+};
+const isDatePickerDefaultRangeBoundaryPair = (value)=>Array.isArray(value) && value.length >= 2 && isDatePickerDefaultRangeBoundaryValue(value[0], 'start') && isDatePickerDefaultRangeBoundaryValue(value[value.length - 1], 'end');
+const isDatePickerLocalRangeBoundaryValue = (value, boundary)=>{
+    const m = external_dayjs_default()(value);
+    if (!m.isValid()) return false;
+    return 'start' === boundary ? '00:00:00' === m.format('HH:mm:ss') : '23:59:59' === m.format('HH:mm:ss');
+};
+const isDatePickerRetainedLocalBoundaryPair = (value)=>Array.isArray(value) && value.length >= 2 && isDatePickerLocalRangeBoundaryValue(value[0], 'start') && isDatePickerLocalRangeBoundaryValue(value[value.length - 1], 'end');
+const resolveDatePickerRangeValueInfo = function(value) {
+    let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
+    const metadataMode = getRangeValueMode(value);
+    if (metadataMode) return {
+        mode: metadataMode,
+        source: 'metadata'
+    };
+    if ('DatePicker.RangePicker' === options.component && !options.showTime) return {
+        mode: 'date',
+        source: 'schema'
+    };
+    if (options.preferDateBoundaryFallback && options.showTime && isDatePickerRetainedLocalBoundaryPair(value)) return {
+        mode: 'date',
+        source: 'retained-local-date-boundary'
+    };
+    if (options.preferDateBoundaryFallback && isDatePickerDefaultRangeBoundaryPair(value)) return {
+        mode: 'date',
+        source: 'retained-date-boundary'
+    };
+    return {
+        source: 'unknown'
+    };
+};
 const normalizeDatePickerParseOptions = function() {
     let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
-    if (false === options.utc || options.showTime || 'boolean' == typeof options.gmt || options.picker) return options;
+    if (false === options.utc || 'boolean' == typeof options.gmt || options.picker) return options;
+    const rangeValueInfo = resolveDatePickerRangeValueInfo(options.value, {
+        component: options.component,
+        showTime: options.showTime,
+        preferDateBoundaryFallback: 'DatePicker.RangePicker' === options.component
+    });
+    if (options.showTime) {
+        if ('date' !== rangeValueInfo.mode || 'retained-local-date-boundary' === rangeValueInfo.source) return options;
+    }
     return {
         ...options,
         gmt: true
@@ -107,12 +167,15 @@ const mapRangePicker = function() {
         return {
             ...props,
             format: format,
-            value: (0, client_namespaceObject.str2moment)(props.value, normalizeDatePickerParseOptions(props)),
+            value: (0, client_namespaceObject.str2moment)(props.value, normalizeDatePickerParseOptions({
+                ...props,
+                component: 'DatePicker.RangePicker'
+            })),
             onChange: (value)=>{
-                if (onChange) onChange(value ? [
+                if (onChange) onChange(value ? markRangeValueMode([
                     moment2str(getRangeStart(value[0], props), props),
                     moment2str(getRangeEnd(value[1], props), props)
-                ] : []);
+                ], props.showTime ? 'datetime' : 'date') : []);
             }
         };
     };
@@ -241,19 +304,31 @@ const getDateExact = ()=>({
         tomorrowLocal: ()=>external_dayjs_default()().add(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
         tomorrowDate: ()=>external_dayjs_default()().add(1, 'day').format('YYYY-MM-DD')
     });
+exports.DATE_PICKER_RANGE_VALUE_MODE = __webpack_exports__.DATE_PICKER_RANGE_VALUE_MODE;
 exports.getDateExact = __webpack_exports__.getDateExact;
 exports.getDateRanges = __webpack_exports__.getDateRanges;
+exports.getRangeValueMode = __webpack_exports__.getRangeValueMode;
+exports.isDatePickerDefaultRangeBoundaryPair = __webpack_exports__.isDatePickerDefaultRangeBoundaryPair;
+exports.isDatePickerDefaultRangeBoundaryValue = __webpack_exports__.isDatePickerDefaultRangeBoundaryValue;
 exports.mapDatePicker = __webpack_exports__.mapDatePicker;
 exports.mapRangePicker = __webpack_exports__.mapRangePicker;
+exports.markRangeValueMode = __webpack_exports__.markRangeValueMode;
 exports.moment2str = __webpack_exports__.moment2str;
 exports.normalizeDatePickerParseOptions = __webpack_exports__.normalizeDatePickerParseOptions;
+exports.resolveDatePickerRangeValueInfo = __webpack_exports__.resolveDatePickerRangeValueInfo;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "DATE_PICKER_RANGE_VALUE_MODE",
     "getDateExact",
     "getDateRanges",
+    "getRangeValueMode",
+    "isDatePickerDefaultRangeBoundaryPair",
+    "isDatePickerDefaultRangeBoundaryValue",
     "mapDatePicker",
     "mapRangePicker",
+    "markRangeValueMode",
     "moment2str",
-    "normalizeDatePickerParseOptions"
+    "normalizeDatePickerParseOptions",
+    "resolveDatePickerRangeValueInfo"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/lib/schema-component/antd/filter/useFilterActionProps.js

@@ -52,6 +52,7 @@ const index_js_namespaceObject = require("../../../block-provider/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../../../collection-manager/index.js");
 const utils_js_namespaceObject = require("../../../filter-provider/utils.js");
 const setDataLoadingModeSettingsItem_js_namespaceObject = require("../../../modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.js");
+const util_js_namespaceObject = require("../date-picker/util.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const useGetFilterOptions = ()=>{
     const { getCollectionFields } = (0, external_collection_manager_index_js_namespaceObject.useCollectionManager_deprecated)();
@@ -153,7 +154,9 @@ const useFilterFieldOptions = (fields)=>{
 };
 const isEmpty = (obj)=>Array.isArray(obj) && 0 === obj.length || obj && 0 === Object.keys(obj).length && Object.getPrototypeOf(obj) === Object.prototype;
 const CUSTOM_FILTER_VARIABLE_REGEXP = /^\{\{\$nFilter\.([^}]+)\}\}$/;
-const getCustomFilterValue = (items, key)=>{
+const getCustomFilterValue = function(items, key) {
+    let rawItems = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
+    if (rawItems && key in rawItems) return rawItems[key];
     if (key in items) return items[key];
     const arrayItems = Object.keys(items).filter((itemKey)=>itemKey.startsWith("".concat(key, ".")) && /^\d+$/.test(itemKey.slice(key.length + 1))).sort((a, b)=>Number(a.slice(key.length + 1)) - Number(b.slice(key.length + 1))).map((itemKey)=>items[itemKey]);
     return arrayItems.length ? arrayItems : void 0;
@@ -178,18 +181,37 @@ const findCustomFieldSchema = (schema, key)=>{
     }
     return null;
 };
+const getDatePickerComponent = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
+};
+const getDatePickerShowTime = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
+};
 const expandArrayValueFilter = function(filterSchemaItem, filterKey, value, customFlat) {
     let options = arguments.length > 4 && void 0 !== arguments[4] ? arguments[4] : {};
     const pathParts = filterKey.split('.');
     const operator = pathParts.pop();
     if ('$dateBetween' === operator && Array.isArray(value)) {
-        filterSchemaItem[filterKey] = (0, utils_js_namespaceObject.normalizeDateBetweenValue)(value, options);
+        const valueInfo = (0, util_js_namespaceObject.resolveDatePickerRangeValueInfo)(value, {
+            component: options.component,
+            showTime: options.showTime,
+            preferDateBoundaryFallback: options.useDefaultDateBoundary
+        });
+        filterSchemaItem[filterKey] = (0, utils_js_namespaceObject.normalizeDateBetweenValue)(value, {
+            useDefaultDateBoundary: options.useDefaultDateBoundary,
+            valueMode: valueInfo.mode,
+            valueSource: valueInfo.source,
+            preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
+        });
         return;
     }
     if (!Array.isArray(value) || utils_js_namespaceObject.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator || '')) {
         filterSchemaItem[filterKey] = value;
         return;
     }
+    if (0 === value.length) return void delete filterSchemaItem[filterKey];
     let branchEndIndex = -1;
     for(let index = pathParts.length - 2; index >= 0; index--)if ([
         '$and',
@@ -222,8 +244,10 @@ const getCustomCondition = function(filter, fieldSchema) {
             const match = 'string' == typeof filterSchemaItem[filterKey] && filterSchemaItem[filterKey].match(CUSTOM_FILTER_VARIABLE_REGEXP);
             if (!match) continue;
             const customFieldSchema = findCustomFieldSchema(fieldSchema, match[1]);
-            expandArrayValueFilter(filterSchemaItem, filterKey, getCustomFilterValue(items, match[1]), customFlat, {
-                useDefaultDateBoundary: (0, utils_js_namespaceObject.shouldUseDefaultDateBoundary)(customFieldSchema)
+            expandArrayValueFilter(filterSchemaItem, filterKey, getCustomFilterValue(items, match[1], filter || {}), customFlat, {
+                useDefaultDateBoundary: (0, utils_js_namespaceObject.shouldUseDefaultDateBoundary)(customFieldSchema),
+                component: getDatePickerComponent(customFieldSchema),
+                showTime: getDatePickerShowTime(customFieldSchema)
             });
         }
         for(const item in filterSchemaItem)if (!filterSchemaItem[item] || filterSchemaItem[item].includes('$nFilter')) delete filterSchemaItem[item];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.6.18",
+  "version": "1.6.19",
   "homepage": "https://github.com/tegojs/tego-standard#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego-standard/issues"