@tachybase/client 1.6.17 → 1.6.18

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

@@ -21,6 +21,11 @@ export declare const getSupportFieldsByForeignKey: (filterBlockCollection: Retur
  * @returns
  */
 export declare const useSupportedBlocks: (filterBlockType: FilterBlockType) => DataBlock[];
+type NormalizeDateBetweenOptions = {
+    useDefaultDateBoundary?: 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 +54,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

@@ -62,6 +62,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 +88,54 @@ const resolveFilterOperator = function(schema, path) {
     if (!operatorList.length || !fieldSchema) return;
     return getDefaultFilterOperatorValue(fieldSchema, operatorList);
 };
+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)=>{
+    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);
+    if (!m.isValid()) return value;
+    if (!options.useDefaultDateBoundary && hasExplicitTime(rawValue) && !isDateOnlyString(rawValue)) 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] : {};
+    if (!options.useDefaultDateBoundary) return false;
+    if (isDateOnlyString(start) || isDateOnlyString(end)) return true;
+    return isDefaultDateBoundaryValue(start, 'start') && isDefaultDateBoundaryValue(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, 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 transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = findFilterOperators(fieldSchema);
     values = flatten(values, {
@@ -108,6 +157,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 +177,10 @@ 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]
-                    ];
+                    value = normalizeDateBetweenValue(value, {
+                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema)
+                    });
+                    if (!value) return null;
                 }
             }
             return {
@@ -231,4 +270,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/filter/useFilterActionProps.mjs

@@ -4,7 +4,7 @@ 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 { hasDuplicateKeys } from "./utils.mjs";
 const useGetFilterOptions = ()=>{
@@ -106,6 +106,60 @@ 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 = (items, 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 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);
+        return;
+    }
+    if (!Array.isArray(value) || FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator || '')) {
+        filterSchemaItem[filterKey] = value;
+        return;
+    }
+    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 +173,12 @@ 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]), customFlat, {
+                useDefaultDateBoundary: shouldUseDefaultDateBoundary(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[];

package/es/schema-initializer/utils.mjs

@@ -327,7 +327,7 @@ const useFilterFormItemInitializerFields = (options)=>{
                 'x-component': 'CollectionField',
                 'x-decorator': 'FormItem',
                 'x-collection-field': "".concat(name, ".").concat(field.name),
-                'x-component-props': null == (_field_uiSchema2 = field.uiSchema) ? void 0 : _field_uiSchema2['x-component-props']
+                'x-component-props': (null == (_field_uiSchema2 = field.uiSchema) ? void 0 : _field_uiSchema2['x-component-props']) || {}
             };
         }
         const resultItem = {
@@ -438,7 +438,7 @@ const getItem = (field, schemaName, collectionName, getCollectionFields, process
                 'oho',
                 'o2m',
                 'm2m'
-            ].includes(subField.interface)) options.push(getResultSchema("".concat(schemaName, ".").concat(subField.name), subField, collectionName, (fieldPath || '') + field.key));
+            ].includes(subField.interface)) options.push(createFilterAssociatedResultSchema("".concat(schemaName, ".").concat(subField.name), subField, collectionName, (fieldPath || '') + field.key));
             options.push(getItem(subField, "".concat(schemaName, ".").concat(subField.name), collectionName, getCollectionFields, [
                 ...processedCollections,
                 field.target
@@ -453,9 +453,9 @@ const getItem = (field, schemaName, collectionName, getCollectionFields, process
         };
     }
     if (isAssocField(field)) return null;
-    return getResultSchema(schemaName, field, collectionName, (fieldPath || '') + field.key);
+    return createFilterAssociatedResultSchema(schemaName, field, collectionName, (fieldPath || '') + field.key);
 };
-const getResultSchema = (schemaName, field, collectionName, fieldPath)=>{
+const createFilterAssociatedResultSchema = (schemaName, field, collectionName, fieldPath)=>{
     var _field_uiSchema, _field_uiSchema1, _field_uiSchema2;
     const schema = {
         type: 'string',
@@ -468,7 +468,8 @@ const getResultSchema = (schemaName, field, collectionName, fieldPath)=>{
         'x-component': 'CollectionField',
         'x-read-pretty': false,
         'x-decorator': 'FormItem',
-        'x-collection-field': "".concat(collectionName, ".").concat(schemaName)
+        'x-collection-field': "".concat(collectionName, ".").concat(schemaName),
+        'x-component-props': {}
     };
     const result = {
         name: (null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title) || field.name,
@@ -1374,4 +1375,4 @@ function useAssociationFields(param) {
         t
     ]);
 }
-export { createDetailsBlockSchema, createFormBlockSchema, createReadPrettyFormBlockSchema, createTableBlockSchema, findSchema, findTableColumn, gridRowColWrap, itemsMerge, removeGridFormItem, removeTableColumn, useAssociatedFormItemInitializerFields, useAssociatedTableColumnInitializerFields, useCollectionDataSourceItems, useCurrentSchema, useCustomFormItemInitializerFields, useFilterAssociatedFormItemInitializerFields, useFilterFormItemInitializerFields, useFilterInheritsFormItemInitializerFields, useFormItemInitializerFields, useInheritsFormItemInitializerFields, useInheritsTableColumnInitializerFields, useRecordCollectionDataSourceItems, useRemoveGridFormItem, useTableColumnInitializerFields };
+export { createDetailsBlockSchema, createFilterAssociatedResultSchema, createFormBlockSchema, createReadPrettyFormBlockSchema, createTableBlockSchema, findSchema, findTableColumn, gridRowColWrap, itemsMerge, removeGridFormItem, removeTableColumn, useAssociatedFormItemInitializerFields, useAssociatedTableColumnInitializerFields, useCollectionDataSourceItems, useCurrentSchema, useCustomFormItemInitializerFields, useFilterAssociatedFormItemInitializerFields, useFilterFormItemInitializerFields, useFilterInheritsFormItemInitializerFields, useFormItemInitializerFields, useInheritsFormItemInitializerFields, useInheritsTableColumnInitializerFields, useRecordCollectionDataSourceItems, useRemoveGridFormItem, useTableColumnInitializerFields };

package/lib/block-provider/hooks/index.js

@@ -740,7 +740,6 @@ var __webpack_exports__ = {};
             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;
@@ -777,11 +776,9 @@ var __webpack_exports__ = {};
                             ...Object.values(storedFilter).map((filter)=>(0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.removeNullCondition)(filter)),
                             (0, _filter_provider_incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_16__.getFilterSourceDefaultFilter)(getDataBlocks(), uid),
                             block.defaultFilter,
-                            filter.customFilter,
-                            prevMergedFilter
+                            filter.customFilter
                         ]);
                         const currFilter = filterByCleanedFields(mergedFilter);
-                        prevMergedFilter = currFilter;
                         if ('manual' === block.dataLoadingMode && lodash__WEBPACK_IMPORTED_MODULE_5___default().isEmpty(currFilter)) return block.clearData();
                         return block.doFilter({
                             ...param,
@@ -809,7 +806,6 @@ var __webpack_exports__ = {};
                 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;
@@ -822,11 +818,9 @@ var __webpack_exports__ = {};
                         const currFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__.mergeFilter)([
                             ...Object.values(storedFilter),
                             (0, _filter_provider_incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_16__.getFilterSourceDefaultFilter)(getDataBlocks(), uid),
-                            block.defaultFilter,
-                            prevMergedFilter
+                            block.defaultFilter
                         ]);
                         const mergedFilter = filterByCleanedFields(currFilter);
-                        prevMergedFilter = mergedFilter;
                         return block.doFilter({
                             ...param,
                             page: 1,

package/lib/data-source/data-block/DataBlockRequestProvider.js

@@ -82,14 +82,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/lib/filter-provider/utils.js

@@ -35,6 +35,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     mergeFilter: ()=>mergeFilter,
     FILTER_OPERATORS_WITH_ARRAY_VALUES: ()=>FILTER_OPERATORS_WITH_ARRAY_VALUES,
+    normalizeDateBetweenValue: ()=>normalizeDateBetweenValue,
     transformToFilter: ()=>transformToFilter,
     isSameCollection: ()=>isSameCollection,
     getSupportFieldsByForeignKey: ()=>getSupportFieldsByForeignKey,
@@ -43,6 +44,7 @@ __webpack_require__.d(__webpack_exports__, {
     isAssocField: ()=>isAssocField,
     useAssociatedFields: ()=>useAssociatedFields,
     isInFilterFormBlock: ()=>isInFilterFormBlock,
+    shouldUseDefaultDateBoundary: ()=>shouldUseDefaultDateBoundary,
     useFilterAPI: ()=>useFilterAPI,
     useSupportedBlocks: ()=>useSupportedBlocks
 });
@@ -112,6 +114,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;
     }
@@ -137,6 +140,54 @@ const resolveFilterOperator = function(schema, path) {
     if (!operatorList.length || !fieldSchema) return;
     return (0, SchemaSettingOptions_js_namespaceObject.getDefaultFilterOperatorValue)(fieldSchema, operatorList);
 };
+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)=>{
+    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);
+    if (!m.isValid()) return value;
+    if (!options.useDefaultDateBoundary && hasExplicitTime(rawValue) && !isDateOnlyString(rawValue)) 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] : {};
+    if (!options.useDefaultDateBoundary) return false;
+    if (isDateOnlyString(start) || isDateOnlyString(end)) return true;
+    return isDefaultDateBoundaryValue(start, 'start') && isDefaultDateBoundaryValue(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, 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 transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = (0, SchemaSettingOptions_js_namespaceObject.findFilterOperators)(fieldSchema);
     values = (0, client_namespaceObject.flatten)(values, {
@@ -158,6 +209,7 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
             const defKey = key;
             let value = external_lodash_default().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 = (0, client_namespaceObject.getValuesByPath)(value, collectionField.targetKey || 'id');
@@ -177,21 +229,10 @@ 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 = external_dayjs_default()(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]
-                    ];
+                    value = normalizeDateBetweenValue(value, {
+                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema)
+                    });
+                    if (!value) return null;
                 }
             }
             return {
@@ -289,6 +330,8 @@ exports.isAssocField = __webpack_exports__.isAssocField;
 exports.isInFilterFormBlock = __webpack_exports__.isInFilterFormBlock;
 exports.isSameCollection = __webpack_exports__.isSameCollection;
 exports.mergeFilter = __webpack_exports__.mergeFilter;
+exports.normalizeDateBetweenValue = __webpack_exports__.normalizeDateBetweenValue;
+exports.shouldUseDefaultDateBoundary = __webpack_exports__.shouldUseDefaultDateBoundary;
 exports.transformToFilter = __webpack_exports__.transformToFilter;
 exports.useAssociatedFields = __webpack_exports__.useAssociatedFields;
 exports.useFilterAPI = __webpack_exports__.useFilterAPI;
@@ -302,6 +345,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "isInFilterFormBlock",
     "isSameCollection",
     "mergeFilter",
+    "normalizeDateBetweenValue",
+    "shouldUseDefaultDateBoundary",
     "transformToFilter",
     "useAssociatedFields",
     "useFilterAPI",

package/lib/modules/fields/component/DrawerSubTable/drawerSubTableComponentFieldSettings.js

@@ -48,14 +48,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
         const field = (0, schema_namespaceObject.useField)();
         const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
         const { dn, refresh } = (0, external_schema_component_index_js_namespaceObject.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']
@@ -154,7 +153,7 @@ const drawerSubTableComponentFieldSettings = new SchemaSettings_js_namespaceObje
                             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/lib/modules/fields/component/Nester/subformComponentFieldSettings.js

@@ -47,14 +47,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
         const field = (0, schema_namespaceObject.useField)();
         const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
         const { dn, refresh } = (0, external_schema_component_index_js_namespaceObject.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/lib/modules/fields/component/Picker/recordPickerComponentFieldSettings.js

@@ -89,14 +89,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
         const field = (0, schema_namespaceObject.useField)();
         const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
         const { dn, refresh } = (0, external_schema_component_index_js_namespaceObject.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']
@@ -194,7 +193,7 @@ const recordPickerComponentFieldSettings = new SchemaSettings_js_namespaceObject
                             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/lib/modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.js

@@ -48,14 +48,13 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
         const field = (0, schema_namespaceObject.useField)();
         const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
         const { dn, refresh } = (0, external_schema_component_index_js_namespaceObject.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/lib/modules/fields/component/Select/selectComponentFieldSettings.js

@@ -169,7 +169,6 @@ const allowMultiple = {
         ].includes(null == collectionField ? void 0 : collectionField.type);
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
         const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
         const field = (0, schema_namespaceObject.useField)();
         const { fieldSchema: tableColumnSchema } = (0, Table_Column_Decorator_js_namespaceObject.useColumnSchema)();
@@ -178,7 +177,7 @@ const allowMultiple = {
         const { dn, refresh } = (0, external_schema_component_index_js_namespaceObject.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/lib/schema-component/antd/association-select/AssociationSelect.js

@@ -39,8 +39,8 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const icons_namespaceObject = require("@ant-design/icons");
 const client_namespaceObject = require("@tego/client");
+const icons_namespaceObject = require("@ant-design/icons");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -106,7 +106,7 @@ const InternalAssociationSelect = (0, schema_namespaceObject.connect)((props)=>{
     })), (0, schema_namespaceObject.mapReadPretty)(external_ReadPretty_js_namespaceObject.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 } = (0, external_collection_manager_index_js_namespaceObject.useCollectionManager_deprecated)();
     const { getField } = (0, external_collection_manager_index_js_namespaceObject.useCollection_deprecated)();
     const { form } = (0, index_js_namespaceObject.useFormBlockContext)();
@@ -358,7 +358,7 @@ AssociationSelect.Designer = function() {
             }),
             IsShowMultipleSwitch() ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SchemaSettings_js_namespaceObject.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/lib/schema-component/antd/filter/useFilterActionProps.js

@@ -152,6 +152,60 @@ 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 = (items, 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 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);
+        return;
+    }
+    if (!Array.isArray(value) || utils_js_namespaceObject.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator || '')) {
+        filterSchemaItem[filterKey] = value;
+        return;
+    }
+    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] : external_flat_default();
     var _filterSchema_$and, _filterSchema_$or;
@@ -165,12 +219,12 @@ 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]), customFlat, {
+                useDefaultDateBoundary: (0, utils_js_namespaceObject.shouldUseDefaultDateBoundary)(customFieldSchema)
+            });
         }
         for(const item in filterSchemaItem)if (!filterSchemaItem[item] || filterSchemaItem[item].includes('$nFilter')) delete filterSchemaItem[item];
         const flatFieldSchema = customFlat.unflatten(filterSchemaItem);

package/lib/schema-component/antd/form-item/FormItem.Settings.js

@@ -885,14 +885,13 @@ const formItemSettings = new index_js_namespaceObject.SchemaSettings({
                 return isAssociationField && IsShowMultipleSwitch();
             },
             useComponentProps () {
-                var _fieldSchema_xcomponentprops;
                 const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
                 const field = (0, schema_namespaceObject.useField)();
                 const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
                 const { dn, refresh } = (0, external_hooks_index_js_namespaceObject.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/lib/schema-initializer/utils.js

@@ -49,6 +49,7 @@ __webpack_require__.d(__webpack_exports__, {
     useAssociatedTableColumnInitializerFields: ()=>useAssociatedTableColumnInitializerFields,
     useFilterFormItemInitializerFields: ()=>useFilterFormItemInitializerFields,
     useFormItemInitializerFields: ()=>useFormItemInitializerFields,
+    createFilterAssociatedResultSchema: ()=>createFilterAssociatedResultSchema,
     gridRowColWrap: ()=>gridRowColWrap,
     useCustomFormItemInitializerFields: ()=>useCustomFormItemInitializerFields,
     useFilterInheritsFormItemInitializerFields: ()=>useFilterInheritsFormItemInitializerFields,
@@ -388,7 +389,7 @@ const useFilterFormItemInitializerFields = (options)=>{
                 'x-component': 'CollectionField',
                 'x-decorator': 'FormItem',
                 'x-collection-field': "".concat(name, ".").concat(field.name),
-                'x-component-props': null == (_field_uiSchema2 = field.uiSchema) ? void 0 : _field_uiSchema2['x-component-props']
+                'x-component-props': (null == (_field_uiSchema2 = field.uiSchema) ? void 0 : _field_uiSchema2['x-component-props']) || {}
             };
         }
         const resultItem = {
@@ -499,7 +500,7 @@ const getItem = (field, schemaName, collectionName, getCollectionFields, process
                 'oho',
                 'o2m',
                 'm2m'
-            ].includes(subField.interface)) options.push(getResultSchema("".concat(schemaName, ".").concat(subField.name), subField, collectionName, (fieldPath || '') + field.key));
+            ].includes(subField.interface)) options.push(createFilterAssociatedResultSchema("".concat(schemaName, ".").concat(subField.name), subField, collectionName, (fieldPath || '') + field.key));
             options.push(getItem(subField, "".concat(schemaName, ".").concat(subField.name), collectionName, getCollectionFields, [
                 ...processedCollections,
                 field.target
@@ -514,9 +515,9 @@ const getItem = (field, schemaName, collectionName, getCollectionFields, process
         };
     }
     if ((0, utils_js_namespaceObject.isAssocField)(field)) return null;
-    return getResultSchema(schemaName, field, collectionName, (fieldPath || '') + field.key);
+    return createFilterAssociatedResultSchema(schemaName, field, collectionName, (fieldPath || '') + field.key);
 };
-const getResultSchema = (schemaName, field, collectionName, fieldPath)=>{
+const createFilterAssociatedResultSchema = (schemaName, field, collectionName, fieldPath)=>{
     var _field_uiSchema, _field_uiSchema1, _field_uiSchema2;
     const schema = {
         type: 'string',
@@ -529,7 +530,8 @@ const getResultSchema = (schemaName, field, collectionName, fieldPath)=>{
         'x-component': 'CollectionField',
         'x-read-pretty': false,
         'x-decorator': 'FormItem',
-        'x-collection-field': "".concat(collectionName, ".").concat(schemaName)
+        'x-collection-field': "".concat(collectionName, ".").concat(schemaName),
+        'x-component-props': {}
     };
     const result = {
         name: (null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title) || field.name,
@@ -1436,6 +1438,7 @@ function useAssociationFields(param) {
     ]);
 }
 exports.createDetailsBlockSchema = __webpack_exports__.createDetailsBlockSchema;
+exports.createFilterAssociatedResultSchema = __webpack_exports__.createFilterAssociatedResultSchema;
 exports.createFormBlockSchema = __webpack_exports__.createFormBlockSchema;
 exports.createReadPrettyFormBlockSchema = __webpack_exports__.createReadPrettyFormBlockSchema;
 exports.createTableBlockSchema = __webpack_exports__.createTableBlockSchema;
@@ -1461,6 +1464,7 @@ exports.useRemoveGridFormItem = __webpack_exports__.useRemoveGridFormItem;
 exports.useTableColumnInitializerFields = __webpack_exports__.useTableColumnInitializerFields;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "createDetailsBlockSchema",
+    "createFilterAssociatedResultSchema",
     "createFormBlockSchema",
     "createReadPrettyFormBlockSchema",
     "createTableBlockSchema",

package/package.json

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