@tachybase/client 0.23.41 → 0.23.47

package/lib/schema-component/antd/form-item/FormItem.Settings.js

@@ -66,6 +66,7 @@ const external_data_source_index_js_namespaceObject = require("../../../data-sou
 const external_record_provider_index_js_namespaceObject = require("../../../record-provider/index.js");
 const Table_Column_Decorator_js_namespaceObject = require("../table-v2/Table.Column.Decorator.js");
 const GeneralSettings_js_namespaceObject = require("../../../schema-items/GeneralSettings.js");
+const external_schema_settings_index_js_namespaceObject = require("../../../schema-settings/index.js");
 const useIsAllowToSetDefaultValue_js_namespaceObject = require("../../../schema-settings/hooks/useIsAllowToSetDefaultValue.js");
 const useIsShowMultipleSwitch_js_namespaceObject = require("../../../schema-settings/hooks/useIsShowMultipleSwitch.js");
 const isPatternDisabled_js_namespaceObject = require("../../../schema-settings/isPatternDisabled.js");
@@ -623,6 +624,86 @@ const formItemSettings = new index_js_namespaceObject.SchemaSettings({
             },
             useVisible: useShowFieldMode
         },
+        {
+            name: 'customTitle',
+            type: 'modal',
+            useComponentProps () {
+                var _fieldSchema_xcomponentprops_fieldNames, _fieldSchema_xcomponentprops;
+                const schema = (0, schema_namespaceObject.useFieldSchema)();
+                const { fieldSchema: tableColumnSchema } = (0, Table_Column_Decorator_js_namespaceObject.useColumnSchema)();
+                const fieldSchema = tableColumnSchema || schema;
+                const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
+                const { dn } = (0, external_hooks_index_js_namespaceObject.useDesignable)();
+                const options = (0, external_schema_settings_index_js_namespaceObject.useFormulaTitleOptions)();
+                const def = null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : null === (_fieldSchema_xcomponentprops_fieldNames = _fieldSchema_xcomponentprops.fieldNames) || void 0 === _fieldSchema_xcomponentprops_fieldNames ? void 0 : _fieldSchema_xcomponentprops_fieldNames.formula;
+                const field = (0, schema_namespaceObject.useField)();
+                return {
+                    title: t('Custom option label'),
+                    schema: {
+                        type: 'object',
+                        title: t('Custom option label'),
+                        properties: {
+                            formula: {
+                                required: true,
+                                'x-decorator': 'FormItem',
+                                'x-component': 'Variable.TextArea',
+                                'x-component-props': {
+                                    scope: options
+                                },
+                                default: def || ''
+                            }
+                        }
+                    },
+                    onSubmit: (param)=>{
+                        let { formula } = param;
+                        if (formula) {
+                            var _fieldSchema_xcomponentprops, _field_componentProps;
+                            const componentProps = {
+                                ...fieldSchema['x-component-props'],
+                                fieldNames: {
+                                    ...null === (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) || void 0 === _fieldSchema_xcomponentprops ? void 0 : _fieldSchema_xcomponentprops['fieldNames'],
+                                    formula
+                                },
+                                appends: [
+                                    fieldSchema['name']
+                                ]
+                            };
+                            const regex = /{{(.*?)}}/g;
+                            let match;
+                            while(match = regex.exec(formula))if (match[1].includes('.')) {
+                                const matchList = match[1].split('.');
+                                let appendsValue = fieldSchema['name'];
+                                matchList.forEach((item, index)=>{
+                                    if (index === matchList.length - 1) return;
+                                    appendsValue += '.' + item;
+                                    componentProps.appends.push(appendsValue);
+                                });
+                            }
+                            field.componentProps = {
+                                ...field.componentProps,
+                                fieldNames: {
+                                    ...null === (_field_componentProps = field.componentProps) || void 0 === _field_componentProps ? void 0 : _field_componentProps.fieldNames,
+                                    formula
+                                }
+                            };
+                            fieldSchema['x-component-props'] = componentProps;
+                            dn.emit('patch', {
+                                schema: {
+                                    'x-uid': fieldSchema['x-uid'],
+                                    'x-component-props': componentProps
+                                }
+                            });
+                        }
+                        dn.refresh();
+                    }
+                };
+            },
+            useVisible: ()=>{
+                const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
+                const formula = 'CustomTitle' === fieldSchema['x-component-props'].mode;
+                return useShowFieldMode() && formula;
+            }
+        },
         {
             name: 'popupSize',
             type: 'select',
@@ -989,7 +1070,7 @@ const formItemSettings = new index_js_namespaceObject.SchemaSettings({
                 const options = useTitleFieldOptions();
                 const isAssociationField = useIsAssociationField();
                 const fieldMode = useFieldMode();
-                return options.length > 0 && isAssociationField && 'SubTable' !== fieldMode;
+                return options.length > 0 && isAssociationField && 'SubTable' !== fieldMode && 'CustomTitle' !== fieldMode;
             },
             useComponentProps () {
                 var _field_componentProps_fieldNames, _field_componentProps;
@@ -1234,7 +1315,7 @@ function useFieldMode() {
 function useIsSelectFieldMode() {
     const fieldMode = useFieldMode();
     const isAssociationField = useIsAssociationField();
-    const isSelectFieldMode = isAssociationField && 'Select' === fieldMode;
+    const isSelectFieldMode = isAssociationField && ('Select' === fieldMode || 'CustomTitle' === fieldMode);
     return isSelectFieldMode;
 }
 function useValidateSchema() {

package/lib/schema-component/antd/remote-select/RemoteSelect.js

@@ -136,15 +136,17 @@ const InternalRemoteSelect = (0, schema_namespaceObject.connect)((props)=>{
         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, index_js_namespaceObject.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/lib/schema-component/antd/select/FormulaSelect.js

@@ -137,7 +137,7 @@ const useLabelOptions = (others)=>{
         resource: (null == collectionField ? void 0 : collectionField.target) || fieldSchema['collectionName'],
         action: 'list',
         params: {
-            pageSize: 99999
+            paginate: false
         }
     };
     const regex = /{{(.*?)}}/g;
@@ -172,7 +172,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);
                 }
             });
@@ -199,7 +199,7 @@ const FormulaSelect = (props)=>{
         api.request({
             url: others.collection + ':list',
             params: {
-                pageSize: 99999,
+                paginate: false,
                 filter: filterField ? {
                     ...filterField.filter
                 } : {}

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

@@ -128,7 +128,9 @@ const InternalSelect = (0, schema_namespaceObject.connect)((props)=>{
         'multiple',
         'tags'
     ].includes(mode)) mode = void 0;
-    if ('formula' in others.fieldNames || 'collection' in props) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_FormulaSelect_js_default(), {
+    if ([
+        'CustomTitle'
+    ].includes(props.mode) && ('formula' in others.fieldNames || 'collection' in props)) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_FormulaSelect_js_default(), {
         ...props
     });
     if (objectValue) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ObjectSelect, {

package/lib/schema-component/antd/variable/TextArea.js

@@ -185,7 +185,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, schema_namespaceObject.useFieldSchema)();
+    const value = propsValue || fieldSchema.default || '';
     const { styles } = (0, external_style_js_namespaceObject.useStyles)({
         multiline
     });

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

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

package/lib/schema-settings/EditFormulaTitleField.js

@@ -41,7 +41,9 @@ function useFormulaTitleOptions() {
     const compile = (0, external_schema_component_index_js_namespaceObject.useCompile)();
     const { getCollectionJoinField, getCollectionFields } = (0, index_js_namespaceObject.useCollectionManager_deprecated)();
     const { getField } = (0, index_js_namespaceObject.useCollection_deprecated)();
-    const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
+    const { fieldSchema: tableColumnSchema } = (0, external_schema_component_index_js_namespaceObject.useColumnSchema)();
+    const schema = (0, schema_namespaceObject.useFieldSchema)();
+    const fieldSchema = tableColumnSchema || schema;
     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']);
@@ -50,7 +52,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/lib/schema-settings/SchemaSettingsPlugin.js

@@ -66,6 +66,7 @@ const markdownBlockSettings_js_namespaceObject = require("../modules/blocks/othe
 const cascaderComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/Cascader/cascaderComponentFieldSettings.js");
 const cascadeSelectComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.js");
 const checkboxComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/Checkbox/checkboxComponentFieldSettings.js");
+const customTitleComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/CustomTitle/customTitleComponentFieldSettings.js");
 const datePickerComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/DatePicker/datePickerComponentFieldSettings.js");
 const drawerSubTableComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/DrawerSubTable/drawerSubTableComponentFieldSettings.js");
 const fileManagerComponentFieldSettings_js_namespaceObject = require("../modules/fields/component/FileManager/fileManagerComponentFieldSettings.js");
@@ -130,6 +131,7 @@ class SchemaSettingsPlugin extends Plugin_js_namespaceObject.Plugin {
         this.schemaSettingsManager.add(inputNumberComponentFieldSettings_js_namespaceObject.inputNumberComponentFieldSettings);
         this.schemaSettingsManager.add(checkboxComponentFieldSettings_js_namespaceObject.checkboxComponentFieldSettings);
         this.schemaSettingsManager.add(radioComponentFieldSettings_js_namespaceObject.radioComponentFieldSettings);
+        this.schemaSettingsManager.add(customTitleComponentFieldSettings_js_namespaceObject.CustomTitleComponentFieldSettings);
         this.schemaSettingsManager.add(fileManagerComponentFieldSettings_js_namespaceObject.fileManagerComponentFieldSettings);
         this.schemaSettingsManager.add(tagComponentFieldSettings_js_namespaceObject.tagComponentFieldSettings);
         this.schemaSettingsManager.add(cascadeSelectComponentFieldSettings_js_namespaceObject.cascadeSelectComponentFieldSettings);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "0.23.41",
+  "version": "0.23.47",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -64,15 +64,15 @@
     "react-zoom-pan-pinch": "^3.6.1",
     "sanitize-html": "2.14.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@tachybase/components": "0.23.41",
-    "@tachybase/evaluators": "0.23.41",
-    "@tachybase/requirejs": "0.23.41",
-    "@tachybase/sdk": "0.23.41",
-    "@tachybase/utils": "0.23.41",
-    "@tachybase/schema": "0.23.41"
+    "@tachybase/components": "0.23.47",
+    "@tachybase/requirejs": "0.23.47",
+    "@tachybase/evaluators": "0.23.47",
+    "@tachybase/schema": "0.23.47",
+    "@tachybase/sdk": "0.23.47",
+    "@tachybase/utils": "0.23.47"
   },
   "devDependencies": {
-    "@testing-library/react": "^14.3.1",
+    "@testing-library/react": "^16.2.0",
     "@types/flat": "^5.0.5",
     "@types/lodash": "^4.17.13",
     "@types/markdown-it": "12.2.3",