@tachybase/client 1.3.20 → 1.3.22

package/lib/collection-manager/Configuration/EditSubFieldAction.js

@@ -37,8 +37,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const cloneDeep_namespaceObject = require("lodash/cloneDeep");
 var cloneDeep_default = /*#__PURE__*/ __webpack_require__.n(cloneDeep_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -141,7 +141,7 @@ const EditSubFieldAction = (props)=>{
                 schema: schema,
                 components: {
                     ...external_components_index_js_namespaceObject,
-                    ArrayTable: components_namespaceObject.ArrayTable
+                    ArrayTable: client_namespaceObject.ArrayTable
                 },
                 scope: {
                     useUpdateCollectionField

package/lib/collection-manager/Configuration/ImportXlsx/xlsxImportAction.js

@@ -37,8 +37,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const index_js_namespaceObject = require("../../../api-client/index.js");
@@ -97,7 +97,7 @@ const XlsxEditFieldAction = (props)=>{
                     schema: schema,
                     components: {
                         ...external_components_index_js_namespaceObject,
-                        ArrayTable: components_namespaceObject.ArrayTable
+                        ArrayTable: client_namespaceObject.ArrayTable
                     },
                     scope: {
                         getContainer,

package/lib/collection-manager/Configuration/OverridingCollectionField.js

@@ -38,8 +38,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 const cloneDeep_namespaceObject = require("lodash/cloneDeep");
 var cloneDeep_default = /*#__PURE__*/ __webpack_require__.n(cloneDeep_namespaceObject);
@@ -230,7 +230,7 @@ const OverridingFieldAction = (props)=>{
                     schema: schema,
                     components: {
                         ...external_components_index_js_namespaceObject,
-                        ArrayTable: components_namespaceObject.ArrayTable
+                        ArrayTable: client_namespaceObject.ArrayTable
                     },
                     scope: {
                         getContainer,

package/lib/collection-manager/Configuration/SyncFieldsAction.js

@@ -29,9 +29,9 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
 const icons_namespaceObject = require("@ant-design/icons");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const external_lodash_namespaceObject = require("lodash");
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -208,7 +208,7 @@ const SyncFieldsActionCom = (props)=>{
                     schema: schema,
                     components: {
                         ...external_components_index_js_namespaceObject,
-                        ArrayTable: components_namespaceObject.ArrayTable
+                        ArrayTable: client_namespaceObject.ArrayTable
                     },
                     scope: {
                         getContainer,

package/lib/collection-manager/Configuration/SyncSQLFieldsAction.js

@@ -28,9 +28,9 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
 const icons_namespaceObject = require("@ant-design/icons");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const index_js_namespaceObject = require("../../api-client/index.js");
@@ -179,7 +179,7 @@ const SyncSQLFieldsAction = (param)=>{
                     /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_component_index_js_namespaceObject.SchemaComponent, {
                         schema: schema,
                         components: {
-                            FormLayout: components_namespaceObject.FormLayout
+                            FormLayout: client_namespaceObject.FormLayout
                         },
                         scope: {
                             useCancelAction: external_action_hooks_js_namespaceObject.useCancelAction,

package/lib/collection-manager/Configuration/ViewInheritedField.js

@@ -38,8 +38,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const cloneDeep_namespaceObject = require("lodash/cloneDeep");
 var cloneDeep_default = /*#__PURE__*/ __webpack_require__.n(cloneDeep_namespaceObject);
 const set_namespaceObject = require("lodash/set");
@@ -161,7 +161,7 @@ const ViewFieldAction = (props)=>{
                     schema: schema,
                     components: {
                         ...external_components_index_js_namespaceObject,
-                        ArrayTable: components_namespaceObject.ArrayTable
+                        ArrayTable: client_namespaceObject.ArrayTable
                     },
                     scope: {
                         getContainer,

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/json.js

@@ -28,8 +28,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const CollectionFieldInterface_js_namespaceObject = require("../../data-source/collection-field-interface/CollectionFieldInterface.js");
 const index_js_namespaceObject = require("./properties/index.js");
 function _define_property(obj, key, value) {
@@ -85,8 +85,8 @@ class JsonFieldInterface extends CollectionFieldInterface_js_namespaceObject.Col
                 title: 'JSONB',
                 'x-decorator': (param)=>{
                     let { children } = param;
-                    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
-                        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormItem, {
+                    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
+                        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormItem, {
                             children: children
                         })
                     });

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/collection-manager/templates/expression.js

@@ -26,7 +26,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     ExpressionCollectionTemplate: ()=>ExpressionCollectionTemplate
 });
-const client_namespaceObject = require("@tachybase/evaluators/client");
+const client_namespaceObject = require("@tego/client");
 const CollectionTemplate_js_namespaceObject = require("../../data-source/collection-template/CollectionTemplate.js");
 const index_js_namespaceObject = require("./properties/index.js");
 function _define_property(obj, key, value) {

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/filter-provider/utils.js

@@ -47,7 +47,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const index_js_namespaceObject = require("../block-provider/hooks/index.js");

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/actions/link/customizeLinkActionSettings.js

@@ -38,8 +38,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -67,7 +67,7 @@ const SchemaSettingsActionLinkItem = ()=>{
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_settings_index_js_namespaceObject.SchemaSettingsModalItem, {
         title: t('Edit link'),
         components: {
-            ArrayItems: components_namespaceObject.ArrayItems
+            ArrayItems: client_namespaceObject.ArrayItems
         },
         schema: {
             type: 'object',

package/lib/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.js

@@ -27,8 +27,8 @@ __webpack_require__.d(__webpack_exports__, {
     detailsWithPaginationSettings: ()=>detailsWithPaginationSettings,
     multiDataDetailsBlockSettings: ()=>multiDataDetailsBlockSettings
 });
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 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");
@@ -106,7 +106,7 @@ const commonItems = [
             return {
                 title: t('Set default sorting rules'),
                 components: {
-                    ArrayItems: components_namespaceObject.ArrayItems
+                    ArrayItems: client_namespaceObject.ArrayItems
                 },
                 schema: {
                     type: 'object',

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

@@ -35,8 +35,8 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     fieldSettingsFormItem: ()=>fieldSettingsFormItem
 });
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -393,8 +393,8 @@ const fieldSettingsFormItem = new SchemaSettings_js_namespaceObject.SchemaSettin
                             return {
                                 title: t('Set validation rules'),
                                 components: {
-                                    ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                                    FormLayout: components_namespaceObject.FormLayout
+                                    ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                                    FormLayout: client_namespaceObject.FormLayout
                                 },
                                 schema: {
                                     type: 'object',
@@ -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/grid-card/gridCardBlockSettings.js

@@ -36,8 +36,8 @@ __webpack_require__.d(__webpack_exports__, {
     gridCardBlockSettings: ()=>gridCardBlockSettings
 });
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -163,7 +163,7 @@ const gridCardBlockSettings = new SchemaSettings_js_namespaceObject.SchemaSettin
                 return {
                     title: t('Set default sorting rules'),
                     components: {
-                        ArrayItems: components_namespaceObject.ArrayItems
+                        ArrayItems: client_namespaceObject.ArrayItems
                     },
                     schema: {
                         type: 'object',

package/lib/modules/blocks/data-blocks/list/listBlockSettings.js

@@ -35,8 +35,8 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     listBlockSettings: ()=>listBlockSettings
 });
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -108,7 +108,7 @@ const listBlockSettings = new SchemaSettings_js_namespaceObject.SchemaSettings({
                 return {
                     title: t('Set default sorting rules'),
                     components: {
-                        ArrayItems: components_namespaceObject.ArrayItems
+                        ArrayItems: client_namespaceObject.ArrayItems
                     },
                     schema: {
                         type: 'object',

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/tableBlockSettings.js

@@ -27,8 +27,8 @@ __webpack_require__.d(__webpack_exports__, {
     tableBlockSettings: ()=>tableBlockSettings
 });
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const index_js_namespaceObject = require("../../../../api-client/index.js");
 const SchemaSettings_js_namespaceObject = require("../../../../application/schema-settings/SchemaSettings.js");
@@ -228,7 +228,7 @@ const tableBlockSettings = new SchemaSettings_js_namespaceObject.SchemaSettings(
                 return {
                     title: t('Set default sorting rules'),
                     components: {
-                        ArrayItems: components_namespaceObject.ArrayItems
+                        ArrayItems: client_namespaceObject.ArrayItems
                     },
                     schema: {
                         type: 'object',

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/data-blocks/table-selector/tableSelectorBlockSettings.js

@@ -27,8 +27,8 @@ __webpack_require__.d(__webpack_exports__, {
     tableSelectorBlockSettings: ()=>tableSelectorBlockSettings
 });
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const SchemaSettings_js_namespaceObject = require("../../../../application/schema-settings/SchemaSettings.js");
@@ -158,7 +158,7 @@ const tableSelectorBlockSettings = new SchemaSettings_js_namespaceObject.SchemaS
                 return {
                     title: t('Set default sorting rules'),
                     components: {
-                        ArrayItems: components_namespaceObject.ArrayItems
+                        ArrayItems: client_namespaceObject.ArrayItems
                     },
                     schema: {
                         type: 'object',

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

@@ -35,8 +35,8 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     filterFormItemFieldSettings: ()=>filterFormItemFieldSettings
 });
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -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({
@@ -229,8 +228,8 @@ const filterFormItemFieldSettings = new SchemaSettings_js_namespaceObject.Schema
                             return {
                                 title: t('Set validation rules'),
                                 components: {
-                                    ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                                    FormLayout: components_namespaceObject.FormLayout
+                                    ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                                    FormLayout: client_namespaceObject.FormLayout
                                 },
                                 schema: {
                                     type: 'object',
@@ -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

package/lib/modules/blocks/filter-blocks/tree/filterTreeItemFieldSettings.js

@@ -35,8 +35,8 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     filterFormItemFieldSettings: ()=>filterFormItemFieldSettings
 });
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -227,8 +227,8 @@ const filterFormItemFieldSettings = new SchemaSettings_js_namespaceObject.Schema
                             return {
                                 title: t('Set validation rules'),
                                 components: {
-                                    ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                                    FormLayout: components_namespaceObject.FormLayout
+                                    ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                                    FormLayout: client_namespaceObject.FormLayout
                                 },
                                 schema: {
                                     type: 'object',

package/lib/modules/fields/component/Cascader/cascaderComponentFieldSettings.js

@@ -39,8 +39,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -80,7 +80,7 @@ const SchemaSettingsSortingRule = function(props) {
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_settings_index_js_namespaceObject.SchemaSettingsModalItem, {
         title: t('Set default sorting rules'),
         components: {
-            ArrayItems: components_namespaceObject.ArrayItems
+            ArrayItems: client_namespaceObject.ArrayItems
         },
         schema: {
             type: 'object',