@tachybase/client 0.23.40 → 0.23.47

package/es/schema-component/antd/menu/Menu.styles.mjs

@@ -27,7 +27,9 @@ function _templateObject1() {
 }
 function _templateObject2() {
     const data = _tagged_template_literal([
-        "\n      height: 100%;\n      overflow-y: auto;\n      overflow-x: hidden;\n\n      .ant-menu-submenu.ant-menu-submenu-inline .ant-menu-submenu-title {\n        position: relative;\n        ::before {\n          content: '';\n          position: absolute;\n          left: 0;\n          top: 50%;\n          transform: translateY(-50%);\n          width: 3px;\n          height: 50%;\n          background-color: var(--colorPrimaryText);\n\n          /* 使用 clip-path 裁剪为梯形 */\n          clip-path: polygon(0 0, 100% 15%, 100% 85%, 0 100%);\n        }\n      }\n\n      .ant-menu-item,\n      .ant-menu-submenu-title {\n        padding-inline-end: 10px;\n      }\n\n      .ant-menu-submenu-title {\n        .ant-menu-title-content {\n          > div {\n            > .general-schema-designer {\n              right: 6px !important;\n            }\n            > span.anticon {\n              margin-right: 10px;\n            }\n          }\n        }\n      }\n    "
+        "\n      height: 100%;\n      overflow-y: auto;\n      overflow-x: hidden;\n\n      .ant-menu-submenu.ant-menu-submenu-inline .ant-menu-submenu-title {\n        position: relative;\n        ::before {\n          content: '';\n          position: absolute;\n          left: 0;\n          top: 50%;\n          transform: translateY(-50%);\n          width: 3px;\n          height: 50%;\n          background-color: ",
+        ";\n\n          /* 使用 clip-path 裁剪为梯形 */\n          clip-path: polygon(0 0, 100% 15%, 100% 85%, 0 100%);\n        }\n      }\n\n      .ant-menu-submenu.ant-menu-submenu-inline.ant-menu-submenu-open > .ant-menu-submenu-title {\n        ::before {\n          background-color: ",
+        ";\n        }\n      }\n\n      .ant-menu-item,\n      .ant-menu-submenu-title {\n        padding-inline-end: 10px;\n      }\n\n      .ant-menu-submenu-title {\n        .ant-menu-title-content {\n          > div {\n            > .general-schema-designer {\n              right: 6px !important;\n            }\n            > span.anticon {\n              margin-right: 10px;\n            }\n          }\n        }\n      }\n    "
     ]);
     _templateObject2 = function() {
         return data;
@@ -57,7 +59,7 @@ const useStyles = (0, __WEBPACK_EXTERNAL_MODULE_antd_style__.createStyles)((para
     return {
         subMenuDesignerCss: css(_templateObject()),
         designerCss: css(_templateObject1()),
-        sideMenuClass: css(_templateObject2()),
+        sideMenuClass: css(_templateObject2(), token.colorBorder, token.colorPrimaryText),
         menuItemClass: css(_templateObject3()),
         headerMenuClass: css(_templateObject4())
     };

package/es/schema-component/antd/nanoIDInput/NanoIDInput.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const NanoIDInput: React.ForwardRefExoticComponent<Omit<Partial<import("antd").InputProps & React.RefAttributes<import("antd").InputRef>>, "ref"> & React.RefAttributes<unknown>> & {
+export declare const NanoIDInput: React.ForwardRefExoticComponent<Omit<import("antd").InputProps & React.RefAttributes<import("antd").InputRef>, "ref"> & React.RefAttributes<import("antd").InputRef>> & {
     ReadPretty: (props: import("antd").InputProps & {
         ellipsis?: any;
     }) => import("react/jsx-runtime").JSX.Element;

package/es/schema-component/antd/password/Password.d.ts

@@ -3,5 +3,5 @@ import { PasswordProps } from 'antd/es/input';
 export interface IPasswordProps extends PasswordProps {
     checkStrength: boolean;
 }
-export declare const Password: React.ForwardRefExoticComponent<Partial<IPasswordProps> & React.RefAttributes<unknown>>;
+export declare const Password: React.ForwardRefExoticComponent<IPasswordProps & React.RefAttributes<never>>;
 export default Password;

package/es/schema-component/antd/percent/Percent.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const Percent: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
+export declare const Percent: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;

package/es/schema-component/antd/preview/Preview.d.ts

@@ -8,6 +8,6 @@ type Props = UploadProps & {
     onRemove?: (file: any) => void;
     onSelect?: () => void;
 };
-export declare const Preview: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
+export declare const Preview: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export declare const FileSelector: (props: Props) => React.JSX.Element;
 export default Preview;

package/es/schema-component/antd/remote-select/RemoteSelect.d.ts

@@ -5,7 +5,7 @@ import { ReadPretty } from './ReadPretty';
 export type RemoteSelectProps<P = any> = SelectProps<P, any> & {
     objectValue?: boolean;
     onChange?: (v: any) => void;
-    target: string;
+    target?: string;
     wait?: number;
     manual?: boolean;
     mapOptions?: (data: any) => RemoteSelectProps['fieldNames'];
@@ -14,10 +14,10 @@ export type RemoteSelectProps<P = any> = SelectProps<P, any> & {
     CustomDropdownRender?: (v: any) => any;
     optionFilter?: (option: any) => boolean;
 };
-declare const InternalRemoteSelect: React.ForwardRefExoticComponent<Partial<SelectProps<any, any> & {
+declare const InternalRemoteSelect: React.ForwardRefExoticComponent<SelectProps<any, any> & {
     objectValue?: boolean;
     onChange?: (v: any) => void;
-    target: string;
+    target?: string;
     wait?: number;
     manual?: boolean;
     mapOptions?: (data: any) => RemoteSelectProps["fieldNames"];
@@ -25,7 +25,7 @@ declare const InternalRemoteSelect: React.ForwardRefExoticComponent<Partial<Sele
     service: ResourceActionOptions<any>;
     CustomDropdownRender?: (v: any) => any;
     optionFilter?: (option: any) => boolean;
-}> & React.RefAttributes<unknown>>;
+} & React.RefAttributes<never>>;
 export declare const RemoteSelect: typeof InternalRemoteSelect & {
     ReadPretty: typeof ReadPretty;
 };

package/es/schema-component/antd/remote-select/RemoteSelect.mjs

@@ -91,15 +91,17 @@ const InternalRemoteSelect = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.c
         null == targetField ? void 0 : targetField.uiSchema,
         fieldNames
     ]);
+    const params = {
+        ...null == service ? void 0 : service.params,
+        filter: null == service ? void 0 : null === (_service_params = service.params) || void 0 === _service_params ? void 0 : _service_params.filter
+    };
+    if (fieldNames['formula']) params['paginate'] = false;
+    else params['pageSize'] = 200;
     const { data, run, loading } = (0, __WEBPACK_EXTERNAL_MODULE__api_client_index_mjs__.useRequest)({
         action: 'list',
         ...service,
         headers,
-        params: {
-            pageSize: fieldNames['formula'] ? 9999 : 200,
-            ...null == service ? void 0 : service.params,
-            filter: null == service ? void 0 : null === (_service_params = service.params) || void 0 === _service_params ? void 0 : _service_params.filter
-        }
+        params
     }, {
         manual,
         debounceWait: wait

package/es/schema-component/antd/rich-text/RichText.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const RichText: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
+export declare const RichText: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;

package/es/schema-component/antd/select/FormulaSelect.mjs

@@ -107,7 +107,7 @@ const useLabelOptions = (others)=>{
         resource: (null == collectionField ? void 0 : collectionField.target) || fieldSchema['collectionName'],
         action: 'list',
         params: {
-            pageSize: 99999
+            paginate: false
         }
     };
     const regex = /{{(.*?)}}/g;
@@ -142,7 +142,7 @@ const useLabelOptions = (others)=>{
                         const opvalue = opValue[match[1].split('.')[0]];
                         const value = opvalue ? opValue[match[1].split('.')[0]][match[1].split('.')[1]] : '';
                         valueOject[match[1]] = null != value ? value : '';
-                    } else valueOject[match[1]] = op[match[1]] || '';
+                    } else valueOject[match[1]] = opValue[match[1]] || '';
                     outputStr = replacePlaceholders(formula, valueOject);
                 }
             });
@@ -169,7 +169,7 @@ const FormulaSelect = (props)=>{
         api.request({
             url: others.collection + ':list',
             params: {
-                pageSize: 99999,
+                paginate: false,
                 filter: filterField ? {
                     ...filterField.filter
                 } : {}

package/es/schema-component/antd/select/Select.mjs

@@ -83,7 +83,9 @@ const InternalSelect = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.connect
         'multiple',
         'tags'
     ].includes(mode)) mode = void 0;
-    if ('formula' in others.fieldNames || 'collection' in props) return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__FormulaSelect_mjs__["default"], {
+    if ([
+        'CustomTitle'
+    ].includes(props.mode) && ('formula' in others.fieldNames || 'collection' in props)) return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(__WEBPACK_EXTERNAL_MODULE__FormulaSelect_mjs__["default"], {
         ...props
     });
     if (objectValue) return /*#__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_react_jsx_runtime__.jsx)(ObjectSelect, {

package/es/schema-component/antd/unixTimestamp/UnixTimestamp.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const UnixTimestamp: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
+export declare const UnixTimestamp: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;

package/es/schema-component/antd/variable/TextArea.mjs

@@ -140,7 +140,9 @@ function getCurrentRange(element) {
     return result;
 }
 function TextArea(props) {
-    const { value = '', scope, onChange, multiline = true, changeOnSelect } = props;
+    const { value: propsValue, scope, onChange, multiline = true, changeOnSelect } = props;
+    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
+    const value = propsValue || fieldSchema.default || '';
     const { styles } = (0, __WEBPACK_EXTERNAL_MODULE__style_mjs__.useStyles)({
         multiline
     });

package/es/schema-component/antd/variable/Variable.d.ts

@@ -6,10 +6,10 @@ export declare function VariableScopeProvider({ scope, children }: {
 export declare function useVariableScope(): any[];
 export declare function Variable(): any;
 export declare namespace Variable {
-    var Input: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
-    var TextArea: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
-    var RawTextArea: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
-    var JSON: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
-    var CodeMirror: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
+    var Input: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+    var TextArea: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+    var RawTextArea: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+    var JSON: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+    var CodeMirror: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 }
 export default Variable;

package/es/schema-component/hooks/useFieldModeOptions.mjs

@@ -206,6 +206,10 @@ const useFieldModeOptions = (props)=>{
                         label: t('Tag'),
                         value: 'Tag'
                     },
+                    {
+                        label: t('Custom Title'),
+                        value: 'CustomTitle'
+                    },
                     !isTableField && {
                         label: t('Sub-details'),
                         value: 'Nester'
@@ -234,6 +238,10 @@ const useFieldModeOptions = (props)=>{
                     {
                         label: t('Cascader'),
                         value: 'Cascader'
+                    },
+                    {
+                        label: t('Custom Title'),
+                        value: 'CustomTitle'
                     }
                 ];
             default:

package/es/schema-initializer/SchemaInitializerPlugin.mjs

@@ -124,6 +124,7 @@ class SchemaInitializerPlugin extends __WEBPACK_EXTERNAL_MODULE__application_Plu
         this.app.schemaInitializerManager.add(__WEBPACK_EXTERNAL_MODULE__buttons_index_mjs__.tabPaneInitializersForRecordBlock);
         this.app.schemaInitializerManager.add(__WEBPACK_EXTERNAL_MODULE__buttons_index_mjs__.tabPaneInitializersForBulkEditFormBlock);
         this.app.schemaInitializerManager.add(__WEBPACK_EXTERNAL_MODULE__modules_menu_menuItemInitializer_mjs__.menuItemInitializer);
+        this.app.schemaInitializerManager.add(__WEBPACK_EXTERNAL_MODULE__buttons_index_mjs__.tabPaneInitializers);
     }
 }
 export { SchemaInitializerPlugin };

package/es/schema-initializer/buttons/TabPaneInitializers.d.ts

@@ -6,6 +6,7 @@ export declare const TabPaneInitializersForBulkEditFormBlock: (props: any) => im
  * @deprecated
  */
 export declare const tabPaneInitializers_deprecated: SchemaInitializer<any, {}>;
+export declare const tabPaneInitializers: SchemaInitializer<any, {}>;
 /**
  * @deprecated
  */

package/es/schema-initializer/buttons/TabPaneInitializers.mjs

@@ -144,11 +144,19 @@ const TabPaneInitializersForBulkEditFormBlock = (props)=>/*#__PURE__*/ (0, __WEB
         ...props,
         isBulkEdit: true
     });
+const commonOptions = {
+    Component: TabPaneInitializers,
+    popover: false
+};
 const tabPaneInitializers_deprecated = new __WEBPACK_EXTERNAL_MODULE__application_schema_initializer_SchemaInitializer_mjs__.SchemaInitializer({
     name: 'TabPaneInitializers',
     Component: TabPaneInitializers,
     popover: false
 });
+const tabPaneInitializers = new __WEBPACK_EXTERNAL_MODULE__application_schema_initializer_SchemaInitializer_mjs__.SchemaInitializer({
+    name: 'popup:addTab',
+    ...commonOptions
+});
 const tabPaneInitializersForRecordBlock = new __WEBPACK_EXTERNAL_MODULE__application_schema_initializer_SchemaInitializer_mjs__.SchemaInitializer({
     name: 'TabPaneInitializersForCreateFormBlock',
     Component: TabPaneInitializersForCreateFormBlock,
@@ -159,4 +167,4 @@ const tabPaneInitializersForBulkEditFormBlock = new __WEBPACK_EXTERNAL_MODULE__a
     Component: TabPaneInitializersForBulkEditFormBlock,
     popover: false
 });
-export { TabPaneInitializers, TabPaneInitializersForBulkEditFormBlock, TabPaneInitializersForCreateFormBlock, tabPaneInitializersForBulkEditFormBlock, tabPaneInitializersForRecordBlock, tabPaneInitializers_deprecated };
+export { TabPaneInitializers, TabPaneInitializersForBulkEditFormBlock, TabPaneInitializersForCreateFormBlock, tabPaneInitializers, tabPaneInitializersForBulkEditFormBlock, tabPaneInitializersForRecordBlock, tabPaneInitializers_deprecated };

package/es/schema-settings/DateFormat/ExpiresRadio.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 export declare const DateFormatCom: (props?: any) => import("react/jsx-runtime").JSX.Element;
-declare const ExpiresRadio: React.ForwardRefExoticComponent<Omit<Partial<any>, "ref"> & React.RefAttributes<unknown>>;
+declare const ExpiresRadio: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
 export { ExpiresRadio };

package/es/schema-settings/EditFormulaTitleField.mjs

@@ -9,7 +9,9 @@ function useFormulaTitleOptions() {
     const compile = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useCompile)();
     const { getCollectionJoinField, getCollectionFields } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)();
     const { getField } = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollection_deprecated)();
-    const fieldSchema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
+    const { fieldSchema: tableColumnSchema } = (0, __WEBPACK_EXTERNAL_MODULE__schema_component_index_mjs__.useColumnSchema)();
+    const schema = (0, __WEBPACK_EXTERNAL_MODULE__tachybase_schema__.useFieldSchema)();
+    const fieldSchema = tableColumnSchema || schema;
     const collectionManage = (0, __WEBPACK_EXTERNAL_MODULE__collection_manager_index_mjs__.useCollectionManager_deprecated)();
     const collectionManageField = collectionManage.collections.filter((value)=>value.name === fieldSchema['x-decorator-props'])[0];
     const collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
@@ -18,7 +20,10 @@ function useFormulaTitleOptions() {
     else if (collectionManageField) fields = collectionManageField['fields'];
     const options = [];
     null == fields || fields.forEach((field)=>{
-        if ('m2m' !== field.interface) {
+        if (![
+            'm2m',
+            'o2m'
+        ].includes(field.interface)) {
             if (field.uiSchema) {
                 var _getCollectionFields;
                 var _getCollectionFields_filter_map;

package/es/schema-settings/SchemaSettingsPlugin.mjs

@@ -36,6 +36,7 @@ import * as __WEBPACK_EXTERNAL_MODULE__modules_blocks_other_blocks_markdown_mark
 import * as __WEBPACK_EXTERNAL_MODULE__modules_fields_component_Cascader_cascaderComponentFieldSettings_mjs__ from "../modules/fields/component/Cascader/cascaderComponentFieldSettings.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__modules_fields_component_CascadeSelect_cascadeSelectComponentFieldSettings_mjs__ from "../modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__modules_fields_component_Checkbox_checkboxComponentFieldSettings_mjs__ from "../modules/fields/component/Checkbox/checkboxComponentFieldSettings.mjs";
+import * as __WEBPACK_EXTERNAL_MODULE__modules_fields_component_CustomTitle_customTitleComponentFieldSettings_mjs__ from "../modules/fields/component/CustomTitle/customTitleComponentFieldSettings.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__modules_fields_component_DatePicker_datePickerComponentFieldSettings_mjs__ from "../modules/fields/component/DatePicker/datePickerComponentFieldSettings.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__modules_fields_component_DrawerSubTable_drawerSubTableComponentFieldSettings_mjs__ from "../modules/fields/component/DrawerSubTable/drawerSubTableComponentFieldSettings.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE__modules_fields_component_FileManager_fileManagerComponentFieldSettings_mjs__ from "../modules/fields/component/FileManager/fileManagerComponentFieldSettings.mjs";
@@ -100,6 +101,7 @@ class SchemaSettingsPlugin extends __WEBPACK_EXTERNAL_MODULE__application_Plugin
         this.schemaSettingsManager.add(__WEBPACK_EXTERNAL_MODULE__modules_fields_component_InputNumber_inputNumberComponentFieldSettings_mjs__.inputNumberComponentFieldSettings);
         this.schemaSettingsManager.add(__WEBPACK_EXTERNAL_MODULE__modules_fields_component_Checkbox_checkboxComponentFieldSettings_mjs__.checkboxComponentFieldSettings);
         this.schemaSettingsManager.add(__WEBPACK_EXTERNAL_MODULE__modules_fields_component_Radio_radioComponentFieldSettings_mjs__.radioComponentFieldSettings);
+        this.schemaSettingsManager.add(__WEBPACK_EXTERNAL_MODULE__modules_fields_component_CustomTitle_customTitleComponentFieldSettings_mjs__.CustomTitleComponentFieldSettings);
         this.schemaSettingsManager.add(__WEBPACK_EXTERNAL_MODULE__modules_fields_component_FileManager_fileManagerComponentFieldSettings_mjs__.fileManagerComponentFieldSettings);
         this.schemaSettingsManager.add(__WEBPACK_EXTERNAL_MODULE__modules_fields_component_Tag_tagComponentFieldSettings_mjs__.tagComponentFieldSettings);
         this.schemaSettingsManager.add(__WEBPACK_EXTERNAL_MODULE__modules_fields_component_CascadeSelect_cascadeSelectComponentFieldSettings_mjs__.cascadeSelectComponentFieldSettings);

package/lib/application/WebSocketClient.js

@@ -48,7 +48,7 @@ class WebSocketClient {
         const apiBaseURL = null == options ? void 0 : null === (_options_apiClient = options.apiClient) || void 0 === _options_apiClient ? void 0 : _options_apiClient['baseURL'];
         if (!apiBaseURL) return;
         const subApp = (0, sdk_namespaceObject.getSubAppName)(this.app.getPublicPath());
-        const queryString = subApp ? "?__appName=".concat(subApp) : '';
+        const queryString = subApp ? "?__appName=".concat(subApp) : "?__hostname=".concat(window.location.hostname);
         const wsPath = this.options.basename || '/ws';
         if (this.options.url) {
             const url = new URL(this.options.url);

package/lib/application/schema-settings/SchemaSettingsDefaults.js

@@ -162,20 +162,17 @@ const defaultSettingItems = [
                         refresh,
                         fieldSchema
                     ]);
-                    const { data } = (0, index_js_namespaceObject.useRequest)(async ()=>{
-                        const { data } = await api.request({
-                            url: "/uiSchemas:getJsonSchema/".concat(fieldSchema['x-uid'], "?includeAsyncNode=true")
-                        });
-                        return data;
-                    });
                     return {
                         width: '800px',
-                        disabled: !data,
-                        schema: ()=>{
-                            if (!data) return {
-                                title: t('Edit loading.')
-                            };
+                        asyncGetInitialValues: async ()=>{
+                            const { data } = await api.request({
+                                url: "/uiSchemas:getJsonSchema/".concat(fieldSchema['x-uid'], "?includeAsyncNode=true")
+                            });
                             return {
+                                schema: JSON.stringify((null == data ? void 0 : data.data) || {}, null, 2)
+                            };
+                        },
+                        schema: ()=>({
                                 type: 'object',
                                 title: t('Edit'),
                                 properties: {
@@ -183,7 +180,6 @@ const defaultSettingItems = [
                                         type: 'string',
                                         title: '{{ t("Schema") }}',
                                         required: true,
-                                        default: JSON.stringify((null == data ? void 0 : data.data) || {}, null, 2),
                                         'x-decorator': 'FormItem',
                                         'x-component': 'CodeMirror',
                                         'x-component-props': {
@@ -192,9 +188,8 @@ const defaultSettingItems = [
                                         }
                                     }
                                 }
-                            };
-                        },
-                        title: data ? t('Edit') : t('Loading'),
+                            }),
+                        title: t('Edit'),
                         onSubmit: async (param)=>{
                             let { schema } = param;
                             dn.emit('patch', {

package/lib/block-provider/hooks/index.js

@@ -734,6 +734,7 @@ const useFilterBlockActionProps = ()=>{
         async onClick () {
             const { targets = [], uid } = findFilterTargets(fieldSchema);
             actionField.data.loading = true;
+            let prevMergedFilter = {};
             try {
                 await Promise.all(getDataBlocks().map(async (block)=>{
                     var _block_service_params, _block_service_params_, _block_service_params1, _Object_keys;
@@ -764,8 +765,10 @@ const useFilterBlockActionProps = ()=>{
                     const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_15__.mergeFilter)([
                         ...Object.values(storedFilter).map((filter)=>(0, _schema_component__WEBPACK_IMPORTED_MODULE_17__.removeNullCondition)(filter)),
                         block.defaultFilter,
-                        filter.customFilter
+                        filter.customFilter,
+                        prevMergedFilter
                     ]);
+                    prevMergedFilter = mergedFilter;
                     if ('manual' === block.dataLoadingMode && lodash__WEBPACK_IMPORTED_MODULE_4___default().isEmpty(mergedFilter)) return block.clearData();
                     return block.doFilter({
                         ...param,
@@ -1438,7 +1441,7 @@ const useAssociationNames = (dataSource)=>{
     const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
     const _getAssociationAppends = (schema, str)=>{
         schema.reduceProperties((pre, s)=>{
-            var _s_xcomponentprops, _s_xcomponentprops1, _getCollection;
+            var _s_xcomponentprops, _s_xcomponentprops_fieldNames, _s_xcomponentprops1, _s_xcomponentprops2, _getCollection;
             const prefix = pre || str;
             const collectionField = s['x-collection-field'] && getCollectionJoinField(s['x-collection-field'], dataSource);
             const isAssociationSubfield = s.name.includes('.');
@@ -1449,11 +1452,27 @@ const useAssociationNames = (dataSource)=>{
                 'belongsToMany'
             ].includes(collectionField.type);
             if (null === (_s_xcomponentprops = s['x-component-props']) || void 0 === _s_xcomponentprops ? void 0 : _s_xcomponentprops['appends']) {
-                var _s_xcomponentprops2;
-                lodash__WEBPACK_IMPORTED_MODULE_4___default().forEach(null === (_s_xcomponentprops2 = s['x-component-props']) || void 0 === _s_xcomponentprops2 ? void 0 : _s_xcomponentprops2['appends'], (append)=>{
+                var _s_xcomponentprops3;
+                lodash__WEBPACK_IMPORTED_MODULE_4___default().forEach(null === (_s_xcomponentprops3 = s['x-component-props']) || void 0 === _s_xcomponentprops3 ? void 0 : _s_xcomponentprops3['appends'], (append)=>{
                     appends.add(append);
                 });
             }
+            if (null === (_s_xcomponentprops1 = s['x-component-props']) || void 0 === _s_xcomponentprops1 ? void 0 : null === (_s_xcomponentprops_fieldNames = _s_xcomponentprops1.fieldNames) || void 0 === _s_xcomponentprops_fieldNames ? void 0 : _s_xcomponentprops_fieldNames.formula) {
+                var _s_xcomponentprops_fieldNames1, _s_xcomponentprops4;
+                appends.add(s['name']);
+                const regex = /{{(.*?)}}/g;
+                const formula = null === (_s_xcomponentprops4 = s['x-component-props']) || void 0 === _s_xcomponentprops4 ? void 0 : null === (_s_xcomponentprops_fieldNames1 = _s_xcomponentprops4.fieldNames) || void 0 === _s_xcomponentprops_fieldNames1 ? void 0 : _s_xcomponentprops_fieldNames1.formula;
+                let match;
+                while(match = regex.exec(formula))if (match[1].includes('.')) {
+                    const matchList = match[1].split('.');
+                    let appendsValue = s['name'];
+                    matchList.forEach((item, index)=>{
+                        if (index === matchList.length - 1) return;
+                        appendsValue += '.' + item;
+                        appends.add(appendsValue);
+                    });
+                }
+            }
             if (s['x-linkage-rules']) {
                 const collectAppends = (obj)=>{
                     const type = Object.keys(obj)[0] || '$and';
@@ -1470,7 +1489,7 @@ const useAssociationNames = (dataSource)=>{
                     collectAppends(condition);
                 });
             }
-            if (null === (_s_xcomponentprops1 = s['x-component-props']) || void 0 === _s_xcomponentprops1 ? void 0 : _s_xcomponentprops1['x-next-title']) {
+            if (null === (_s_xcomponentprops2 = s['x-component-props']) || void 0 === _s_xcomponentprops2 ? void 0 : _s_xcomponentprops2['x-next-title']) {
                 const pre = prefix && '' !== prefix ? prefix + '.' + s.name : s.name;
                 const title = s['x-component-props']['x-next-title'];
                 const path = pre + '.' + title.label;
@@ -1478,7 +1497,7 @@ const useAssociationNames = (dataSource)=>{
             }
             const isTreeCollection = isAssociationField && (null === (_getCollection = getCollection(collectionField.target, dataSource)) || void 0 === _getCollection ? void 0 : _getCollection.template) === 'tree';
             if (collectionField && (isAssociationField || isAssociationSubfield) && 'TableField' !== s['x-component']) {
-                var _s_xcomponentprops3;
+                var _s_xcomponentprops5;
                 const fieldPath = !isAssociationField && isAssociationSubfield ? getAssociationPath(s.name) : s.name;
                 const path = '' !== prefix && prefix ? prefix + '.' + fieldPath : fieldPath;
                 if (isTreeCollection) {
@@ -1489,7 +1508,7 @@ const useAssociationNames = (dataSource)=>{
                     'Nester',
                     'SubTable',
                     'PopoverNester'
-                ].includes(null === (_s_xcomponentprops3 = s['x-component-props']) || void 0 === _s_xcomponentprops3 ? void 0 : _s_xcomponentprops3.mode)) {
+                ].includes(null === (_s_xcomponentprops5 = s['x-component-props']) || void 0 === _s_xcomponentprops5 ? void 0 : _s_xcomponentprops5.mode)) {
                     updateAssociationValues.add(path);
                     const bufPrefix = prefix && '' !== prefix ? prefix + '.' + s.name : s.name;
                     _getAssociationAppends(s, bufPrefix);

package/lib/collection-manager/interfaces/properties/index.js

@@ -501,7 +501,7 @@ const recordPickerViewer = {
             type: 'void',
             'x-component': 'Tabs',
             'x-component-props': {},
-            'x-initializer': 'TabPaneInitializers',
+            'x-initializer': 'popup:addTab',
             properties: {
                 tab1: {
                     type: 'void',

package/lib/modules/actions/disassociate/__e2e__/templatesOfPage.js

@@ -187,7 +187,7 @@ const disassociatePage = {
                                                                                         type: 'void',
                                                                                         'x-component': 'Tabs',
                                                                                         'x-component-props': {},
-                                                                                        'x-initializer': 'TabPaneInitializers',
+                                                                                        'x-initializer': 'popup:addTab',
                                                                                         properties: {
                                                                                             tab1: {
                                                                                                 _isJSONSchemaObject: true,

package/lib/modules/actions/view-edit-popup/PopupActionInitializer.js

@@ -56,7 +56,7 @@ const PopupActionInitializer = (props)=>{
                         type: 'void',
                         'x-component': 'Tabs',
                         'x-component-props': {},
-                        'x-initializer': 'TabPaneInitializers',
+                        'x-initializer': 'popup:addTab',
                         properties: {
                             tab1: {
                                 type: 'void',

package/lib/modules/actions/view-edit-popup/UpdateActionInitializer.js

@@ -56,7 +56,7 @@ const UpdateActionInitializer = (props)=>{
                         type: 'void',
                         'x-component': 'Tabs',
                         'x-component-props': {},
-                        'x-initializer': 'TabPaneInitializers',
+                        'x-initializer': 'popup:addTab',
                         properties: {
                             tab1: {
                                 type: 'void',

package/lib/modules/blocks/data-blocks/details-multi/__tests__/createDetailsBlockWithPagingUISchema.test.js

@@ -1,7 +1,7 @@
 "use strict";
 var __webpack_exports__ = {};
 const external_createDetailsWithPaginationUISchema_js_namespaceObject = require("../createDetailsWithPaginationUISchema.js");
-vi.mock('@formily/shared', ()=>({
+vi.mock('@tachybase/schema', ()=>({
         uid: vi.fn().mockReturnValue('mocked-uid')
     }));
 describe('createDetailsBlockWithPaginationUISchema', ()=>{

package/lib/modules/blocks/data-blocks/details-single/__tests__/createDetailsBlockWithoutPagingUISchema.test.js

@@ -1,7 +1,7 @@
 "use strict";
 var __webpack_exports__ = {};
 const external_createDetailsUISchema_js_namespaceObject = require("../createDetailsUISchema.js");
-vi.mock('@formily/shared', ()=>({
+vi.mock('@tachybase/schema', ()=>({
         uid: ()=>'fixed-uid'
     }));
 describe('createDetailsBlockWithoutPagingUISchema', ()=>{

package/lib/modules/blocks/data-blocks/form/__e2e__/form-create/schemaSettings.test.js

@@ -1060,7 +1060,7 @@ e2e_namespaceObject.test.describe('creation form block schema settings', ()=>{
                                                                                                 type: 'void',
                                                                                                 'x-component': 'Tabs',
                                                                                                 'x-component-props': {},
-                                                                                                'x-initializer': 'TabPaneInitializers',
+                                                                                                'x-initializer': 'popup:addTab',
                                                                                                 properties: {
                                                                                                     tab1: {
                                                                                                         _isJSONSchemaObject: true,