@tachybase/client 1.6.12 → 1.6.14

package/es/block-provider/BlockProvider.mjs

@@ -8,7 +8,8 @@ import template from "lodash/template";
 import { Link } from "react-router-dom";
 import { ACLCollectionProvider, DataBlockProvider, TableFieldResource, WithoutTableFieldResource, useCollectionManager, useCollectionParentRecord, useCollectionParentRecordData, useCollectionRecord, useDataBlockProps, useDataBlockRequest, useDataBlockResource, useDesignable, useRecord } from "../index.mjs";
 import { CollectionProvider_deprecated, useCollectionManager_deprecated, useCollection_deprecated } from "../collection-manager/index.mjs";
-import { DataBlockCollector } from "../filter-provider/FilterProvider.mjs";
+import { DataBlockCollector, useFilterBlock } from "../filter-provider/FilterProvider.mjs";
+import { mergeIncomingFiltersFromSourceBlocks } from "../filter-provider/incomingFilterFromSources.mjs";
 import { RecordProvider, useRecordIndex } from "../record-provider/index.mjs";
 import { useAssociationNames } from "./hooks/index.mjs";
 import { useDataBlockParentRecord } from "./hooks/useDataBlockSourceId.mjs";
@@ -172,24 +173,45 @@ const useCompatDataBlockParentRecord = (props)=>{
     return useDataBlockParentRecord(props);
 };
 const BlockProvider = (props)=>{
+    var _props_params;
     const { name, dataSource, useParams, parentRecord } = props;
     const parentRecordFromHook = useCompatDataBlockParentRecord(props);
+    const fieldSchema = useFieldSchema();
+    const { dataBlocks, inProvider } = useFilterBlock();
     const paramsFromHook = null == useParams ? void 0 : useParams();
     const { getAssociationAppends } = useAssociationNames(dataSource);
     const { appends, updateAssociationValues } = getAssociationAppends();
-    const params = useMemo(()=>{
+    const mergedFilter = useMemo(()=>{
         var _props_params;
-        if (!(null == (_props_params = props.params) ? void 0 : _props_params['appends'])) return {
+        const uid = null == fieldSchema ? void 0 : fieldSchema['x-uid'];
+        if (!inProvider || !uid) {
+            var _props_params1;
+            return null == (_props_params1 = props.params) ? void 0 : _props_params1.filter;
+        }
+        return mergeIncomingFiltersFromSourceBlocks(null == (_props_params = props.params) ? void 0 : _props_params.filter, uid, dataBlocks);
+    }, [
+        null == (_props_params = props.params) ? void 0 : _props_params.filter,
+        fieldSchema,
+        dataBlocks,
+        inProvider
+    ]);
+    const params = useMemo(()=>{
+        const baseParams = {
             ...props.params,
+            filter: mergedFilter
+        };
+        if (!baseParams['appends']) return {
+            ...baseParams,
             appends,
             ...paramsFromHook
         };
         return {
-            ...props.params,
+            ...baseParams,
             ...paramsFromHook
         };
     }, [
         appends,
+        mergedFilter,
         paramsFromHook,
         props.params
     ]);

package/es/block-provider/TreeBlockProvider.mjs

@@ -2,6 +2,7 @@ import { jsx } from "react/jsx-runtime";
 import { createContext, useContext, useEffect, useState } from "react";
 import { useField, useFieldSchema } from "@tachybase/schema";
 import { mergeFilter, useFilterBlock } from "../filter-provider/index.mjs";
+import { getFilterSourceDefaultFilter } from "../filter-provider/incomingFilterFromSources.mjs";
 import { FixedBlockWrapper, removeNullCondition } from "../schema-component/index.mjs";
 import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from "./BlockProvider.mjs";
 import { findFilterTargets } from "./hooks/index.mjs";
@@ -101,6 +102,7 @@ const useTreeBlockProps = ()=>{
                 };
                 const mergedFilter = mergeFilter([
                     ...Object.values(storedFilter).map((filter)=>removeNullCondition(filter)),
+                    getFilterSourceDefaultFilter(dataBlocks, uid),
                     block.defaultFilter
                 ]);
                 return block.doFilter({

package/es/block-provider/hooks/index.mjs

@@ -14,6 +14,7 @@ import { useAPIClient, useRequest } from "../../api-client/index.mjs";
 import { PathHandler } from "../../built-in/dynamic-page/utils.mjs";
 import { useCollectionManager_deprecated, useCollection_deprecated } from "../../collection-manager/index.mjs";
 import { useFilterBlock } from "../../filter-provider/FilterProvider.mjs";
+import { getFilterSourceDefaultFilter } from "../../filter-provider/incomingFilterFromSources.mjs";
 import { FILTER_OPERATORS_WITH_ARRAY_VALUES, mergeFilter as utils_mjs_mergeFilter, transformToFilter } from "../../filter-provider/utils.mjs";
 import { useRecord } from "../../record-provider/index.mjs";
 import { getCustomCondition, removeNullCondition, useActionContext, useCompile, useDesignable } from "../../schema-component/index.mjs";
@@ -50,6 +51,7 @@ function filterByCleanedFields(mergeFilter) {
             ].includes(p)) return false;
             if (/^\d+$/.test(p)) {
                 const prev = i > 0 ? arr[i - 1] : '';
+                if ('$and' === prev || '$or' === prev) return true;
                 if (FILTER_OPERATORS_WITH_ARRAY_VALUES.has(prev)) return true;
                 return false;
             }
@@ -452,6 +454,7 @@ const useFilterBlockActionProps = ()=>{
                     storedFilter[uid] = removeNullCondition(transformToFilter(filter.formValues, fieldSchema, getCollectionJoinField, name));
                     const mergedFilter = utils_mjs_mergeFilter([
                         ...Object.values(storedFilter).map((filter)=>removeNullCondition(filter)),
+                        getFilterSourceDefaultFilter(getDataBlocks(), uid),
                         block.defaultFilter,
                         filter.customFilter,
                         prevMergedFilter
@@ -497,6 +500,7 @@ const useResetBlockActionProps = ()=>{
                     delete storedFilter[uid];
                     const currFilter = utils_mjs_mergeFilter([
                         ...Object.values(storedFilter),
+                        getFilterSourceDefaultFilter(getDataBlocks(), uid),
                         block.defaultFilter,
                         prevMergedFilter
                     ]);
@@ -1085,6 +1089,7 @@ const useAssociationFilterBlockProps = ()=>{
             }
             const mergedFilter = utils_mjs_mergeFilter([
                 ...Object.values(storedFilter),
+                getFilterSourceDefaultFilter(getDataBlocks(), uid),
                 block.defaultFilter
             ]);
             return block.doFilter({

package/es/filter-provider/FilterProvider.d.ts

@@ -37,6 +37,8 @@ export interface DataBlock {
     foreignKeyFields?: ForeignKeyField[];
     /** 数据卡片已经存在的过滤条件（通过 `设置数据范围` 或者其它能设置筛选条件的功能） */
     defaultFilter?: FilterParam;
+    /** 本块作为连接发起方时，x-filter-targets 中的目标块 uid（用于把发起方的数据范围合并到被连接块） */
+    filterTargetUids?: string[];
     /** 数据卡片用于请求数据的接口 */
     service?: any;
     /** 数据卡片所的 DOM 容器 */
@@ -74,6 +76,7 @@ export declare const useFilterBlock: () => {
     recordDataBlocks: (block: DataBlock) => void;
     getDataBlocks: () => DataBlock[];
     removeDataBlock: (uid: string) => void;
+    dataBlocks: DataBlock[];
     /**
      * running in FilterBlockProvider
      */

package/es/filter-provider/FilterProvider.mjs

@@ -32,6 +32,15 @@ const DataBlockCollector = (param)=>{
     const dataLoadingMode = useDataLoadingMode();
     const shouldApplyFilter = 'FilterFormBlockProvider' !== field.decoratorType && 'FormBlockProvider' !== field.decoratorType && 'filter' !== field.decoratorProps.blockType;
     const addBlockToDataBlocks = useCallback(()=>{
+        let filterTargetUids = [];
+        let s = fieldSchema;
+        while(s){
+            if (s['x-filter-targets']) {
+                filterTargetUids = s['x-filter-targets'].map((t)=>t.uid);
+                break;
+            }
+            s = s.parent;
+        }
         recordDataBlocks({
             uid: fieldSchema['x-uid'],
             title: field.componentProps.title,
@@ -40,6 +49,7 @@ const DataBlockCollector = (param)=>{
             associatedFields,
             foreignKeyFields: collection.foreignKeyFields,
             defaultFilter: (null == params ? void 0 : params.filter) || {},
+            filterTargetUids,
             service,
             dom: container.current,
             dataLoadingMode,
@@ -97,15 +107,22 @@ const useFilterBlock = ()=>{
         inProvider: false,
         recordDataBlocks: ()=>{},
         getDataBlocks: ()=>[],
-        removeDataBlock: ()=>{}
+        removeDataBlock: ()=>{},
+        dataBlocks: []
     };
     const { dataBlocks, setDataBlocks } = ctx;
     const recordDataBlocks = (block)=>{
         const existingBlock = dataBlocks.find((item)=>item.uid === block.uid);
         if (existingBlock) {
+            const prevDf = JSON.stringify(existingBlock.defaultFilter);
+            const prevTg = JSON.stringify(existingBlock.filterTargetUids);
             existingBlock.service = block.service;
             existingBlock.defaultFilter = block.defaultFilter;
+            existingBlock.filterTargetUids = block.filterTargetUids;
             existingBlock.dataLoadingMode = block.dataLoadingMode;
+            if (JSON.stringify(existingBlock.defaultFilter) !== prevDf || JSON.stringify(existingBlock.filterTargetUids) !== prevTg) setDataBlocks((prev)=>[
+                    ...prev
+                ]);
             return;
         }
         setDataBlocks((prev)=>uniqBy([
@@ -121,6 +138,7 @@ const useFilterBlock = ()=>{
         recordDataBlocks,
         getDataBlocks,
         removeDataBlock,
+        dataBlocks,
         inProvider: true
     };
 };

package/es/filter-provider/incomingFilterFromSources.d.ts

@@ -0,0 +1,15 @@
+/** 与 FilterProvider.DataBlock 对齐，用于合并「谁连接了我」带来的 defaultFilter */
+export type DataBlockIncomingRef = {
+    uid: string;
+    defaultFilter?: any;
+    /** 本块在 schema 的 x-filter-targets 里声明的连接目标 uid 列表（发起方） */
+    filterTargetUids?: string[];
+};
+/**
+ * 被连接的数据卡片：将连接发起方数据卡片上的 defaultFilter（如设置数据范围）与自身 filter 做 $and。
+ */
+export declare function mergeIncomingFiltersFromSourceBlocks(ownFilter: unknown, currentBlockUid: string, dataBlocks: DataBlockIncomingRef[]): any;
+/**
+ * 带 x-filter-targets 的连接发起方（表格、筛选表单等）自身的 defaultFilter。
+ */
+export declare function getFilterSourceDefaultFilter(dataBlocks: DataBlockIncomingRef[], filterSourceUid: string | undefined): Record<string, any>;

package/es/filter-provider/incomingFilterFromSources.mjs

@@ -0,0 +1,23 @@
+import { mergeFilter } from "./utils.mjs";
+function mergeIncomingFiltersFromSourceBlocks(ownFilter, currentBlockUid, dataBlocks) {
+    if (!currentBlockUid) return null != ownFilter ? ownFilter : {};
+    const sources = dataBlocks.filter((b)=>{
+        var _b_filterTargetUids;
+        return (null == (_b_filterTargetUids = b.filterTargetUids) ? void 0 : _b_filterTargetUids.length) && b.filterTargetUids.includes(currentBlockUid);
+    });
+    const sourceFilters = sources.map((b)=>b.defaultFilter).filter((f)=>f && 'object' == typeof f && Object.keys(f).length > 0);
+    if (!sourceFilters.length) return null != ownFilter ? ownFilter : {};
+    const own = ownFilter && 'object' == typeof ownFilter ? ownFilter : {};
+    return mergeFilter([
+        ...sourceFilters,
+        own
+    ], '$and');
+}
+function getFilterSourceDefaultFilter(dataBlocks, filterSourceUid) {
+    var _dataBlocks_find;
+    if (!filterSourceUid) return {};
+    const f = null == (_dataBlocks_find = dataBlocks.find((b)=>b.uid === filterSourceUid)) ? void 0 : _dataBlocks_find.defaultFilter;
+    if (f && 'object' == typeof f && Object.keys(f).length) return f;
+    return {};
+}
+export { getFilterSourceDefaultFilter, mergeIncomingFiltersFromSourceBlocks };

package/es/filter-provider/index.d.ts

@@ -1,2 +1,3 @@
 export * from './FilterProvider';
+export * from './incomingFilterFromSources';
 export * from './utils';

package/es/filter-provider/index.mjs

@@ -1,2 +1,3 @@
 export * from "./FilterProvider.mjs";
+export * from "./incomingFilterFromSources.mjs";
 export * from "./utils.mjs";

package/es/filter-provider/utils.mjs

@@ -8,6 +8,7 @@ import { useCollectionManager_deprecated, useCollection_deprecated } from "../co
 import { removeNullCondition } from "../schema-component/index.mjs";
 import { findFilterOperators } from "../schema-component/antd/form-item/SchemaSettingOptions.mjs";
 import { useFilterBlock } from "./FilterProvider.mjs";
+import { getFilterSourceDefaultFilter } from "./incomingFilterFromSources.mjs";
 var utils_FilterBlockType = /*#__PURE__*/ function(FilterBlockType) {
     FilterBlockType[FilterBlockType["FORM"] = 0] = "FORM";
     FilterBlockType[FilterBlockType["TABLE"] = 1] = "TABLE";
@@ -172,6 +173,7 @@ const useFilterAPI = ()=>{
             else delete storedFilter[uid];
             const mergedFilter = mergeFilter([
                 ...Object.values(storedFilter).map((filter)=>removeNullCondition(filter)),
+                getFilterSourceDefaultFilter(dataBlocks, uid),
                 block.defaultFilter
             ]);
             block.doFilter({

package/es/modules/blocks/data-blocks/table/hooks/useTableBlockProps.mjs

@@ -5,6 +5,7 @@ import lodash from "lodash";
 import { filterByCleanedFields, findFilterTargets } from "../../../../../block-provider/hooks/index.mjs";
 import { useTableBlockContext } from "../../../../../block-provider/TableBlockProvider.mjs";
 import { useFilterBlock } from "../../../../../filter-provider/FilterProvider.mjs";
+import { getFilterSourceDefaultFilter } from "../../../../../filter-provider/incomingFilterFromSources.mjs";
 import { mergeFilter } from "../../../../../filter-provider/utils.mjs";
 import { removeNullCondition } from "../../../../../schema-component/index.mjs";
 const useTableBlockProps = ()=>{
@@ -88,8 +89,9 @@ const useTableBlockProps = ()=>{
             });
         },
         onClickRow (record, setSelectedRow, selectedRow) {
-            const { targets, uid } = findFilterTargets(fieldSchema);
+            const { targets, uid: filterSourceUid } = findFilterTargets(fieldSchema);
             const dataBlocks = getDataBlocks();
+            const sourceDefaultFilter = getFilterSourceDefaultFilter(dataBlocks, filterSourceUid);
             if (!targets || !targets.some((target)=>dataBlocks.some((dataBlock)=>dataBlock.uid === target.uid))) return void setSelectedRow((prev)=>prev.length ? [] : prev);
             const value = [
                 record[ctx.rowKey]
@@ -103,8 +105,8 @@ const useTableBlockProps = ()=>{
                 const storedFilter = (null == (_block_service_params1 = block.service.params) ? void 0 : null == (_block_service_params_ = _block_service_params1[1]) ? void 0 : _block_service_params_.filters) || {};
                 if (selectedRow.includes(record[ctx.rowKey])) {
                     if ('manual' === block.dataLoadingMode) return block.clearData();
-                    delete storedFilter[uid];
-                } else storedFilter[uid] = {
+                    delete storedFilter[filterSourceUid];
+                } else storedFilter[filterSourceUid] = {
                     $and: [
                         {
                             [(null == target ? void 0 : target.field) || ctx.rowKey]: {
@@ -121,6 +123,7 @@ const useTableBlockProps = ()=>{
                 const mergeList = [
                     ...Object.values(storedFilter).map((filter)=>removeNullCondition(filter)),
                     flat.unflatten(items),
+                    sourceDefaultFilter,
                     block.defaultFilter,
                     prevMergedFilter
                 ];

package/lib/block-provider/BlockProvider.js

@@ -64,6 +64,7 @@ const external_react_router_dom_namespaceObject = require("react-router-dom");
 const external_index_js_namespaceObject = require("../index.js");
 const index_js_namespaceObject = require("../collection-manager/index.js");
 const FilterProvider_js_namespaceObject = require("../filter-provider/FilterProvider.js");
+const incomingFilterFromSources_js_namespaceObject = require("../filter-provider/incomingFilterFromSources.js");
 const external_record_provider_index_js_namespaceObject = require("../record-provider/index.js");
 const external_hooks_index_js_namespaceObject = require("./hooks/index.js");
 const useDataBlockSourceId_js_namespaceObject = require("./hooks/useDataBlockSourceId.js");
@@ -227,24 +228,45 @@ const useCompatDataBlockParentRecord = (props)=>{
     return (0, useDataBlockSourceId_js_namespaceObject.useDataBlockParentRecord)(props);
 };
 const BlockProvider = (props)=>{
+    var _props_params;
     const { name, dataSource, useParams, parentRecord } = props;
     const parentRecordFromHook = useCompatDataBlockParentRecord(props);
+    const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
+    const { dataBlocks, inProvider } = (0, FilterProvider_js_namespaceObject.useFilterBlock)();
     const paramsFromHook = null == useParams ? void 0 : useParams();
     const { getAssociationAppends } = (0, external_hooks_index_js_namespaceObject.useAssociationNames)(dataSource);
     const { appends, updateAssociationValues } = getAssociationAppends();
-    const params = (0, external_react_namespaceObject.useMemo)(()=>{
+    const mergedFilter = (0, external_react_namespaceObject.useMemo)(()=>{
         var _props_params;
-        if (!(null == (_props_params = props.params) ? void 0 : _props_params['appends'])) return {
+        const uid = null == fieldSchema ? void 0 : fieldSchema['x-uid'];
+        if (!inProvider || !uid) {
+            var _props_params1;
+            return null == (_props_params1 = props.params) ? void 0 : _props_params1.filter;
+        }
+        return (0, incomingFilterFromSources_js_namespaceObject.mergeIncomingFiltersFromSourceBlocks)(null == (_props_params = props.params) ? void 0 : _props_params.filter, uid, dataBlocks);
+    }, [
+        null == (_props_params = props.params) ? void 0 : _props_params.filter,
+        fieldSchema,
+        dataBlocks,
+        inProvider
+    ]);
+    const params = (0, external_react_namespaceObject.useMemo)(()=>{
+        const baseParams = {
             ...props.params,
+            filter: mergedFilter
+        };
+        if (!baseParams['appends']) return {
+            ...baseParams,
             appends,
             ...paramsFromHook
         };
         return {
-            ...props.params,
+            ...baseParams,
             ...paramsFromHook
         };
     }, [
         appends,
+        mergedFilter,
         paramsFromHook,
         props.params
     ]);

package/lib/block-provider/TreeBlockProvider.js

@@ -33,6 +33,7 @@ const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
 const index_js_namespaceObject = require("../filter-provider/index.js");
+const incomingFilterFromSources_js_namespaceObject = require("../filter-provider/incomingFilterFromSources.js");
 const external_schema_component_index_js_namespaceObject = require("../schema-component/index.js");
 const external_BlockProvider_js_namespaceObject = require("./BlockProvider.js");
 const external_hooks_index_js_namespaceObject = require("./hooks/index.js");
@@ -132,6 +133,7 @@ const useTreeBlockProps = ()=>{
                 };
                 const mergedFilter = (0, index_js_namespaceObject.mergeFilter)([
                     ...Object.values(storedFilter).map((filter)=>(0, external_schema_component_index_js_namespaceObject.removeNullCondition)(filter)),
+                    (0, incomingFilterFromSources_js_namespaceObject.getFilterSourceDefaultFilter)(dataBlocks, uid),
                     block.defaultFilter
                 ]);
                 return block.doFilter({

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

@@ -12,6 +12,9 @@ var __webpack_modules__ = {
     "../../filter-provider/FilterProvider": function(module) {
         module.exports = require("../../filter-provider/FilterProvider.js");
     },
+    "../../filter-provider/incomingFilterFromSources": function(module) {
+        module.exports = require("../../filter-provider/incomingFilterFromSources.js");
+    },
     "../../filter-provider/utils": function(module) {
         module.exports = require("../../filter-provider/utils.js");
     },
@@ -187,20 +190,21 @@ var __webpack_exports__ = {};
     var _built_in_dynamic_page_utils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../built-in/dynamic-page/utils");
     var _collection_manager__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../collection-manager");
     var _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__("../../filter-provider/FilterProvider");
-    var _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../filter-provider/utils");
-    var _record_provider__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../record-provider");
-    var _schema_component__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../schema-component");
-    var _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../schema-component/antd/association-field/util");
-    var _user__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../user");
-    var _variables__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../variables");
-    var _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../variables/utils/isVariable");
-    var _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../../variables/utils/transformVariableValue");
-    var _BlockProvider__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../BlockProvider");
-    var _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../DetailsBlockProvider");
-    var _TableFieldProvider__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("../TableFieldProvider");
-    var _useFormActiveFields__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("./useFormActiveFields");
+    var _filter_provider_incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__("../../filter-provider/incomingFilterFromSources");
+    var _filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__("../../filter-provider/utils");
+    var _record_provider__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__("../../record-provider");
+    var _schema_component__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__("../../schema-component");
+    var _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__("../../schema-component/antd/association-field/util");
+    var _user__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__("../../user");
+    var _variables__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__("../../variables");
+    var _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__("../../variables/utils/isVariable");
+    var _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__("../../variables/utils/transformVariableValue");
+    var _BlockProvider__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__("../BlockProvider");
+    var _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__("../DetailsBlockProvider");
+    var _TableFieldProvider__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__("../TableFieldProvider");
+    var _useFormActiveFields__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("./useFormActiveFields");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _useFormActiveFields__WEBPACK_IMPORTED_MODULE_27__)if ([
+    for(var __WEBPACK_IMPORT_KEY__ in _useFormActiveFields__WEBPACK_IMPORTED_MODULE_28__)if ([
         "useBulkDestroyActionProps",
         "updateFilterTargets",
         "useCustomizeUpdateActionProps",
@@ -231,12 +235,12 @@ var __webpack_exports__ = {};
         "useOptionalFieldList",
         "filterByCleanedFields"
     ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _useFormActiveFields__WEBPACK_IMPORTED_MODULE_27__[key];
+        return _useFormActiveFields__WEBPACK_IMPORTED_MODULE_28__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _useParsedFilter__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__("./useParsedFilter");
+    var _useParsedFilter__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("./useParsedFilter");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _useParsedFilter__WEBPACK_IMPORTED_MODULE_28__)if ([
+    for(var __WEBPACK_IMPORT_KEY__ in _useParsedFilter__WEBPACK_IMPORTED_MODULE_29__)if ([
         "useBulkDestroyActionProps",
         "updateFilterTargets",
         "useCustomizeUpdateActionProps",
@@ -267,12 +271,12 @@ var __webpack_exports__ = {};
         "useOptionalFieldList",
         "filterByCleanedFields"
     ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _useParsedFilter__WEBPACK_IMPORTED_MODULE_28__[key];
+        return _useParsedFilter__WEBPACK_IMPORTED_MODULE_29__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_29__ = __webpack_require__("./useDataBlockSourceId");
+    var _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__("./useDataBlockSourceId");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_29__)if ([
+    for(var __WEBPACK_IMPORT_KEY__ in _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_30__)if ([
         "useBulkDestroyActionProps",
         "updateFilterTargets",
         "useCustomizeUpdateActionProps",
@@ -303,12 +307,12 @@ var __webpack_exports__ = {};
         "useOptionalFieldList",
         "filterByCleanedFields"
     ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_29__[key];
+        return _useDataBlockSourceId__WEBPACK_IMPORTED_MODULE_30__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _useIsMobile__WEBPACK_IMPORTED_MODULE_30__ = __webpack_require__("./useIsMobile");
+    var _useIsMobile__WEBPACK_IMPORTED_MODULE_31__ = __webpack_require__("./useIsMobile");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _useIsMobile__WEBPACK_IMPORTED_MODULE_30__)if ([
+    for(var __WEBPACK_IMPORT_KEY__ in _useIsMobile__WEBPACK_IMPORTED_MODULE_31__)if ([
         "useBulkDestroyActionProps",
         "updateFilterTargets",
         "useCustomizeUpdateActionProps",
@@ -339,7 +343,7 @@ var __webpack_exports__ = {};
         "useOptionalFieldList",
         "filterByCleanedFields"
     ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _useIsMobile__WEBPACK_IMPORTED_MODULE_30__[key];
+        return _useIsMobile__WEBPACK_IMPORTED_MODULE_31__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
     function renderTemplate(str, data) {
@@ -363,7 +367,8 @@ var __webpack_exports__ = {};
                 ].includes(p)) return false;
                 if (/^\d+$/.test(p)) {
                     const prev = i > 0 ? arr[i - 1] : '';
-                    if (_filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(prev)) return true;
+                    if ('$and' === prev || '$or' === prev) return true;
+                    if (_filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(prev)) return true;
                     return false;
                 }
                 return true;
@@ -399,18 +404,18 @@ var __webpack_exports__ = {};
     }
     function useCollectValuesToSubmit() {
         const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
-        const { field, resource } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
+        const { field, resource } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
         const { fields, getField, getTreeParentField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
         const fieldNames = fields.map((field)=>field.name);
-        const { fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
+        const { fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
         const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
-        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
-        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
+        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useVariables)();
+        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useLocalVariables)({
             currentForm: form
         });
         const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
-        const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_17__.useRecord)();
+        const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_18__.useRecord)();
         return (0, react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(async ()=>{
             var _fieldSchema_xcomponentprops;
             var _actionSchema_xactionsettings;
@@ -428,9 +433,9 @@ var __webpack_exports__ = {};
             const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
                 const value = originalAssignedValues[key];
                 const collectionField = getField(key);
-                if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
+                if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_23__.isVariable)(value)) {
                     const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                    if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
+                    if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_24__.transformVariableValue)(result, {
                         targetCollectionField: collectionField
                     });
                 } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -499,7 +504,7 @@ var __webpack_exports__ = {};
     };
     const useInsertSchema = ()=>{
         const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
-        const { insertAfterBegin } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useDesignable)();
+        const { insertAfterBegin } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useDesignable)();
         const insert = (0, react__WEBPACK_IMPORTED_MODULE_0__.useCallback)((ss)=>{
             const schema = fieldSchema.reduceProperties((buf, s)=>{
                 if (s['x-component'] === pageDetailsViewer) return s;
@@ -513,7 +518,7 @@ var __webpack_exports__ = {};
     };
     const useCancelActionProps = ()=>{
         const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
-        const ctx = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
+        const ctx = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
         return {
             async onClick () {
                 ctx.setVisible(false);
@@ -524,7 +529,7 @@ var __webpack_exports__ = {};
     const useJumpDetails = ()=>{
         const collection = (0, ___WEBPACK_IMPORTED_MODULE_11__.useCollection)();
         const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
-        const dn = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useDesignable)();
+        const dn = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useDesignable)();
         const insert = useInsertSchema();
         const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
         return (filterByTk)=>{
@@ -557,13 +562,13 @@ var __webpack_exports__ = {};
         var _actionField_componentProps_filterKeys;
         const record = (0, ___WEBPACK_IMPORTED_MODULE_11__.useCollectionRecord)();
         const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
-        const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
+        const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
         const jumpDetails = useJumpDetails();
-        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
+        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
         const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
         const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
         const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
-        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
+        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useCompile)();
         const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
         const { t } = (0, react_i18next__WEBPACK_IMPORTED_MODULE_8__.useTranslation)();
         const { updateAssociationValues } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormBlockContext)();
@@ -624,17 +629,17 @@ var __webpack_exports__ = {};
     const useAssociationCreateActionProps = ()=>{
         var _actionField_componentProps_filterKeys;
         const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
-        const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
-        const { setVisible, fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
+        const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
+        const { setVisible, fieldSchema } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
         const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
         const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
         const { message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
         const { fields, getField, getTreeParentField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
-        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
-        const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_17__.useRecord)();
-        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
-        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
+        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useCompile)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
+        const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_18__.useRecord)();
+        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useVariables)();
+        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useLocalVariables)({
             currentForm: form
         });
         const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
@@ -651,9 +656,9 @@ var __webpack_exports__ = {};
                 const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
                     const value = originalAssignedValues[key];
                     const collectionField = getField(key);
-                    if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
+                    if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_23__.isVariable)(value)) {
                         const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                        if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
+                        if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_24__.transformVariableValue)(result, {
                             targetCollectionField: collectionField
                         });
                     } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -760,11 +765,12 @@ var __webpack_exports__ = {};
                                 ...values
                             };
                             for(const key in form.values['__custom'])if (form.values['__custom'][key]) filter.customValues[key] = form.values['__custom'][key];
-                            filter.customFilter = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.getCustomCondition)(filter.customValues, fieldSchema);
+                            filter.customFilter = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.getCustomCondition)(filter.customValues, fieldSchema);
                         }
-                        storedFilter[uid] = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.removeNullCondition)((0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.transformToFilter)(filter.formValues, fieldSchema, getCollectionJoinField, name));
-                        const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
-                            ...Object.values(storedFilter).map((filter)=>(0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.removeNullCondition)(filter)),
+                        storedFilter[uid] = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.removeNullCondition)((0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__.transformToFilter)(filter.formValues, fieldSchema, getCollectionJoinField, name));
+                        const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__.mergeFilter)([
+                            ...Object.values(storedFilter).map((filter)=>(0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.removeNullCondition)(filter)),
+                            (0, _filter_provider_incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_16__.getFilterSourceDefaultFilter)(getDataBlocks(), uid),
                             block.defaultFilter,
                             filter.customFilter,
                             prevMergedFilter
@@ -808,8 +814,9 @@ var __webpack_exports__ = {};
                         const param = (null == (_block_service_params = block.service.params) ? void 0 : _block_service_params[0]) || {};
                         const storedFilter = (null == (_block_service_params1 = block.service.params) ? void 0 : null == (_block_service_params_ = _block_service_params1[1]) ? void 0 : _block_service_params_.filters) || {};
                         delete storedFilter[uid];
-                        const currFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
+                        const currFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__.mergeFilter)([
                             ...Object.values(storedFilter),
+                            (0, _filter_provider_incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_16__.getFilterSourceDefaultFilter)(getDataBlocks(), uid),
                             block.defaultFilter,
                             prevMergedFilter
                         ]);
@@ -831,15 +838,15 @@ var __webpack_exports__ = {};
         };
     };
     const useCustomizeUpdateActionProps = ()=>{
-        const { resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
+        const { resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
         const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
         const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
-        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
+        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useCompile)();
         const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
         const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
-        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
-        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
+        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useVariables)();
+        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useLocalVariables)({
             currentForm: form
         });
         const { name, getField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
@@ -852,9 +859,9 @@ var __webpack_exports__ = {};
                 const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
                     const value = originalAssignedValues[key];
                     const collectionField = getField(key);
-                    if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
+                    if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_23__.isVariable)(value)) {
                         const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                        if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
+                        if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_24__.transformVariableValue)(result, {
                             targetCollectionField: collectionField
                         });
                     } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -870,7 +877,7 @@ var __webpack_exports__ = {};
                     beforeWorkflows: getBeforeWorkflows(triggerWorkflows)
                 });
                 null == service || null == (_service_refresh = service.refresh) || _service_refresh.call(service);
-                if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_26__.TableFieldResource)) {
+                if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_27__.TableFieldResource)) {
                     var __parent_service_refresh, __parent_service;
                     null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                 }
@@ -894,17 +901,17 @@ var __webpack_exports__ = {};
         var _currentUserContext_data;
         const apiClient = (0, _api_client__WEBPACK_IMPORTED_MODULE_12__.useAPIClient)();
         const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
         const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
-        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
+        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useCompile)();
         const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
         const { fields, getField } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
-        const { field, resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
-        const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_17__.useRecord)();
-        const currentUserContext = (0, _user__WEBPACK_IMPORTED_MODULE_20__.useCurrentUserContext)();
+        const { field, resource, __parent, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
+        const currentRecord = (0, _record_provider__WEBPACK_IMPORTED_MODULE_18__.useRecord)();
+        const currentUserContext = (0, _user__WEBPACK_IMPORTED_MODULE_21__.useCurrentUserContext)();
         const currentUser = null == currentUserContext ? void 0 : null == (_currentUserContext_data = currentUserContext.data) ? void 0 : _currentUserContext_data.data;
         const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
-        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
+        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
         const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
         const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
         return {
@@ -962,7 +969,7 @@ var __webpack_exports__ = {};
                         ...requestBody
                     });
                     actionField.data.loading = false;
-                    if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_26__.TableFieldResource)) {
+                    if (!(resource instanceof _TableFieldProvider__WEBPACK_IMPORTED_MODULE_27__.TableFieldResource)) {
                         var __parent_service_refresh, __parent_service;
                         null == __parent || null == (__parent_service = __parent.service) || null == (__parent_service_refresh = __parent_service.refresh) || __parent_service_refresh.call(__parent_service);
                     }
@@ -985,19 +992,19 @@ var __webpack_exports__ = {};
     };
     const useUpdateActionProps = ()=>{
         const form = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useForm)();
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
-        const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
-        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
+        const { field, resource, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
+        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
         const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
         const navigate = (0, react_router_dom__WEBPACK_IMPORTED_MODULE_9__.useNavigate)();
         const { fields, getField, name } = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollection_deprecated)();
-        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useCompile)();
+        const compile = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useCompile)();
         const actionField = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
         const { updateAssociationValues } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormBlockContext)();
         const { modal, message } = antd__WEBPACK_IMPORTED_MODULE_3__.App.useApp();
-        const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useParamsFromRecord)();
-        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useVariables)();
-        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_21__.useLocalVariables)({
+        const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useParamsFromRecord)();
+        const variables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useVariables)();
+        const localVariables = (0, _variables__WEBPACK_IMPORTED_MODULE_22__.useLocalVariables)({
             currentForm: form
         });
         const { getActiveFieldsName } = (0, ___WEBPACK_IMPORTED_MODULE_11__.useFormActiveFields)() || {};
@@ -1009,9 +1016,9 @@ var __webpack_exports__ = {};
                 const waitList = Object.keys(originalAssignedValues).map(async (key)=>{
                     const value = originalAssignedValues[key];
                     const collectionField = getField(key);
-                    if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_22__.isVariable)(value)) {
+                    if ((0, _variables_utils_isVariable__WEBPACK_IMPORTED_MODULE_23__.isVariable)(value)) {
                         const result = await (null == variables ? void 0 : variables.parseVariable(value, localVariables));
-                        if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_23__.transformVariableValue)(result, {
+                        if (result) assignedValues[key] = (0, _variables_utils_transformVariableValue__WEBPACK_IMPORTED_MODULE_24__.transformVariableValue)(result, {
                             targetCollectionField: collectionField
                         });
                     } else if (null != value && '' !== value) assignedValues[key] = value;
@@ -1078,10 +1085,10 @@ var __webpack_exports__ = {};
         };
     };
     const useDestroyActionProps = ()=>{
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
-        const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
-        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
-        const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useParamsFromRecord)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
+        const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
+        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
+        const data = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useParamsFromRecord)();
         const actionSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
         return {
             async onClick () {
@@ -1114,7 +1121,7 @@ var __webpack_exports__ = {};
         };
     };
     const useRemoveActionProps = (associationName)=>{
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
         const api = (0, _api_client__WEBPACK_IMPORTED_MODULE_12__.useAPIClient)();
         const resource = api.resource(associationName, filterByTk);
         return {
@@ -1128,9 +1135,9 @@ var __webpack_exports__ = {};
         };
     };
     const useDisassociateActionProps = ()=>{
-        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useFilterByTk)();
-        const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
-        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_18__.useActionContext)();
+        const filterByTk = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useFilterByTk)();
+        const { resource, service, block, __parent } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
+        const { setVisible } = (0, _schema_component__WEBPACK_IMPORTED_MODULE_19__.useActionContext)();
         return {
             async onClick () {
                 var _service_data;
@@ -1171,8 +1178,8 @@ var __webpack_exports__ = {};
         };
     };
     const useBulkDestroyActionProps = ()=>{
-        const { field } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
-        const { resource, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
+        const { field } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
+        const { resource, service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
         return {
             async onClick () {
                 var _field_data_selectedRowKeys, _field_data, _field_data1, _service_params_, _service_data_meta, _service_data, _service_refresh;
@@ -1189,7 +1196,7 @@ var __webpack_exports__ = {};
         };
     };
     const useRefreshActionProps = ()=>{
-        const { service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
+        const { service } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
         return {
             async onClick () {
                 var _service_refresh;
@@ -1199,7 +1206,7 @@ var __webpack_exports__ = {};
     };
     const useDetailsPaginationProps = ()=>{
         var _ctx_service_data_meta, _ctx_service_data, _ctx_service, _ctx_service_data_meta1, _ctx_service_data1, _ctx_service1;
-        const ctx = (0, _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_25__.useDetailsBlockContext)();
+        const ctx = (0, _DetailsBlockProvider__WEBPACK_IMPORTED_MODULE_26__.useDetailsBlockContext)();
         const count = (null == (_ctx_service = ctx.service) ? void 0 : null == (_ctx_service_data = _ctx_service.data) ? void 0 : null == (_ctx_service_data_meta = _ctx_service_data.meta) ? void 0 : _ctx_service_data_meta.count) || 0;
         return {
             simple: true,
@@ -1225,7 +1232,7 @@ var __webpack_exports__ = {};
     const useAssociationFilterProps = ()=>{
         var _cm_getCollection, _fieldSchema_xcomponentprops_fieldNames, _fieldSchema_xcomponentprops, _field_componentProps, _field_componentProps1;
         const collectionField = ___WEBPACK_IMPORTED_MODULE_11__.AssociationFilter.useAssociationField();
-        const { service, props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
+        const { service, props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
         const fieldSchema = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useFieldSchema)();
         const cm = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollectionManager_deprecated)();
         const valueKey = (null == collectionField ? void 0 : collectionField.target) ? null == (_cm_getCollection = cm.getCollection(collectionField.target)) ? void 0 : _cm_getCollection.getPrimaryKey() : 'id';
@@ -1266,7 +1273,7 @@ var __webpack_exports__ = {};
                 ...null == (_service_params1 = service.params) ? void 0 : _service_params1[0],
                 pageSize: 200,
                 page: 1,
-                filter: (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
+                filter: (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__.mergeFilter)([
                     ...Object.values(filters),
                     null == blockProps ? void 0 : null == (_blockProps_params = blockProps.params) ? void 0 : _blockProps_params.filter
                 ])
@@ -1312,7 +1319,7 @@ var __webpack_exports__ = {};
         const { getDataBlocks } = (0, _filter_provider_FilterProvider__WEBPACK_IMPORTED_MODULE_15__.useFilterBlock)();
         const collectionFieldName = null == collectionField ? void 0 : collectionField.name;
         const field = (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.useField)();
-        const { props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_24__.useBlockRequestContext)();
+        const { props: blockProps } = (0, _BlockProvider__WEBPACK_IMPORTED_MODULE_25__.useBlockRequestContext)();
         const headers = (0, ___WEBPACK_IMPORTED_MODULE_11__.useDataSourceHeaders)(null == blockProps ? void 0 : blockProps.dataSource);
         const cm = (0, _collection_manager__WEBPACK_IMPORTED_MODULE_14__.useCollectionManager_deprecated)();
         let list, handleSearchInput, params, run, data, valueKey, labelKey, filterKey;
@@ -1396,8 +1403,9 @@ var __webpack_exports__ = {};
                     if ('manual' === block.dataLoadingMode) return block.clearData();
                     delete storedFilter[key];
                 }
-                const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.mergeFilter)([
+                const mergedFilter = (0, _filter_provider_utils__WEBPACK_IMPORTED_MODULE_17__.mergeFilter)([
                     ...Object.values(storedFilter),
+                    (0, _filter_provider_incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_16__.getFilterSourceDefaultFilter)(getDataBlocks(), uid),
                     block.defaultFilter
                 ]);
                 return block.doFilter({
@@ -1556,7 +1564,7 @@ var __webpack_exports__ = {};
     async function resetFormCorrectly(form) {
         (0, _tachybase_schema__WEBPACK_IMPORTED_MODULE_1__.untracked)(()=>{
             Object.keys(form.fields).forEach((key)=>{
-                if ((0, _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_19__.isSubMode)(form.fields[key])) form.fields[key].initialValue = null;
+                if ((0, _schema_component_antd_association_field_util__WEBPACK_IMPORTED_MODULE_20__.isSubMode)(form.fields[key])) form.fields[key].initialValue = null;
             });
         });
         await form.reset();

package/lib/filter-provider/FilterProvider.js

@@ -72,6 +72,15 @@ const DataBlockCollector = (param)=>{
     const dataLoadingMode = (0, setDataLoadingModeSettingsItem_js_namespaceObject.useDataLoadingMode)();
     const shouldApplyFilter = 'FilterFormBlockProvider' !== field.decoratorType && 'FormBlockProvider' !== field.decoratorType && 'filter' !== field.decoratorProps.blockType;
     const addBlockToDataBlocks = (0, external_react_namespaceObject.useCallback)(()=>{
+        let filterTargetUids = [];
+        let s = fieldSchema;
+        while(s){
+            if (s['x-filter-targets']) {
+                filterTargetUids = s['x-filter-targets'].map((t)=>t.uid);
+                break;
+            }
+            s = s.parent;
+        }
         recordDataBlocks({
             uid: fieldSchema['x-uid'],
             title: field.componentProps.title,
@@ -80,6 +89,7 @@ const DataBlockCollector = (param)=>{
             associatedFields,
             foreignKeyFields: collection.foreignKeyFields,
             defaultFilter: (null == params ? void 0 : params.filter) || {},
+            filterTargetUids,
             service,
             dom: container.current,
             dataLoadingMode,
@@ -137,15 +147,22 @@ const useFilterBlock = ()=>{
         inProvider: false,
         recordDataBlocks: ()=>{},
         getDataBlocks: ()=>[],
-        removeDataBlock: ()=>{}
+        removeDataBlock: ()=>{},
+        dataBlocks: []
     };
     const { dataBlocks, setDataBlocks } = ctx;
     const recordDataBlocks = (block)=>{
         const existingBlock = dataBlocks.find((item)=>item.uid === block.uid);
         if (existingBlock) {
+            const prevDf = JSON.stringify(existingBlock.defaultFilter);
+            const prevTg = JSON.stringify(existingBlock.filterTargetUids);
             existingBlock.service = block.service;
             existingBlock.defaultFilter = block.defaultFilter;
+            existingBlock.filterTargetUids = block.filterTargetUids;
             existingBlock.dataLoadingMode = block.dataLoadingMode;
+            if (JSON.stringify(existingBlock.defaultFilter) !== prevDf || JSON.stringify(existingBlock.filterTargetUids) !== prevTg) setDataBlocks((prev)=>[
+                    ...prev
+                ]);
             return;
         }
         setDataBlocks((prev)=>(0, external_lodash_namespaceObject.uniqBy)([
@@ -161,6 +178,7 @@ const useFilterBlock = ()=>{
         recordDataBlocks,
         getDataBlocks,
         removeDataBlock,
+        dataBlocks,
         inProvider: true
     };
 };

package/lib/filter-provider/incomingFilterFromSources.js

@@ -0,0 +1,60 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    mergeIncomingFiltersFromSourceBlocks: ()=>mergeIncomingFiltersFromSourceBlocks,
+    getFilterSourceDefaultFilter: ()=>getFilterSourceDefaultFilter
+});
+const external_utils_js_namespaceObject = require("./utils.js");
+function mergeIncomingFiltersFromSourceBlocks(ownFilter, currentBlockUid, dataBlocks) {
+    if (!currentBlockUid) return null != ownFilter ? ownFilter : {};
+    const sources = dataBlocks.filter((b)=>{
+        var _b_filterTargetUids;
+        return (null == (_b_filterTargetUids = b.filterTargetUids) ? void 0 : _b_filterTargetUids.length) && b.filterTargetUids.includes(currentBlockUid);
+    });
+    const sourceFilters = sources.map((b)=>b.defaultFilter).filter((f)=>f && 'object' == typeof f && Object.keys(f).length > 0);
+    if (!sourceFilters.length) return null != ownFilter ? ownFilter : {};
+    const own = ownFilter && 'object' == typeof ownFilter ? ownFilter : {};
+    return (0, external_utils_js_namespaceObject.mergeFilter)([
+        ...sourceFilters,
+        own
+    ], '$and');
+}
+function getFilterSourceDefaultFilter(dataBlocks, filterSourceUid) {
+    var _dataBlocks_find;
+    if (!filterSourceUid) return {};
+    const f = null == (_dataBlocks_find = dataBlocks.find((b)=>b.uid === filterSourceUid)) ? void 0 : _dataBlocks_find.defaultFilter;
+    if (f && 'object' == typeof f && Object.keys(f).length) return f;
+    return {};
+}
+exports.getFilterSourceDefaultFilter = __webpack_exports__.getFilterSourceDefaultFilter;
+exports.mergeIncomingFiltersFromSourceBlocks = __webpack_exports__.mergeIncomingFiltersFromSourceBlocks;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "getFilterSourceDefaultFilter",
+    "mergeIncomingFiltersFromSourceBlocks"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/lib/filter-provider/index.js

@@ -3,6 +3,9 @@ var __webpack_modules__ = {
     "./FilterProvider": function(module) {
         module.exports = require("./FilterProvider.js");
     },
+    "./incomingFilterFromSources": function(module) {
+        module.exports = require("./incomingFilterFromSources.js");
+    },
     "./utils?198b": function(module) {
         module.exports = require("./utils.js");
     }
@@ -56,10 +59,16 @@ var __webpack_exports__ = {};
         return _FilterProvider__WEBPACK_IMPORTED_MODULE_0__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
-    var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./utils?198b");
+    var _incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./incomingFilterFromSources");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_1__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _incomingFilterFromSources__WEBPACK_IMPORTED_MODULE_1__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./utils?198b");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _utils__WEBPACK_IMPORTED_MODULE_1__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
-        return _utils__WEBPACK_IMPORTED_MODULE_1__[key];
+    for(var __WEBPACK_IMPORT_KEY__ in _utils__WEBPACK_IMPORTED_MODULE_2__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _utils__WEBPACK_IMPORTED_MODULE_2__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();

package/lib/filter-provider/utils.js

@@ -58,6 +58,7 @@ const external_collection_manager_index_js_namespaceObject = require("../collect
 const external_schema_component_index_js_namespaceObject = require("../schema-component/index.js");
 const SchemaSettingOptions_js_namespaceObject = require("../schema-component/antd/form-item/SchemaSettingOptions.js");
 const external_FilterProvider_js_namespaceObject = require("./FilterProvider.js");
+const external_incomingFilterFromSources_js_namespaceObject = require("./incomingFilterFromSources.js");
 var utils_FilterBlockType = /*#__PURE__*/ function(FilterBlockType) {
     FilterBlockType[FilterBlockType["FORM"] = 0] = "FORM";
     FilterBlockType[FilterBlockType["TABLE"] = 1] = "TABLE";
@@ -222,6 +223,7 @@ const useFilterAPI = ()=>{
             else delete storedFilter[uid];
             const mergedFilter = mergeFilter([
                 ...Object.values(storedFilter).map((filter)=>(0, external_schema_component_index_js_namespaceObject.removeNullCondition)(filter)),
+                (0, external_incomingFilterFromSources_js_namespaceObject.getFilterSourceDefaultFilter)(dataBlocks, uid),
                 block.defaultFilter
             ]);
             block.doFilter({

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

@@ -44,6 +44,7 @@ var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodas
 const index_js_namespaceObject = require("../../../../../block-provider/hooks/index.js");
 const TableBlockProvider_js_namespaceObject = require("../../../../../block-provider/TableBlockProvider.js");
 const FilterProvider_js_namespaceObject = require("../../../../../filter-provider/FilterProvider.js");
+const incomingFilterFromSources_js_namespaceObject = require("../../../../../filter-provider/incomingFilterFromSources.js");
 const utils_js_namespaceObject = require("../../../../../filter-provider/utils.js");
 const external_schema_component_index_js_namespaceObject = require("../../../../../schema-component/index.js");
 const useTableBlockProps = ()=>{
@@ -127,8 +128,9 @@ const useTableBlockProps = ()=>{
             });
         },
         onClickRow (record, setSelectedRow, selectedRow) {
-            const { targets, uid } = (0, index_js_namespaceObject.findFilterTargets)(fieldSchema);
+            const { targets, uid: filterSourceUid } = (0, index_js_namespaceObject.findFilterTargets)(fieldSchema);
             const dataBlocks = getDataBlocks();
+            const sourceDefaultFilter = (0, incomingFilterFromSources_js_namespaceObject.getFilterSourceDefaultFilter)(dataBlocks, filterSourceUid);
             if (!targets || !targets.some((target)=>dataBlocks.some((dataBlock)=>dataBlock.uid === target.uid))) return void setSelectedRow((prev)=>prev.length ? [] : prev);
             const value = [
                 record[ctx.rowKey]
@@ -142,8 +144,8 @@ const useTableBlockProps = ()=>{
                 const storedFilter = (null == (_block_service_params1 = block.service.params) ? void 0 : null == (_block_service_params_ = _block_service_params1[1]) ? void 0 : _block_service_params_.filters) || {};
                 if (selectedRow.includes(record[ctx.rowKey])) {
                     if ('manual' === block.dataLoadingMode) return block.clearData();
-                    delete storedFilter[uid];
-                } else storedFilter[uid] = {
+                    delete storedFilter[filterSourceUid];
+                } else storedFilter[filterSourceUid] = {
                     $and: [
                         {
                             [(null == target ? void 0 : target.field) || ctx.rowKey]: {
@@ -160,6 +162,7 @@ const useTableBlockProps = ()=>{
                 const mergeList = [
                     ...Object.values(storedFilter).map((filter)=>(0, external_schema_component_index_js_namespaceObject.removeNullCondition)(filter)),
                     external_flat_default().unflatten(items),
+                    sourceDefaultFilter,
                     block.defaultFilter,
                     prevMergedFilter
                 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.6.12",
+  "version": "1.6.14",
   "homepage": "https://github.com/tegojs/tego-standard#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego-standard/issues"