@tachybase/client 1.3.20 → 1.3.21

package/es/schema-component/antd/page/style.mjs

@@ -1,40 +1,4 @@
-import { createStyles } from "antd-style";
 import { genStyleHook } from "../__builtins__/index.mjs";
-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      .ant-modal-content {\n        position: relative;\n        overflow: hidden;\n        border-radius: 16px;\n        &::before,\n        &::after {\n          content: '';\n          position: absolute;\n          width: 300px;\n          height: 300px;\n          background: radial-gradient(circle, rgba(0, 149, 255, 0.11) 0%, transparent 70%);\n          z-index: 0;\n          pointer-events: none;\n        }\n\n        &::before {\n          top: -165px;\n          left: -10px;\n        }\n\n        &::after {\n          bottom: -160px;\n          right: -150px;\n        }\n        .ant-modal-header {\n          text-align: center;\n          margin-bottom: 20px;\n          margin-top: 15px;\n          .ant-modal-title {\n            font-size: x-large;\n            font-weight: 400;\n          }\n        }\n        .ant-modal-body {\n          justify-items: center;\n        }\n      }\n    "
-    ]);
-    _templateObject = function() {
-        return data;
-    };
-    return data;
-}
-function _templateObject1() {
-    const data = _tagged_template_literal([
-        "\n      display: flex;\n      justify-content: center;\n      align-items: center;\n      width: 100%;\n      margin-top: 20px;\n      margin-bottom: 40px;\n      position: relative;\n      gap: 20%;\n      padding-left: 10%;\n      padding-right: 10%;\n      .tb-header-modal-list {\n        width: 50%;\n        gap: 10px;\n        display: flex;\n        flex-direction: column;\n        justify-content: center;\n        text-align: center;\n        border: 1px solid transparent;\n        border-color: rgba(203, 227, 254, 0.62);\n        box-shadow: none;\n        border-radius: 12px;\n        padding: 16px;\n        transition:\n          box-shadow 0.2s ease,\n          transform 0.2s ease;\n        z-index: 1;\n        position: relative;\n        &:hover {\n          border-color: rgba(0, 120, 255, 0.3);\n          box-shadow: 0 4px 16px rgba(0, 120, 255, 0.15);\n        }\n        &:active {\n          box-shadow: none;\n          transform: translateY(2px);\n        }\n        .anticon {\n          width: 100%;\n          display: flex;\n          justify-content: center;\n          svg {\n            width: 30px;\n            height: 30px;\n          }\n        }\n        .tb-header-modal-list-text {\n          text-align: center;\n        }\n      }\n    "
-    ]);
-    _templateObject1 = function() {
-        return data;
-    };
-    return data;
-}
-function _templateObject2() {
-    const data = _tagged_template_literal([
-        "\n      display: flex;\n      justify-content: center;\n      .ant-modal-content {\n        width: 280px;\n        height: 360px;\n      }\n    "
-    ]);
-    _templateObject2 = function() {
-        return data;
-    };
-    return data;
-}
 const getStyles = genStyleHook('tb-page', (token)=>{
     const { componentCls } = token;
     return {
@@ -179,12 +143,4 @@ const getStyles = genStyleHook('tb-page', (token)=>{
         }
     };
 });
-const useStyles = createStyles((param)=>{
-    let { css, token } = param;
-    return {
-        firstmodal: css(_templateObject()),
-        secondmodal: css(_templateObject1()),
-        imageModal: css(_templateObject2())
-    };
-});
-export { getStyles, useStyles };
+export { getStyles };

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

@@ -103,6 +103,7 @@ const useLabelOptions = (others)=>{
     const collectionField = useMemo(()=>getField(fieldSchema['x-collection-field']), [
         fieldSchema['x-collection-field']
     ]);
+    if (!(null == collectionField ? void 0 : collectionField.target) && !fieldSchema['collectionName']) return others;
     const request = {
         resource: (null == collectionField ? void 0 : collectionField.target) || fieldSchema['collectionName'],
         action: 'list',
@@ -151,16 +152,18 @@ const useLabelOptions = (others)=>{
     }
     return others;
 };
-const FormulaSelect_FormulaSelect = (props)=>{
+const FormulaSelect = (props)=>{
     const { objectValue, loading, value, rawOptions, defaultValue, ...others } = props;
     let mode = props.multiple ? 'multiple' : props.mode;
     const filterField = null == others ? void 0 : others['params'];
     const [options, setOptions] = useState([]);
     const [collectionName, setCollectionName] = useState('');
+    const fieldSchema = useFieldSchema();
     const api = useAPIClient();
     if (mode && ![
         'multiple',
-        'tags'
+        'tags',
+        'CustomTitle'
     ].includes(mode)) mode = void 0;
     const fieldProps = {
         ...others
@@ -182,6 +185,7 @@ const FormulaSelect_FormulaSelect = (props)=>{
     } else if ((null == others ? void 0 : others.collection) === collectionName) fieldProps['options'] = options.map((option)=>({
             ...option
         }));
+    else fieldProps['options'] = getFormulaValue(props.fieldNames['formula'], (null == props ? void 0 : props.options) || [], fieldSchema);
     const modifiedProps = useLabelOptions(fieldProps);
     return /*#__PURE__*/ jsx(ObjectSelect, {
         rawOptions: rawOptions,
@@ -192,5 +196,13 @@ const FormulaSelect_FormulaSelect = (props)=>{
         loading: loading
     });
 };
-const FormulaSelect = FormulaSelect_FormulaSelect;
-export { FormulaSelect as default };
+const select_FormulaSelect = FormulaSelect;
+const getFormulaValue = (template, options, fieldSchema)=>options.map((item)=>{
+        const label = item.label;
+        const customLabel = template.replace(new RegExp("{{".concat(fieldSchema['name'], "}}"), 'g'), label);
+        return {
+            ...item,
+            label: customLabel
+        };
+    });
+export { select_FormulaSelect as default };

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

@@ -1,12 +1,12 @@
 import { jsx } from "react/jsx-runtime";
 import "react";
-import { isArrayField, isValid, observer, useField } from "@tachybase/schema";
+import { isArrayField, isValid, observer, useField, useFieldSchema } from "@tachybase/schema";
 import { Tag } from "antd";
 import { useCollectionField } from "../../../data-source/collection-field/CollectionFieldProvider.mjs";
 import { EllipsisWithTooltip } from "../input/EllipsisWithTooltip.mjs";
 import { defaultFieldNames, getCurrentOptions } from "./utils.mjs";
 const ReadPretty = observer((props)=>{
-    var _field_value;
+    var _field_value, _fieldSchema_xcomponentprops_fieldNames;
     const fieldNames = {
         ...defaultFieldNames,
         ...props.fieldNames
@@ -15,8 +15,10 @@ const ReadPretty = observer((props)=>{
     if (!isValid(props.value)) return /*#__PURE__*/ jsx("div", {});
     if (isArrayField(field) && (null == field ? void 0 : null == (_field_value = field.value) ? void 0 : _field_value.length) === 0) return /*#__PURE__*/ jsx("div", {});
     const collectionField = useCollectionField();
+    const fieldSchema = useFieldSchema();
     const dataSource = field.dataSource || props.options || (null == collectionField ? void 0 : collectionField.uiSchema.enum) || [];
-    const currentOptions = getCurrentOptions(field.value, dataSource, fieldNames);
+    const options = getCurrentOptions(field.value, dataSource, fieldNames);
+    const currentOptions = getFormulaValue(null == (_fieldSchema_xcomponentprops_fieldNames = fieldSchema['x-component-props'].fieldNames) ? void 0 : _fieldSchema_xcomponentprops_fieldNames['formula'], options, fieldSchema);
     return /*#__PURE__*/ jsx("div", {
         children: /*#__PURE__*/ jsx(EllipsisWithTooltip, {
             ellipsis: props.ellipsis,
@@ -30,4 +32,15 @@ const ReadPretty = observer((props)=>{
 }, {
     displayName: 'ReadPretty'
 });
+const getFormulaValue = (template, options, fieldSchema)=>{
+    if (!template) return options;
+    return options.map((item)=>{
+        const label = item.label;
+        const customLabel = template.replace(new RegExp("{{".concat(fieldSchema['name'], "}}"), 'g'), label);
+        return {
+            ...item,
+            label: customLabel
+        };
+    });
+};
 export { ReadPretty };

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

@@ -81,8 +81,12 @@ const InternalSelect = connect((props)=>{
     let mode = props.multiple ? 'multiple' : props.mode;
     if (mode && ![
         'multiple',
-        'tags'
+        'tags',
+        'CustomTitle'
     ].includes(mode)) mode = void 0;
+    let options = props.options ? [
+        ...props.options
+    ] : [];
     if ([
         'CustomTitle'
     ].includes(props.mode) && ('formula' in others.fieldNames || 'collection' in props)) return /*#__PURE__*/ jsx(FormulaSelect, {
@@ -117,6 +121,7 @@ const InternalSelect = connect((props)=>{
                 "aria-label": "icon-close-select"
             })
         },
+        options: options,
         popupMatchSelectWidth: false,
         notFoundContent: loading ? /*#__PURE__*/ jsx(Spin, {}) : /*#__PURE__*/ jsx(Empty, {
             image: Empty.PRESENTED_IMAGE_SIMPLE

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

@@ -2,8 +2,10 @@ import { useMemo } from "react";
 import { useField, useFieldSchema, useForm } from "@tachybase/schema";
 import { useTranslation } from "react-i18next";
 import { useCollectionManager_deprecated, useCollection_deprecated } from "../../collection-manager/index.mjs";
+import { useDataSourceManager } from "../../data-source/index.mjs";
+import { useCompile } from "./useCompile.mjs";
 const useFieldModeOptions = (props)=>{
-    var _fieldSchema_xcomponentprops;
+    var _fieldSchema_xcomponentprops, _collectionInterface_componentOptions_filter, _collectionInterface_componentOptions;
     const { t } = useTranslation();
     const { getCollectionJoinField, getCollection } = useCollectionManager_deprecated();
     const currentFieldSchema = useFieldSchema();
@@ -11,12 +13,15 @@ const useFieldModeOptions = (props)=>{
     const field = useField();
     const form = useForm();
     const isReadPretty = (null == fieldSchema ? void 0 : fieldSchema['x-read-pretty']) || field.readPretty || form.readPretty;
+    const dm = useDataSourceManager();
     const isTableField = null == props ? void 0 : props.fieldSchema;
     const { getField } = useCollection_deprecated();
     const collectionField = (null == props ? void 0 : props.collectionField) || getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+    const collectionInterface = dm.collectionFieldInterfaceManager.getFieldInterface(null == collectionField ? void 0 : collectionField.interface);
     const { label } = (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.fieldNames) || {};
+    const compile = useCompile();
     const fieldModeOptions = useMemo(()=>{
-        if (!collectionField || !(null == collectionField ? void 0 : collectionField.interface)) return;
+        if (!collectionField || !(null == collectionField ? void 0 : collectionField.interface)) return [];
         if (![
             'o2o',
             'oho',
@@ -206,10 +211,6 @@ const useFieldModeOptions = (props)=>{
                         label: t('Tag'),
                         value: 'Tag'
                     },
-                    {
-                        label: t('Custom Title'),
-                        value: 'CustomTitle'
-                    },
                     !isTableField && {
                         label: t('Sub-details'),
                         value: 'Nester'
@@ -238,10 +239,6 @@ const useFieldModeOptions = (props)=>{
                     {
                         label: t('Cascader'),
                         value: 'Cascader'
-                    },
-                    {
-                        label: t('Custom Title'),
-                        value: 'CustomTitle'
                     }
                 ];
             default:
@@ -286,6 +283,12 @@ const useFieldModeOptions = (props)=>{
         null == collectionField ? void 0 : collectionField.interface,
         label
     ]);
+    null == collectionInterface || null == (_collectionInterface_componentOptions = collectionInterface.componentOptions) || null == (_collectionInterface_componentOptions_filter = _collectionInterface_componentOptions.filter((item)=>!item.useVisible || item.useVisible())) || _collectionInterface_componentOptions_filter.forEach((item)=>{
+        if (!(null == fieldModeOptions ? void 0 : fieldModeOptions.find((modeItem)=>modeItem.value === item.value))) null == fieldModeOptions || fieldModeOptions.push({
+            label: compile(item.label),
+            value: item.value
+        });
+    });
     return (fieldModeOptions || []).filter(Boolean);
 };
 export { useFieldModeOptions };

package/es/schema-settings/EditFormulaTitleField.mjs

@@ -15,6 +15,12 @@ function useFormulaTitleOptions() {
     const collectionManage = 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']);
+    const isAssociationField = collectionField && [
+        'hasOne',
+        'hasMany',
+        'belongsTo',
+        'belongsToMany'
+    ].includes(collectionField.type);
     let fields = [];
     if (collectionField) fields = getCollectionFields(collectionField ? collectionField.target ? collectionField.target : collectionField.collectionName : fieldSchema['name']);
     else if (collectionManageField) fields = collectionManageField['fields'];
@@ -23,7 +29,7 @@ function useFormulaTitleOptions() {
         if (![
             'm2m',
             'o2m'
-        ].includes(field.interface)) {
+        ].includes(field.interface) && isAssociationField) {
             if (field.uiSchema) {
                 var _getCollectionFields;
                 var _getCollectionFields_filter_map;
@@ -37,6 +43,18 @@ function useFormulaTitleOptions() {
                 });
             }
         }
+        if (!isAssociationField && field.name === fieldSchema['name']) {
+            var _getCollectionFields1;
+            var _getCollectionFields_filter_map1;
+            options.push({
+                label: compile(field.uiSchema.title),
+                value: field.name,
+                children: null != (_getCollectionFields_filter_map1 = null == (_getCollectionFields1 = getCollectionFields(field.target)) ? void 0 : _getCollectionFields1.filter((subField)=>subField.uiSchema).map((subField)=>({
+                        label: subField.uiSchema ? compile(subField.uiSchema.title) : '',
+                        value: subField.name
+                    }))) ? _getCollectionFields_filter_map1 : []
+            });
+        }
     });
     return options;
 }

package/es/schema-settings/SchemaSettingsPlugin.mjs

@@ -43,6 +43,8 @@ import { fileManagerComponentFieldSettings } from "../modules/fields/component/F
 import { uploadAttachmentComponentFieldSettings } from "../modules/fields/component/FileManager/uploadAttachmentComponentFieldSettings.mjs";
 import { inputComponentFieldSettings } from "../modules/fields/component/Input/inputComponentFieldsSettings.mjs";
 import { inputNumberComponentFieldSettings } from "../modules/fields/component/InputNumber/inputNumberComponentFieldSettings.mjs";
+import { inputPreviewComponentFieldSettings } from "../modules/fields/component/InputPreview/inputPreviewComponentFieldSettings.mjs";
+import { multipleComponentFieldSettings } from "../modules/fields/component/MultipleSelect/multipleSelectComponentFieldSettings.mjs";
 import { subformComponentFieldSettings } from "../modules/fields/component/Nester/subformComponentFieldSettings.mjs";
 import { recordPickerComponentFieldSettings } from "../modules/fields/component/Picker/recordPickerComponentFieldSettings.mjs";
 import { subformPopoverComponentFieldSettings } from "../modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.mjs";
@@ -100,6 +102,7 @@ class SchemaSettingsPlugin extends Plugin {
         this.schemaSettingsManager.add(datePickerComponentFieldSettings);
         this.schemaSettingsManager.add(unixTimestampComponentFieldSettings);
         this.schemaSettingsManager.add(inputComponentFieldSettings);
+        this.schemaSettingsManager.add(inputPreviewComponentFieldSettings);
         this.schemaSettingsManager.add(inputNumberComponentFieldSettings);
         this.schemaSettingsManager.add(checkboxComponentFieldSettings);
         this.schemaSettingsManager.add(radioComponentFieldSettings);
@@ -109,6 +112,7 @@ class SchemaSettingsPlugin extends Plugin {
         this.schemaSettingsManager.add(cascadeSelectComponentFieldSettings);
         this.schemaSettingsManager.add(uploadAttachmentComponentFieldSettings);
         this.schemaSettingsManager.add(cascaderComponentFieldSettings);
+        this.schemaSettingsManager.add(multipleComponentFieldSettings);
     }
 }
 export { SchemaSettingsPlugin };

package/lib/application/Application.js

@@ -125,14 +125,6 @@ class Application {
             path: '*',
             Component: this.components['AppNotFound']
         });
-        this.router.add('share', {
-            path: '/share',
-            Component: external_components_index_js_namespaceObject.SharePage
-        });
-        this.router.add('share.page', {
-            path: '/share/:name',
-            Component: external_components_index_js_namespaceObject.ShareSchemaComponent
-        });
         this.router.add('share.notAuthorized', {
             path: '/share/not-authorized',
             element: null

package/lib/application/components/index.js

@@ -9,12 +9,6 @@ var __webpack_modules__ = {
     "./RouterContextCleaner": function(module) {
         module.exports = require("./RouterContextCleaner.js");
     },
-    "./SharePage": function(module) {
-        module.exports = require("./SharePage.js");
-    },
-    "./ShareSchemaComponent": function(module) {
-        module.exports = require("./ShareSchemaComponent.js");
-    },
     "./defaultComponents": function(module) {
         module.exports = require("./defaultComponents.js");
     }
@@ -86,18 +80,6 @@ var __webpack_exports__ = {};
         return _RouterContextCleaner__WEBPACK_IMPORTED_MODULE_3__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _SharePage__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./SharePage");
-    var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _SharePage__WEBPACK_IMPORTED_MODULE_4__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _SharePage__WEBPACK_IMPORTED_MODULE_4__[key];
-    }).bind(0, __WEBPACK_IMPORT_KEY__);
-    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _ShareSchemaComponent__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("./ShareSchemaComponent");
-    var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _ShareSchemaComponent__WEBPACK_IMPORTED_MODULE_5__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _ShareSchemaComponent__WEBPACK_IMPORTED_MODULE_5__[key];
-    }).bind(0, __WEBPACK_IMPORT_KEY__);
-    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();
 for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

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

@@ -1439,7 +1439,7 @@ var __webpack_exports__ = {};
                         appends.add(append);
                     });
                 }
-                if (null == (_s_xcomponentprops1 = s['x-component-props']) ? void 0 : null == (_s_xcomponentprops_fieldNames = _s_xcomponentprops1.fieldNames) ? void 0 : _s_xcomponentprops_fieldNames.formula) {
+                if ((null == (_s_xcomponentprops1 = s['x-component-props']) ? void 0 : null == (_s_xcomponentprops_fieldNames = _s_xcomponentprops1.fieldNames) ? void 0 : _s_xcomponentprops_fieldNames.formula) && isAssociationField) {
                     var _s_xcomponentprops_fieldNames1, _s_xcomponentprops4;
                     appends.add(s['name']);
                     const regex = /{{(.*?)}}/g;

package/lib/built-in/index.js

@@ -78,6 +78,9 @@ var __webpack_modules__ = {
     "./pinned-list/PluginPinnedList": function(module) {
         module.exports = require("./pinned-list/PluginPinnedList.js");
     },
+    "./pinned-list": function(module) {
+        module.exports = require("./pinned-list/index.js");
+    },
     "./pm": function(module) {
         module.exports = require("./pm/index.js");
     },
@@ -173,8 +176,10 @@ var __webpack_exports__ = {};
     __webpack_require__.d(__webpack_exports__, {
         AdminLayout: ()=>_admin_layout__WEBPACK_IMPORTED_MODULE_40__.AdminLayout,
         AdminProvider: ()=>_admin_layout__WEBPACK_IMPORTED_MODULE_40__.AdminProvider,
+        AdminTabs: ()=>_admin_layout__WEBPACK_IMPORTED_MODULE_40__.AdminTabs,
         AppNotFound: ()=>AppNotFound,
         BuiltInPlugin: ()=>BuiltInPlugin,
+        MenuEditor: ()=>_admin_layout__WEBPACK_IMPORTED_MODULE_40__.MenuEditor,
         NoticeArea: ()=>_admin_layout__WEBPACK_IMPORTED_MODULE_40__.NoticeArea
     });
     var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("react/jsx-runtime");
@@ -218,17 +223,34 @@ var __webpack_exports__ = {};
     var _system_version__WEBPACK_IMPORTED_MODULE_38__ = __webpack_require__("./system-version");
     var _user_settings__WEBPACK_IMPORTED_MODULE_39__ = __webpack_require__("./user-settings");
     var _admin_layout__WEBPACK_IMPORTED_MODULE_40__ = __webpack_require__("./admin-layout");
-    var _context_menu_useContextMenu__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__("./context-menu/useContextMenu");
+    var _pinned_list__WEBPACK_IMPORTED_MODULE_41__ = __webpack_require__("./pinned-list");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _context_menu_useContextMenu__WEBPACK_IMPORTED_MODULE_41__)if ([
+    for(var __WEBPACK_IMPORT_KEY__ in _pinned_list__WEBPACK_IMPORTED_MODULE_41__)if ([
+        "default",
+        "AdminTabs",
+        "MenuEditor",
+        "NoticeArea",
         "BuiltInPlugin",
         "AppNotFound",
-        "default",
         "AdminProvider",
+        "AdminLayout"
+    ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _pinned_list__WEBPACK_IMPORTED_MODULE_41__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _context_menu_useContextMenu__WEBPACK_IMPORTED_MODULE_42__ = __webpack_require__("./context-menu/useContextMenu");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _context_menu_useContextMenu__WEBPACK_IMPORTED_MODULE_42__)if ([
+        "default",
+        "AdminTabs",
+        "MenuEditor",
         "NoticeArea",
+        "BuiltInPlugin",
+        "AppNotFound",
+        "AdminProvider",
         "AdminLayout"
     ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _context_menu_useContextMenu__WEBPACK_IMPORTED_MODULE_41__[key];
+        return _context_menu_useContextMenu__WEBPACK_IMPORTED_MODULE_42__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
     function _tagged_template_literal(strings, raw) {
@@ -689,14 +711,18 @@ var __webpack_exports__ = {};
 })();
 exports.AdminLayout = __webpack_exports__.AdminLayout;
 exports.AdminProvider = __webpack_exports__.AdminProvider;
+exports.AdminTabs = __webpack_exports__.AdminTabs;
 exports.AppNotFound = __webpack_exports__.AppNotFound;
 exports.BuiltInPlugin = __webpack_exports__.BuiltInPlugin;
+exports.MenuEditor = __webpack_exports__.MenuEditor;
 exports.NoticeArea = __webpack_exports__.NoticeArea;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "AdminLayout",
     "AdminProvider",
+    "AdminTabs",
     "AppNotFound",
     "BuiltInPlugin",
+    "MenuEditor",
     "NoticeArea"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

package/lib/collection-manager/collectionPlugin.js

@@ -70,6 +70,42 @@ class CollectionPlugin extends Plugin_js_namespaceObject.Plugin {
             key: DataSourceManager_js_namespaceObject.DEFAULT_DATA_SOURCE_KEY,
             displayName: DataSourceManager_js_namespaceObject.DEFAULT_DATA_SOURCE_TITLE
         });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('m2o', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('m2m', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('o2m', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('o2o', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('obo', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('select', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('checkbox', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('radioGroup', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
+        this.app.dataSourceManager.collectionFieldInterfaceManager.addFieldInterfaceComponentOption('multipleSelect', {
+            label: '{{t("CustomTitle")}}',
+            value: 'CustomTitle'
+        });
     }
     addFieldInterfaceGroups() {
         this.dataSourceManager.addFieldInterfaceGroups({

package/lib/collection-manager/interfaces/url.js

@@ -49,7 +49,16 @@ class UrlFieldInterface extends CollectionFieldInterface_js_namespaceObject.Coll
                 type: 'string',
                 'x-component': 'Input.URL'
             }
-        }), _define_property(this, "availableTypes", [
+        }), _define_property(this, "componentOptions", [
+            {
+                label: 'URL',
+                value: 'Input.URL'
+            },
+            {
+                label: 'Preview',
+                value: 'Input.Preview'
+            }
+        ]), _define_property(this, "availableTypes", [
             'string',
             'text'
         ]), _define_property(this, "properties", {

package/lib/data-source/collection-field-interface/CollectionFieldInterface.js

@@ -38,21 +38,7 @@ function _define_property(obj, key, value) {
 }
 class CollectionFieldInterface {
     addComponentOption(componentOption) {
-        if (!this.componentOptions) {
-            var _this_default_uiSchema, _this_default, _this_default_uiSchema1, _this_default1;
-            this.componentOptions = [];
-            const xComponent = null == (_this_default = this.default) ? void 0 : null == (_this_default_uiSchema = _this_default.uiSchema) ? void 0 : _this_default_uiSchema['x-component'];
-            const componentProps = null == (_this_default1 = this.default) ? void 0 : null == (_this_default_uiSchema1 = _this_default1.uiSchema) ? void 0 : _this_default_uiSchema1['x-component-props'];
-            if (xComponent) this.componentOptions = [
-                {
-                    label: xComponent.split('.').pop(),
-                    value: xComponent,
-                    useProps () {
-                        return componentProps || {};
-                    }
-                }
-            ];
-        }
+        if (!this.componentOptions) this.componentOptions = [];
         this.componentOptions.push(componentOption);
     }
     constructor(collectionFieldInterfaceManager){

package/lib/locale/zh-CN.js

@@ -257,6 +257,7 @@ module.exports = {
   "Custom option label": "\u81EA\u5B9A\u4E49\u9009\u9879\u6807\u7B7E",
   "Custom request": "\u81EA\u5B9A\u4E49\u8BF7\u6C42",
   "Custom title": "\u81EA\u5B9A\u4E49\u6807\u9898",
+  CustomTitle: "\u81EA\u5B9A\u4E49\u6807\u9898",
   Customize: "\u81EA\u5B9A\u4E49",
   Cyan: "\u660E\u9752",
   DESC: "\u964D\u5E8F",

package/lib/modules/blocks/data-blocks/form/fieldSettingsFormItem.js

@@ -510,9 +510,6 @@ const fieldSettingsFormItem = new SchemaSettings_js_namespaceObject.SchemaSettin
                             const validateSchema = (0, external_schema_component_index_js_namespaceObject.useValidateSchema)();
                             return form && !isFormReadPretty && validateSchema;
                         }
-                    },
-                    {
-                        ...external_data_source_index_js_namespaceObject.fieldComponentSettingsItem
                     }
                 ];
             }

package/lib/modules/blocks/data-blocks/table/hooks/useTableBlockProps.js

@@ -157,14 +157,26 @@ const useTableBlockProps = ()=>{
                     let [key, value] = param;
                     if (key.includes(ctx.rowKey) && selectedRow.includes(value)) delete items[key];
                 });
-                const mergedFilter = (0, utils_js_namespaceObject.mergeFilter)([
+                const mergeList = [
                     ...Object.values(storedFilter).map((filter)=>(0, external_schema_component_index_js_namespaceObject.removeNullCondition)(filter)),
                     external_flat_default().unflatten(items),
                     block.defaultFilter,
                     prevMergedFilter
-                ]);
+                ];
+                const mergedFilter = (0, utils_js_namespaceObject.mergeFilter)(mergeList);
                 const currFilter = (0, index_js_namespaceObject.filterByCleanedFields)(mergedFilter);
                 prevMergedFilter = currFilter;
+                dataBlocks.forEach((item)=>{
+                    const targetsUidList = targets.map((targetItem)=>targetItem.uid);
+                    if (targetsUidList.includes(item.uid) && !item.associatedFields.find((assItem)=>assItem.name === target.field || target.field.includes(assItem.name))) {
+                        const prevFlatItems = external_flat_default()(prevMergedFilter);
+                        Object.entries(prevFlatItems).forEach((param)=>{
+                            let [key, prevItem] = param;
+                            if (key.split('.').includes(target.field)) delete prevFlatItems[key];
+                        });
+                        prevMergedFilter = external_flat_default().unflatten(prevFlatItems);
+                    }
+                });
                 return block.doFilter({
                     ...param,
                     page: 1,

package/lib/modules/blocks/data-blocks/table/tableColumnSettings.js

@@ -32,7 +32,6 @@ const index_js_namespaceObject = require("../../../../application/index.js");
 const SchemaSettings_js_namespaceObject = require("../../../../application/schema-settings/SchemaSettings.js");
 const external_collection_manager_index_js_namespaceObject = require("../../../../collection-manager/index.js");
 const CollectionProvider_js_namespaceObject = require("../../../../data-source/collection/CollectionProvider.js");
-const fieldComponent_js_namespaceObject = require("../../../../data-source/commonsSettingsItem/fieldComponent.js");
 const external_schema_component_index_js_namespaceObject = require("../../../../schema-component/index.js");
 const hooks_js_namespaceObject = require("../../../../schema-component/antd/association-field/hooks.js");
 const Table_Column_Decorator_js_namespaceObject = require("../../../../schema-component/antd/table-v2/Table.Column.Decorator.js");
@@ -358,8 +357,7 @@ const tableColumnSettings = new SchemaSettings_js_namespaceObject.SchemaSettings
                             }
                         };
                     }
-                },
-                fieldComponent_js_namespaceObject.fieldComponentSettingsItem
+                }
             ]
         },
         {

package/lib/modules/blocks/filter-blocks/collapse/filterCollapseItemFieldSettings.js

@@ -42,7 +42,6 @@ const external_react_i18next_namespaceObject = require("react-i18next");
 const SchemaSettings_js_namespaceObject = require("../../../../application/schema-settings/SchemaSettings.js");
 const index_js_namespaceObject = require("../../../../block-provider/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../../../../collection-manager/index.js");
-const external_data_source_index_js_namespaceObject = require("../../../../data-source/index.js");
 const external_schema_component_index_js_namespaceObject = require("../../../../schema-component/index.js");
 const external_schema_settings_index_js_namespaceObject = require("../../../../schema-settings/index.js");
 const SchemaSettingsDataScope_js_namespaceObject = require("../../../../schema-settings/SchemaSettingsDataScope.js");
@@ -222,9 +221,6 @@ const filterCollapseItemFieldSettings = new SchemaSettings_js_namespaceObject.Sc
                                 onChange: onTitleFieldChange
                             };
                         }
-                    },
-                    {
-                        ...external_data_source_index_js_namespaceObject.fieldComponentSettingsItem
                     }
                 ];
             }

package/lib/modules/blocks/filter-blocks/form/filterFormItemFieldSettings.js

@@ -44,7 +44,6 @@ const index_js_namespaceObject = require("../../../../application/index.js");
 const SchemaSettings_js_namespaceObject = require("../../../../application/schema-settings/SchemaSettings.js");
 const external_collection_manager_index_js_namespaceObject = require("../../../../collection-manager/index.js");
 const useFieldComponentName_js_namespaceObject = require("../../../../common/useFieldComponentName.js");
-const external_data_source_index_js_namespaceObject = require("../../../../data-source/index.js");
 const external_schema_component_index_js_namespaceObject = require("../../../../schema-component/index.js");
 const external_schema_settings_index_js_namespaceObject = require("../../../../schema-settings/index.js");
 const filterFormItemFieldSettings = new SchemaSettings_js_namespaceObject.SchemaSettings({
@@ -349,9 +348,6 @@ const filterFormItemFieldSettings = new SchemaSettings_js_namespaceObject.Schema
                         name: 'operator',
                         Component: external_schema_component_index_js_namespaceObject.EditOperator
                     },
-                    {
-                        ...external_data_source_index_js_namespaceObject.fieldComponentSettingsItem
-                    },
                     {
                         name: 'editDefaultValue',
                         Component: external_schema_settings_index_js_namespaceObject.SchemaSettingsDefaultValue