@tachybase/client 1.3.20 → 1.3.21

package/lib/schema-component/antd/page/Page.Settings.js

@@ -28,7 +28,6 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const schema_namespaceObject = require("@tachybase/schema");
 const external_react_i18next_namespaceObject = require("react-i18next");
-const external_react_router_namespaceObject = require("react-router");
 const external_index_js_namespaceObject = require("../../index.js");
 const index_js_namespaceObject = require("../../../application/schema-settings/index.js");
 const schema_toolbar_index_js_namespaceObject = require("../../../application/schema-toolbar/index.js");
@@ -65,38 +64,6 @@ const pageSettings = new index_js_namespaceObject.SchemaSettings({
                 };
             }
         },
-        {
-            name: 'enablesharePage',
-            type: 'switch',
-            useVisible () {
-                const isShare = (0, external_react_router_namespaceObject.useMatch)('/share/:name');
-                return !isShare;
-            },
-            useComponentProps () {
-                var _fieldSchema_xcomponentprops;
-                const { dn } = (0, external_index_js_namespaceObject.useDesignable)();
-                const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
-                const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-                const { title } = (0, schema_toolbar_index_js_namespaceObject.useSchemaToolbar)();
-                return {
-                    title: t('Enable Share page'),
-                    checked: null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.enableSharePage,
-                    onChange (v) {
-                        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
-                        fieldSchema['x-component-props']['enableSharePage'] = v;
-                        if (!fieldSchema.title) fieldSchema.title = title;
-                        dn.emit('patch', {
-                            schema: {
-                                ['x-uid']: fieldSchema['x-uid'],
-                                ['x-component-props']: fieldSchema['x-component-props'],
-                                title: fieldSchema.title
-                            }
-                        });
-                        dn.refresh();
-                    }
-                };
-            }
-        },
         {
             name: 'divider',
             type: 'divider',

package/lib/schema-component/antd/page/Page.js

@@ -66,7 +66,6 @@ const external_hooks_index_js_namespaceObject = require("../../hooks/index.js");
 const external_error_fallback_index_js_namespaceObject = require("../error-fallback/index.js");
 const external_FixedBlock_js_namespaceObject = require("./FixedBlock.js");
 var external_FixedBlock_js_default = /*#__PURE__*/ __webpack_require__.n(external_FixedBlock_js_namespaceObject);
-const useShareActions_js_namespaceObject = require("./hooks/useShareActions.js");
 const external_Page_style_js_namespaceObject = require("./Page.style.js");
 const external_PageDesigner_js_namespaceObject = require("./PageDesigner.js");
 const external_PageTabDesigner_js_namespaceObject = require("./PageTabDesigner.js");
@@ -128,29 +127,21 @@ const Page = (props)=>{
     }));
 };
 const PageHeader = (props)=>{
-    var _fieldSchema_xcomponentprops;
+    var _fieldSchema_xcomponentprops, _Object_values, _Object_values1;
     const { disablePageHeader, enablePageTabs, setHeight, activeKey, setLoading, setSearchParams, fieldSchema, title, parentProps, enableSharePage } = props;
     const { theme } = (0, theme_index_js_namespaceObject.useGlobalTheme)();
     const options = (0, external_react_namespaceObject.useContext)(schema_namespaceObject.SchemaOptionsContext);
     const compile = (0, external_hooks_index_js_namespaceObject.useCompile)();
-    const [open, setOpen] = (0, external_react_namespaceObject.useState)(false);
-    const [imageOpen, setImageOpen] = (0, external_react_namespaceObject.useState)(false);
     const { showScrollArea } = (0, useContextMenu_js_namespaceObject.useContextMenu)();
     const hidePageTitle = null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.hidePageTitle;
+    const extendComponents = fieldSchema['x-extend-components'] || {};
     const pageHeaderTitle = hidePageTitle ? void 0 : fieldSchema.title || compile(title);
-    const isShare = (0, external_react_router_dom_namespaceObject.useMatch)('/share/:name');
     const items = fieldSchema.mapProperties((schema)=>({
             key: schema.name,
             label: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(TabItem, {
                 schema: schema
             })
         }));
-    const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
-    const { styles } = (0, external_style_js_namespaceObject.useStyles)();
-    const { copyLink, imageAction } = (0, useShareActions_js_namespaceObject.useShareActions)({
-        title: pageHeaderTitle,
-        uid: ''
-    });
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("div", {
         ref: (ref)=>{
             setHeight(Math.floor((null == ref ? void 0 : ref.getBoundingClientRect().height) || 0) + 1);
@@ -162,12 +153,29 @@ const PageHeader = (props)=>{
                 ghost: false,
                 title: pageHeaderTitle || ' ',
                 ...parentProps,
-                extra: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(HeaderExtra, {
-                    enablePageTabs: enablePageTabs,
-                    showScrollArea: showScrollArea,
-                    isShare: isShare,
-                    setOpen: setOpen,
-                    enableSharePage: enableSharePage
+                extra: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
+                    children: [
+                        null == (_Object_values = Object.values(extendComponents)) ? void 0 : _Object_values.map((item, index)=>{
+                            const schema = {
+                                type: 'void',
+                                name: item.name,
+                                'x-component': item.component,
+                                'x-component-props': {}
+                            };
+                            const componentProps = {
+                                ...props,
+                                isExtra: true,
+                                fieldSchema
+                            };
+                            return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_index_js_namespaceObject.PageExtendComponentProvider, {
+                                ...componentProps,
+                                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_core_index_js_namespaceObject.SchemaComponent, {
+                                    schema: schema
+                                })
+                            });
+                        }),
+                        !enablePageTabs && showScrollArea && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_index_js_namespaceObject.ScrollArea, {})
+                    ]
                 }),
                 footer: enablePageTabs && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(TabComponent, {
                     activeKey: activeKey,
@@ -179,84 +187,27 @@ const PageHeader = (props)=>{
                     items: items
                 })
             }),
-            disablePageHeader && enableSharePage && !isShare && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
-                className: "tb-page-header-button",
-                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_antd_namespaceObject.Button, {
-                    icon: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(icons_namespaceObject.ShareAltOutlined, {}),
-                    onClick: ()=>{
-                        setOpen(true);
-                    },
-                    children: t('Share')
-                })
-            }),
-            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(external_antd_namespaceObject.Modal, {
-                open: open,
-                className: styles.firstmodal,
-                title: t('Share'),
-                footer: null,
-                width: 500,
-                onCancel: ()=>{
-                    setOpen(false);
-                },
-                children: [
-                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("div", {
-                        className: styles.secondmodal,
-                        children: [
-                            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("div", {
-                                className: "tb-header-modal-list",
-                                onClick: copyLink,
-                                children: [
-                                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_icon_index_js_namespaceObject.Icon, {
-                                        type: "PaperClipOutlined"
-                                    }),
-                                    t('Copy link')
-                                ]
-                            }),
-                            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("div", {
-                                className: "tb-header-modal-list",
-                                onClick: ()=>{
-                                    setImageOpen(true);
-                                },
-                                children: [
-                                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_icon_index_js_namespaceObject.Icon, {
-                                        type: "QrcodeOutlined"
-                                    }),
-                                    t('Generate QR code')
-                                ]
-                            })
-                        ]
-                    }),
-                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_antd_namespaceObject.Modal, {
-                        className: styles.imageModal,
-                        open: imageOpen,
-                        footer: null,
-                        onCancel: ()=>{
-                            setImageOpen(false);
-                        },
-                        children: imageAction()
+            null == (_Object_values1 = Object.values(extendComponents)) ? void 0 : _Object_values1.map((item, index)=>{
+                const schema = {
+                    type: 'void',
+                    name: 'icon' + item.name,
+                    'x-component': item.component,
+                    'x-component-props': {}
+                };
+                const componentProps = {
+                    ...props,
+                    fieldSchema
+                };
+                return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_index_js_namespaceObject.PageExtendComponentProvider, {
+                    ...componentProps,
+                    children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_core_index_js_namespaceObject.SchemaComponent, {
+                        schema: schema
                     })
-                ]
+                });
             })
         ]
     });
 };
-const HeaderExtra = (param)=>{
-    let { enablePageTabs, showScrollArea, isShare, setOpen, enableSharePage } = param;
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
-        children: [
-            !isShare && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_antd_namespaceObject.Button, {
-                icon: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(icons_namespaceObject.ShareAltOutlined, {}),
-                onClick: ()=>{
-                    setOpen(true);
-                },
-                style: {
-                    visibility: "".concat(enableSharePage ? 'visible' : 'hidden')
-                }
-            }),
-            !enablePageTabs && showScrollArea && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_index_js_namespaceObject.ScrollArea, {})
-        ]
-    });
-};
 const TabComponent = (props)=>{
     const { activeKey, setLoading, setSearchParams, showScrollArea, options, theme, items } = props;
     const { styles } = (0, external_Page_style_js_namespaceObject.useStyles)();

package/lib/schema-component/antd/page/hooks/index.js

@@ -1,7 +1,7 @@
 "use strict";
 var __webpack_modules__ = {
-    "./useShareActions": function(module) {
-        module.exports = require("./useShareActions.js");
+    "./useIsBlockInPage": function(module) {
+        module.exports = require("./useIsBlockInPage.js");
     }
 };
 var __webpack_module_cache__ = {};
@@ -47,10 +47,10 @@ function __webpack_require__(moduleId) {
 var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
-    var _useShareActions__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./useShareActions");
+    var _useIsBlockInPage__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./useIsBlockInPage");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _useShareActions__WEBPACK_IMPORTED_MODULE_0__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _useShareActions__WEBPACK_IMPORTED_MODULE_0__[key];
+    for(var __WEBPACK_IMPORT_KEY__ in _useIsBlockInPage__WEBPACK_IMPORTED_MODULE_0__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _useIsBlockInPage__WEBPACK_IMPORTED_MODULE_0__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();

package/lib/schema-component/antd/page/index.js

@@ -17,6 +17,9 @@ var __webpack_modules__ = {
     },
     "./hooks?5620": function(module) {
         module.exports = require("./hooks/index.js");
+    },
+    "./pageExtendComponentProvider": function(module) {
+        module.exports = require("./pageExtendComponentProvider.js");
     }
 };
 var __webpack_module_cache__ = {};
@@ -98,6 +101,12 @@ var __webpack_exports__ = {};
         return _hooks__WEBPACK_IMPORTED_MODULE_5__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _pageExtendComponentProvider__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__("./pageExtendComponentProvider");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _pageExtendComponentProvider__WEBPACK_IMPORTED_MODULE_6__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _pageExtendComponentProvider__WEBPACK_IMPORTED_MODULE_6__[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/{application/components/ShareSchemaComponent.js → schema-component/antd/page/pageExtendComponentProvider.js}

@@ -24,20 +24,25 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    ShareSchemaComponent: ()=>ShareSchemaComponent
+    usePageExtendComponentContext: ()=>usePageExtendComponentContext,
+    PageExtendComponentContext: ()=>PageExtendComponentContext,
+    PageExtendComponentProvider: ()=>PageExtendComponentProvider
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
-const external_react_router_namespaceObject = require("react-router");
-const index_js_namespaceObject = require("../../schema-component/index.js");
-function ShareSchemaComponent() {
-    const params = (0, external_react_router_namespaceObject.useParams)();
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.RemoteSchemaComponent, {
-        uid: params.name
+const external_react_namespaceObject = require("react");
+const PageExtendComponentContext = /*#__PURE__*/ (0, external_react_namespaceObject.createContext)({});
+const PageExtendComponentProvider = (props)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(PageExtendComponentContext.Provider, {
+        value: props,
+        children: props.children
     });
-}
-exports.ShareSchemaComponent = __webpack_exports__.ShareSchemaComponent;
+const usePageExtendComponentContext = ()=>(0, external_react_namespaceObject.useContext)(PageExtendComponentContext);
+exports.PageExtendComponentContext = __webpack_exports__.PageExtendComponentContext;
+exports.PageExtendComponentProvider = __webpack_exports__.PageExtendComponentProvider;
+exports.usePageExtendComponentContext = __webpack_exports__.usePageExtendComponentContext;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
-    "ShareSchemaComponent"
+    "PageExtendComponentContext",
+    "PageExtendComponentProvider",
+    "usePageExtendComponentContext"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/lib/schema-component/antd/page/style.js

@@ -24,46 +24,9 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    getStyles: ()=>getStyles,
-    useStyles: ()=>useStyles
+    getStyles: ()=>getStyles
 });
-const external_antd_style_namespaceObject = require("antd-style");
 const index_js_namespaceObject = require("../__builtins__/index.js");
-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 = (0, index_js_namespaceObject.genStyleHook)('tb-page', (token)=>{
     const { componentCls } = token;
     return {
@@ -208,19 +171,9 @@ const getStyles = (0, index_js_namespaceObject.genStyleHook)('tb-page', (token)=
         }
     };
 });
-const useStyles = (0, external_antd_style_namespaceObject.createStyles)((param)=>{
-    let { css, token } = param;
-    return {
-        firstmodal: css(_templateObject()),
-        secondmodal: css(_templateObject1()),
-        imageModal: css(_templateObject2())
-    };
-});
 exports.getStyles = __webpack_exports__.getStyles;
-exports.useStyles = __webpack_exports__.useStyles;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
-    "getStyles",
-    "useStyles"
+    "getStyles"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/lib/schema-component/antd/select/FormulaSelect.js

@@ -24,7 +24,7 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>FormulaSelect
+    default: ()=>select_FormulaSelect
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
@@ -131,6 +131,7 @@ const useLabelOptions = (others)=>{
     const collectionField = (0, external_react_namespaceObject.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',
@@ -179,16 +180,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] = (0, external_react_namespaceObject.useState)([]);
     const [collectionName, setCollectionName] = (0, external_react_namespaceObject.useState)('');
+    const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
     const api = (0, index_js_namespaceObject.useAPIClient)();
     if (mode && ![
         'multiple',
-        'tags'
+        'tags',
+        'CustomTitle'
     ].includes(mode)) mode = void 0;
     const fieldProps = {
         ...others
@@ -210,6 +213,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__*/ (0, jsx_runtime_namespaceObject.jsx)(ObjectSelect, {
         rawOptions: rawOptions,
@@ -220,7 +224,15 @@ const FormulaSelect_FormulaSelect = (props)=>{
         loading: loading
     });
 };
-const FormulaSelect = FormulaSelect_FormulaSelect;
+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
+        };
+    });
 exports["default"] = __webpack_exports__["default"];
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "default"

package/lib/schema-component/antd/select/ReadPretty.js

@@ -34,7 +34,7 @@ const CollectionFieldProvider_js_namespaceObject = require("../../../data-source
 const EllipsisWithTooltip_js_namespaceObject = require("../input/EllipsisWithTooltip.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const ReadPretty = (0, schema_namespaceObject.observer)((props)=>{
-    var _field_value;
+    var _field_value, _fieldSchema_xcomponentprops_fieldNames;
     const fieldNames = {
         ...external_utils_js_namespaceObject.defaultFieldNames,
         ...props.fieldNames
@@ -43,8 +43,10 @@ const ReadPretty = (0, schema_namespaceObject.observer)((props)=>{
     if (!(0, schema_namespaceObject.isValid)(props.value)) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {});
     if ((0, schema_namespaceObject.isArrayField)(field) && (null == field ? void 0 : null == (_field_value = field.value) ? void 0 : _field_value.length) === 0) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {});
     const collectionField = (0, CollectionFieldProvider_js_namespaceObject.useCollectionField)();
+    const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
     const dataSource = field.dataSource || props.options || (null == collectionField ? void 0 : collectionField.uiSchema.enum) || [];
-    const currentOptions = (0, external_utils_js_namespaceObject.getCurrentOptions)(field.value, dataSource, fieldNames);
+    const options = (0, external_utils_js_namespaceObject.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__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(EllipsisWithTooltip_js_namespaceObject.EllipsisWithTooltip, {
             ellipsis: props.ellipsis,
@@ -58,6 +60,17 @@ const ReadPretty = (0, schema_namespaceObject.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
+        };
+    });
+};
 exports.ReadPretty = __webpack_exports__.ReadPretty;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ReadPretty"

package/lib/schema-component/antd/select/Select.js

@@ -120,8 +120,12 @@ const InternalSelect = (0, schema_namespaceObject.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__*/ (0, jsx_runtime_namespaceObject.jsx)(external_FormulaSelect_js_default(), {
@@ -156,6 +160,7 @@ const InternalSelect = (0, schema_namespaceObject.connect)((props)=>{
                 "aria-label": "icon-close-select"
             })
         },
+        options: options,
         popupMatchSelectWidth: false,
         notFoundContent: loading ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_antd_namespaceObject.Spin, {}) : /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_antd_namespaceObject.Empty, {
             image: external_antd_namespaceObject.Empty.PRESENTED_IMAGE_SIMPLE

package/lib/schema-component/hooks/useFieldModeOptions.js

@@ -30,8 +30,10 @@ const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const index_js_namespaceObject = require("../../collection-manager/index.js");
+const external_data_source_index_js_namespaceObject = require("../../data-source/index.js");
+const external_useCompile_js_namespaceObject = require("./useCompile.js");
 const useFieldModeOptions = (props)=>{
-    var _fieldSchema_xcomponentprops;
+    var _fieldSchema_xcomponentprops, _collectionInterface_componentOptions_filter, _collectionInterface_componentOptions;
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const { getCollectionJoinField, getCollection } = (0, index_js_namespaceObject.useCollectionManager_deprecated)();
     const currentFieldSchema = (0, schema_namespaceObject.useFieldSchema)();
@@ -39,12 +41,15 @@ const useFieldModeOptions = (props)=>{
     const field = (0, schema_namespaceObject.useField)();
     const form = (0, schema_namespaceObject.useForm)();
     const isReadPretty = (null == fieldSchema ? void 0 : fieldSchema['x-read-pretty']) || field.readPretty || form.readPretty;
+    const dm = (0, external_data_source_index_js_namespaceObject.useDataSourceManager)();
     const isTableField = null == props ? void 0 : props.fieldSchema;
     const { getField } = (0, index_js_namespaceObject.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 = (0, external_useCompile_js_namespaceObject.useCompile)();
     const fieldModeOptions = (0, external_react_namespaceObject.useMemo)(()=>{
-        if (!collectionField || !(null == collectionField ? void 0 : collectionField.interface)) return;
+        if (!collectionField || !(null == collectionField ? void 0 : collectionField.interface)) return [];
         if (![
             'o2o',
             'oho',
@@ -234,10 +239,6 @@ const useFieldModeOptions = (props)=>{
                         label: t('Tag'),
                         value: 'Tag'
                     },
-                    {
-                        label: t('Custom Title'),
-                        value: 'CustomTitle'
-                    },
                     !isTableField && {
                         label: t('Sub-details'),
                         value: 'Nester'
@@ -266,10 +267,6 @@ const useFieldModeOptions = (props)=>{
                     {
                         label: t('Cascader'),
                         value: 'Cascader'
-                    },
-                    {
-                        label: t('Custom Title'),
-                        value: 'CustomTitle'
                     }
                 ];
             default:
@@ -314,6 +311,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);
 };
 exports.useFieldModeOptions = __webpack_exports__.useFieldModeOptions;

package/lib/schema-settings/EditFormulaTitleField.js

@@ -45,6 +45,12 @@ function useFormulaTitleOptions() {
     const collectionManage = (0, index_js_namespaceObject.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'];
@@ -53,7 +59,7 @@ function useFormulaTitleOptions() {
         if (![
             'm2m',
             'o2m'
-        ].includes(field.interface)) {
+        ].includes(field.interface) && isAssociationField) {
             if (field.uiSchema) {
                 var _getCollectionFields;
                 var _getCollectionFields_filter_map;
@@ -67,6 +73,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/lib/schema-settings/SchemaSettingsPlugin.js

@@ -71,6 +71,8 @@ const fileManagerComponentFieldSettings_js_namespaceObject = require("../modules
 const uploadAttachmentComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/FileManager/uploadAttachmentComponentFieldSettings.js");
 const inputComponentFieldsSettings_js_namespaceObject = require("../modules/fields/component/Input/inputComponentFieldsSettings.js");
 const inputNumberComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/InputNumber/inputNumberComponentFieldSettings.js");
+const inputPreviewComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/InputPreview/inputPreviewComponentFieldSettings.js");
+const multipleSelectComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/MultipleSelect/multipleSelectComponentFieldSettings.js");
 const subformComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/Nester/subformComponentFieldSettings.js");
 const recordPickerComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/Picker/recordPickerComponentFieldSettings.js");
 const subformPopoverComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.js");
@@ -128,6 +130,7 @@ class SchemaSettingsPlugin extends Plugin_js_namespaceObject.Plugin {
         this.schemaSettingsManager.add(datePickerComponentFieldSettings_js_namespaceObject.datePickerComponentFieldSettings);
         this.schemaSettingsManager.add(unixTimestampComponentFieldSettings_js_namespaceObject.unixTimestampComponentFieldSettings);
         this.schemaSettingsManager.add(inputComponentFieldsSettings_js_namespaceObject.inputComponentFieldSettings);
+        this.schemaSettingsManager.add(inputPreviewComponentFieldSettings_js_namespaceObject.inputPreviewComponentFieldSettings);
         this.schemaSettingsManager.add(inputNumberComponentFieldSettings_js_namespaceObject.inputNumberComponentFieldSettings);
         this.schemaSettingsManager.add(checkboxComponentFieldSettings_js_namespaceObject.checkboxComponentFieldSettings);
         this.schemaSettingsManager.add(radioComponentFieldSettings_js_namespaceObject.radioComponentFieldSettings);
@@ -137,6 +140,7 @@ class SchemaSettingsPlugin extends Plugin_js_namespaceObject.Plugin {
         this.schemaSettingsManager.add(cascadeSelectComponentFieldSettings_js_namespaceObject.cascadeSelectComponentFieldSettings);
         this.schemaSettingsManager.add(uploadAttachmentComponentFieldSettings_js_namespaceObject.uploadAttachmentComponentFieldSettings);
         this.schemaSettingsManager.add(cascaderComponentFieldSettings_js_namespaceObject.cascaderComponentFieldSettings);
+        this.schemaSettingsManager.add(multipleSelectComponentFieldSettings_js_namespaceObject.multipleComponentFieldSettings);
     }
 }
 exports.SchemaSettingsPlugin = __webpack_exports__.SchemaSettingsPlugin;