@nocobase/client 0.7.7-alpha.1 → 0.8.0-alpha.4

package/lib/block-provider/TableSelectorProvider.js

@@ -38,7 +38,8 @@ exports.TableSelectorContext = TableSelectorContext;
 
 var InternalTableSelectorProvider = function InternalTableSelectorProvider(props) {
   var params = props.params,
-      rowKey = props.rowKey;
+      rowKey = props.rowKey,
+      extraFilter = props.extraFilter;
   var field = (0, _react.useField)();
 
   var _useBlockRequestConte = (0, _BlockProvider.useBlockRequestContext)(),
@@ -54,6 +55,7 @@ var InternalTableSelectorProvider = function InternalTableSelectorProvider(props
       service: service,
       resource: resource,
       params: params,
+      extraFilter: extraFilter,
       rowKey: rowKey
     }
   }, props.children);
@@ -103,10 +105,12 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
     params['appends'] = appends;
   }
 
+  var extraFilter;
+
   if (collectionField) {
     if (['oho', 'o2m'].includes(collectionField.interface)) {
       if (record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]) {
-        params['filter'] = {
+        extraFilter = {
           $or: [_defineProperty({}, collectionField.foreignKey, {
             $is: null
           }), _defineProperty({}, collectionField.foreignKey, {
@@ -114,7 +118,7 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
           })]
         };
       } else {
-        params['filter'] = _defineProperty({}, collectionField.foreignKey, {
+        extraFilter = _defineProperty({}, collectionField.foreignKey, {
           $is: null
         });
       }
@@ -128,7 +132,7 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
 
       if (targetField) {
         if (record === null || record === void 0 ? void 0 : record[collectionField.foreignKey]) {
-          params['filter'] = {
+          extraFilter = {
             $or: [_defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
               $is: null
             }), _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
@@ -136,7 +140,7 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
             })]
           };
         } else {
-          params['filter'] = _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+          extraFilter = _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
             $is: null
           });
         }
@@ -144,10 +148,21 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
     }
   }
 
+  if (extraFilter) {
+    if (params === null || params === void 0 ? void 0 : params.filter) {
+      params['filter'] = {
+        $and: [extraFilter, params['filter']]
+      };
+    } else {
+      params['filter'] = extraFilter;
+    }
+  }
+
   return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
   }), /*#__PURE__*/_react2.default.createElement(InternalTableSelectorProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: params
+    params: params,
+    extraFilter: extraFilter
   })));
 };
 

package/lib/block-provider/hooks/index.d.ts

@@ -7,6 +7,12 @@ export declare const useCreateActionProps: () => {
 export declare const useCustomizeUpdateActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useCustomizeBulkUpdateActionProps: () => {
+    onClick(): Promise<void>;
+};
+export declare const useCustomizeBulkEditActionProps: () => {
+    onClick(): Promise<void>;
+};
 export declare const useCustomizeRequestActionProps: () => {
     onClick(): Promise<void>;
 };