@tachybase/client 1.6.17 → 1.6.19

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
 });
@@ -56,6 +58,7 @@ var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodas
 const index_js_namespaceObject = require("../block-provider/hooks/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../collection-manager/index.js");
 const external_schema_component_index_js_namespaceObject = require("../schema-component/index.js");
+const util_js_namespaceObject = require("../schema-component/antd/date-picker/util.js");
 const SchemaSettingOptions_js_namespaceObject = require("../schema-component/antd/form-item/SchemaSettingOptions.js");
 const external_FilterProvider_js_namespaceObject = require("./FilterProvider.js");
 const external_incomingFilterFromSources_js_namespaceObject = require("./incomingFilterFromSources.js");
@@ -112,6 +115,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 +141,58 @@ const resolveFilterOperator = function(schema, path) {
     if (!operatorList.length || !fieldSchema) return;
     return (0, SchemaSettingOptions_js_namespaceObject.getDefaultFilterOperatorValue)(fieldSchema, operatorList);
 };
+const getDatePickerComponent = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
+};
+const getDatePickerShowTime = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
+};
+const isDateOnlyString = (value)=>'string' == typeof value && /^\d{4}-\d{2}-\d{2}$/.test(value);
+const hasExplicitTime = (value)=>'string' == typeof value && /[T\s]\d{2}:\d{2}/.test(value);
+const 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 ('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);
 const transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = (0, SchemaSettingOptions_js_namespaceObject.findFilterOperators)(fieldSchema);
     values = (0, client_namespaceObject.flatten)(values, {
@@ -158,6 +214,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 +234,18 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operator) {
                 if (Array.isArray(value)) {
-                    const normalized = [];
-                    for(const index in value){
-                        if (!value[index]) continue;
-                        let v = value[index];
-                        if ('string' != typeof v && !(v instanceof Date)) v = 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]
-                    ];
+                    const valueInfo = (0, util_js_namespaceObject.resolveDatePickerRangeValueInfo)(value, {
+                        component: getDatePickerComponent(currentFieldSchema),
+                        showTime: getDatePickerShowTime(currentFieldSchema),
+                        preferDateBoundaryFallback: shouldUseDefaultDateBoundary(currentFieldSchema)
+                    });
+                    value = normalizeDateBetweenValue(value, {
+                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema),
+                        valueMode: valueInfo.mode,
+                        valueSource: valueInfo.source,
+                        preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
+                    });
+                    if (!value) return null;
                 }
             }
             return {
@@ -289,6 +343,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 +358,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/date-picker/util.js

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