@tachybase/client 1.6.17 → 1.6.19

package/es/block-provider/hooks/index.mjs

@@ -424,7 +424,6 @@ const useFilterBlockActionProps = ()=>{
         async onClick () {
             const { targets = [], uid } = findFilterTargets(fieldSchema);
             actionField.data.loading = true;
-            let prevMergedFilter = {};
             try {
                 await Promise.all(getDataBlocks().map(async (block)=>{
                     var _block_service_params, _block_service_params_, _block_service_params1, _Object_keys;
@@ -461,11 +460,9 @@ const useFilterBlockActionProps = ()=>{
                         ...Object.values(storedFilter).map((filter)=>removeNullCondition(filter)),
                         getFilterSourceDefaultFilter(getDataBlocks(), uid),
                         block.defaultFilter,
-                        filter.customFilter,
-                        prevMergedFilter
+                        filter.customFilter
                     ]);
                     const currFilter = filterByCleanedFields(mergedFilter);
-                    prevMergedFilter = currFilter;
                     if ('manual' === block.dataLoadingMode && lodash.isEmpty(currFilter)) return block.clearData();
                     return block.doFilter({
                         ...param,
@@ -493,7 +490,6 @@ const useResetBlockActionProps = ()=>{
             const { targets, uid } = findFilterTargets(fieldSchema);
             form.reset();
             actionField.data.loading = true;
-            let prevMergedFilter = {};
             try {
                 await Promise.all(getDataBlocks().map(async (block)=>{
                     var _block_service_params, _block_service_params_, _block_service_params1;
@@ -506,11 +502,9 @@ const useResetBlockActionProps = ()=>{
                     const currFilter = utils_mjs_mergeFilter([
                         ...Object.values(storedFilter),
                         getFilterSourceDefaultFilter(getDataBlocks(), uid),
-                        block.defaultFilter,
-                        prevMergedFilter
+                        block.defaultFilter
                     ]);
                     const mergedFilter = filterByCleanedFields(currFilter);
-                    prevMergedFilter = mergedFilter;
                     return block.doFilter({
                         ...param,
                         page: 1,

package/es/data-source/data-block/DataBlockRequestProvider.mjs

@@ -52,14 +52,14 @@ function useParentRequest(options) {
         if (parentRecord) return Promise.resolve({
             data: parentRecord
         });
-        if (!association || !sourceKey) return Promise.resolve({
+        if (!association || !sourceKey || null == sourceId) return Promise.resolve({
             data: void 0
         });
         const arr = association.split('.');
-        const url = "".concat(arr[0], ":get?filter[").concat(sourceKey, "]=").concat(sourceId);
-        const res = await api.request({
-            url,
-            headers
+        const res = await api.resource(arr[0], void 0, headers).get({
+            filter: {
+                [sourceKey]: sourceId
+            }
         });
         return res.data;
     }, {

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,
@@ -21,6 +22,14 @@ export declare const getSupportFieldsByForeignKey: (filterBlockCollection: Retur
  * @returns
  */
 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;
 export declare const transformToFilter: (values: Record<string, any>, fieldSchema: Schema, getCollectionJoinField: (name: string) => CollectionFieldOptions_deprecated, collectionName: string, getOperatorList?: (path: string, options: {
     fieldSchema?: Schema;
     collectionField?: CollectionFieldOptions_deprecated;
@@ -49,3 +58,4 @@ export declare const useFilterAPI: () => {
     doFilter: (value: any, field?: string | ((target: FilterTarget["targets"][0]) => string), operator?: string | ((target: FilterTarget["targets"][0]) => string)) => void;
 };
 export declare const isInFilterFormBlock: (fieldSchema: Schema) => boolean;
+export {};

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";
@@ -62,6 +63,7 @@ const findSchemaByName = (schema, name)=>{
     if (schema.name === name) return schema;
     const properties = schema.properties || {};
     for (const key of Object.keys(properties)){
+        if (key === name) return properties[key];
         const found = findSchemaByName(properties[key], name);
         if (found) return found;
     }
@@ -87,6 +89,58 @@ 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 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 m = dayjs(value);
+    if (!m.isValid()) return value;
+    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, 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 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] : {};
+    const normalized = value.filter(Boolean);
+    if (0 === normalized.length) return null;
+    const start = normalized[0];
+    const end = 1 === normalized.length ? normalized[0] : normalized[normalized.length - 1];
+    const boundaryOptions = {
+        ...options,
+        useDefaultDateBoundary: shouldApplyDefaultDateBoundary(start, end, value, options)
+    };
+    return [
+        normalizeDateBetweenBoundary(start, 'start', boundaryOptions),
+        normalizeDateBetweenBoundary(end, 'end', boundaryOptions)
+    ];
+};
+const shouldUseDefaultDateBoundary = (fieldSchema)=>'DatePicker.RangePicker' === getDatePickerComponent(fieldSchema);
 const transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = findFilterOperators(fieldSchema);
     values = flatten(values, {
@@ -108,6 +162,7 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
             const defKey = key;
             let value = lodash.get(values, key);
             const collectionField = getCollectionJoinField("".concat(collectionName, ".").concat(key));
+            const currentFieldSchema = findSchemaByName(getFilterSchemaRoot(fieldSchema), defKey);
             const operator = resolveFilterOperator(fieldSchema, defKey, operators, getOperatorList, collectionField);
             if (null == collectionField ? void 0 : collectionField.target) {
                 value = getValuesByPath(value, collectionField.targetKey || 'id');
@@ -127,21 +182,18 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operator) {
                 if (Array.isArray(value)) {
-                    const normalized = [];
-                    for(const index in value){
-                        if (!value[index]) continue;
-                        let v = value[index];
-                        if ('string' != typeof v && !(v instanceof Date)) v = dayjs(v).toISOString();
-                        normalized.push(v);
-                    }
-                    if (0 === normalized.length) return null;
-                    value = 1 === normalized.length ? [
-                        normalized[0],
-                        normalized[0]
-                    ] : [
-                        normalized[0],
-                        normalized[normalized.length - 1]
-                    ];
+                    const valueInfo = resolveDatePickerRangeValueInfo(value, {
+                        component: getDatePickerComponent(currentFieldSchema),
+                        showTime: getDatePickerShowTime(currentFieldSchema),
+                        preferDateBoundaryFallback: shouldUseDefaultDateBoundary(currentFieldSchema)
+                    });
+                    value = normalizeDateBetweenValue(value, {
+                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema),
+                        valueMode: valueInfo.mode,
+                        valueSource: valueInfo.source,
+                        preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
+                    });
+                    if (!value) return null;
                 }
             }
             return {
@@ -231,4 +283,4 @@ const isInFilterFormBlock = (fieldSchema)=>{
     }
     return false;
 };
-export { FILTER_OPERATORS_WITH_ARRAY_VALUES, utils_FilterBlockType as FilterBlockType, getSupportFieldsByAssociation, getSupportFieldsByForeignKey, isAssocField, isInFilterFormBlock, isSameCollection, mergeFilter, transformToFilter, useAssociatedFields, useFilterAPI, useSupportedBlocks };
+export { FILTER_OPERATORS_WITH_ARRAY_VALUES, utils_FilterBlockType as FilterBlockType, getSupportFieldsByAssociation, getSupportFieldsByForeignKey, isAssocField, isInFilterFormBlock, isSameCollection, mergeFilter, normalizeDateBetweenValue, shouldUseDefaultDateBoundary, transformToFilter, useAssociatedFields, useFilterAPI, useSupportedBlocks };

package/es/modules/fields/component/DrawerSubTable/drawerSubTableComponentFieldSettings.mjs

@@ -20,14 +20,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = useTranslation();
         const field = useField();
         const fieldSchema = useFieldSchema();
         const { dn, refresh } = useDesignable();
         return {
             title: t('Allow multiple'),
-            checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+            checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
             onChange (value) {
                 const schema = {
                     ['x-uid']: fieldSchema['x-uid']
@@ -126,7 +125,7 @@ const drawerSubTableComponentFieldSettings = new SchemaSettings({
                             value: 'large'
                         }
                     ],
-                    value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openMode']) == 'modal' ? 'large' : 'middle',
+                    value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openMode']) === 'modal' ? 'large' : 'middle',
                     onChange: (value)=>{
                         field.componentProps.openSize = value;
                         fieldSchema['x-component-props'] = {

package/es/modules/fields/component/Nester/subformComponentFieldSettings.mjs

@@ -19,14 +19,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = useTranslation();
         const field = useField();
         const fieldSchema = useFieldSchema();
         const { dn, refresh } = useDesignable();
         return {
             title: t('Allow multiple'),
-            checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+            checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
             onChange (value) {
                 const schema = {
                     ['x-uid']: fieldSchema['x-uid']

package/es/modules/fields/component/Picker/recordPickerComponentFieldSettings.mjs

@@ -60,14 +60,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = useTranslation();
         const field = useField();
         const fieldSchema = useFieldSchema();
         const { dn, refresh } = useDesignable();
         return {
             title: t('Allow multiple'),
-            checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+            checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
             onChange (value) {
                 const schema = {
                     ['x-uid']: fieldSchema['x-uid']
@@ -165,7 +164,7 @@ const recordPickerComponentFieldSettings = new SchemaSettings({
                             value: 'large'
                         }
                     ],
-                    value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openMode']) == 'modal' ? 'large' : 'middle',
+                    value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openMode']) === 'modal' ? 'large' : 'middle',
                     onChange: (value)=>{
                         field.componentProps.openSize = value;
                         fieldSchema['x-component-props'] = {

package/es/modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.mjs

@@ -20,14 +20,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = useTranslation();
         const field = useField();
         const fieldSchema = useFieldSchema();
         const { dn, refresh } = useDesignable();
         return {
             title: t('Allow multiple'),
-            checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+            checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
             onChange (value) {
                 const schema = {
                     ['x-uid']: fieldSchema['x-uid']

package/es/modules/fields/component/Select/selectComponentFieldSettings.mjs

@@ -123,7 +123,6 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = useTranslation();
         const field = useField();
         const { fieldSchema: tableColumnSchema } = useColumnSchema();
@@ -132,7 +131,7 @@ const allowMultiple = {
         const { dn, refresh } = useDesignable();
         return {
             title: t('Allow multiple'),
-            checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+            checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
             onChange (value) {
                 const schema = {
                     ['x-uid']: fieldSchema['x-uid']

package/es/schema-component/antd/association-select/AssociationSelect.mjs

@@ -1,8 +1,8 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useCallback, useEffect, useMemo } from "react";
 import { connect, mapProps, mapReadPretty, uid, useField, useFieldSchema } from "@tachybase/schema";
-import { LoadingOutlined } from "@ant-design/icons";
 import { ArrayCollapse, ArrayItems, FormLayout } from "@tego/client";
+import { LoadingOutlined } from "@ant-design/icons";
 import lodash from "lodash";
 import { useTranslation } from "react-i18next";
 import { useFilterByTk, useFormBlockContext } from "../../../block-provider/index.mjs";
@@ -66,7 +66,7 @@ const InternalAssociationSelect = connect((props)=>{
     })), mapReadPretty(ReadPretty));
 const AssociationSelect = InternalAssociationSelect;
 AssociationSelect.Designer = function() {
-    var _interfaceConfig_validateSchema, _collectionField_uiSchema, _field_componentProps_service_params, _field_componentProps_service, _field_componentProps, _fieldSchema_xcomponentprops, _field_componentProps_service_params1, _field_componentProps_service1, _field_componentProps1, _field_componentProps_fieldNames, _field_componentProps2;
+    var _interfaceConfig_validateSchema, _collectionField_uiSchema, _field_componentProps_service_params, _field_componentProps_service, _field_componentProps, _field_componentProps_service_params1, _field_componentProps_service1, _field_componentProps1, _field_componentProps_fieldNames, _field_componentProps2;
     const { getCollectionFields, getInterface, getCollectionJoinField, getCollection, isTitleField } = useCollectionManager_deprecated();
     const { getField } = useCollection_deprecated();
     const { form } = useFormBlockContext();
@@ -318,7 +318,7 @@ AssociationSelect.Designer = function() {
             }),
             IsShowMultipleSwitch() ? /*#__PURE__*/ jsx(SchemaSettingsSwitchItem, {
                 title: t('Allow multiple'),
-                checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+                checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
                 onChange: (value)=>{
                     const schema = {
                         ['x-uid']: fieldSchema['x-uid']

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

@@ -4,8 +4,9 @@ import lodash from "lodash";
 import { useTranslation } from "react-i18next";
 import { useBlockRequestContext } from "../../../block-provider/index.mjs";
 import { useCollectionManager_deprecated, useCollection_deprecated } from "../../../collection-manager/index.mjs";
-import { mergeFilter } from "../../../filter-provider/utils.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();
@@ -106,6 +107,81 @@ const useFilterFieldOptions = (fields)=>{
     return getOptions(fields, 1);
 };
 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 = 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;
+};
+const findCustomFieldSchemaInTree = (schema, key)=>{
+    if (!schema) return null;
+    if (schema.name === "__custom.".concat(key) || schema.name === key) return schema;
+    const properties = schema.properties || {};
+    for (const propertyKey of Object.keys(properties)){
+        if (propertyKey === "__custom.".concat(key) || propertyKey === key) return properties[propertyKey];
+        const found = findCustomFieldSchemaInTree(properties[propertyKey], key);
+        if (found) return found;
+    }
+    return null;
+};
+const findCustomFieldSchema = (schema, key)=>{
+    let current = schema;
+    while(current){
+        const found = findCustomFieldSchemaInTree(current, key);
+        if (found) return found;
+        current = current.parent;
+    }
+    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)) {
+        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',
+        '$or'
+    ].includes(pathParts[index]) && /^\d+$/.test(pathParts[index + 1])) {
+        branchEndIndex = index;
+        break;
+    }
+    const branchPath = branchEndIndex >= 0 ? pathParts.slice(0, branchEndIndex + 2).join('.') : '';
+    const fieldPath = pathParts.slice(branchEndIndex + 2).join('.');
+    const conditions = value.map((item)=>customFlat.unflatten({
+            ["".concat(fieldPath, ".").concat(operator)]: item
+        }));
+    delete filterSchemaItem[filterKey];
+    filterSchemaItem[branchPath ? "".concat(branchPath, ".$or") : '$or'] = conditions;
+};
 const getCustomCondition = function(filter, fieldSchema) {
     let customFlat = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : flat;
     var _filterSchema_$and, _filterSchema_$or;
@@ -119,12 +195,14 @@ const getCustomCondition = function(filter, fieldSchema) {
     {
         var _flatFieldSchema_$and, _flatFieldSchema_$or;
         for(const filterKey in filterSchemaItem){
-            var _filterSchemaItem_filterKey;
-            const match = null == (_filterSchemaItem_filterKey = filterSchemaItem[filterKey]) ? void 0 : _filterSchemaItem_filterKey.slice(11, -2);
-            const collection = null == match ? void 0 : match.split('.')[0];
-            const filterItems = Object.keys(items).filter((item)=>item.includes(collection));
-            if (filterItems.length > 1) filterSchemaItem[filterKey] = filterItems.map((key)=>items[key]);
-            else filterSchemaItem[filterKey] = items[filterItems[0]];
+            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], 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];
         const flatFieldSchema = customFlat.unflatten(filterSchemaItem);

package/es/schema-component/antd/form-item/FormItem.Settings.mjs

@@ -836,14 +836,13 @@ const formItemSettings = new SchemaSettings({
                 return isAssociationField && IsShowMultipleSwitch();
             },
             useComponentProps () {
-                var _fieldSchema_xcomponentprops;
                 const { t } = useTranslation();
                 const field = useField();
                 const fieldSchema = useFieldSchema();
                 const { dn, refresh } = useDesignable();
                 return {
                     title: t('Allow multiple'),
-                    checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+                    checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
                     onChange (value) {
                         const schema = {
                             ['x-uid']: fieldSchema['x-uid']

package/es/schema-initializer/utils.d.ts

@@ -83,6 +83,7 @@ export declare const useInheritsTableColumnInitializerFields: () => {
 export declare const useFormItemInitializerFields: (options?: any) => SchemaInitializerItemType[];
 export declare const useFilterFormItemInitializerFields: (options?: any) => SchemaInitializerItemType[];
 export declare const useAssociatedFormItemInitializerFields: (options?: any) => SchemaInitializerItemType[];
+export declare const createFilterAssociatedResultSchema: (schemaName: any, field: any, collectionName: any, fieldPath: any) => SchemaInitializerItemType;
 export declare const useFilterAssociatedFormItemInitializerFields: () => SchemaInitializerItemType[];
 export declare const useInheritsFormItemInitializerFields: (options?: any) => {
     [x: string]: SchemaInitializerItemType[];