@tachybase/client 0.23.48 → 1.0.6

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

@@ -1,5 +1,6 @@
 import { ISchema } from '@tachybase/schema';
 import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings';
+import { FieldNames } from '../../../../schema-component';
 export declare const setDefaultSortingRules: {
     name: string;
     type: string;
@@ -29,52 +30,89 @@ export declare const allowAddNewData: {
         onChange(value: any): void;
     };
 };
-export declare const isQuickAddTabs: {
+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;
-        checked: any;
-        onChange(value: any): void;
-    };
-};
-export declare const setQuickAddTabs: {
-    name: string;
-    type: string;
-    useComponentProps(): {
-        title: string;
-        options: {
-            label: any;
-            value: any;
-            name?: any;
-            collectionName?: string;
-            sourceKey?: string;
-            uiSchema?: any;
-            target?: string;
-        }[];
-        value: any;
-        onChange(mode: any): void;
-    };
-    useVisible(): any;
-};
-export declare const setQuickAddParentTabs: {
-    name: string;
-    type: string;
-    useComponentProps(): {
-        title: string;
-        options: {
-            label: any;
-            value: any;
-            name?: any;
-            collectionName?: string;
-            sourceKey?: string;
-            uiSchema?: any;
-            target?: string;
-        }[];
-        value: any;
-        onChange(mode: any): void;
+        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>;
     };
-    useVisible(): boolean;
 };
 export declare const subTablePopoverComponentFieldSettings: SchemaSettings<{}>;

package/es/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.mjs

@@ -1,3 +1,4 @@
+import * as __WEBPACK_EXTERNAL_MODULE_react__ from "react";
 import * as __WEBPACK_EXTERNAL_MODULE__tachybase_components__ from "@tachybase/components";
 import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema__ from "@tachybase/schema";
 import * as __WEBPACK_EXTERNAL_MODULE_react_i18next__ from "react-i18next";
@@ -8,6 +9,7 @@ import * as __WEBPACK_EXTERNAL_MODULE__data_source_index_mjs__ from "../../../..
 import * as __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__ from "../../../../schema-component/index.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__schema_component_antd_association_field_util_mjs__ from "../../../../schema-component/antd/association-field/util.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__schema_component_antd_form_item_index_mjs__ from "../../../../schema-component/antd/form-item/index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__secondLevelSelect_mjs__ from "./secondLevelSelect.mjs";
 const fieldComponent = {
     name: 'fieldComponent',
     type: 'select',
@@ -233,51 +235,24 @@ const allowAddNewData = {
         };
     }
 };
-const isQuickAddTabs = {
-    name: 'isquickaddtabs',
-    type: 'switch',
+const clickToSelect = {
+    name: 'clicktoselect',
+    type: 'modal',
     useVisible () {
         const readPretty = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_antd_form_item_index_mjs__.useIsFieldReadPretty)();
         const isAssociationField = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_antd_form_item_index_mjs__.useIsAssociationField)();
         return !readPretty && isAssociationField;
     },
     useComponentProps () {
-        var _fieldSchema_xcomponentprops;
+        var _fieldSchema_xcomponentprops_quickAddField, _fieldSchema_xcomponentprops_quickAddParentCollection, _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops1;
         const { t } = (0, __WEBPACK_EXTERNAL_MODULE_react_i18next__.useTranslation)();
         const field = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
         const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
         const { dn, refresh } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useDesignable)();
-        return {
-            title: t('Is Quick Add Tabs'),
-            checked: (null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : _fieldSchema_xcomponentprops.isQuickAdd) || false,
-            onChange (value) {
-                const schema = {
-                    ['x-uid']: fieldSchema['x-uid']
-                };
-                field.componentProps['isQuickAdd'] = value;
-                fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
-                fieldSchema['x-component-props']['isQuickAdd'] = value;
-                schema['x-component-props'] = fieldSchema['x-component-props'];
-                dn.emit('patch', {
-                    schema
-                });
-                refresh();
-            }
-        };
-    }
-};
-const setQuickAddTabs = {
-    name: 'setquickaddtabs',
-    type: 'select',
-    useComponentProps () {
-        const { t } = (0, __WEBPACK_EXTERNAL_MODULE_react_i18next__.useTranslation)();
-        const field = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
         const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
-        const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
         const cm = (0, __WEBPACK_EXTERNAL_MODULE__data_source_index_mjs__.useCollectionManager)();
+        const [firstLevelValue, setFirstLevelValue] = (0, __WEBPACK_EXTERNAL_MODULE_react__.useState)((null === (_fieldSchema_xcomponentprops_quickAddField = fieldSchema['x-component-props']['quickAddField']) || void 0 === _fieldSchema_xcomponentprops_quickAddField ? void 0 : _fieldSchema_xcomponentprops_quickAddField.value) || 'none');
         const options = cm.getCollection(fieldSchema['x-collection-field']);
-        const defVal = fieldSchema['x-component-props']['quickAddField'] || 'none';
-        const { dn } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useDesignable)();
         const isAddNewForm = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useIsAddNewForm)();
         const fieldTabsOptions = options.fields.map((item)=>{
             if ('m2o' === item.interface || 'select' === item.interface) {
@@ -293,84 +268,117 @@ const setQuickAddTabs = {
             label: 'none',
             value: 'none'
         });
-        return {
-            title: t('Set Quick Add Tabs'),
-            options: fieldTabsOptions,
-            value: defVal,
-            onChange (mode) {
-                const schema = {
-                    ['x-uid']: fieldSchema['x-uid']
-                };
-                fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
-                fieldSchema['x-component-props']['quickAddField'] = {
-                    fieldInterface: fieldTabsOptions.find((item)=>item.value === mode)['interface'] || 'none',
-                    value: mode
-                };
-                schema['x-component-props'] = fieldSchema['x-component-props'];
-                field.componentProps = field.componentProps || {};
-                field.componentProps['quickAddField'] = fieldSchema['x-component-props']['quickAddField'];
-                if ((0, __WEBPACK_EXTERNAL_MODULE__schema_component_antd_association_field_util_mjs__.isSubMode)(fieldSchema) && isAddNewForm) {
-                    schema.default = null;
-                    fieldSchema.default = null;
-                    field.setInitialValue(null);
-                    field.setValue(null);
-                }
-                dn.emit('patch', {
-                    schema
-                });
-                dn.refresh();
-            }
-        };
-    },
-    useVisible () {
-        const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-        return fieldSchema['x-component-props']['isQuickAdd'];
-    }
-};
-const setQuickAddParentTabs = {
-    name: 'setquickaddparenttabs',
-    type: 'select',
-    useComponentProps () {
-        var _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops_quickAddParentCollection, _fieldSchema_xcomponentprops1;
-        const { t } = (0, __WEBPACK_EXTERNAL_MODULE_react_i18next__.useTranslation)();
-        const field = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useField)();
-        const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
-        const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-        const cm = (0, __WEBPACK_EXTERNAL_MODULE__data_source_index_mjs__.useCollectionManager)();
-        const { value: quickField } = (null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : _fieldSchema_xcomponentprops['quickAddField']) || {};
-        const options = cm.getCollectionFields("".concat(fieldSchema['x-collection-field'], ".").concat(quickField));
-        const { dn } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useDesignable)();
-        const isAddNewForm = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useIsAddNewForm)();
-        const fieldTabsOptions = options.map((item)=>{
+        const Parentoptions = cm.getCollectionFields("".concat(fieldSchema['x-collection-field'], ".").concat(firstLevelValue));
+        const fieldParentTabsOptions = Parentoptions.map((item)=>{
             if ('m2o' === item.interface) return {
                 ...item,
                 label: compile(item.uiSchema.title),
                 value: item.name
             };
         }).filter(Boolean);
-        fieldTabsOptions.unshift({
+        fieldParentTabsOptions.unshift({
             label: t('none'),
             value: 'none'
         });
-        const defValue = (null === (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops1 ? void 0 : null === (_fieldSchema_xcomponentprops_quickAddParentCollection = _fieldSchema_xcomponentprops1['quickAddParentCollection']) || void 0 === _fieldSchema_xcomponentprops_quickAddParentCollection ? void 0 : _fieldSchema_xcomponentprops_quickAddParentCollection.value) || 'none';
+        const defParentVal = (null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : null === (_fieldSchema_xcomponentprops_quickAddParentCollection = _fieldSchema_xcomponentprops['quickAddParentCollection']) || void 0 === _fieldSchema_xcomponentprops_quickAddParentCollection ? void 0 : _fieldSchema_xcomponentprops_quickAddParentCollection.value) || 'none';
+        const schema = {
+            type: 'object',
+            title: t('Click to select'),
+            properties: {
+                isquickaddtabs: {
+                    title: t('Enable quick create'),
+                    type: 'boolean',
+                    default: (null === (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops1 ? void 0 : _fieldSchema_xcomponentprops1.isQuickAdd) || false,
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Switch',
+                    'x-component-props': {}
+                },
+                firstLevelselection: {
+                    title: t('Set Quick Add Tabs'),
+                    default: firstLevelValue,
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Select',
+                    enum: fieldTabsOptions,
+                    'x-reactions': [
+                        {
+                            dependencies: [
+                                'isquickaddtabs'
+                            ],
+                            fulfill: {
+                                state: {
+                                    visible: '{{$deps[0] === true}}'
+                                }
+                            }
+                        }
+                    ],
+                    'x-component-props': {
+                        onChange (value) {
+                            setFirstLevelValue(value);
+                        }
+                    }
+                },
+                secondLevelselection: {
+                    title: t('Set Quick Add Parent Tabs'),
+                    default: defParentVal,
+                    'x-decorator': 'FormItem',
+                    'x-component': 'SecondLevelSelect',
+                    'x-reactions': [
+                        {
+                            dependencies: [
+                                'firstLevelselection',
+                                'isquickaddtabs'
+                            ],
+                            fulfill: {
+                                state: {
+                                    visible: '{{$deps[0] !== "none" && $deps[1] === true}}'
+                                },
+                                schema: {
+                                    'x-component-props': {
+                                        firstLevelValue: '{{$deps[0]}}',
+                                        collectionField: fieldSchema['x-collection-field']
+                                    }
+                                }
+                            }
+                        }
+                    ]
+                }
+            }
+        };
         return {
-            title: t('Set Quick Add Parent Tabs'),
-            options: fieldTabsOptions,
-            value: defValue,
-            onChange (mode) {
+            components: {
+                Switch: __WEBPACK_EXTERNAL_MODULE__tachybase_components__.Switch,
+                SecondLevelSelect: __WEBPACK_EXTERNAL_MODULE__secondLevelSelect_mjs__.SecondLevelSelect
+            },
+            title: t('Quick create'),
+            schema,
+            onSubmit: async (param)=>{
+                let { isquickaddtabs, firstLevelselection, secondLevelselection } = param;
+                var _fieldTabsOptions_find;
                 const schema = {
                     ['x-uid']: fieldSchema['x-uid']
                 };
+                field.componentProps['isQuickAdd'] = isquickaddtabs;
+                fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+                fieldSchema['x-component-props']['isQuickAdd'] = isquickaddtabs;
+                schema['x-component-props'] = fieldSchema['x-component-props'];
+                fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+                fieldSchema['x-component-props']['quickAddField'] = {
+                    fieldInterface: (null === (_fieldTabsOptions_find = fieldTabsOptions.find((item)=>item.value === firstLevelselection)) || void 0 === _fieldTabsOptions_find ? void 0 : _fieldTabsOptions_find['interface']) || 'none',
+                    value: firstLevelselection
+                };
+                schema['x-component-props'] = fieldSchema['x-component-props'];
+                field.componentProps = field.componentProps || {};
+                field.componentProps['quickAddField'] = fieldSchema['x-component-props']['quickAddField'];
                 fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
                 fieldSchema['x-component-props']['quickAddParentCollection'] = {
-                    collectionField: "".concat(fieldSchema['x-collection-field'], ".").concat(quickField, ".").concat(mode),
-                    value: mode
+                    collectionField: "".concat(fieldSchema['x-collection-field'], ".").concat(firstLevelselection, ".").concat(secondLevelselection),
+                    value: secondLevelselection
                 };
                 schema['x-component-props'] = fieldSchema['x-component-props'];
                 field.componentProps = field.componentProps || {};
                 field.componentProps['quickAddParentCollection'] = {
-                    collectionField: "".concat(fieldSchema['x-collection-field'], ".").concat(quickField, ".").concat(mode),
-                    value: mode
+                    collectionField: "".concat(fieldSchema['x-collection-field'], ".").concat(firstLevelselection, ".").concat(secondLevelselection),
+                    value: secondLevelselection
                 };
                 if ((0, __WEBPACK_EXTERNAL_MODULE__schema_component_antd_association_field_util_mjs__.isSubMode)(fieldSchema) && isAddNewForm) {
                     schema.default = null;
@@ -379,15 +387,12 @@ const setQuickAddParentTabs = {
                     field.setValue(null);
                 }
                 dn.emit('patch', {
-                    schema
+                    schema: schema
                 });
+                refresh();
                 dn.refresh();
             }
         };
-    },
-    useVisible () {
-        const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
-        return fieldSchema['x-component-props']['isQuickAdd'] && fieldSchema['x-component-props']['quickAddField'] && 'none' !== fieldSchema['x-component-props']['quickAddField'];
     }
 };
 const subTablePopoverComponentFieldSettings = new __WEBPACK_EXTERNAL_MODULE__application_schema_settings_SchemaSettings_mjs__.SchemaSettings({
@@ -397,9 +402,7 @@ const subTablePopoverComponentFieldSettings = new __WEBPACK_EXTERNAL_MODULE__app
         allowAddNewData,
         allowSelectExistingRecord,
         setDefaultSortingRules,
-        isQuickAddTabs,
-        setQuickAddTabs,
-        setQuickAddParentTabs
+        clickToSelect
     ]
 });
-export { allowAddNewData, isQuickAddTabs, setDefaultSortingRules, setQuickAddParentTabs, setQuickAddTabs, subTablePopoverComponentFieldSettings };
+export { allowAddNewData, clickToSelect, setDefaultSortingRules, subTablePopoverComponentFieldSettings };

package/es/powered-by/index.mjs

@@ -1,5 +1,5 @@
 import * as __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__ from "react/jsx-runtime";
-import "react";
+import * as __WEBPACK_EXTERNAL_MODULE_react_i18next__ from "react-i18next";
 import * as __WEBPACK_EXTERNAL_MODULE__style_index_mjs__ from "../style/index.mjs";
 function _tagged_template_literal(strings, raw) {
     if (!raw) raw = strings.slice(0);
@@ -31,13 +31,10 @@ const PoweredBy = ()=>{
     const { styles } = useStyles();
     const date = new Date();
     const year = date.getFullYear();
-    return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsxs)("div", {
+    const { t } = (0, __WEBPACK_EXTERNAL_MODULE_react_i18next__.useTranslation)();
+    return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)("div", {
         className: styles.powerBy,
-        children: [
-            "\xa92023-",
-            year,
-            " TachyBase Team"
-        ]
+        children: "\xa92023-".concat(year, " ").concat(t('TachyBase Team'))
     });
 };
 export { PoweredBy };

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

@@ -204,7 +204,7 @@ function AfterSuccess() {
     const openMode = findSchema(ctx.fieldSchema);
     const component = fieldSchema.parent.parent['x-component'];
     const schema = {
-        ...__WEBPACK_EXTERNAL_MODULE__utils_mjs__.afterSuccessSchema
+        ...(0, __WEBPACK_EXTERNAL_MODULE__utils_mjs__.afterSuccessSchema)(t)
     };
     if ((!openMode || 'page' === openMode) && component.includes('Form') || !component.includes('Form')) delete schema.properties.popupClose;
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__schema_settings_SchemaSettings_mjs__.SchemaSettingsModalItem, {
@@ -312,7 +312,10 @@ function WorkflowSelectComponent(param) {
                         'config.collection': noCollection ? void 0 : workflowCollection,
                         sync: void 0 === props.filterSync ? void 0 : props.filterSync,
                         key: void 0 === props.filterKey ? void 0 : props.filterKey
-                    }
+                    },
+                    sort: [
+                        '-updatedAt'
+                    ]
                 }
             },
             optionFilter: optionFilter,
@@ -348,19 +351,53 @@ function WorkflowConfig() {
     const formAction = null == formBlock ? void 0 : formBlock.type;
     const buttonAction = fieldSchema['x-action'];
     const description = {
-        submit: t('Workflow will be triggered before or after submitting succeeded based on workflow type.', {
+        submit: t('Workflow will be triggered before or after submitting succeeded.', {
             ns: 'workflow'
         }),
-        'customize:save': t('Workflow will be triggered before or after submitting succeeded based on workflow type.', {
+        'customize:save': t('Workflow will be triggered before or after submitting succeeded.', {
             ns: 'workflow'
         }),
         'customize:triggerWorkflows': t('Workflow will be triggered directly once the button clicked, without data saving.', {
             ns: 'workflow'
         }),
-        destroy: t('Workflow will be triggered before deleting succeeded.', {
+        destroy: t('Workflow will be triggered before or after submitting succeeded.', {
             ns: 'workflow'
         })
     }[null == fieldSchema ? void 0 : fieldSchema['x-action']];
+    let orderColumn = {};
+    if ([
+        'submit',
+        'customize:save',
+        'destroy'
+    ].includes(null == fieldSchema ? void 0 : fieldSchema['x-action'])) orderColumn = {
+        order: {
+            type: 'void',
+            'x-component': 'ArrayTable.Column',
+            'x-component-props': {
+                title: t('Sequentially', {
+                    ns: 'workflow'
+                })
+            },
+            properties: {
+                order: {
+                    type: 'string',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Select',
+                    default: 'after',
+                    enum: [
+                        {
+                            label: t('After'),
+                            value: 'after'
+                        },
+                        {
+                            label: t('Before'),
+                            value: 'before'
+                        }
+                    ]
+                }
+            }
+        }
+    };
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__schema_settings_SchemaSettings_mjs__.SchemaSettingsActionModalItem, {
         title: t('Bind workflows', {
             ns: 'workflow'
@@ -461,6 +498,7 @@ function WorkflowConfig() {
                                     }
                                 }
                             },
+                            ...orderColumn,
                             operations: {
                                 type: 'void',
                                 'x-component': 'ArrayTable.Column',

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

@@ -4,9 +4,9 @@ import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema__ from "@tachybase/schem
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_icons__ from "@ant-design/icons";
 import * as __WEBPACK_EXTERNAL_MODULE__emotion_css__ from "@emotion/css";
 import * as __WEBPACK_EXTERNAL_MODULE_antd__ from "antd";
-import * as __WEBPACK_EXTERNAL_MODULE_antd_style__ from "antd-style";
 import * as __WEBPACK_EXTERNAL_MODULE_classnames__ from "classnames";
 import * as __WEBPACK_EXTERNAL_MODULE__index_mjs__ from "./index.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__Action_Modal_style_mjs__ from "./Action.Modal.style.mjs";
 import "./hooks/useSetAriaLabelForModal.mjs";
 function _tagged_template_literal(strings, raw) {
     if (!raw) raw = strings.slice(0);
@@ -18,7 +18,7 @@ function _tagged_template_literal(strings, raw) {
 }
 function _templateObject() {
     const data = _tagged_template_literal([
-        "\n      &.tb-action-popup {\n        .ant-modal-header {\n          // TODO: theme variables\n          margin-top: -20px;\n          margin-left: -24px;\n          margin-right: -24px;\n          padding-top: 20px;\n          padding-left: 24px;\n          padding-right: 24px;\n          padding-bottom: 20px;\n        }\n        .ant-modal-content {\n          background: var(--tb-box-bg);\n        }\n      }\n    "
+        "\n                  background: none;\n                  border: none;\n                "
     ]);
     _templateObject = function() {
         return data;
@@ -26,29 +26,14 @@ function _templateObject() {
     return data;
 }
 function _templateObject1() {
-    const data = _tagged_template_literal([
-        "\n                  background: none;\n                  border: none;\n                "
-    ]);
-    _templateObject1 = function() {
-        return data;
-    };
-    return data;
-}
-function _templateObject2() {
     const data = _tagged_template_literal([
         "\n        background: none;\n        border: none;\n      "
     ]);
-    _templateObject2 = function() {
+    _templateObject1 = function() {
         return data;
     };
     return data;
 }
-const useStyles = (0, __WEBPACK_EXTERNAL_MODULE_antd_style__.createStyles)((param)=>{
-    let { css } = param;
-    return {
-        container: css(_templateObject())
-    };
-});
 const openSizeWidthMap = new Map([
     [
         'small',
@@ -65,7 +50,7 @@ const openSizeWidthMap = new Map([
 ]);
 const ActionModal = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.observer)((props)=>{
     const { footerNodeName = 'Action.Modal.Footer', width, ...others } = props;
-    const { styles } = useStyles();
+    const { styles } = (0, __WEBPACK_EXTERNAL_MODULE__Action_Modal_style_mjs__.useStyles)();
     const { visible, setVisible, openSize = 'middle', modalProps } = (0, __WEBPACK_EXTERNAL_MODULE__index_mjs__.useActionContext)();
     const actualWidth = null != width ? width : openSizeWidthMap.get(openSize);
     const schema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
@@ -75,6 +60,11 @@ const ActionModal = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.observer)(
         return buf;
     });
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE_antd__.Modal, {
+        className: (0, __WEBPACK_EXTERNAL_MODULE_classnames__["default"])(others.className, null == modalProps ? void 0 : modalProps.className, styles.container, 'amplifier-block'),
+        style: {
+            ...null == modalProps ? void 0 : modalProps.style,
+            ...null == others ? void 0 : others.style
+        },
         width: actualWidth,
         title: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsxs)("div", {
             style: {
@@ -93,7 +83,7 @@ const ActionModal = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.observer)(
                         /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE_antd__.Button, {
                             type: "text",
                             icon: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__ant_design_icons__.CloseOutlined, {}),
-                            className: (0, __WEBPACK_EXTERNAL_MODULE__emotion_css__.css)(_templateObject1()),
+                            className: (0, __WEBPACK_EXTERNAL_MODULE__emotion_css__.css)(_templateObject()),
                             onClick: ()=>setVisible(false, true)
                         })
                     ]
@@ -102,25 +92,23 @@ const ActionModal = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.observer)(
         }),
         ...others,
         ...modalProps,
-        style: {
-            ...null == modalProps ? void 0 : modalProps.style,
-            ...null == others ? void 0 : others.style
-        },
         destroyOnClose: true,
         open: visible,
         closable: false,
-        className: (0, __WEBPACK_EXTERNAL_MODULE_classnames__["default"])(others.className, null == modalProps ? void 0 : modalProps.className, styles.container, 'amplifier-block'),
         footer: !!footerSchema && /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__tachybase_schema__.RecursionField, {
             basePath: field.address,
             schema: schema,
             onlyRenderProperties: true,
             filterProperties: (s)=>s['x-component'] === footerNodeName
         }),
-        children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__tachybase_schema__.RecursionField, {
-            basePath: field.address,
-            schema: schema,
-            onlyRenderProperties: true,
-            filterProperties: (s)=>s['x-component'] !== footerNodeName
+        children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)("div", {
+            className: styles.modalClassName,
+            children: /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__tachybase_schema__.RecursionField, {
+                basePath: field.address,
+                schema: schema,
+                onlyRenderProperties: true,
+                filterProperties: (s)=>s['x-component'] !== footerNodeName
+            })
         })
     });
 }, {
@@ -144,7 +132,7 @@ const Amplifier = ()=>{
     return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE_antd__.Button, {
         icon: isAmplifier ? /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__ant_design_icons__.FullscreenExitOutlined, {}) : /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__ant_design_icons__.FullscreenOutlined, {}),
         type: "text",
-        className: (0, __WEBPACK_EXTERNAL_MODULE__emotion_css__.css)(_templateObject2()),
+        className: (0, __WEBPACK_EXTERNAL_MODULE__emotion_css__.css)(_templateObject1()),
         onClick: (e)=>{
             const element = e.target.closest('.ant-modal-content');
             const modal = document.querySelector('.ant-modal');

package/es/schema-component/antd/action/Action.Modal.style.d.ts

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