@tachybase/client 1.6.20 → 1.6.22

package/es/schema-component/antd/cron/CronSet.mjs

@@ -1,6 +1,6 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from "react";
-import { connect, mapReadPretty, useFieldSchema } from "@tachybase/schema";
+import { connect, mapProps, mapReadPretty, useFieldSchema } from "@tachybase/schema";
 import { Select } from "antd";
 import { useCollection_deprecated } from "../../../collection-manager/index.mjs";
 import { useCompile } from "../../hooks/index.mjs";
@@ -24,6 +24,7 @@ const CronSetInternal = (props)=>{
                 label: compile(item.label)
             })), [
         props.options,
+        uiSchemaOptions,
         customizeOption
     ]);
     useEffect(()=>{
@@ -86,7 +87,8 @@ const ReadPretty = (props)=>{
     const { getField } = useCollection_deprecated();
     const uiSchemaOptions = null == (_getField = getField(null == fieldSchema ? void 0 : fieldSchema.name)) ? void 0 : _getField.uiSchema.enum;
     const options = useMemo(()=>(props.options || []).concat(uiSchemaOptions || []), [
-        props.options
+        props.options,
+        uiSchemaOptions
     ]);
     const label = useMemo(()=>{
         var _options_find;
@@ -102,5 +104,9 @@ const ReadPretty = (props)=>{
         }))
     });
 };
-const CronSet = connect(CronSetInternal, mapReadPretty(ReadPretty));
+const CronSet = connect(CronSetInternal, mapProps({
+    dataSource: 'options',
+    value: 'value',
+    onInput: 'onChange'
+}), mapReadPretty(ReadPretty));
 export { CronSet };

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

@@ -84,6 +84,10 @@ const normalizeDatePickerParseOptions = function() {
         if ('date' !== rangeValueInfo.mode || 'retained-local-date-boundary' === rangeValueInfo.source) return options;
     }
     const { gmt, ...rest } = options;
+    if ('retained-date-boundary' === rangeValueInfo.source) return {
+        ...rest,
+        gmt: true
+    };
     return rest;
 };
 const moment2str = function(value) {

package/es/schema-component/antd/filter/conditionUtils.d.ts

@@ -0,0 +1,2 @@
+export declare const getCustomCondition: any;
+export declare const removeNullCondition: any;

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

@@ -0,0 +1,133 @@
+import flat from "flat";
+import { resolveDatePickerRangeValueInfo } from "../date-picker/util.mjs";
+import { FILTER_OPERATORS_WITH_ARRAY_VALUES, normalizeDateBetweenValue, shouldUseDefaultDateBoundary } from "./dateValueUtils.mjs";
+import { hasDuplicateKeys } from "./utils.mjs";
+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;
+    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
+        var _fieldSchema_xcomponentprops1;
+        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
+    }
+    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;
+    const filterSchema = fieldSchema ? fieldSchema['x-filter-rules'] : '';
+    const filterSchemaItem = customFlat(filterSchema || '');
+    const items = customFlat(filter || {});
+    const isCustomFilter = (null == filterSchema ? void 0 : null == (_filterSchema_$and = filterSchema.$and) ? void 0 : _filterSchema_$and.length) || (null == filterSchema ? void 0 : null == (_filterSchema_$or = filterSchema.$or) ? void 0 : _filterSchema_$or.length);
+    const isFilterCustom = isCustomFilter ? hasDuplicateKeys(items, filterSchemaItem) : false;
+    if (isFilterCustom) return customFlat.unflatten(items);
+    if (!isCustomFilter) return customFlat.unflatten({});
+    {
+        for(const filterKey in filterSchemaItem){
+            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){
+            const value = filterSchemaItem[item];
+            if (null == value || '' === value || 'string' == typeof value && value.includes('$nFilter')) delete filterSchemaItem[item];
+        }
+        const flatFieldSchema = customFlat.unflatten(filterSchemaItem);
+        if (Array.isArray(null == flatFieldSchema ? void 0 : flatFieldSchema['$and'])) flatFieldSchema['$and'] = flatFieldSchema['$and'].filter(Boolean);
+        if (Array.isArray(null == flatFieldSchema ? void 0 : flatFieldSchema['$or'])) flatFieldSchema['$or'] = flatFieldSchema['$or'].filter(Boolean);
+        return flatFieldSchema;
+    }
+};
+const removeNullCondition = function(filter) {
+    let customFlat = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : flat;
+    const items = customFlat(filter || {});
+    const values = {};
+    for(const key in items){
+        const value = items[key];
+        if (null != value && !isEmpty(value)) values[key] = value;
+    }
+    for (const key of Object.keys(values))if (key.endsWith('$dateBetween.0')) {
+        const key1 = key.replace(/\$dateBetween\.0$/, '$dateBetween.1');
+        if (!(key1 in values)) values[key1] = values[key];
+    } else if (key.endsWith('$dateBetween.1')) {
+        const key0 = key.replace(/\$dateBetween\.1$/, '$dateBetween.0');
+        if (!(key0 in values)) values[key0] = values[key];
+    }
+    return customFlat.unflatten(values);
+};
+export { getCustomCondition, removeNullCondition };

package/es/schema-component/antd/filter/dateValueUtils.d.ts

@@ -0,0 +1,13 @@
+import { type DatePickerRangeValueMode, type DatePickerRangeValueSource } from '../date-picker/util';
+/**
+ * 筛选值为数组的操作符；与 transformToFilter 的 flatten breakOn、filterByCleanedFields 路径去重共用，避免两处列表漂移。
+ */
+export declare const FILTER_OPERATORS_WITH_ARRAY_VALUES: Set<string>;
+export type NormalizeDateBetweenOptions = {
+    useDefaultDateBoundary?: boolean;
+    valueMode?: DatePickerRangeValueMode;
+    valueSource?: DatePickerRangeValueSource;
+    preferDateBoundaryFallback?: boolean;
+};
+export declare const normalizeDateBetweenValue: (value: any[], options?: NormalizeDateBetweenOptions) => any[];
+export declare const shouldUseDefaultDateBoundary: (fieldSchema?: any) => boolean;

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

@@ -0,0 +1,66 @@
+import dayjs from "dayjs";
+import { isDatePickerDefaultRangeBoundaryValue } from "../date-picker/util.mjs";
+const FILTER_OPERATORS_WITH_ARRAY_VALUES = new Set([
+    '$match',
+    '$notMatch',
+    '$anyOf',
+    '$noneOf',
+    '$childIn',
+    '$childNotIn',
+    '$dateBetween',
+    '$in',
+    '$notIn'
+]);
+const getDatePickerComponent = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
+        var _fieldSchema_xcomponentprops1;
+        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
+    }
+    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 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 ('metadata' === options.valueSource || '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);
+export { FILTER_OPERATORS_WITH_ARRAY_VALUES, normalizeDateBetweenValue, shouldUseDefaultDateBoundary };

package/es/schema-component/antd/filter/useFilterActionProps.d.ts

@@ -1,9 +1,7 @@
-export declare const useGetFilterOptions: () => (collectionName: any, dataSource?: string) => any[];
+export { getCustomCondition, removeNullCondition } from './conditionUtils';
+export { useGetFilterFieldOptions, useGetFilterOptions } from './useGetFilterOptions';
 export declare const useFilterOptions: (collectionName: string) => any[];
-export declare const useGetFilterFieldOptions: () => (fields: any) => any[];
 export declare const useFilterFieldOptions: (fields: any) => any[];
-export declare const getCustomCondition: any;
-export declare const removeNullCondition: any;
 export declare const useFilterActionProps: () => {
     options: any;
     onSubmit(values: any): any;

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

@@ -1,70 +1,18 @@
 import { useField, useFieldSchema } from "@tachybase/schema";
-import flat from "flat";
 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 { FILTER_OPERATORS_WITH_ARRAY_VALUES, mergeFilter, normalizeDateBetweenValue, shouldUseDefaultDateBoundary } from "../../../filter-provider/utils.mjs";
+import { mergeFilter } 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();
-    const getFilterFieldOptions = useGetFilterFieldOptions();
-    return (collectionName, dataSource)=>{
-        const fields = getCollectionFields(collectionName, dataSource);
-        const options = getFilterFieldOptions(fields);
-        return options;
-    };
-};
+import { getCustomCondition, removeNullCondition } from "./conditionUtils.mjs";
+import { useGetFilterFieldOptions, useGetFilterOptions } from "./useGetFilterOptions.mjs";
 const useFilterOptions = (collectionName)=>{
     const { getCollectionFields } = useCollectionManager_deprecated();
     const fields = getCollectionFields(collectionName);
     const options = useFilterFieldOptions(fields);
     return options;
 };
-const useGetFilterFieldOptions = ()=>{
-    var _fieldSchema_xcomponentprops;
-    const fieldSchema = useFieldSchema();
-    const nonfilterable = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.nonfilterable) || [];
-    const { getCollectionFields, getInterface } = useCollectionManager_deprecated();
-    const field2option = (field, depth)=>{
-        var _field_uiSchema, _operators_filter;
-        if (nonfilterable.length && 1 === depth && nonfilterable.includes(field.name)) return;
-        if (!field.interface) return;
-        const fieldInterface = getInterface(field.interface);
-        if (!(null == fieldInterface ? void 0 : fieldInterface.filterable)) return;
-        const { nested, children, operators } = fieldInterface.filterable;
-        const option = {
-            name: field.name,
-            type: field.type,
-            target: field.target,
-            title: (null == field ? void 0 : null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title) || field.name,
-            schema: null == field ? void 0 : field.uiSchema,
-            interface: field.interface,
-            operators: (null == operators ? void 0 : null == (_operators_filter = operators.filter) ? void 0 : _operators_filter.call(operators, (operator)=>!(null == operator ? void 0 : operator.visible) || operator.visible(field))) || []
-        };
-        if (field.target && depth > 2) return;
-        if (depth > 2) return option;
-        if (null == children ? void 0 : children.length) option['children'] = children;
-        if (nested) {
-            const targetFields = getCollectionFields(field.target);
-            const options = getOptions(targetFields, depth + 1).filter(Boolean);
-            option['children'] = option['children'] || [];
-            option['children'].push(...options);
-        }
-        return option;
-    };
-    const getOptions = (fields, depth)=>{
-        const options = [];
-        fields.forEach((field)=>{
-            const option = field2option(field, depth);
-            if (option) options.push(option);
-        });
-        return options;
-    };
-    return (fields)=>getOptions(fields, 1);
-};
 const useFilterFieldOptions = (fields)=>{
     var _fieldSchema_xcomponentprops;
     const fieldSchema = useFieldSchema();
@@ -106,132 +54,6 @@ 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;
-    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
-        var _fieldSchema_xcomponentprops1;
-        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
-    }
-    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;
-    const filterSchema = fieldSchema ? fieldSchema['x-filter-rules'] : '';
-    const filterSchemaItem = customFlat(filterSchema || '');
-    const items = customFlat(filter || {});
-    const isCustomFilter = (null == filterSchema ? void 0 : null == (_filterSchema_$and = filterSchema.$and) ? void 0 : _filterSchema_$and.length) || (null == filterSchema ? void 0 : null == (_filterSchema_$or = filterSchema.$or) ? void 0 : _filterSchema_$or.length);
-    const isFilterCustom = isCustomFilter ? hasDuplicateKeys(items, filterSchemaItem) : false;
-    if (isFilterCustom) return customFlat.unflatten(items);
-    if (!isCustomFilter) return customFlat.unflatten({});
-    {
-        var _flatFieldSchema_$and, _flatFieldSchema_$or;
-        for(const filterKey in filterSchemaItem){
-            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);
-        flatFieldSchema['$and'] = null == flatFieldSchema ? void 0 : null == (_flatFieldSchema_$and = flatFieldSchema['$and']) ? void 0 : _flatFieldSchema_$and.filter(Boolean);
-        flatFieldSchema['$or'] = null == flatFieldSchema ? void 0 : null == (_flatFieldSchema_$or = flatFieldSchema['$or']) ? void 0 : _flatFieldSchema_$or.filter(Boolean);
-        return flatFieldSchema;
-    }
-};
-const removeNullCondition = function(filter) {
-    let customFlat = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : flat;
-    const items = customFlat(filter || {});
-    const values = {};
-    for(const key in items){
-        const value = items[key];
-        if (null != value && !isEmpty(value)) values[key] = value;
-    }
-    for (const key of Object.keys(values))if (key.endsWith('$dateBetween.0')) {
-        const key1 = key.replace(/\$dateBetween\.0$/, '$dateBetween.1');
-        if (!(key1 in values)) values[key1] = values[key];
-    } else if (key.endsWith('$dateBetween.1')) {
-        const key0 = key.replace(/\$dateBetween\.1$/, '$dateBetween.0');
-        if (!(key0 in values)) values[key0] = values[key];
-    }
-    return customFlat.unflatten(values);
-};
 const useFilterActionProps = ()=>{
     const { name } = useCollection_deprecated();
     const options = useFilterOptions(name);

package/es/schema-component/antd/filter/useGetFilterOptions.d.ts

@@ -0,0 +1,2 @@
+export declare const useGetFilterFieldOptions: () => (fields: any) => any[];
+export declare const useGetFilterOptions: () => (collectionName: any, dataSource?: string) => any[];

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

@@ -0,0 +1,54 @@
+import { useFieldSchema } from "@tachybase/schema";
+import { useCollectionManager_deprecated } from "../../../collection-manager/index.mjs";
+const useGetFilterFieldOptions = ()=>{
+    var _fieldSchema_xcomponentprops;
+    const fieldSchema = useFieldSchema();
+    const nonfilterable = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.nonfilterable) || [];
+    const { getCollectionFields, getInterface } = useCollectionManager_deprecated();
+    const field2option = (field, depth)=>{
+        var _field_uiSchema, _operators_filter;
+        if (nonfilterable.length && 1 === depth && nonfilterable.includes(field.name)) return;
+        if (!field.interface) return;
+        const fieldInterface = getInterface(field.interface);
+        if (!(null == fieldInterface ? void 0 : fieldInterface.filterable)) return;
+        const { nested, children, operators } = fieldInterface.filterable;
+        const option = {
+            name: field.name,
+            type: field.type,
+            target: field.target,
+            title: (null == field ? void 0 : null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title) || field.name,
+            schema: null == field ? void 0 : field.uiSchema,
+            interface: field.interface,
+            operators: (null == operators ? void 0 : null == (_operators_filter = operators.filter) ? void 0 : _operators_filter.call(operators, (operator)=>!(null == operator ? void 0 : operator.visible) || operator.visible(field))) || []
+        };
+        if (field.target && depth > 2) return;
+        if (depth > 2) return option;
+        if (null == children ? void 0 : children.length) option['children'] = children;
+        if (nested) {
+            const targetFields = getCollectionFields(field.target);
+            const options = getOptions(targetFields, depth + 1).filter(Boolean);
+            option['children'] = option['children'] || [];
+            option['children'].push(...options);
+        }
+        return option;
+    };
+    const getOptions = (fields, depth)=>{
+        const options = [];
+        fields.forEach((field)=>{
+            const option = field2option(field, depth);
+            if (option) options.push(option);
+        });
+        return options;
+    };
+    return (fields)=>getOptions(fields, 1);
+};
+const useGetFilterOptions = ()=>{
+    const { getCollectionFields } = useCollectionManager_deprecated();
+    const getFilterFieldOptions = useGetFilterFieldOptions();
+    return (collectionName, dataSource)=>{
+        const fields = getCollectionFields(collectionName, dataSource);
+        const options = getFilterFieldOptions(fields);
+        return options;
+    };
+};
+export { useGetFilterFieldOptions, useGetFilterOptions };

package/es/schema-component/antd/form/Form.mjs

@@ -3,11 +3,11 @@ import { createContext, useContext, useEffect, useMemo } from "react";
 import { FieldContext, FormContext, RecursionField, createForm, observer, useField, useFieldSchema } from "@tachybase/schema";
 import { FormLayout } from "@tego/client";
 import { ConfigProvider, Spin } from "antd";
-import { useAttach, useComponent } from "../../index.mjs";
 import { useRequest } from "../../../api-client/index.mjs";
 import { useCollection_deprecated } from "../../../collection-manager/index.mjs";
 import { GeneralSchemaDesigner, SchemaSettingsDivider, SchemaSettingsRemove, SchemaSettingsTemplate } from "../../../schema-settings/index.mjs";
 import { useSchemaTemplate } from "../../../schema-templates/index.mjs";
+import { useAttach, useComponent } from "../../hooks/index.mjs";
 const FormComponent = (props)=>{
     const { form, children, ...others } = props;
     const field = useField();

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

@@ -1,6 +1,6 @@
 import { jsx } from "react/jsx-runtime";
 import "react";
-import { GeneralSchemaDesigner } from "../../../schema-settings/index.mjs";
+import { GeneralSchemaDesigner } from "../../../schema-settings/GeneralSchemaDesigner.mjs";
 const FilterFormDesigner = ()=>/*#__PURE__*/ jsx(GeneralSchemaDesigner, {
         schemaSettings: "FilterFormItemSettings"
     });

package/es/schema-component/antd/form-item/FormItem.d.ts

@@ -1,4 +1,4 @@
-import { Collection_deprecated } from '../../../collection-manager';
+import { Collection_deprecated } from '../../../collection-manager/hooks/useCollection_deprecated';
 export declare const FormItem: {
     (props: any): import("react/jsx-runtime").JSX.Element;
     displayName: string;

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

@@ -4,19 +4,20 @@ import { useField, useFieldSchema } from "@tachybase/schema";
 import { FormItem } from "@tego/client";
 import { createStyles } from "antd-style";
 import classnames from "classnames";
-import { useApp } from "../../../application/index.mjs";
+import { useApp } from "../../../application/hooks/useApp.mjs";
 import { useFormActiveFields } from "../../../block-provider/hooks/useFormActiveFields.mjs";
-import { ACLCollectionFieldProvider } from "../../../built-in/acl/index.mjs";
-import { CollectionFieldProvider, useContextConfigSetting } from "../../../data-source/index.mjs";
-import { GeneralSchemaDesigner } from "../../../schema-settings/index.mjs";
-import { useVariables } from "../../../variables/index.mjs";
+import { ACLCollectionFieldProvider } from "../../../built-in/acl/ACLCollectionFieldProvider.mjs";
+import { CollectionFieldProvider } from "../../../data-source/collection-field/CollectionFieldProvider.mjs";
+import { useContextConfigSetting } from "../../../data-source/data-block/context/ConfigSetting.provider.mjs";
+import { GeneralSchemaDesigner } from "../../../schema-settings/GeneralSchemaDesigner.mjs";
 import useContextVariable from "../../../variables/hooks/useContextVariable.mjs";
-import { BlockItem } from "../block-item/index.mjs";
+import useVariables from "../../../variables/hooks/useVariables.mjs";
+import { BlockItem } from "../block-item/BlockItem.mjs";
 import { HTMLEncode } from "../input/shared.mjs";
 import { FilterFormDesigner } from "./FormItem.FilterFormDesigner.mjs";
 import useLazyLoadDisplayAssociationFieldsOfForm from "./hooks/useLazyLoadDisplayAssociationFieldsOfForm.mjs";
 import useParseDefaultValue from "./hooks/useParseDefaultValue.mjs";
-import { useEnsureOperatorsValid } from "./SchemaSettingOptions.mjs";
+import { useEnsureOperatorsValid } from "./operatorUtils.mjs";
 function _tagged_template_literal(strings, raw) {
     if (!raw) raw = strings.slice(0);
     return Object.freeze(Object.defineProperties(strings, {
@@ -109,16 +110,17 @@ const FormItem_FormItem = (props)=>{
         }), [
         showTitle
     ]);
+    const item = /*#__PURE__*/ jsx(FormItem, {
+        className: className,
+        ...props,
+        extra: extra
+    });
     return /*#__PURE__*/ jsx(CollectionFieldProvider, {
         allowNull: true,
         children: /*#__PURE__*/ jsx(BlockItem, {
             className: 'tb-form-item',
             children: /*#__PURE__*/ jsx(ACLCollectionFieldProvider, {
-                children: /*#__PURE__*/ jsx(FormItem, {
-                    className: className,
-                    ...props,
-                    extra: extra
-                })
+                children: item
             })
         })
     });