@tachybase/client 0.23.20 → 0.23.35

package/es/built-in/scroll-assistant/useJoystick.mjs

@@ -1,4 +1,5 @@
 import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
+import * as __WEBPACK_EXTERNAL_MODULE_lodash__ from "lodash";
 const useJoystick = (ref, callbacks)=>{
     (0, __WEBPACK_EXTERNAL_MODULE_react__.useEffect)(()=>{
         if (!ref.current) return;
@@ -17,6 +18,7 @@ const useJoystick = (ref, callbacks)=>{
         let moveY = 0;
         let displayX = 0;
         let displayY = 0;
+        const debouncedOnMousewheel = __WEBPACK_EXTERNAL_MODULE_lodash__["default"].debounce(onMousewheel, 16);
         ele.addEventListener('mousedown', down);
         ele.addEventListener('mousemove', move);
         ele.addEventListener('mouseup', up);
@@ -24,7 +26,7 @@ const useJoystick = (ref, callbacks)=>{
         ele.addEventListener('touchmove', move);
         ele.addEventListener('touchend', up);
         ele.addEventListener('contextmenu', onContextmenu);
-        ele.addEventListener('mousewheel', onMousewheel);
+        ele.addEventListener('mousewheel', debouncedOnMousewheel);
         const stickEle = createStickCanvas();
         const baseEle = createBaseCanvas();
         ele.appendChild(baseEle);

package/es/built-in/setting-layout/SettingLayout.mjs

@@ -1,13 +1,14 @@
 import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__ from "react/jsx-runtime";
-import "react";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_icons__ from "@ant-design/icons";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_pro_components__ from "@ant-design/pro-components";
 import * as __WEBPACK_EXTERNAL_MODULE_antd__ from "antd";
 import * as __WEBPACK_EXTERNAL_MODULE_react_router__ from "react-router";
+import * as __WEBPACK_EXTERNAL_MODULE__index_mjs__ from "../../index.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__user_index_mjs__ from "../../user/index.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__admin_layout_index_mjs__ from "../admin-layout/index.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__admin_layout_AdminProvider_mjs__ from "../admin-layout/AdminProvider.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__system_settings_index_mjs__ from "../system-settings/index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__style_mjs__ from "./style.mjs";
 const SettingLayout = (param)=>{
     let { selectedKeys, onClick, route, children, fullscreen } = param;
     var _result_data_data, _result_data, _result_data_data_logo, _result_data_data1, _result_data1, _data_data, _data_data1, _data_data2;
@@ -20,18 +21,26 @@ const SettingLayout = (param)=>{
         fixedHeader: true,
         siderMenuType: 'sub'
     };
+    const app = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useApp)();
     const location = (0, __WEBPACK_EXTERNAL_MODULE_react_router__.useLocation)();
     const navigate = (0, __WEBPACK_EXTERNAL_MODULE_react_router__.useNavigate)();
     const { data } = (0, __WEBPACK_EXTERNAL_MODULE__user_index_mjs__.useCurrentUserContext)();
     const result = (0, __WEBPACK_EXTERNAL_MODULE__system_settings_index_mjs__.useSystemSettings)();
+    const { styles } = (0, __WEBPACK_EXTERNAL_MODULE__style_mjs__.useStyles)();
+    const redirectToUserHome = ()=>{
+        if (app.adminUrl.startsWith('/')) navigate(app.adminUrl);
+        else window.location.href = app.adminUrl;
+    };
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__admin_layout_AdminProvider_mjs__.AdminProvider, {
         children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__ant_design_pro_components__.ProConfigProvider, {
             hashed: false,
             children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__ant_design_pro_components__.ProLayout, {
+                className: styles.settingLayout,
                 title: null == result ? void 0 : null === (_result_data = result.data) || void 0 === _result_data ? void 0 : null === (_result_data_data = _result_data.data) || void 0 === _result_data_data ? void 0 : _result_data_data.title,
                 logo: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)("img", {
                     src: null == result ? void 0 : null === (_result_data1 = result.data) || void 0 === _result_data1 ? void 0 : null === (_result_data_data1 = _result_data1.data) || void 0 === _result_data_data1 ? void 0 : null === (_result_data_data_logo = _result_data_data1.logo) || void 0 === _result_data_data_logo ? void 0 : _result_data_data_logo.url
                 }),
+                onMenuHeaderClick: redirectToUserHome,
                 bgLayoutImgList: [
                     {
                         src: 'https://img.alicdn.com/imgextra/i2/O1CN01O4etvp1DvpFLKfuWq_!!6000000000279-2-tps-609-606.png',

package/es/built-in/{assistant/calculator → setting-layout}/style.d.ts

@@ -1,3 +1,3 @@
 export declare const useStyles: (props?: unknown) => import("antd-style").ReturnStyles<{
-    container: import("antd-style").SerializedStyles;
+    settingLayout: import("antd-style").SerializedStyles;
 }>;

package/es/built-in/setting-layout/style.mjs

@@ -0,0 +1,25 @@
+import * as __WEBPACK_EXTERNAL_MODULE_antd_style__ from "antd-style";
+function _tagged_template_literal(strings, raw) {
+    if (!raw) raw = strings.slice(0);
+    return Object.freeze(Object.defineProperties(strings, {
+        raw: {
+            value: Object.freeze(raw)
+        }
+    }));
+}
+function _templateObject() {
+    const data = _tagged_template_literal([
+        "\n      /* Depends on antd's ProLayout component structure */\n      .ant-pro-global-header-logo {\n        cursor: pointer;\n      }\n    "
+    ]);
+    _templateObject = function() {
+        return data;
+    };
+    return data;
+}
+const useStyles = (0, __WEBPACK_EXTERNAL_MODULE_antd_style__.createStyles)((param)=>{
+    let { css, token } = param;
+    return {
+        settingLayout: css(_templateObject())
+    };
+});
+export { useStyles };

package/es/collection-manager/action-hooks.d.ts

@@ -17,10 +17,7 @@ export declare const useKanbanEvents: () => {
         toPosition: any;
     }): Promise<void>;
 };
-export declare const useSortFields: (collectionName: string) => {
-    value: any;
-    label: any;
-}[];
+export declare const useSortFields: (collectionName: any, depth?: number, parentFieldName?: string, parentLabel?: string) => any[];
 export declare const useChildrenCollections: (collectionName: string) => {
     value: any;
     label: any;

package/es/collection-manager/action-hooks.mjs

@@ -74,21 +74,49 @@ const useKanbanEvents = ()=>{
         }
     };
 };
-const useSortFields = (collectionName)=>{
+const toOneField = (field)=>[
+        'belongsTo',
+        'hasOne'
+    ].includes(field.type);
+const useSortFields = function(collectionName) {
+    let depth = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : 1, parentFieldName = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : '', parentLabel = arguments.length > 3 && void 0 !== arguments[3] ? arguments[3] : '';
+    const { t } = (0, __WEBPACK_EXTERNAL_MODULE_react_i18next__.useTranslation)();
     const { getCollectionFields, getInterface } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useCollectionManager_deprecated)();
     const fields = getCollectionFields(collectionName);
-    return fields.filter((field)=>{
-        if (!field.interface) return false;
-        const fieldInterface = getInterface(field.interface);
-        if (null == fieldInterface ? void 0 : fieldInterface.sortable) return true;
-        return false;
-    }).map((field)=>{
+    if (!Array.isArray(fields) || 0 === fields.length) return [];
+    fields.sort((a, b)=>{
+        const toOnFieldA = toOneField(a);
+        const toOnFieldB = toOneField(b);
+        if (toOnFieldA && !toOnFieldB) return 1;
+        if (!toOnFieldA && toOnFieldB) return -1;
+        return a.sort - b.sort;
+    });
+    return fields.map((field)=>{
         var _field_uiSchema;
-        return {
-            value: field.name,
-            label: (null == field ? void 0 : null === (_field_uiSchema = field.uiSchema) || void 0 === _field_uiSchema ? void 0 : _field_uiSchema.title) || field.name
+        if (!field.interface) return null;
+        const fieldInterface = getInterface(field.interface);
+        if (!(null == fieldInterface ? void 0 : fieldInterface.sortable) && !toOneField(field)) return null;
+        if (!(null == fieldInterface ? void 0 : fieldInterface.sortable) && depth >= 2) return null;
+        if (field.target === collectionName) return null;
+        const value = parentFieldName ? "".concat(parentFieldName, ".").concat(field.name) : field.name;
+        const currentLabel = (null == field ? void 0 : null === (_field_uiSchema = field.uiSchema) || void 0 === _field_uiSchema ? void 0 : _field_uiSchema.title) || field.name;
+        let fullLabel = '';
+        if (parentLabel) {
+            if (parentLabel.includes('{{') || currentLabel.includes('{{')) {
+                const formatLabel = (label)=>label.includes('{{t(') ? "t(".concat(label.slice(4, -3), ")") : label.includes('{{') ? "t(".concat(label.slice(2, -2), ")") : '"'.concat(label, '"');
+                let formattedParentLabel = formatLabel(parentLabel);
+                const formattedCurrentLabel = formatLabel(currentLabel);
+                fullLabel = "{{t(".concat(formattedParentLabel, ' +  "/" + ').concat(formattedCurrentLabel, ")}}");
+            } else fullLabel = "".concat(parentLabel, " / ").concat(currentLabel);
+        } else fullLabel = currentLabel;
+        const option = {
+            label: currentLabel,
+            fullLabel,
+            value
         };
-    });
+        if (field.target) option.children = useSortFields(field.target, depth + 1, value, fullLabel);
+        return option;
+    }).filter(Boolean);
 };
 const useChildrenCollections = (collectionName)=>{
     const { getChildrenCollections } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useCollectionManager_deprecated)();

package/es/icon/preloaded.mjs

@@ -36,7 +36,7 @@ const Approval = ()=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runti
         ]
     });
 const ApprovalNew = ()=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)("svg", {
-        "fill-rule": "evenodd",
+        fillRule: "evenodd",
         viewBox: "0 0 34 34",
         focusable: "false",
         fill: "currentColor",
@@ -51,7 +51,7 @@ const ApprovalNew = ()=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_ru
                         id: "Ellipse 42",
                         d: "M16.8963 7C14.6872 7 12.8963 8.79086 12.8963 11C12.8963 12.2907 13.5076 13.4385 14.4564 14.1699C14.7966 14.4322 15.018 14.8415 14.9526 15.266L14.6723 17.0856C14.5972 17.5734 14.1774 17.9334 13.6839 17.9334H10.999C10.4467 17.9334 9.99902 18.3811 9.99902 18.9334V22.012",
                         stroke: "white",
-                        "stroke-width": "1.5"
+                        strokeWidth: "1.5"
                     }),
                     /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)("path", {
                         id: "Ellipse 43",
@@ -62,8 +62,8 @@ const ApprovalNew = ()=>/*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_ru
                         id: "Vector 5",
                         d: "M10.0479 25.0195H23.7546",
                         stroke: "white",
-                        "stroke-width": "1.5",
-                        "stroke-linecap": "round"
+                        strokeWidth: "1.5",
+                        strokeLinecap: "round"
                     })
                 ]
             })

package/es/modules/actions/associate/AssociateActionInitializer.d.ts

@@ -0,0 +1 @@
+export declare const AssociateActionInitializer: () => import("react/jsx-runtime").JSX.Element;

package/es/modules/actions/associate/AssociateActionInitializer.mjs

@@ -0,0 +1,71 @@
+import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__ from "react/jsx-runtime";
+import "react";
+import * as __WEBPACK_EXTERNAL_MODULE__application_index_mjs__ from "../../../application/index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__schema_initializer_items_ActionInitializer_mjs__ from "../../../schema-initializer/items/ActionInitializer.mjs";
+const AssociateActionInitializer = ()=>{
+    const schema = {
+        type: 'void',
+        'x-action': 'associate',
+        'x-acl-action': 'associate',
+        title: "{{t('Associate')}}",
+        'x-toolbar': 'ActionSchemaToolbar',
+        'x-settings': 'actionSettings:associate',
+        'x-component': 'Action',
+        'x-component-props': {
+            actionType: 'associations',
+            openMode: 'drawer',
+            type: 'primary',
+            icon: 'PlusOutlined'
+        },
+        properties: {
+            drawer: {
+                type: 'void',
+                title: '{{ t("Select record") }}',
+                'x-component': 'Action.Container',
+                'x-component-props': {
+                    className: 'nb-record-picker-selector'
+                },
+                'x-decorator': 'AssociateActionProvider',
+                properties: {
+                    grid: {
+                        type: 'void',
+                        'x-component': 'Grid',
+                        'x-initializer': 'popup:tableSelector:addBlock',
+                        properties: {}
+                    },
+                    footer: {
+                        'x-component': 'Action.Container.Footer',
+                        'x-component-props': {},
+                        properties: {
+                            actions: {
+                                type: 'void',
+                                'x-component': 'ActionBar',
+                                'x-component-props': {},
+                                properties: {
+                                    submit: {
+                                        title: '{{ t("Submit") }}',
+                                        'x-action': 'submit',
+                                        'x-component': 'Action',
+                                        'x-use-component-props': 'usePickActionProps',
+                                        'x-toolbar': 'ActionSchemaToolbar',
+                                        'x-settings': 'actionSettings:submit',
+                                        'x-component-props': {
+                                            type: 'primary',
+                                            htmlType: 'submit'
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+    const itemConfig = (0, __WEBPACK_EXTERNAL_MODULE__application_index_mjs__.useSchemaInitializerItem)();
+    return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__schema_initializer_items_ActionInitializer_mjs__.ActionInitializer, {
+        item: itemConfig,
+        schema: schema
+    });
+};
+export { AssociateActionInitializer };

package/es/modules/actions/associate/AssociateActionProvider.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+interface AssociateActionProviderProps {
+    children: React.ReactNode;
+    onChange?: (selectedRows: any[]) => void;
+}
+export declare const AssociateActionProvider: (props: AssociateActionProviderProps) => import("react/jsx-runtime").JSX.Element;
+export {};

package/es/modules/actions/associate/AssociateActionProvider.mjs

@@ -0,0 +1,82 @@
+import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__ from "react/jsx-runtime";
+import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
+import * as __WEBPACK_EXTERNAL_MODULE__index_mjs__ from "../../../index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__block_provider_TableSelectorProvider_mjs__ from "../../../block-provider/TableSelectorProvider.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__schema_component_antd_record_picker_index_mjs__ from "../../../schema-component/antd/record-picker/index.mjs";
+const useTableSelectorProps = ()=>{
+    const { setSelectedRows } = (0, __WEBPACK_EXTERNAL_MODULE_react__.useContext)(__WEBPACK_EXTERNAL_MODULE__schema_component_antd_record_picker_index_mjs__.RecordPickerContext);
+    const { onRowSelectionChange, rowKey = 'id', ...others } = (0, __WEBPACK_EXTERNAL_MODULE__block_provider_TableSelectorProvider_mjs__.useTableSelectorProps)();
+    return {
+        ...others,
+        rowKey,
+        rowSelection: {
+            type: 'checkbox'
+        },
+        onRowSelectionChange (selectedRowKeys, selectedRows) {
+            null == setSelectedRows || setSelectedRows(selectedRowKeys);
+            null == onRowSelectionChange || onRowSelectionChange(selectedRowKeys, selectedRows);
+        }
+    };
+};
+const AssociateActionProvider = (props)=>{
+    const [selectedRows, setSelectedRows] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)([]);
+    const collection = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useCollection)();
+    const { resource, service, block, __parent } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useBlockRequestContext)();
+    const pickerProps = {
+        size: 'small',
+        onChange: null == props ? void 0 : props.onChange,
+        selectedRows,
+        setSelectedRows
+    };
+    const usePickActionProps = ()=>{
+        const { selectedRows } = (0, __WEBPACK_EXTERNAL_MODULE_react__.useContext)(__WEBPACK_EXTERNAL_MODULE__schema_component_antd_record_picker_index_mjs__.RecordPickerContext);
+        const { setVisible, setFormValueChanged } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useActionContext)();
+        return {
+            async onClick (e, callBack) {
+                await resource.add({
+                    values: selectedRows
+                });
+                null == callBack || callBack();
+                null == setVisible || setVisible(false);
+                if (block && 'TableField' !== block) {
+                    var __parent_service_refresh, __parent_service;
+                    null == __parent || null === (__parent_service = __parent.service) || void 0 === __parent_service || null === (__parent_service_refresh = __parent_service.refresh) || void 0 === __parent_service_refresh || __parent_service_refresh.call(__parent_service);
+                    null == setFormValueChanged || setFormValueChanged(false);
+                }
+            }
+        };
+    };
+    const getFilter = ()=>{
+        var _service_data;
+        const targetKey = (null == collection ? void 0 : collection.filterTargetKey) || 'id';
+        if (null === (_service_data = service.data) || void 0 === _service_data ? void 0 : _service_data.data) {
+            var _service_data1;
+            const list = null === (_service_data1 = service.data) || void 0 === _service_data1 ? void 0 : _service_data1.data.map((option)=>option[targetKey]).filter(Boolean);
+            const filter = list.length ? {
+                $and: [
+                    {
+                        ["".concat(targetKey, ".$ne")]: list
+                    }
+                ]
+            } : {};
+            return filter;
+        }
+        return {};
+    };
+    return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__schema_component_antd_record_picker_index_mjs__.RecordPickerProvider, {
+        ...pickerProps,
+        children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__index_mjs__.SchemaComponentOptions, {
+            scope: {
+                useTableSelectorProps,
+                usePickActionProps
+            },
+            children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__block_provider_TableSelectorProvider_mjs__.TableSelectorParamsProvider, {
+                params: {
+                    filter: getFilter()
+                },
+                children: props.children
+            })
+        })
+    });
+};
+export { AssociateActionProvider };

package/es/modules/actions/associate/AssociateActionSettings.d.ts

@@ -0,0 +1,2 @@
+import { SchemaSettings } from '../../../application/schema-settings/SchemaSettings';
+export declare const associateActionSettings: SchemaSettings<{}>;

package/es/modules/actions/associate/AssociateActionSettings.mjs

@@ -0,0 +1,57 @@
+import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
+import * as __WEBPACK_EXTERNAL_MODULE__application_index_mjs__ from "../../../application/index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__application_schema_settings_SchemaSettings_mjs__ from "../../../application/schema-settings/SchemaSettings.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__ from "../../../collection-manager/index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__schema_component_antd_action_Action_Designer_mjs__ from "../../../schema-component/antd/action/Action.Designer.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__schema_items_index_mjs__ from "../../../schema-items/index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__schema_settings_SchemaSettings_mjs__ from "../../../schema-settings/SchemaSettings.mjs";
+const associateActionSettings = new __WEBPACK_EXTERNAL_MODULE__application_schema_settings_SchemaSettings_mjs__.SchemaSettings({
+    name: 'actionSettings:associate',
+    items: [
+        {
+            name: 'editButton',
+            Component: __WEBPACK_EXTERNAL_MODULE__schema_component_antd_action_Action_Designer_mjs__.ButtonEditor,
+            useComponentProps () {
+                const { buttonEditorProps } = (0, __WEBPACK_EXTERNAL_MODULE__application_index_mjs__.useSchemaToolbar)();
+                return buttonEditorProps;
+            }
+        },
+        {
+            name: 'openMode',
+            Component: __WEBPACK_EXTERNAL_MODULE__schema_items_index_mjs__.SchemaSettingOpenModeSchemaItems,
+            componentProps: {
+                openMode: true,
+                openSize: true
+            }
+        },
+        {
+            name: 'enableChildCollections',
+            Component: __WEBPACK_EXTERNAL_MODULE__schema_settings_SchemaSettings_mjs__.SchemaSettingsEnableChildCollections,
+            useComponentProps () {
+                const { name } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
+                return {
+                    collectionName: name
+                };
+            },
+            useVisible () {
+                const { name } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
+                const { getChildrenCollections } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)();
+                const isChildCollectionAction = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>getChildrenCollections(name).length > 0, [
+                    getChildrenCollections,
+                    name
+                ]);
+                return isChildCollectionAction;
+            }
+        },
+        {
+            name: 'delete',
+            sort: 100,
+            Component: __WEBPACK_EXTERNAL_MODULE__schema_component_antd_action_Action_Designer_mjs__.RemoveButton,
+            useComponentProps () {
+                const { removeButtonProps } = (0, __WEBPACK_EXTERNAL_MODULE__application_index_mjs__.useSchemaToolbar)();
+                return removeButtonProps;
+            }
+        }
+    ]
+});
+export { associateActionSettings };

package/es/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.mjs

@@ -109,7 +109,8 @@ const commonItems = [
                                                 'x-component-props': {
                                                     style: {
                                                         width: 260
-                                                    }
+                                                    },
+                                                    optionLabelProp: 'fullLabel'
                                                 }
                                             },
                                             direction: {

package/es/modules/blocks/data-blocks/form/RecordFormBlockInitializer.mjs

@@ -1,5 +1,6 @@
 import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__ from "react/jsx-runtime";
 import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
+import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema__ from "@tachybase/schema";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_icons__ from "@ant-design/icons";
 import * as __WEBPACK_EXTERNAL_MODULE__application_index_mjs__ from "../../../../application/index.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__ from "../../../../collection-manager/index.mjs";
@@ -34,23 +35,27 @@ const RecordFormBlockInitializer = ()=>{
 };
 function useCreateEditFormBlock() {
     const { insert } = (0, __WEBPACK_EXTERNAL_MODULE__application_index_mjs__.useSchemaInitializer)();
+    const cm = (0, __WEBPACK_EXTERNAL_MODULE__data_source_index_mjs__.useCollectionManager)();
+    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
+    const actionType = null == fieldSchema ? void 0 : fieldSchema['actionType'];
     const association = (0, __WEBPACK_EXTERNAL_MODULE__data_source_index_mjs__.useAssociationName)();
     const createEditFormBlock = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((param)=>{
         let { item } = param;
-        const collectionName = item.collectionName || item.name;
-        if (!association && item.associationField) {
+        const field = item.associationField;
+        const collectionName = (null == field ? void 0 : field.target) ? cm.getCollection(field.target).name : item.collectionName || item.name;
+        if (item.associationField) {
             const field = item.associationField;
             insert((0, __WEBPACK_EXTERNAL_MODULE__createEditFormBlockUISchema_mjs__.createEditFormBlockUISchema)({
                 dataSource: item.dataSource,
                 association: "".concat(field.collectionName, ".").concat(field.name)
             }));
-        } else insert((0, __WEBPACK_EXTERNAL_MODULE__createEditFormBlockUISchema_mjs__.createEditFormBlockUISchema)(association ? {
+        } else insert((0, __WEBPACK_EXTERNAL_MODULE__createEditFormBlockUISchema_mjs__.createEditFormBlockUISchema)(association && !actionType ? {
             association,
             dataSource: item.dataSource,
             isCurrent: true
         } : {
-            collectionName,
-            dataSource: item.dataSource
+            dataSource: item.dataSource,
+            collectionName
         }));
     }, [
         association,
@@ -60,16 +65,18 @@ function useCreateEditFormBlock() {
         let { item } = param;
         if ('FormItem' !== item.template.componentName) return templateSchema;
         {
-            const blockSchema = (0, __WEBPACK_EXTERNAL_MODULE__createEditFormBlockUISchema_mjs__.createEditFormBlockUISchema)(association ? {
-                association,
-                dataSource: item.dataSource,
-                templateSchema: templateSchema,
-                isCurrent: true
-            } : {
-                collectionName: item.collectionName || item.name,
+            const options = {
                 dataSource: item.dataSource,
-                templateSchema: templateSchema
-            });
+                templateSchema
+            };
+            if (item.associationField) {
+                const field = item.associationField;
+                options.association = "".concat(field.collectionName, ".").concat(field.name);
+            } else if (association) {
+                options.association = association;
+                options.isCurrent = true;
+            } else options.collectionName = item.collectionName || item.name;
+            const blockSchema = (0, __WEBPACK_EXTERNAL_MODULE__createEditFormBlockUISchema_mjs__.createEditFormBlockUISchema)(options);
             if ('reference' === item.mode) blockSchema['x-template-key'] = item.template.key;
             return blockSchema;
         }

package/es/modules/blocks/data-blocks/form/createEditFormBlockUISchema.d.ts

@@ -1,5 +1,5 @@
 import { ISchema } from '@tachybase/schema';
-interface EditFormBlockOptions {
+export interface EditFormBlockOptions {
     dataSource: string;
     /** 如果传了 association 就不需要再传 collectionName 了 */
     collectionName?: string;
@@ -11,4 +11,3 @@ interface EditFormBlockOptions {
     isCurrent?: boolean;
 }
 export declare function createEditFormBlockUISchema(options: EditFormBlockOptions): ISchema;
-export {};

package/es/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.mjs

@@ -157,7 +157,8 @@ const gridCardBlockSettings = new __WEBPACK_EXTERNAL_MODULE__application_schema_
                                                     'x-component-props': {
                                                         style: {
                                                             width: 260
-                                                        }
+                                                        },
+                                                        optionLabelProp: 'fullLabel'
                                                     }
                                                 },
                                                 direction: {

package/es/modules/blocks/data-blocks/list/listBlockSettings.mjs

@@ -101,7 +101,8 @@ const listBlockSettings = new __WEBPACK_EXTERNAL_MODULE__application_schema_sett
                                                     'x-component-props': {
                                                         style: {
                                                             width: 260
-                                                        }
+                                                        },
+                                                        optionLabelProp: 'fullLabel'
                                                     }
                                                 },
                                                 direction: {

package/es/modules/blocks/data-blocks/table/TableActionInitializers.mjs

@@ -44,6 +44,21 @@ const tableActionInitializers = new __WEBPACK_EXTERNAL_MODULE__application_schem
                         ].includes(collection.template) || (null == collection ? void 0 : collection.writableView);
                     }
                 },
+                {
+                    type: 'item',
+                    title: "{{t('Associate')}}",
+                    name: 'associate',
+                    Component: 'AssociateActionInitializer',
+                    useVisible () {
+                        const collection = (0, __WEBPACK_EXTERNAL_MODULE__data_source_index_mjs__.useCollection)();
+                        const props = (0, __WEBPACK_EXTERNAL_MODULE__data_source_index_mjs__.useDataBlockProps)();
+                        return props.association && (![
+                            'view',
+                            'file',
+                            'sql'
+                        ].includes(collection.template) || (null == collection ? void 0 : collection.writableView));
+                    }
+                },
                 {
                     type: 'item',
                     title: "{{t('Delete')}}",

package/es/modules/blocks/data-blocks/table/tableBlockSettings.mjs

@@ -228,7 +228,8 @@ const tableBlockSettings = new __WEBPACK_EXTERNAL_MODULE__application_schema_set
                                                     'x-component-props': {
                                                         style: {
                                                             width: 260
-                                                        }
+                                                        },
+                                                        optionLabelProp: 'fullLabel'
                                                     }
                                                 },
                                                 direction: {

package/es/modules/blocks/data-blocks/table/tableColumnSettings.mjs

@@ -112,12 +112,12 @@ const tableColumnSettings = new __WEBPACK_EXTERNAL_MODULE__application_schema_se
                     name: 'sortable',
                     type: 'switch',
                     useVisible () {
-                        const collection = (0, __WEBPACK_EXTERNAL_MODULE__data_source_collection_CollectionProvider_mjs__.useCollection)();
+                        (0, __WEBPACK_EXTERNAL_MODULE__data_source_collection_CollectionProvider_mjs__.useCollection)();
                         const { collectionField } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_antd_table_v2_Table_Column_Decorator_mjs__.useColumnSchema)();
                         const { getInterface } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)();
                         const interfaceCfg = getInterface(null == collectionField ? void 0 : collectionField.interface);
                         const { currentMode } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_antd_association_field_hooks_mjs__.useAssociationFieldContext)();
-                        return (null == interfaceCfg ? void 0 : interfaceCfg.sortable) === true && !currentMode && (null == collection ? void 0 : collection.name) === (null == collectionField ? void 0 : collectionField.collectionName);
+                        return (null == interfaceCfg ? void 0 : interfaceCfg.sortable) === true && !currentMode;
                     },
                     useComponentProps () {
                         const field = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();

package/es/modules/blocks/data-blocks/table-selector/tableSelectorBlockSettings.mjs

@@ -162,7 +162,8 @@ const tableSelectorBlockSettings = new __WEBPACK_EXTERNAL_MODULE__application_sc
                                                     'x-component-props': {
                                                         style: {
                                                             width: 260
-                                                        }
+                                                        },
+                                                        optionLabelProp: 'fullLabel'
                                                     }
                                                 },
                                                 direction: {

package/es/modules/fields/component/Cascader/cascaderComponentFieldSettings.mjs

@@ -72,7 +72,8 @@ const SchemaSettingsSortingRule = function(props) {
                                         'x-component-props': {
                                             style: {
                                                 width: 260
-                                            }
+                                            },
+                                            optionLabelProp: 'fullLabel'
                                         }
                                     },
                                     direction: {

package/es/modules/fields/component/Radio/radioComponentFieldSettings.mjs

@@ -24,6 +24,10 @@ const radioComponentFieldSettings = new __WEBPACK_EXTERNAL_MODULE__application_s
                     {
                         label: t('Radio group'),
                         value: 'Radio group'
+                    },
+                    {
+                        label: t('Select'),
+                        value: 'Select'
                     }
                 ];
                 const { dn } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useDesignable)();