@nocobase/client 0.7.2-alpha.7 → 0.7.3-alpha.1

package/es/block-provider/FormBlockProvider.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { createForm } from '@formily/core';
 import { useField } from '@formily/react';
 import { Spin } from 'antd';
-import React, { createContext, useContext, useEffect, useMemo } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 export var FormBlockContext = /*#__PURE__*/createContext({});
 
@@ -25,6 +25,8 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       resource = _useBlockRequestConte.resource,
       service = _useBlockRequestConte.service;
 
+  var formBlockRef = useRef();
+
   if (service.loading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
@@ -36,9 +38,12 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       field: field,
       service: service,
       resource: resource,
-      updateAssociationValues: []
+      updateAssociationValues: [],
+      formBlockRef: formBlockRef
     }
-  }, props.children);
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: formBlockRef
+  }, props.children));
 };
 
 export var FormBlockProvider = function FormBlockProvider(props) {

package/es/block-provider/TableSelectorProvider.js

@@ -62,7 +62,8 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
   var ctx = useFormBlockContext();
 
   var _useCollectionManager2 = useCollectionManager(),
-      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
+      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField,
+      getCollectionFields = _useCollectionManager2.getCollectionFields;
 
   var record = useRecord();
   var collectionFieldSchema = recursiveParent(fieldSchema, 'CollectionField'); // const value = ctx.form.query(collectionFieldSchema?.name).value();
@@ -84,16 +85,43 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
 
   if (collectionField) {
     if (['oho', 'o2m'].includes(collectionField.interface)) {
-      params['filter'] = {
-        $or: [_defineProperty({}, collectionField.foreignKey, {
+      if (record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]) {
+        params['filter'] = {
+          $or: [_defineProperty({}, collectionField.foreignKey, {
+            $is: null
+          }), _defineProperty({}, collectionField.foreignKey, {
+            $eq: record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]
+          })]
+        };
+      } else {
+        params['filter'] = _defineProperty({}, collectionField.foreignKey, {
           $is: null
-        }), _defineProperty({}, collectionField.foreignKey, {
-          $eq: record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]
-        })]
-      };
+        });
+      }
     }
 
-    if (['obo'].includes(collectionField.interface)) {}
+    if (['obo'].includes(collectionField.interface)) {
+      var fields = getCollectionFields(collectionField.target);
+      var targetField = fields.find(function (f) {
+        return f.foreignKey && f.foreignKey === collectionField.foreignKey;
+      });
+
+      if (targetField) {
+        if (record === null || record === void 0 ? void 0 : record[collectionField.foreignKey]) {
+          params['filter'] = {
+            $or: [_defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+              $is: null
+            }), _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+              $eq: record === null || record === void 0 ? void 0 : record[collectionField.foreignKey]
+            })]
+          };
+        } else {
+          params['filter'] = _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+            $is: null
+          });
+        }
+      }
+    }
   }
 
   return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
@@ -140,14 +168,14 @@ export var useTableSelectorProps = function useTableSelectorProps() {
       ctx.field.data = (ctx === null || ctx === void 0 ? void 0 : (_ctx$field2 = ctx.field) === null || _ctx$field2 === void 0 ? void 0 : _ctx$field2.data) || {};
       ctx.field.data.selectedRowKeys = selectedRowKeys;
     },
-    onRowDragEnd: function onRowDragEnd(_ref3) {
+    onRowDragEnd: function onRowDragEnd(_ref5) {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
         var from, to;
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                from = _ref3.from, to = _ref3.to;
+                from = _ref5.from, to = _ref5.to;
                 _context.next = 3;
                 return ctx.resource.move({
                   sourceId: from[ctx.rowKey || 'id'],
@@ -165,11 +193,11 @@ export var useTableSelectorProps = function useTableSelectorProps() {
         }, _callee);
       }))();
     },
-    onChange: function onChange(_ref4) {
+    onChange: function onChange(_ref6) {
       var _ctx$service$params;
 
-      var current = _ref4.current,
-          pageSize = _ref4.pageSize;
+      var current = _ref6.current,
+          pageSize = _ref6.pageSize;
       ctx.service.run(_objectSpread(_objectSpread({}, (_ctx$service$params = ctx.service.params) === null || _ctx$service$params === void 0 ? void 0 : _ctx$service$params[0]), {}, {
         page: current,
         pageSize: pageSize

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

@@ -16,9 +16,15 @@ export declare const useUpdateActionProps: () => {
 export declare const useDestroyActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useDetailPrintActionProps: () => {
+    onClick(): Promise<void>;
+};
 export declare const useBulkDestroyActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useRefreshActionProps: () => {
+    onClick(): Promise<void>;
+};
 export declare const useDetailsPaginationProps: () => {
     simple: boolean;
     hidden: boolean;

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

@@ -10,12 +10,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-import { Schema as SchemaCompiler } from '@formily/json-schema';
 import { useField, useFieldSchema, useForm } from '@formily/react';
 import { message, Modal } from 'antd';
+import parse from 'json-templates';
 import get from 'lodash/get';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
+import { useReactToPrint } from 'react-to-print';
 import { useFormBlockContext } from '../..';
 import { useAPIClient } from '../../api-client';
 import { useCollection } from '../../collection-manager';
@@ -141,6 +142,8 @@ function getFormValues(filterByTk, field, form, fieldNames, getField, resource)
 }
 
 export var useCreateActionProps = function useCreateActionProps() {
+  var _currentUserContext$d;
+
   var form = useForm();
 
   var _useBlockRequestConte = useBlockRequestContext(),
@@ -166,12 +169,15 @@ export var useCreateActionProps = function useCreateActionProps() {
 
   var compile = useCompile();
   var filterByTk = useFilterByTk();
+  var currentRecord = useRecord();
+  var currentUserContext = useCurrentUserContext();
+  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d = currentUserContext.data) === null || _currentUserContext$d === void 0 ? void 0 : _currentUserContext$d.data;
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var _actionSchema$xActio;
 
-        var fieldNames, _ref, assignedValues, onSuccess, overwriteValues, skipValidator, values, _parent$service, _parent$service$refre;
+        var fieldNames, _ref, _ref$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, assignedValues, values, _parent$service, _parent$service$refre;
 
         return regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -180,39 +186,44 @@ export var useCreateActionProps = function useCreateActionProps() {
                 fieldNames = fields.map(function (field) {
                   return field.name;
                 });
-                _ref = (_actionSchema$xActio = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio !== void 0 ? _actionSchema$xActio : {}, assignedValues = _ref.assignedValues, onSuccess = _ref.onSuccess, overwriteValues = _ref.overwriteValues, skipValidator = _ref.skipValidator;
+                _ref = (_actionSchema$xActio = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio !== void 0 ? _actionSchema$xActio : {}, _ref$assignedValues = _ref.assignedValues, originalAssignedValues = _ref$assignedValues === void 0 ? {} : _ref$assignedValues, onSuccess = _ref.onSuccess, overwriteValues = _ref.overwriteValues, skipValidator = _ref.skipValidator;
+                assignedValues = parse(originalAssignedValues)({
+                  currentTime: new Date(),
+                  currentRecord: currentRecord,
+                  currentUser: currentUser
+                });
 
                 if (skipValidator) {
-                  _context2.next = 5;
+                  _context2.next = 6;
                   break;
                 }
 
-                _context2.next = 5;
+                _context2.next = 6;
                 return form.submit();
 
-              case 5:
+              case 6:
                 values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
                 actionField.data = field.data || {};
                 actionField.data.loading = true;
-                _context2.prev = 8;
-                _context2.next = 11;
+                _context2.prev = 9;
+                _context2.next = 12;
                 return resource.create({
                   values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
                 });
 
-              case 11:
+              case 12:
                 actionField.data.loading = false;
                 __parent === null || __parent === void 0 ? void 0 : (_parent$service = __parent.service) === null || _parent$service === void 0 ? void 0 : (_parent$service$refre = _parent$service.refresh) === null || _parent$service$refre === void 0 ? void 0 : _parent$service$refre.call(_parent$service);
                 setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
 
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context2.next = 16;
+                  _context2.next = 17;
                   break;
                 }
 
                 return _context2.abrupt("return");
 
-              case 16:
+              case 17:
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
                   Modal.success({
                     title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
@@ -253,25 +264,27 @@ export var useCreateActionProps = function useCreateActionProps() {
                   message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
                 }
 
-                _context2.next = 22;
+                _context2.next = 23;
                 break;
 
-              case 19:
-                _context2.prev = 19;
-                _context2.t0 = _context2["catch"](8);
+              case 20:
+                _context2.prev = 20;
+                _context2.t0 = _context2["catch"](9);
                 actionField.data.loading = false;
 
-              case 22:
+              case 23:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[8, 19]]);
+        }, _callee2, null, [[9, 20]]);
       }))();
     }
   };
 };
 export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProps() {
+  var _currentUserContext$d2;
+
   var _useBlockRequestConte2 = useBlockRequestContext(),
       resource = _useBlockRequestConte2.resource,
       __parent = _useBlockRequestConte2.__parent,
@@ -280,7 +293,8 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
   var filterByTk = useFilterByTk();
   var actionSchema = useFieldSchema();
   var currentRecord = useRecord();
-  var ctx = useCurrentUserContext();
+  var currentUserContext = useCurrentUserContext();
+  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d2 = currentUserContext.data) === null || _currentUserContext$d2 === void 0 ? void 0 : _currentUserContext$d2.data;
   var history = useHistory();
   var compile = useCompile();
   var form = useForm();
@@ -289,30 +303,35 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
         var _actionSchema$xActio2, _service$refresh;
 
-        var _ref2, assignedValues, onSuccess, skipValidator, _parent$service2, _parent$service2$refr;
+        var _ref2, _ref2$assignedValues, originalAssignedValues, onSuccess, skipValidator, assignedValues, _parent$service2, _parent$service2$refr;
 
         return regeneratorRuntime.wrap(function _callee4$(_context4) {
           while (1) {
             switch (_context4.prev = _context4.next) {
               case 0:
-                _ref2 = (_actionSchema$xActio2 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio2 !== void 0 ? _actionSchema$xActio2 : {}, assignedValues = _ref2.assignedValues, onSuccess = _ref2.onSuccess, skipValidator = _ref2.skipValidator;
+                _ref2 = (_actionSchema$xActio2 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio2 !== void 0 ? _actionSchema$xActio2 : {}, _ref2$assignedValues = _ref2.assignedValues, originalAssignedValues = _ref2$assignedValues === void 0 ? {} : _ref2$assignedValues, onSuccess = _ref2.onSuccess, skipValidator = _ref2.skipValidator;
+                assignedValues = parse(originalAssignedValues)({
+                  currentTime: new Date(),
+                  currentRecord: currentRecord,
+                  currentUser: currentUser
+                });
 
                 if (!(skipValidator === false)) {
-                  _context4.next = 4;
+                  _context4.next = 5;
                   break;
                 }
 
-                _context4.next = 4;
+                _context4.next = 5;
                 return form.submit();
 
-              case 4:
-                _context4.next = 6;
+              case 5:
+                _context4.next = 7;
                 return resource.update({
                   filterByTk: filterByTk,
                   values: _objectSpread({}, assignedValues)
                 });
 
-              case 6:
+              case 7:
                 service === null || service === void 0 ? void 0 : (_service$refresh = service.refresh) === null || _service$refresh === void 0 ? void 0 : _service$refresh.call(service);
 
                 if (!(resource instanceof TableFieldResource)) {
@@ -320,13 +339,13 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
                 }
 
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context4.next = 10;
+                  _context4.next = 11;
                   break;
                 }
 
                 return _context4.abrupt("return");
 
-              case 10:
+              case 11:
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
                   Modal.success({
                     title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
@@ -363,7 +382,7 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
                   message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
                 }
 
-              case 11:
+              case 12:
               case "end":
                 return _context4.stop();
             }
@@ -374,7 +393,7 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
   };
 };
 export var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
-  var _currentUserContext$d;
+  var _currentUserContext$d3;
 
   var apiClient = useAPIClient();
   var history = useHistory();
@@ -395,7 +414,7 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
 
   var currentRecord = useRecord();
   var currentUserContext = useCurrentUserContext();
-  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d = currentUserContext.data) === null || _currentUserContext$d === void 0 ? void 0 : _currentUserContext$d.data;
+  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d3 = currentUserContext.data) === null || _currentUserContext$d3 === void 0 ? void 0 : _currentUserContext$d3.data;
   var actionField = useField();
 
   var _useActionContext2 = useActionContext(),
@@ -452,15 +471,15 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
                     currentUser: currentUser
                   }),
                   method: requestSettings['method'],
-                  headers: SchemaCompiler.compile(headers, {
+                  headers: parse(headers)({
                     currentRecord: currentRecord,
                     currentUser: currentUser
                   }),
-                  params: SchemaCompiler.compile(params, {
+                  params: parse(params)({
                     currentRecord: currentRecord,
                     currentUser: currentUser
                   }),
-                  data: SchemaCompiler.compile(data, {
+                  data: parse(data)({
                     currentRecord: currentRecord,
                     currentUser: currentUser
                   })
@@ -544,6 +563,8 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
   };
 };
 export var useUpdateActionProps = function useUpdateActionProps() {
+  var _currentUserContext$d4;
+
   var form = useForm();
   var filterByTk = useFilterByTk();
 
@@ -557,7 +578,6 @@ export var useUpdateActionProps = function useUpdateActionProps() {
 
   var actionSchema = useFieldSchema();
   var history = useHistory();
-  var record = useRecord();
 
   var _useCollection3 = useCollection(),
       fields = _useCollection3.fields,
@@ -569,43 +589,51 @@ export var useUpdateActionProps = function useUpdateActionProps() {
   var _useFormBlockContext = useFormBlockContext(),
       updateAssociationValues = _useFormBlockContext.updateAssociationValues;
 
+  var currentRecord = useRecord();
+  var currentUserContext = useCurrentUserContext();
+  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d4 = currentUserContext.data) === null || _currentUserContext$d4 === void 0 ? void 0 : _currentUserContext$d4.data;
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
         var _actionSchema$xActio4;
 
-        var _ref4, assignedValues, onSuccess, overwriteValues, skipValidator, fieldNames, values, _parent$service4, _parent$service4$refr, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
+        var _ref4, _ref4$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, assignedValues, fieldNames, values, _parent$service4, _parent$service4$refr, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
 
         return regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) {
             switch (_context8.prev = _context8.next) {
               case 0:
-                _ref4 = (_actionSchema$xActio4 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio4 !== void 0 ? _actionSchema$xActio4 : {}, assignedValues = _ref4.assignedValues, onSuccess = _ref4.onSuccess, overwriteValues = _ref4.overwriteValues, skipValidator = _ref4.skipValidator;
+                _ref4 = (_actionSchema$xActio4 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio4 !== void 0 ? _actionSchema$xActio4 : {}, _ref4$assignedValues = _ref4.assignedValues, originalAssignedValues = _ref4$assignedValues === void 0 ? {} : _ref4$assignedValues, onSuccess = _ref4.onSuccess, overwriteValues = _ref4.overwriteValues, skipValidator = _ref4.skipValidator;
+                assignedValues = parse(originalAssignedValues)({
+                  currentTime: new Date(),
+                  currentRecord: currentRecord,
+                  currentUser: currentUser
+                });
 
                 if (skipValidator) {
-                  _context8.next = 4;
+                  _context8.next = 5;
                   break;
                 }
 
-                _context8.next = 4;
+                _context8.next = 5;
                 return form.submit();
 
-              case 4:
+              case 5:
                 fieldNames = fields.map(function (field) {
                   return field.name;
                 });
                 values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
                 actionField.data = field.data || {};
                 actionField.data.loading = true;
-                _context8.prev = 8;
-                _context8.next = 11;
+                _context8.prev = 9;
+                _context8.next = 12;
                 return resource.update({
                   filterByTk: filterByTk,
                   values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
                   updateAssociationValues: updateAssociationValues
                 });
 
-              case 11:
+              case 12:
                 actionField.data.loading = false;
 
                 if (!(resource instanceof TableFieldResource)) {
@@ -616,13 +644,13 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                 setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
 
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context8.next = 17;
+                  _context8.next = 18;
                   break;
                 }
 
                 return _context8.abrupt("return");
 
-              case 17:
+              case 18:
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
                   Modal.success({
                     title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
@@ -663,20 +691,20 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                   message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
                 }
 
-                _context8.next = 23;
+                _context8.next = 24;
                 break;
 
-              case 20:
-                _context8.prev = 20;
-                _context8.t0 = _context8["catch"](8);
+              case 21:
+                _context8.prev = 21;
+                _context8.t0 = _context8["catch"](9);
                 actionField.data.loading = false;
 
-              case 23:
+              case 24:
               case "end":
                 return _context8.stop();
             }
           }
-        }, _callee8, null, [[8, 20]]);
+        }, _callee8, null, [[9, 21]]);
       }))();
     }
   };
@@ -715,6 +743,35 @@ export var useDestroyActionProps = function useDestroyActionProps() {
     }
   };
 };
+export var useDetailPrintActionProps = function useDetailPrintActionProps() {
+  var _useFormBlockContext2 = useFormBlockContext(),
+      formBlockRef = _useFormBlockContext2.formBlockRef;
+
+  var printHandler = useReactToPrint({
+    content: function content() {
+      return formBlockRef.current;
+    },
+    pageStyle: "@media print {\n      * {\n        margin: 0;\n      }\n      div.ant-formily-layout>div:first-child {\n        overflow: hidden; height: 0;\n      }\n\n    }"
+  });
+  return {
+    onClick: function onClick() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+        return regeneratorRuntime.wrap(function _callee10$(_context10) {
+          while (1) {
+            switch (_context10.prev = _context10.next) {
+              case 0:
+                printHandler();
+
+              case 1:
+              case "end":
+                return _context10.stop();
+            }
+          }
+        }, _callee10);
+      }))();
+    }
+  };
+};
 export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
   var _useBlockRequestConte6 = useBlockRequestContext(),
       field = _useBlockRequestConte6.field;
@@ -725,22 +782,22 @@ export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
 
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
         var _field$data, _field$data$selectedR, _field$data2, _service$refresh4;
 
-        return regeneratorRuntime.wrap(function _callee10$(_context10) {
+        return regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context11.prev = _context11.next) {
               case 0:
                 if (field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : (_field$data$selectedR = _field$data.selectedRowKeys) === null || _field$data$selectedR === void 0 ? void 0 : _field$data$selectedR.length) {
-                  _context10.next = 2;
+                  _context11.next = 2;
                   break;
                 }
 
-                return _context10.abrupt("return");
+                return _context11.abrupt("return");
 
               case 2:
-                _context10.next = 4;
+                _context11.next = 4;
                 return resource.destroy({
                   filterByTk: (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : _field$data2.selectedRowKeys
                 });
@@ -751,10 +808,35 @@ export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
 
               case 6:
               case "end":
-                return _context10.stop();
+                return _context11.stop();
             }
           }
-        }, _callee10);
+        }, _callee11);
+      }))();
+    }
+  };
+};
+export var useRefreshActionProps = function useRefreshActionProps() {
+  var _useBlockRequestConte8 = useBlockRequestContext(),
+      service = _useBlockRequestConte8.service;
+
+  return {
+    onClick: function onClick() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
+        var _service$refresh5;
+
+        return regeneratorRuntime.wrap(function _callee12$(_context12) {
+          while (1) {
+            switch (_context12.prev = _context12.next) {
+              case 0:
+                service === null || service === void 0 ? void 0 : (_service$refresh5 = service.refresh) === null || _service$refresh5 === void 0 ? void 0 : _service$refresh5.call(service);
+
+              case 1:
+              case "end":
+                return _context12.stop();
+            }
+          }
+        }, _callee12);
       }))();
     }
   };
@@ -771,13 +853,13 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
     total: count,
     pageSize: 1,
     onChange: function onChange(page) {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
         var _ctx$service3, _ctx$service3$params;
 
         var params;
-        return regeneratorRuntime.wrap(function _callee11$(_context11) {
+        return regeneratorRuntime.wrap(function _callee13$(_context13) {
           while (1) {
-            switch (_context11.prev = _context11.next) {
+            switch (_context13.prev = _context13.next) {
               case 0:
                 params = (_ctx$service3 = ctx.service) === null || _ctx$service3 === void 0 ? void 0 : (_ctx$service3$params = _ctx$service3.params) === null || _ctx$service3$params === void 0 ? void 0 : _ctx$service3$params[0];
                 ctx.service.run(_objectSpread(_objectSpread({}, params), {}, {
@@ -786,10 +868,10 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
 
               case 2:
               case "end":
-                return _context11.stop();
+                return _context13.stop();
             }
           }
-        }, _callee11);
+        }, _callee13);
       }))();
     },
     style: {

package/es/collection-manager/CollectionField.js

@@ -9,7 +9,8 @@ import { merge } from '@formily/shared';
 import React, { useEffect } from 'react';
 import { useCompile, useComponent, useFormBlockContext } from '..';
 import { CollectionFieldProvider } from './CollectionFieldProvider';
-import { useCollectionField } from './hooks'; // TODO: 初步适配
+import { useCollectionField } from './hooks';
+import { concat } from 'lodash'; // TODO: 初步适配
 
 var InternalField = function InternalField(props) {
   var field = useField();
@@ -51,8 +52,9 @@ var InternalField = function InternalField(props) {
     setFieldProps('description', uiSchema.description);
     setFieldProps('initialValue', uiSchema.default);
 
-    if (!field.validator && uiSchema['x-validator']) {
-      field.validator = uiSchema['x-validator'];
+    if (!field.validator && (uiSchema['x-validator'] || fieldSchema['x-validator'])) {
+      var concatSchema = concat([], uiSchema['x-validator'] || [], fieldSchema['x-validator'] || []);
+      field.validator = concatSchema;
     }
 
     if (fieldSchema['x-disabled'] === true) {