@tachybase/client 1.6.20 → 1.6.22

package/es/collection-manager/sub-table.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 export declare const DataSourceContext_deprecated: React.Context<any>;
 export declare const ds: {
     useSelectedRowKeys: () => any[];
-    useDataSource_deprecated: (options: any) => import("../api-client").UseRequestResult<unknown>;
+    useDataSource_deprecated: (options: any) => import("../").UseRequestResult<unknown>;
     useCreateAction: () => {
         run(): Promise<void>;
     };

package/es/data-source/data-source/DataSourceManager.d.ts

@@ -3,8 +3,7 @@ import type { Collection, CollectionOptions } from '../collection';
 import { CollectionFieldInterfaceManager, type CollectionFieldInterfaceFactory } from '../collection-field-interface';
 import { CollectionTemplateManager, type CollectionTemplateFactory } from '../collection-template';
 import { DataSource, DataSourceFactory, type DataSourceOptions } from './DataSource';
-export declare const DEFAULT_DATA_SOURCE_KEY = "main";
-export declare const DEFAULT_DATA_SOURCE_TITLE = "{{t(\"Main\")}}";
+export { DEFAULT_DATA_SOURCE_KEY, DEFAULT_DATA_SOURCE_TITLE } from './constants';
 export interface DataSourceManagerOptions {
     collectionTemplates?: CollectionTemplateFactory[];
     fieldInterfaces?: CollectionFieldInterfaceFactory[];

package/es/data-source/data-source/DataSourceManager.mjs

@@ -1,6 +1,7 @@
 import lodash from "lodash";
 import { CollectionFieldInterfaceManager } from "../collection-field-interface/index.mjs";
 import { CollectionTemplateManager } from "../collection-template/index.mjs";
+import { DEFAULT_DATA_SOURCE_KEY, DEFAULT_DATA_SOURCE_TITLE } from "./constants.mjs";
 import { LocalDataSource } from "./DataSource.mjs";
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
@@ -12,8 +13,6 @@ function _define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
-const DEFAULT_DATA_SOURCE_KEY = 'main';
-const DEFAULT_DATA_SOURCE_TITLE = '{{t("Main")}}';
 class DataSourceManager {
     addCollectionMixins() {
         let mixins = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : [];

package/es/data-source/data-source/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const DEFAULT_DATA_SOURCE_KEY = "main";
+export declare const DEFAULT_DATA_SOURCE_TITLE = "{{t(\"Main\")}}";

package/es/data-source/data-source/constants.mjs

@@ -0,0 +1,3 @@
+const DEFAULT_DATA_SOURCE_KEY = 'main';
+const DEFAULT_DATA_SOURCE_TITLE = '{{t("Main")}}';
+export { DEFAULT_DATA_SOURCE_KEY, DEFAULT_DATA_SOURCE_TITLE };

package/es/data-source/utils.d.ts

@@ -1,4 +1,4 @@
-import { CollectionFieldOptions } from './collection';
-import { DataSourceManager } from './data-source/DataSourceManager';
+import type { CollectionFieldOptions } from './collection/Collection';
+import type { DataSourceManager } from './data-source/DataSourceManager';
 export declare const isTitleField: (dm: DataSourceManager, field: CollectionFieldOptions) => boolean;
 export declare const useDataSourceHeaders: (dataSource?: string) => any;

package/es/data-source/utils.mjs

@@ -1,5 +1,5 @@
 import { useMemo } from "react";
-import { DEFAULT_DATA_SOURCE_KEY } from "./data-source/DataSourceManager.mjs";
+import { DEFAULT_DATA_SOURCE_KEY } from "./data-source/constants.mjs";
 const isTitleField = (dm, field)=>{
     var _dm_collectionFieldInterfaceManager_getFieldInterface;
     return !field.isForeignKey && (null == (_dm_collectionFieldInterfaceManager_getFieldInterface = dm.collectionFieldInterfaceManager.getFieldInterface(field.interface)) ? void 0 : _dm_collectionFieldInterfaceManager_getFieldInterface.titleUsable);

package/es/exports.d.ts

@@ -0,0 +1,46 @@
+export * from './built-in/acl';
+export * from './api-client';
+export * from './application';
+export * from './async-data-provider';
+export * from './block-provider';
+export * from './collection-manager';
+export * from './common';
+export * from './style/css-variable';
+export * from './data-source';
+export * from './built-in/document-title';
+export * from './filter-provider';
+export * from './flag-provider';
+export * from './style/theme';
+export * from './hooks';
+export * from './i18n';
+export * from './icon';
+export { default as locale } from './locale';
+export * from './built-in';
+export * from './built-in/pinned-list';
+export * from './built-in/pm';
+export * from './powered-by';
+export * from './record-provider';
+export * from './route-switch';
+export * from './schema-component';
+export * from './schema-initializer';
+export * from './schema-items';
+export * from './schema-settings';
+export * from './schema-templates';
+export * from './style';
+export type { CustomToken } from './style/theme';
+export * from './built-in/system-settings';
+export * from './testUtils';
+export * from './user';
+export * from './variables';
+export { withDynamicSchemaProps } from './application/hoc/withDynamicSchemaProps';
+export * from './modules/blocks/BlockSchemaToolbar';
+export * from './modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem';
+export * from './modules/blocks/data-blocks/form';
+export * from './modules/blocks/data-blocks/table';
+export * from './modules/blocks/data-blocks/table-selector';
+export * from './modules/fields/component/SubTable/secondLevelSelect';
+export { useTranslation } from 'react-i18next';
+export * from 'react-i18next';
+export { useHotkeys } from 'react-hotkeys-hook';
+export * from './modules/blocks/useParentRecordCommon';
+export { findSchema as findSchemaUtils, removeGridFormItem } from './schema-initializer/utils';

package/es/exports.mjs

@@ -0,0 +1,46 @@
+import locale from "./locale/index.mjs";
+import { withDynamicSchemaProps } from "./application/hoc/withDynamicSchemaProps.mjs";
+import { useTranslation } from "react-i18next";
+import { useHotkeys } from "react-hotkeys-hook";
+import { findSchema, removeGridFormItem } from "./schema-initializer/utils.mjs";
+export * from "./built-in/acl/index.mjs";
+export * from "./api-client/index.mjs";
+export * from "./application/index.mjs";
+export * from "./async-data-provider/index.mjs";
+export * from "./block-provider/index.mjs";
+export * from "./collection-manager/index.mjs";
+export * from "./common/index.mjs";
+export * from "./style/css-variable/index.mjs";
+export * from "./data-source/index.mjs";
+export * from "./built-in/document-title/index.mjs";
+export * from "./filter-provider/index.mjs";
+export * from "./flag-provider/index.mjs";
+export * from "./style/theme/index.mjs";
+export * from "./hooks/index.mjs";
+export * from "./i18n/index.mjs";
+export * from "./icon/index.mjs";
+export * from "./built-in/index.mjs";
+export * from "./built-in/pinned-list/index.mjs";
+export * from "./built-in/pm/index.mjs";
+export * from "./powered-by/index.mjs";
+export * from "./record-provider/index.mjs";
+export * from "./route-switch/index.mjs";
+export * from "./schema-component/index.mjs";
+export * from "./schema-initializer/index.mjs";
+export * from "./schema-items/index.mjs";
+export * from "./schema-settings/index.mjs";
+export * from "./schema-templates/index.mjs";
+export * from "./style/index.mjs";
+export * from "./built-in/system-settings/index.mjs";
+export * from "./testUtils/index.mjs";
+export * from "./user/index.mjs";
+export * from "./variables/index.mjs";
+export * from "./modules/blocks/BlockSchemaToolbar.mjs";
+export * from "./modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.mjs";
+export * from "./modules/blocks/data-blocks/form/index.mjs";
+export * from "./modules/blocks/data-blocks/table/index.mjs";
+export * from "./modules/blocks/data-blocks/table-selector/index.mjs";
+export * from "./modules/fields/component/SubTable/secondLevelSelect.mjs";
+export * from "react-i18next";
+export * from "./modules/blocks/useParentRecordCommon.mjs";
+export { findSchema as findSchemaUtils, locale, removeGridFormItem, useHotkeys, useTranslation, withDynamicSchemaProps };

package/es/filter-provider/utils.d.ts

@@ -1,7 +1,7 @@
 import { Schema } from '@tachybase/schema';
 import { FilterTarget } from '../block-provider/hooks';
 import { Collection_deprecated, CollectionFieldOptions_deprecated, FieldOptions, useCollection_deprecated } from '../collection-manager';
-import { type DatePickerRangeValueMode, type DatePickerRangeValueSource } from '../schema-component/antd/date-picker/util';
+import { FILTER_OPERATORS_WITH_ARRAY_VALUES, normalizeDateBetweenValue, shouldUseDefaultDateBoundary } from '../schema-component/antd/filter/dateValueUtils';
 import { DataBlock } from './FilterProvider';
 export declare enum FilterBlockType {
     FORM = 0,
@@ -10,10 +10,7 @@ export declare enum FilterBlockType {
     COLLAPSE = 3
 }
 export declare const mergeFilter: (filters: any[], op?: string) => any;
-/**
- * 筛选值为数组的操作符；与 transformToFilter 的 flatten breakOn、filterByCleanedFields 路径去重共用，避免两处列表漂移。
- */
-export declare const FILTER_OPERATORS_WITH_ARRAY_VALUES: Set<string>;
+export { FILTER_OPERATORS_WITH_ARRAY_VALUES, normalizeDateBetweenValue, shouldUseDefaultDateBoundary };
 export declare const getSupportFieldsByAssociation: (inheritCollectionsChain: string[], block: DataBlock) => CollectionFieldOptions_deprecated[];
 export declare const getSupportFieldsByForeignKey: (filterBlockCollection: ReturnType<typeof useCollection_deprecated>, block: DataBlock) => import("./FilterProvider").ForeignKeyField[];
 /**
@@ -22,14 +19,6 @@ export declare const getSupportFieldsByForeignKey: (filterBlockCollection: Retur
  * @returns
  */
 export declare const useSupportedBlocks: (filterBlockType: FilterBlockType) => DataBlock[];
-type NormalizeDateBetweenOptions = {
-    useDefaultDateBoundary?: boolean;
-    valueMode?: DatePickerRangeValueMode;
-    valueSource?: DatePickerRangeValueSource;
-    preferDateBoundaryFallback?: boolean;
-};
-export declare const normalizeDateBetweenValue: (value: any[], options?: NormalizeDateBetweenOptions) => any[];
-export declare const shouldUseDefaultDateBoundary: (fieldSchema?: any) => boolean;
 export declare const transformToFilter: (values: Record<string, any>, fieldSchema: Schema, getCollectionJoinField: (name: string) => CollectionFieldOptions_deprecated, collectionName: string, getOperatorList?: (path: string, options: {
     fieldSchema?: Schema;
     collectionField?: CollectionFieldOptions_deprecated;
@@ -58,4 +47,3 @@ export declare const useFilterAPI: () => {
     doFilter: (value: any, field?: string | ((target: FilterTarget["targets"][0]) => string), operator?: string | ((target: FilterTarget["targets"][0]) => string)) => void;
 };
 export declare const isInFilterFormBlock: (fieldSchema: Schema) => boolean;
-export {};

package/es/filter-provider/utils.mjs

@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useState } from "react";
 import { useFieldSchema } from "@tachybase/schema";
 import { flatten, getValuesByPath } from "@tego/client";
-import dayjs from "dayjs";
 import lodash from "lodash";
 import { findFilterTargets } from "../block-provider/hooks/index.mjs";
 import { useCollectionManager_deprecated, useCollection_deprecated } from "../collection-manager/index.mjs";
 import { removeNullCondition } from "../schema-component/index.mjs";
-import { isDatePickerDefaultRangeBoundaryValue, resolveDatePickerRangeValueInfo } from "../schema-component/antd/date-picker/util.mjs";
+import { resolveDatePickerRangeValueInfo } from "../schema-component/antd/date-picker/util.mjs";
+import { FILTER_OPERATORS_WITH_ARRAY_VALUES, normalizeDateBetweenValue, shouldUseDefaultDateBoundary } from "../schema-component/antd/filter/dateValueUtils.mjs";
 import { findFilterOperators, getDefaultFilterOperatorValue } from "../schema-component/antd/form-item/SchemaSettingOptions.mjs";
 import { useFilterBlock } from "./FilterProvider.mjs";
 import { getFilterSourceDefaultFilter } from "./incomingFilterFromSources.mjs";
@@ -28,17 +28,6 @@ const mergeFilter = function(filters) {
         [op]: items
     };
 };
-const FILTER_OPERATORS_WITH_ARRAY_VALUES = new Set([
-    '$match',
-    '$notMatch',
-    '$anyOf',
-    '$noneOf',
-    '$childIn',
-    '$childNotIn',
-    '$dateBetween',
-    '$in',
-    '$notIn'
-]);
 const getSupportFieldsByAssociation = (inheritCollectionsChain, block)=>{
     var _block_associatedFields;
     return null == (_block_associatedFields = block.associatedFields) ? void 0 : _block_associatedFields.filter((field)=>null == inheritCollectionsChain ? void 0 : inheritCollectionsChain.some((collectionName)=>collectionName === field.target));
@@ -101,50 +90,6 @@ const getDatePickerShowTime = (fieldSchema)=>{
     var _fieldSchema_xcomponentprops;
     return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
 };
-const isDateOnlyString = (value)=>'string' == typeof value && /^\d{4}-\d{2}-\d{2}$/.test(value);
-const hasExplicitTime = (value)=>'string' == typeof value && /[T\s]\d{2}:\d{2}/.test(value);
-const normalizeLocalDateBoundaryInput = (value)=>{
-    if ('string' != typeof value) return value;
-    return value.replace(/Z$/, '').replace(/[+-]\d\d:\d\d$/, '');
-};
-const normalizeDateBetweenBoundary = function(value, boundary) {
-    let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
-    const m = dayjs(value);
-    if (!m.isValid()) return value;
-    if (isDateOnlyString(value)) return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
-    if ('date' === options.valueMode) {
-        if ('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);
 const transformToFilter = (values, fieldSchema, getCollectionJoinField, collectionName, getOperatorList)=>{
     const { operators } = findFilterOperators(fieldSchema);
     values = flatten(values, {

package/es/index.d.ts

@@ -1,49 +1,4 @@
 import 'antd/dist/reset.css';
 import './global.less';
 import './preload';
-export * from './built-in/acl';
-export * from './api-client';
-export * from './application';
-export * from './async-data-provider';
-export * from './block-provider';
-export * from './collection-manager';
-export * from './common';
-export * from './style/css-variable';
-export * from './data-source';
-export * from './built-in/document-title';
-export * from './filter-provider';
-export * from './flag-provider';
-export * from './style/theme';
-export * from './hooks';
-export * from './i18n';
-export * from './icon';
-export { default as locale } from './locale';
-export * from './built-in';
-export * from './built-in/pinned-list';
-export * from './built-in/pm';
-export * from './powered-by';
-export * from './record-provider';
-export * from './route-switch';
-export * from './schema-component';
-export * from './schema-initializer';
-export * from './schema-items';
-export * from './schema-settings';
-export * from './schema-templates';
-export * from './style';
-export type { CustomToken } from './style/theme';
-export * from './built-in/system-settings';
-export * from './testUtils';
-export * from './user';
-export * from './variables';
-export { withDynamicSchemaProps } from './application/hoc/withDynamicSchemaProps';
-export * from './modules/blocks/BlockSchemaToolbar';
-export * from './modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem';
-export * from './modules/blocks/data-blocks/form';
-export * from './modules/blocks/data-blocks/table';
-export * from './modules/blocks/data-blocks/table-selector';
-export * from './modules/fields/component/SubTable/secondLevelSelect';
-export { useTranslation } from 'react-i18next';
-export * from 'react-i18next';
-export { useHotkeys } from 'react-hotkeys-hook';
-export * from './modules/blocks/useParentRecordCommon';
-export { findSchema as findSchemaUtils, removeGridFormItem } from './schema-initializer/utils';
+export * from './exports';

package/es/index.mjs

@@ -1,49 +1,7 @@
 import "antd/dist/reset.css";
 import "./global.css";
 import "./preload.mjs";
-import locale from "./locale/index.mjs";
-import { withDynamicSchemaProps } from "./application/hoc/withDynamicSchemaProps.mjs";
-import { useTranslation } from "react-i18next";
-import { useHotkeys } from "react-hotkeys-hook";
-import { findSchema, removeGridFormItem } from "./schema-initializer/utils.mjs";
-export * from "./built-in/acl/index.mjs";
-export * from "./api-client/index.mjs";
-export * from "./application/index.mjs";
-export * from "./async-data-provider/index.mjs";
-export * from "./block-provider/index.mjs";
-export * from "./collection-manager/index.mjs";
-export * from "./common/index.mjs";
-export * from "./style/css-variable/index.mjs";
-export * from "./data-source/index.mjs";
-export * from "./built-in/document-title/index.mjs";
-export * from "./filter-provider/index.mjs";
-export * from "./flag-provider/index.mjs";
-export * from "./style/theme/index.mjs";
-export * from "./hooks/index.mjs";
-export * from "./i18n/index.mjs";
-export * from "./icon/index.mjs";
-export * from "./built-in/index.mjs";
-export * from "./built-in/pinned-list/index.mjs";
-export * from "./built-in/pm/index.mjs";
-export * from "./powered-by/index.mjs";
-export * from "./record-provider/index.mjs";
-export * from "./route-switch/index.mjs";
-export * from "./schema-component/index.mjs";
-export * from "./schema-initializer/index.mjs";
-export * from "./schema-items/index.mjs";
-export * from "./schema-settings/index.mjs";
-export * from "./schema-templates/index.mjs";
-export * from "./style/index.mjs";
-export * from "./built-in/system-settings/index.mjs";
-export * from "./testUtils/index.mjs";
-export * from "./user/index.mjs";
-export * from "./variables/index.mjs";
-export * from "./modules/blocks/BlockSchemaToolbar.mjs";
-export * from "./modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.mjs";
-export * from "./modules/blocks/data-blocks/form/index.mjs";
-export * from "./modules/blocks/data-blocks/table/index.mjs";
-export * from "./modules/blocks/data-blocks/table-selector/index.mjs";
-export * from "./modules/fields/component/SubTable/secondLevelSelect.mjs";
-export * from "react-i18next";
-export * from "./modules/blocks/useParentRecordCommon.mjs";
-export { findSchema as findSchemaUtils, locale, removeGridFormItem, useHotkeys, useTranslation, withDynamicSchemaProps };
+import { registerTachybaseClientExports } from "./application/utils/clientModuleRegistry.mjs";
+export * from "./exports.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__exports_mjs_ae3a2e60__ from "./exports.mjs";
+registerTachybaseClientExports(__WEBPACK_EXTERNAL_MODULE__exports_mjs_ae3a2e60__);

package/es/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.d.ts

@@ -1,6 +1,6 @@
 import { ISchema } from '@tachybase/schema';
 import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings';
-import { FieldNames } from '../../../../schema-component';
+import type { SchemaSettingsItemType } from '../../../../application/schema-settings/types';
 export declare const setDefaultSortingRules: {
     name: string;
     type: string;
@@ -30,91 +30,7 @@ export declare const allowAddNewData: {
         onChange(value: any): void;
     };
 };
-export declare const clickToSelect: {
-    name: string;
-    type: string;
-    useVisible(): boolean;
-    useComponentProps(): {
-        components: {
-            Switch: import("react").ForwardRefExoticComponent<Omit<import("antd").SwitchProps & import("react").RefAttributes<HTMLButtonElement>, "ref"> & import("react").RefAttributes<HTMLButtonElement>>;
-            SecondLevelSelect: import("react").ForwardRefExoticComponent<import("antd").SelectProps<any, any> & {
-                objectValue?: boolean;
-                onChange?: (v: any) => void;
-                multiple: boolean;
-                rawOptions: any[];
-                fieldNames: FieldNames;
-                firstLevelValue: string;
-                collectionField: string;
-            } & import("react").RefAttributes<never>>;
-        };
-        title: string;
-        schema: {
-            type: string;
-            title: string;
-            properties: {
-                isquickaddtabs: {
-                    title: string;
-                    type: string;
-                    default: any;
-                    'x-decorator': string;
-                    'x-component': string;
-                    'x-component-props': {};
-                };
-                firstLevelselection: {
-                    title: string;
-                    default: any;
-                    'x-decorator': string;
-                    'x-component': string;
-                    enum: {
-                        label: any;
-                        value: any;
-                        name?: any;
-                        collectionName?: string;
-                        sourceKey?: string;
-                        uiSchema?: any;
-                        target?: string;
-                    }[];
-                    'x-reactions': {
-                        dependencies: string[];
-                        fulfill: {
-                            state: {
-                                visible: string;
-                            };
-                        };
-                    }[];
-                    'x-component-props': {
-                        onChange(value: any): void;
-                    };
-                };
-                secondLevelselection: {
-                    title: string;
-                    default: any;
-                    'x-decorator': string;
-                    'x-component': string;
-                    'x-reactions': {
-                        dependencies: string[];
-                        fulfill: {
-                            state: {
-                                visible: string;
-                            };
-                            schema: {
-                                'x-component-props': {
-                                    firstLevelValue: string;
-                                    collectionField: any;
-                                };
-                            };
-                        };
-                    }[];
-                };
-            };
-        };
-        onSubmit: ({ isquickaddtabs, firstLevelselection, secondLevelselection }: {
-            isquickaddtabs: any;
-            firstLevelselection: any;
-            secondLevelselection: any;
-        }) => Promise<void>;
-    };
-};
+export declare const clickToSelect: SchemaSettingsItemType;
 export declare const tablePagination: {
     name: string;
     type: string;

package/es/record-provider/index.mjs

@@ -1,8 +1,8 @@
 import { jsx } from "react/jsx-runtime";
 import { createContext, useContext } from "react";
-import { useCollection_deprecated } from "../collection-manager/index.mjs";
-import { CollectionRecordProvider } from "../data-source/index.mjs";
-import { useCurrentUserContext } from "../user/index.mjs";
+import { useCollection_deprecated } from "../collection-manager/hooks/useCollection_deprecated.mjs";
+import { CollectionRecordProvider } from "../data-source/collection-record/CollectionRecordProvider.mjs";
+import { useCurrentUserContext } from "../user/CurrentUserContext.mjs";
 const RecordContext_deprecated = /*#__PURE__*/ createContext({});
 RecordContext_deprecated.displayName = 'RecordContext_deprecated';
 const RecordIndexContext = /*#__PURE__*/ createContext(null);

package/es/schema-component/antd/action/Action.mjs

@@ -6,8 +6,6 @@ import { App, Button } from "antd";
 import classnames from "classnames";
 import lodash from "lodash";
 import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
-import { StablePopover, useActionContext, useDesignable } from "../../index.mjs";
 import { useApp } from "../../../application/index.mjs";
 import { withDynamicSchemaProps } from "../../../application/hoc/withDynamicSchemaProps.mjs";
 import { useACLActionParamsContext } from "../../../built-in/acl/index.mjs";
@@ -18,7 +16,10 @@ import { RecordProvider } from "../../../record-provider/index.mjs";
 import { useLocalVariables, useVariables } from "../../../variables/index.mjs";
 import { SortableItem } from "../../common/index.mjs";
 import { useCompile, useComponent, useDesigner } from "../../hooks/index.mjs";
+import { useDesignable } from "../../hooks/useDesignable.mjs";
+import { useOptionalNavigate } from "../../hooks/useOptionalNavigate.mjs";
 import { useProps } from "../../hooks/useProps.mjs";
+import { StablePopover } from "../popover/Popover.mjs";
 import { ActionArea } from "./Action.Area.mjs";
 import Action_Container from "./Action.Container.mjs";
 import { ActionDesigner } from "./Action.Designer.mjs";
@@ -28,15 +29,15 @@ import { ActionModal } from "./Action.Modal.mjs";
 import { ActionPage } from "./Action.Page.mjs";
 import Action_style from "./Action.style.mjs";
 import { ActionContextProvider } from "./context.mjs";
-import { useA } from "./hooks.mjs";
+import { useA, useActionContext } from "./hooks.mjs";
 import { useCompiledAction } from "./hooks/useCompiledAction.mjs";
 import { useGetAriaLabelOfAction } from "./hooks/useGetAriaLabelOfAction.mjs";
 import { linkageAction } from "./utils.mjs";
 const Action = withDynamicSchemaProps(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 = useA, className, icon, title, onClick, style, openSize: os, disabled: propsDisabled, actionCallback, addChild, ...others } = useProps(props);
     const aclCtx = useACLActionParamsContext();
-    const navigate = useNavigate();
+    const navigate = useOptionalNavigate();
     const { wrapSSR, componentCls, hashId } = Action_style();
     const { t } = useTranslation();
     const [visible, setVisible] = useState(false);
@@ -44,7 +45,7 @@ const Action = withDynamicSchemaProps(observer((props)=>{
     const Designer = useDesigner();
     const field = useField();
     const app = useApp();
-    const pageMode = app.usePageMode();
+    const pageMode = null == (_app_usePageMode = app.usePageMode) ? void 0 : _app_usePageMode.call(app);
     const fieldSchema = useFieldSchema();
     const { run, element } = useCompiledAction(useAction, actionCallback);
     const form = useForm();

package/es/schema-component/antd/action/hooks.mjs

@@ -2,7 +2,7 @@ import { useContext } from "react";
 import { useFieldSchema, useForm } from "@tachybase/schema";
 import { App } from "antd";
 import { useTranslation } from "react-i18next";
-import { useIsDetailBlock } from "../../../block-provider/FormBlockProvider.mjs";
+import { useFormBlockContext } from "../../../block-provider/FormBlockContext.mjs";
 import { ActionContext } from "./context.mjs";
 const useA = ()=>({
         async run () {}
@@ -48,7 +48,8 @@ const useCloseAction = ()=>{
 };
 const useLinkageAction = ()=>{
     const fieldSchema = useFieldSchema();
-    const isRecordAction = useIsDetailBlock();
+    const ctx = 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/es/schema-component/antd/association-field/AssociationSelect.mjs

@@ -9,7 +9,7 @@ import { RecordProvider, useAPIClient, useApp, useCollectionRecordData } from ".
 import { isVariable } from "../../../variables/utils/isVariable.mjs";
 import { getInnermostKeyAndValue } from "../../common/utils/uitls.mjs";
 import { RemoteSelect } from "../remote-select/index.mjs";
-import hooks, { useAssociationFieldContext } from "./hooks.mjs";
+import hooks, { useAssociationFieldContext, useFieldNames } from "./hooks.mjs";
 const filterAnalyses = (filters)=>{
     if (!filters) return;
     const type = Object.keys(filters)[0] || '$and';
@@ -41,6 +41,7 @@ const InternalAssociationSelect = observer((props)=>{
     const isAllowAddNew = fieldSchema['x-add-new'];
     const { t } = useTranslation();
     const { multiple } = props;
+    const fieldNames = useFieldNames(props);
     const form = useForm();
     const api = useAPIClient();
     const resource = api.resource(collectionField.target);
@@ -68,11 +69,10 @@ const InternalAssociationSelect = 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) {
@@ -121,6 +121,7 @@ const InternalAssociationSelect = observer((props)=>{
                         width: '100%'
                     },
                     ...props,
+                    fieldNames: fieldNames,
                     size: 'middle',
                     objectValue: objectValue,
                     value: value || innerValue,

package/es/schema-component/antd/association-field/hooks.mjs

@@ -130,12 +130,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 = useFieldSchema();
+    const { options: collectionField } = useAssociationFieldContext();
+    const { getCollection } = 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 = createContext(null);
 SubFormContext.displayName = 'SubFormContext';