@nocobase/client 0.7.0-alpha.82 → 0.7.0-alpha.83

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

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

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

@@ -14,6 +14,7 @@ import { useField, useFieldSchema, useForm } from '@formily/react';
 import { message, Modal } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
+import { useAPIClient } from '../../api-client';
 import { useCollection } from '../../collection-manager';
 import { useRecord } from '../../record-provider';
 import { useActionContext, useCompile } from '../../schema-component';
@@ -74,6 +75,61 @@ var filterValue = function filterValue(value) {
   return obj;
 };
 
+function getFormValues(filterByTk, field, form, fieldNames, getField, resource) {
+  var values = {};
+
+  for (var key in form.values) {
+    if (fieldNames.includes(key)) {
+      var collectionField = getField(key);
+
+      if (filterByTk) {
+        if (collectionField.interface === 'subTable') {
+          values[key] = form.values[key];
+          continue;
+        }
+
+        if (field.added && !field.added.has(key)) {
+          continue;
+        }
+      }
+
+      var items = form.values[key];
+
+      if (collectionField.interface === 'linkTo') {
+        (function () {
+          var targetKey = collectionField.targetKey || 'id';
+
+          if (resource instanceof TableFieldResource) {
+            if (Array.isArray(items)) {
+              values[key] = filterValue(items);
+            } else if (items && _typeof(items) === 'object') {
+              values[key] = filterValue(items);
+            } else {
+              values[key] = items;
+            }
+          } else {
+            if (Array.isArray(items)) {
+              values[key] = items.map(function (item) {
+                return item[targetKey];
+              });
+            } else if (items && _typeof(items) === 'object') {
+              values[key] = items[targetKey];
+            } else {
+              values[key] = items;
+            }
+          }
+        })();
+      } else {
+        values[key] = form.values[key];
+      }
+    } else {
+      values[key] = form.values[key];
+    }
+  }
+
+  return values;
+}
+
 export var useCreateActionProps = function useCreateActionProps() {
   var form = useForm();
 
@@ -99,12 +155,13 @@ export var useCreateActionProps = function useCreateActionProps() {
       getField = _useCollection.getField;
 
   var compile = useCompile();
+  var filterByTk = useFilterByTk();
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var _actionSchema$xActio, _parent$service, _parent$service$refre;
 
-        var fieldNames, _ref, assignedValues, onSuccess, overwriteValues, skipValidator, values, key, items, collectionField;
+        var fieldNames, _ref, assignedValues, onSuccess, overwriteValues, skipValidator, values;
 
         return regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -124,65 +181,27 @@ export var useCreateActionProps = function useCreateActionProps() {
                 return form.submit();
 
               case 5:
-                values = {};
-
-                for (key in form.values) {
-                  if (fieldNames.includes(key)) {
-                    items = form.values[key];
-                    collectionField = getField(key);
-
-                    if (collectionField.interface === 'linkTo') {
-                      (function () {
-                        var targetKey = collectionField.targetKey || 'id';
-
-                        if (resource instanceof TableFieldResource) {
-                          if (Array.isArray(items)) {
-                            values[key] = filterValue(items);
-                          } else if (items && _typeof(items) === 'object') {
-                            values[key] = filterValue(items);
-                          } else {
-                            values[key] = items;
-                          }
-                        } else {
-                          if (Array.isArray(items)) {
-                            values[key] = items.map(function (item) {
-                              return item[targetKey];
-                            });
-                          } else if (items && _typeof(items) === 'object') {
-                            values[key] = items[targetKey];
-                          } else {
-                            values[key] = items;
-                          }
-                        }
-                      })();
-                    } else {
-                      values[key] = form.values[key];
-                    }
-                  } else {
-                    values[key] = form.values[key];
-                  }
-                }
-
+                values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
                 actionField.data = field.data || {};
                 actionField.data.loading = true;
-                _context2.next = 11;
+                _context2.next = 10;
                 return resource.create({
                   values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
                 });
 
-              case 11:
+              case 10:
                 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 = 15;
                   break;
                 }
 
                 return _context2.abrupt("return");
 
-              case 16:
+              case 15:
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
                   Modal.success({
                     title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
@@ -223,7 +242,7 @@ export var useCreateActionProps = function useCreateActionProps() {
                   message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
                 }
 
-              case 17:
+              case 16:
               case "end":
                 return _context2.stop();
             }
@@ -335,137 +354,183 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
     }
   };
 };
-export var useUpdateActionProps = function useUpdateActionProps() {
-  var form = useForm();
+export var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
+  var apiClient = useAPIClient();
+  var history = useHistory();
   var filterByTk = useFilterByTk();
-
-  var _useBlockRequestConte3 = useBlockRequestContext(),
-      field = _useBlockRequestConte3.field,
-      resource = _useBlockRequestConte3.resource,
-      __parent = _useBlockRequestConte3.__parent;
-
-  var _useActionContext2 = useActionContext(),
-      setVisible = _useActionContext2.setVisible;
-
   var actionSchema = useFieldSchema();
-  var history = useHistory();
+  var compile = useCompile();
+  var form = useForm();
 
   var _useCollection2 = useCollection(),
       fields = _useCollection2.fields,
       getField = _useCollection2.getField;
 
-  var compile = useCompile();
-  var actionField = useField();
+  var _useBlockRequestConte3 = useBlockRequestContext(),
+      field = _useBlockRequestConte3.field,
+      resource = _useBlockRequestConte3.resource;
+
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-        var _actionSchema$xActio3, _parent$service3, _parent$service3$refr;
+        var _actionSchema$xActio3;
 
-        var _ref3, assignedValues, onSuccess, overwriteValues, skipValidator, fieldNames, values, key, collectionField, items, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
+        var _ref3, skipValidator, onSuccess, requestSettings, headers, params, data, methods, fieldNames, values;
 
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                _ref3 = (_actionSchema$xActio3 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio3 !== void 0 ? _actionSchema$xActio3 : {}, assignedValues = _ref3.assignedValues, onSuccess = _ref3.onSuccess, overwriteValues = _ref3.overwriteValues, skipValidator = _ref3.skipValidator;
+                _ref3 = (_actionSchema$xActio3 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio3 !== void 0 ? _actionSchema$xActio3 : {}, skipValidator = _ref3.skipValidator, onSuccess = _ref3.onSuccess, requestSettings = _ref3.requestSettings;
 
-                if (skipValidator) {
-                  _context6.next = 4;
+                if (requestSettings['url']) {
+                  _context6.next = 3;
                   break;
                 }
 
-                _context6.next = 4;
-                return form.submit();
-
-              case 4:
-                fieldNames = fields.map(function (field) {
-                  return field.name;
-                });
-                values = {};
-                _context6.t0 = regeneratorRuntime.keys(form.values);
+                return _context6.abrupt("return");
 
-              case 7:
-                if ((_context6.t1 = _context6.t0()).done) {
-                  _context6.next = 23;
+              case 3:
+                if (!(skipValidator === false)) {
+                  _context6.next = 6;
                   break;
                 }
 
-                key = _context6.t1.value;
+                _context6.next = 6;
+                return form.submit();
 
-                if (!fieldNames.includes(key)) {
-                  _context6.next = 20;
-                  break;
+              case 6:
+                headers = requestSettings['headers'] ? JSON.parse(requestSettings['headers']) : {};
+                params = requestSettings['params'] ? JSON.parse(requestSettings['params']) : {};
+                data = requestSettings['data'] ? JSON.parse(requestSettings['data']) : {};
+                methods = ['POST', 'PUT', 'PATCH'];
+
+                if (actionSchema['x-action'] === 'customize:form:request' && methods.includes(requestSettings['method'])) {
+                  fieldNames = fields.map(function (field) {
+                    return field.name;
+                  });
+                  values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
+                  Object.assign(data, values);
                 }
 
-                collectionField = getField(key);
+                _context6.next = 13;
+                return apiClient.request(_objectSpread(_objectSpread({}, requestSettings), {}, {
+                  headers: headers,
+                  params: params,
+                  data: data
+                }));
 
-                if (!(collectionField.interface === 'subTable')) {
-                  _context6.next = 14;
+              case 13:
+                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                  _context6.next = 15;
                   break;
                 }
 
-                values[key] = form.values[key];
-                return _context6.abrupt("continue", 7);
+                return _context6.abrupt("return");
 
-              case 14:
-                if (!(field.added && !field.added.has(key))) {
-                  _context6.next = 16;
-                  break;
-                }
+              case 15:
+                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
+                  Modal.success({
+                    title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
+                    onOk: function () {
+                      var _onOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+                        return regeneratorRuntime.wrap(function _callee5$(_context5) {
+                          while (1) {
+                            switch (_context5.prev = _context5.next) {
+                              case 0:
+                                if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
+                                  if (isURL(onSuccess.redirectTo)) {
+                                    window.location.href = onSuccess.redirectTo;
+                                  } else {
+                                    history.push(onSuccess.redirectTo);
+                                  }
+                                }
 
-                return _context6.abrupt("continue", 7);
+                              case 1:
+                              case "end":
+                                return _context5.stop();
+                            }
+                          }
+                        }, _callee5);
+                      }));
 
-              case 16:
-                items = form.values[key];
-
-                if (collectionField.interface === 'linkTo') {
-                  (function () {
-                    var targetKey = collectionField.targetKey || 'id';
-
-                    if (resource instanceof TableFieldResource) {
-                      if (Array.isArray(items)) {
-                        values[key] = filterValue(items);
-                      } else if (items && _typeof(items) === 'object') {
-                        values[key] = filterValue(items);
-                      } else {
-                        values[key] = items;
-                      }
-                    } else {
-                      if (Array.isArray(items)) {
-                        values[key] = items.map(function (item) {
-                          return item[targetKey];
-                        });
-                      } else if (items && _typeof(items) === 'object') {
-                        values[key] = items[targetKey];
-                      } else {
-                        values[key] = items;
+                      function onOk() {
+                        return _onOk3.apply(this, arguments);
                       }
-                    }
-                  })();
+
+                      return onOk;
+                    }()
+                  });
                 } else {
-                  values[key] = form.values[key];
+                  message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
                 }
 
-                _context6.next = 21;
-                break;
+              case 16:
+              case "end":
+                return _context6.stop();
+            }
+          }
+        }, _callee6);
+      }))();
+    }
+  };
+};
+export var useUpdateActionProps = function useUpdateActionProps() {
+  var form = useForm();
+  var filterByTk = useFilterByTk();
+
+  var _useBlockRequestConte4 = useBlockRequestContext(),
+      field = _useBlockRequestConte4.field,
+      resource = _useBlockRequestConte4.resource,
+      __parent = _useBlockRequestConte4.__parent;
+
+  var _useActionContext2 = useActionContext(),
+      setVisible = _useActionContext2.setVisible;
+
+  var actionSchema = useFieldSchema();
+  var history = useHistory();
+
+  var _useCollection3 = useCollection(),
+      fields = _useCollection3.fields,
+      getField = _useCollection3.getField;
+
+  var compile = useCompile();
+  var actionField = useField();
+  return {
+    onClick: function onClick() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+        var _actionSchema$xActio4, _parent$service3, _parent$service3$refr;
+
+        var _ref4, assignedValues, onSuccess, overwriteValues, skipValidator, fieldNames, values, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
 
-              case 20:
-                values[key] = form.values[key];
+        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;
+
+                if (skipValidator) {
+                  _context8.next = 4;
+                  break;
+                }
 
-              case 21:
-                _context6.next = 7;
-                break;
+                _context8.next = 4;
+                return form.submit();
 
-              case 23:
+              case 4:
+                fieldNames = fields.map(function (field) {
+                  return field.name;
+                });
+                values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
                 actionField.data = field.data || {};
                 actionField.data.loading = true;
-                _context6.next = 27;
+                _context8.next = 10;
                 return resource.update({
                   filterByTk: filterByTk,
                   values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
                 });
 
-              case 27:
+              case 10:
                 actionField.data.loading = false;
                 __parent === null || __parent === void 0 ? void 0 : (_parent$service3 = __parent.service) === null || _parent$service3 === void 0 ? void 0 : (_parent$service3$refr = _parent$service3.refresh) === null || _parent$service3$refr === void 0 ? void 0 : _parent$service3$refr.call(_parent$service3);
 
@@ -476,23 +541,23 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                 setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
 
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context6.next = 33;
+                  _context8.next = 16;
                   break;
                 }
 
-                return _context6.abrupt("return");
+                return _context8.abrupt("return");
 
-              case 33:
+              case 16:
                 if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
                   Modal.success({
                     title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
                     onOk: function () {
-                      var _onOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
-                        return regeneratorRuntime.wrap(function _callee5$(_context5) {
+                      var _onOk4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+                        return regeneratorRuntime.wrap(function _callee7$(_context7) {
                           while (1) {
-                            switch (_context5.prev = _context5.next) {
+                            switch (_context7.prev = _context7.next) {
                               case 0:
-                                _context5.next = 2;
+                                _context7.next = 2;
                                 return form.reset();
 
                               case 2:
@@ -506,14 +571,14 @@ export var useUpdateActionProps = function useUpdateActionProps() {
 
                               case 3:
                               case "end":
-                                return _context5.stop();
+                                return _context7.stop();
                             }
                           }
-                        }, _callee5);
+                        }, _callee7);
                       }));
 
                       function onOk() {
-                        return _onOk3.apply(this, arguments);
+                        return _onOk4.apply(this, arguments);
                       }
 
                       return onOk;
@@ -523,12 +588,12 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                   message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
                 }
 
-              case 34:
+              case 17:
               case "end":
-                return _context6.stop();
+                return _context8.stop();
             }
           }
-        }, _callee6);
+        }, _callee8);
       }))();
     }
   };
@@ -536,20 +601,20 @@ export var useUpdateActionProps = function useUpdateActionProps() {
 export var useDestroyActionProps = function useDestroyActionProps() {
   var filterByTk = useFilterByTk();
 
-  var _useBlockRequestConte4 = useBlockRequestContext(),
-      resource = _useBlockRequestConte4.resource,
-      service = _useBlockRequestConte4.service;
+  var _useBlockRequestConte5 = useBlockRequestContext(),
+      resource = _useBlockRequestConte5.resource,
+      service = _useBlockRequestConte5.service;
 
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
         var _service$refresh2;
 
-        return regeneratorRuntime.wrap(function _callee7$(_context7) {
+        return regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
-                _context7.next = 2;
+                _context9.next = 2;
                 return resource.destroy({
                   filterByTk: filterByTk
                 });
@@ -559,40 +624,40 @@ export var useDestroyActionProps = function useDestroyActionProps() {
 
               case 3:
               case "end":
-                return _context7.stop();
+                return _context9.stop();
             }
           }
-        }, _callee7);
+        }, _callee9);
       }))();
     }
   };
 };
 export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
-  var _useBlockRequestConte5 = useBlockRequestContext(),
-      field = _useBlockRequestConte5.field;
-
   var _useBlockRequestConte6 = useBlockRequestContext(),
-      resource = _useBlockRequestConte6.resource,
-      service = _useBlockRequestConte6.service;
+      field = _useBlockRequestConte6.field;
+
+  var _useBlockRequestConte7 = useBlockRequestContext(),
+      resource = _useBlockRequestConte7.resource,
+      service = _useBlockRequestConte7.service;
 
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
         var _field$data, _field$data$selectedR, _field$data2, _service$refresh3;
 
-        return regeneratorRuntime.wrap(function _callee8$(_context8) {
+        return regeneratorRuntime.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context8.prev = _context8.next) {
+            switch (_context10.prev = _context10.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) {
-                  _context8.next = 2;
+                  _context10.next = 2;
                   break;
                 }
 
-                return _context8.abrupt("return");
+                return _context10.abrupt("return");
 
               case 2:
-                _context8.next = 4;
+                _context10.next = 4;
                 return resource.destroy({
                   filterByTk: (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : _field$data2.selectedRowKeys
                 });
@@ -603,10 +668,10 @@ export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
 
               case 6:
               case "end":
-                return _context8.stop();
+                return _context10.stop();
             }
           }
-        }, _callee8);
+        }, _callee10);
       }))();
     }
   };
@@ -623,13 +688,13 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
     total: count,
     pageSize: 1,
     onChange: function onChange(page) {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
         var _ctx$service3, _ctx$service3$params;
 
         var params;
-        return regeneratorRuntime.wrap(function _callee9$(_context9) {
+        return regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) {
-            switch (_context9.prev = _context9.next) {
+            switch (_context11.prev = _context11.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), {}, {
@@ -638,10 +703,10 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
 
               case 2:
               case "end":
-                return _context9.stop();
+                return _context11.stop();
             }
           }
-        }, _callee9);
+        }, _callee11);
       }))();
     },
     style: {