@tachybase/client 1.6.20 → 1.6.22

package/lib/record-provider/index.js

@@ -35,16 +35,16 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const index_js_namespaceObject = require("../collection-manager/index.js");
-const external_data_source_index_js_namespaceObject = require("../data-source/index.js");
-const external_user_index_js_namespaceObject = require("../user/index.js");
+const useCollection_deprecated_js_namespaceObject = require("../collection-manager/hooks/useCollection_deprecated.js");
+const CollectionRecordProvider_js_namespaceObject = require("../data-source/collection-record/CollectionRecordProvider.js");
+const CurrentUserContext_js_namespaceObject = require("../user/CurrentUserContext.js");
 const RecordContext_deprecated = /*#__PURE__*/ (0, external_react_namespaceObject.createContext)({});
 RecordContext_deprecated.displayName = 'RecordContext_deprecated';
 const RecordIndexContext = /*#__PURE__*/ (0, external_react_namespaceObject.createContext)(null);
 RecordIndexContext.displayName = 'RecordIndexContext';
 const RecordProvider = (props)=>{
     const { record, children, parent, isNew } = props;
-    const { name: __collectionName } = (0, index_js_namespaceObject.useCollection_deprecated)();
+    const { name: __collectionName } = (0, useCollection_deprecated_js_namespaceObject.useCollection_deprecated)();
     const value = {
         ...record
     };
@@ -52,7 +52,7 @@ const RecordProvider = (props)=>{
     value['__collectionName'] = __collectionName;
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(RecordContext_deprecated.Provider, {
         value: value,
-        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_data_source_index_js_namespaceObject.CollectionRecordProvider, {
+        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(CollectionRecordProvider_js_namespaceObject.CollectionRecordProvider, {
             isNew: isNew,
             record: record,
             parentRecord: parent,
@@ -79,7 +79,7 @@ function useRecordIndex() {
 const useRecordIsOwn = ()=>{
     var _ctx_data_data, _ctx_data;
     const record = useRecord();
-    const ctx = (0, external_user_index_js_namespaceObject.useCurrentUserContext)();
+    const ctx = (0, CurrentUserContext_js_namespaceObject.useCurrentUserContext)();
     if (!(null == record ? void 0 : record.createdById)) return false;
     return (null == record ? void 0 : record.createdById) === (null == ctx ? void 0 : null == (_ctx_data = ctx.data) ? void 0 : null == (_ctx_data_data = _ctx_data.data) ? void 0 : _ctx_data_data.id);
 };

package/lib/schema-component/antd/action/Action.js

@@ -46,8 +46,6 @@ var external_classnames_default = /*#__PURE__*/ __webpack_require__.n(external_c
 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");
-const external_react_router_dom_namespaceObject = require("react-router-dom");
-const external_index_js_namespaceObject = require("../../index.js");
 const index_js_namespaceObject = require("../../../application/index.js");
 const withDynamicSchemaProps_js_namespaceObject = require("../../../application/hoc/withDynamicSchemaProps.js");
 const acl_index_js_namespaceObject = require("../../../built-in/acl/index.js");
@@ -58,7 +56,10 @@ const external_record_provider_index_js_namespaceObject = require("../../../reco
 const external_variables_index_js_namespaceObject = require("../../../variables/index.js");
 const external_common_index_js_namespaceObject = require("../../common/index.js");
 const external_hooks_index_js_namespaceObject = require("../../hooks/index.js");
+const useDesignable_js_namespaceObject = require("../../hooks/useDesignable.js");
+const useOptionalNavigate_js_namespaceObject = require("../../hooks/useOptionalNavigate.js");
 const useProps_js_namespaceObject = require("../../hooks/useProps.js");
+const Popover_js_namespaceObject = require("../popover/Popover.js");
 const external_Action_Area_js_namespaceObject = require("./Action.Area.js");
 const external_Action_Container_js_namespaceObject = require("./Action.Container.js");
 var external_Action_Container_js_default = /*#__PURE__*/ __webpack_require__.n(external_Action_Container_js_namespaceObject);
@@ -75,10 +76,10 @@ const useCompiledAction_js_namespaceObject = require("./hooks/useCompiledAction.
 const useGetAriaLabelOfAction_js_namespaceObject = require("./hooks/useGetAriaLabelOfAction.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaProps)((0, schema_namespaceObject.observer)((props)=>{
-    var _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops1, _field_data, _field_data1;
+    var _app_usePageMode, _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops1, _field_data, _field_data1;
     const { isShow = true, popover, confirm, openMode: om, containerRefKey, component, useAction = external_hooks_js_namespaceObject.useA, className, icon, title, onClick, style, openSize: os, disabled: propsDisabled, actionCallback, addChild, ...others } = (0, useProps_js_namespaceObject.useProps)(props);
     const aclCtx = (0, acl_index_js_namespaceObject.useACLActionParamsContext)();
-    const navigate = (0, external_react_router_dom_namespaceObject.useNavigate)();
+    const navigate = (0, useOptionalNavigate_js_namespaceObject.useOptionalNavigate)();
     const { wrapSSR, componentCls, hashId } = external_Action_style_js_default()();
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const [visible, setVisible] = (0, external_react_namespaceObject.useState)(false);
@@ -86,7 +87,7 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
     const Designer = (0, external_hooks_index_js_namespaceObject.useDesigner)();
     const field = (0, schema_namespaceObject.useField)();
     const app = (0, index_js_namespaceObject.useApp)();
-    const pageMode = app.usePageMode();
+    const pageMode = null == (_app_usePageMode = app.usePageMode) ? void 0 : _app_usePageMode.call(app);
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
     const { run, element } = (0, useCompiledAction_js_namespaceObject.useCompiledAction)(useAction, actionCallback);
     const form = (0, schema_namespaceObject.useForm)();
@@ -97,7 +98,7 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
     const openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openSize'];
     const disabled = form.disabled || field.disabled || (null == (_field_data = field.data) ? void 0 : _field_data.disabled) || propsDisabled;
     const linkageRules = (null == fieldSchema ? void 0 : fieldSchema['x-linkage-rules']) || [];
-    const { designable } = (0, external_index_js_namespaceObject.useDesignable)();
+    const { designable } = (0, useDesignable_js_namespaceObject.useDesignable)();
     const tarComponent = (0, external_hooks_index_js_namespaceObject.useComponent)(component) || component;
     const { modal } = external_antd_namespaceObject.App.useApp();
     const variables = (0, external_variables_index_js_namespaceObject.useVariables)();
@@ -234,8 +235,8 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
     displayName: 'Action'
 });
 Action.Popover = (0, schema_namespaceObject.observer)((props)=>{
-    const { button, visible, setVisible } = (0, external_index_js_namespaceObject.useActionContext)();
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_index_js_namespaceObject.StablePopover, {
+    const { button, visible, setVisible } = (0, external_hooks_js_namespaceObject.useActionContext)();
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Popover_js_namespaceObject.StablePopover, {
         ...props,
         destroyTooltipOnHide: true,
         open: visible,

package/lib/schema-component/antd/action/hooks.js

@@ -33,7 +33,7 @@ const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
 const external_antd_namespaceObject = require("antd");
 const external_react_i18next_namespaceObject = require("react-i18next");
-const FormBlockProvider_js_namespaceObject = require("../../../block-provider/FormBlockProvider.js");
+const FormBlockContext_js_namespaceObject = require("../../../block-provider/FormBlockContext.js");
 const external_context_js_namespaceObject = require("./context.js");
 const useA = ()=>({
         async run () {}
@@ -79,7 +79,8 @@ const useCloseAction = ()=>{
 };
 const useLinkageAction = ()=>{
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const isRecordAction = (0, FormBlockProvider_js_namespaceObject.useIsDetailBlock)();
+    const ctx = (0, FormBlockContext_js_namespaceObject.useFormBlockContext)();
+    const isRecordAction = 'create' !== ctx.type && (null == fieldSchema ? void 0 : fieldSchema['x-acl-action']) !== 'create' && (null == fieldSchema ? void 0 : fieldSchema['x-action']) !== 'create';
     const isAction = [
         'Action.Link',
         'Action'

package/lib/schema-component/antd/association-field/AssociationSelect.js

@@ -81,6 +81,7 @@ const InternalAssociationSelect = (0, schema_namespaceObject.observer)((props)=>
     const isAllowAddNew = fieldSchema['x-add-new'];
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const { multiple } = props;
+    const fieldNames = (0, external_hooks_js_namespaceObject.useFieldNames)(props);
     const form = (0, schema_namespaceObject.useForm)();
     const api = (0, external_index_js_namespaceObject.useAPIClient)();
     const resource = api.resource(collectionField.target);
@@ -108,11 +109,10 @@ const InternalAssociationSelect = (0, schema_namespaceObject.observer)((props)=>
         };
     }, []);
     const handleCreateAction = async (props)=>{
-        var _field_componentProps_fieldNames, _field_componentProps;
         const { search: value, callBack } = props;
         const { data: { data } } = await resource.create({
             values: {
-                [(null == field ? void 0 : null == (_field_componentProps = field.componentProps) ? void 0 : null == (_field_componentProps_fieldNames = _field_componentProps.fieldNames) ? void 0 : _field_componentProps_fieldNames.label) || 'id']: value
+                [fieldNames.label || 'id']: value
             }
         });
         if (data) {
@@ -161,6 +161,7 @@ const InternalAssociationSelect = (0, schema_namespaceObject.observer)((props)=>
                         width: '100%'
                     },
                     ...props,
+                    fieldNames: fieldNames,
                     size: 'middle',
                     objectValue: objectValue,
                     value: value || innerValue,

package/lib/schema-component/antd/association-field/hooks.js

@@ -175,12 +175,29 @@ function useServiceOptions(props) {
 const useFieldNames = (props)=>{
     var _fieldSchema_xcomponentprops_field_uiSchema_xcomponentprops, _fieldSchema_xcomponentprops_field_uiSchema, _fieldSchema_xcomponentprops_field, _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops1;
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
+    const { options: collectionField } = useAssociationFieldContext();
+    const { getCollection } = (0, index_js_namespaceObject.useCollectionManager_deprecated)();
     const fieldNames = (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : null == (_fieldSchema_xcomponentprops_field = _fieldSchema_xcomponentprops['field']) ? void 0 : null == (_fieldSchema_xcomponentprops_field_uiSchema = _fieldSchema_xcomponentprops_field['uiSchema']) ? void 0 : null == (_fieldSchema_xcomponentprops_field_uiSchema_xcomponentprops = _fieldSchema_xcomponentprops_field_uiSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops_field_uiSchema_xcomponentprops['fieldNames']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['fieldNames']) || props.fieldNames;
-    return {
+    if (fieldNames) return {
         label: 'label',
         value: 'value',
         ...fieldNames
     };
+    if (null == collectionField ? void 0 : collectionField.target) {
+        const targetCollection = getCollection(collectionField.target);
+        if (targetCollection) {
+            var _targetCollection_getPrimaryKey;
+            const pk = targetCollection.filterTargetKey || (null == (_targetCollection_getPrimaryKey = targetCollection.getPrimaryKey) ? void 0 : _targetCollection_getPrimaryKey.call(targetCollection)) || 'id';
+            return {
+                label: targetCollection.titleField || pk,
+                value: pk
+            };
+        }
+    }
+    return {
+        label: 'label',
+        value: 'value'
+    };
 };
 const SubFormContext = (0, external_react_namespaceObject.createContext)(null);
 SubFormContext.displayName = 'SubFormContext';

package/lib/schema-component/antd/cron/CronSet.js

@@ -62,6 +62,7 @@ const CronSetInternal = (props)=>{
                 label: compile(item.label)
             })), [
         props.options,
+        uiSchemaOptions,
         customizeOption
     ]);
     (0, external_react_namespaceObject.useEffect)(()=>{
@@ -124,7 +125,8 @@ const ReadPretty = (props)=>{
     const { getField } = (0, index_js_namespaceObject.useCollection_deprecated)();
     const uiSchemaOptions = null == (_getField = getField(null == fieldSchema ? void 0 : fieldSchema.name)) ? void 0 : _getField.uiSchema.enum;
     const options = (0, external_react_namespaceObject.useMemo)(()=>(props.options || []).concat(uiSchemaOptions || []), [
-        props.options
+        props.options,
+        uiSchemaOptions
     ]);
     const label = (0, external_react_namespaceObject.useMemo)(()=>{
         var _options_find;
@@ -140,7 +142,11 @@ const ReadPretty = (props)=>{
         }))
     });
 };
-const CronSet = (0, schema_namespaceObject.connect)(CronSetInternal, (0, schema_namespaceObject.mapReadPretty)(ReadPretty));
+const CronSet = (0, schema_namespaceObject.connect)(CronSetInternal, (0, schema_namespaceObject.mapProps)({
+    dataSource: 'options',
+    value: 'value',
+    onInput: 'onChange'
+}), (0, schema_namespaceObject.mapReadPretty)(ReadPretty));
 exports.CronSet = __webpack_exports__.CronSet;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "CronSet"

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

@@ -133,6 +133,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/lib/schema-component/antd/filter/conditionUtils.js

@@ -0,0 +1,180 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    getCustomCondition: ()=>getCustomCondition,
+    removeNullCondition: ()=>removeNullCondition
+});
+const external_flat_namespaceObject = require("flat");
+var external_flat_default = /*#__PURE__*/ __webpack_require__.n(external_flat_namespaceObject);
+const util_js_namespaceObject = require("../date-picker/util.js");
+const external_dateValueUtils_js_namespaceObject = require("./dateValueUtils.js");
+const external_utils_js_namespaceObject = require("./utils.js");
+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 = (0, util_js_namespaceObject.resolveDatePickerRangeValueInfo)(value, {
+            component: options.component,
+            showTime: options.showTime,
+            preferDateBoundaryFallback: options.useDefaultDateBoundary
+        });
+        filterSchemaItem[filterKey] = (0, external_dateValueUtils_js_namespaceObject.normalizeDateBetweenValue)(value, {
+            useDefaultDateBoundary: options.useDefaultDateBoundary,
+            valueMode: valueInfo.mode,
+            valueSource: valueInfo.source,
+            preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
+        });
+        return;
+    }
+    if (!Array.isArray(value) || external_dateValueUtils_js_namespaceObject.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator || '')) {
+        filterSchemaItem[filterKey] = value;
+        return;
+    }
+    if (0 === value.length) return void delete filterSchemaItem[filterKey];
+    let branchEndIndex = -1;
+    for(let index = pathParts.length - 2; index >= 0; index--)if ([
+        '$and',
+        '$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;
+    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 ? (0, external_utils_js_namespaceObject.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: (0, external_dateValueUtils_js_namespaceObject.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] : external_flat_default();
+    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);
+};
+exports.getCustomCondition = __webpack_exports__.getCustomCondition;
+exports.removeNullCondition = __webpack_exports__.removeNullCondition;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "getCustomCondition",
+    "removeNullCondition"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

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

@@ -0,0 +1,116 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    normalizeDateBetweenValue: ()=>normalizeDateBetweenValue,
+    FILTER_OPERATORS_WITH_ARRAY_VALUES: ()=>FILTER_OPERATORS_WITH_ARRAY_VALUES,
+    shouldUseDefaultDateBoundary: ()=>shouldUseDefaultDateBoundary
+});
+const external_dayjs_namespaceObject = require("dayjs");
+var external_dayjs_default = /*#__PURE__*/ __webpack_require__.n(external_dayjs_namespaceObject);
+const util_js_namespaceObject = require("../date-picker/util.js");
+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 = external_dayjs_default()(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 = external_dayjs_default()(normalizeLocalDateBoundaryInput(value));
+        return ('start' === boundary ? localBoundary.startOf('day') : localBoundary.endOf('day')).toISOString();
+    }
+    if (hasExplicitTime(value)) return m.toISOString();
+    if (!options.useDefaultDateBoundary) return m.toISOString();
+    return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
+};
+const shouldApplyDefaultDateBoundary = function(start, end, 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 && (0, util_js_namespaceObject.isDatePickerDefaultRangeBoundaryValue)(start, 'start') && (0, util_js_namespaceObject.isDatePickerDefaultRangeBoundaryValue)(end, 'end');
+};
+const normalizeDateBetweenValue = function(value) {
+    let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
+    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);
+exports.FILTER_OPERATORS_WITH_ARRAY_VALUES = __webpack_exports__.FILTER_OPERATORS_WITH_ARRAY_VALUES;
+exports.normalizeDateBetweenValue = __webpack_exports__.normalizeDateBetweenValue;
+exports.shouldUseDefaultDateBoundary = __webpack_exports__.shouldUseDefaultDateBoundary;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "FILTER_OPERATORS_WITH_ARRAY_VALUES",
+    "normalizeDateBetweenValue",
+    "shouldUseDefaultDateBoundary"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});