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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (95) hide show
  1. package/es/acl/ACLProvider.js +10 -15
  2. package/es/antd-config-provider/index.js +7 -4
  3. package/es/api-client/APIClient.d.ts +2 -30
  4. package/es/api-client/APIClient.js +30 -158
  5. package/es/api-client/hooks/useResource.d.ts +1 -1
  6. package/es/block-provider/hooks/index.d.ts +3 -0
  7. package/es/block-provider/hooks/index.js +233 -168
  8. package/es/collection-manager/Configuration/AddFieldAction.js +27 -9
  9. package/es/collection-manager/Configuration/EditFieldAction.js +25 -8
  10. package/es/collection-manager/hooks/useCollection.d.ts +1 -1
  11. package/es/i18n/i18n.js +3 -3
  12. package/es/locale/en_US.d.ts +10 -0
  13. package/es/locale/en_US.js +11 -1
  14. package/es/locale/index.d.ts +44 -0
  15. package/es/locale/zh_CN.d.ts +34 -0
  16. package/es/locale/zh_CN.js +35 -1
  17. package/es/schema-component/antd/action/Action.Designer.js +33 -13
  18. package/es/schema-component/antd/action/utils.d.ts +2 -0
  19. package/es/schema-component/antd/action/utils.js +60 -0
  20. package/es/schema-component/antd/date-picker/util.d.ts +2 -1
  21. package/es/schema-component/antd/date-picker/util.js +4 -2
  22. package/es/schema-initializer/buttons/FormActionInitializers.d.ts +84 -0
  23. package/es/schema-initializer/buttons/FormActionInitializers.js +63 -0
  24. package/es/schema-initializer/buttons/ReadPrettyFormActionInitializers.d.ts +26 -0
  25. package/es/schema-initializer/buttons/ReadPrettyFormActionInitializers.js +21 -0
  26. package/es/schema-initializer/buttons/TableActionColumnInitializers.js +21 -0
  27. package/es/schema-settings/SchemaSettings.js +48 -16
  28. package/es/user/CurrentUser.js +1 -1
  29. package/es/user/LanguageSettings.js +4 -3
  30. package/es/user/SigninPage.js +3 -14
  31. package/es/user/SwitchRole.js +2 -26
  32. package/es/workflow/triggers/collection.js +1 -0
  33. package/es/workflow/triggers/index.js +2 -0
  34. package/es/workflow/triggers/schedule.d.ts +25 -0
  35. package/es/workflow/triggers/schedule.js +531 -0
  36. package/lib/acl/ACLProvider.js +9 -15
  37. package/lib/antd-config-provider/index.js +6 -3
  38. package/lib/api-client/APIClient.d.ts +2 -30
  39. package/lib/api-client/APIClient.js +26 -160
  40. package/lib/api-client/hooks/useResource.d.ts +1 -1
  41. package/lib/block-provider/hooks/index.d.ts +3 -0
  42. package/lib/block-provider/hooks/index.js +238 -169
  43. package/lib/collection-manager/Configuration/AddFieldAction.js +27 -9
  44. package/lib/collection-manager/Configuration/EditFieldAction.js +25 -8
  45. package/lib/collection-manager/hooks/useCollection.d.ts +1 -1
  46. package/lib/i18n/i18n.js +3 -3
  47. package/lib/locale/en_US.d.ts +10 -0
  48. package/lib/locale/en_US.js +11 -1
  49. package/lib/locale/index.d.ts +44 -0
  50. package/lib/locale/zh_CN.d.ts +34 -0
  51. package/lib/locale/zh_CN.js +35 -1
  52. package/lib/schema-component/antd/action/Action.Designer.js +34 -13
  53. package/lib/schema-component/antd/action/utils.d.ts +2 -0
  54. package/lib/schema-component/antd/action/utils.js +67 -0
  55. package/lib/schema-component/antd/date-picker/util.d.ts +2 -1
  56. package/lib/schema-component/antd/date-picker/util.js +6 -1
  57. package/lib/schema-initializer/buttons/FormActionInitializers.d.ts +84 -0
  58. package/lib/schema-initializer/buttons/FormActionInitializers.js +63 -0
  59. package/lib/schema-initializer/buttons/ReadPrettyFormActionInitializers.d.ts +26 -0
  60. package/lib/schema-initializer/buttons/ReadPrettyFormActionInitializers.js +21 -0
  61. package/lib/schema-initializer/buttons/TableActionColumnInitializers.js +21 -0
  62. package/lib/schema-settings/SchemaSettings.js +49 -16
  63. package/lib/user/CurrentUser.js +1 -1
  64. package/lib/user/LanguageSettings.js +4 -3
  65. package/lib/user/SigninPage.js +3 -14
  66. package/lib/user/SwitchRole.js +2 -27
  67. package/lib/workflow/triggers/collection.js +1 -0
  68. package/lib/workflow/triggers/index.js +3 -0
  69. package/lib/workflow/triggers/schedule.d.ts +25 -0
  70. package/lib/workflow/triggers/schedule.js +554 -0
  71. package/package.json +4 -3
  72. package/src/acl/ACLProvider.tsx +4 -5
  73. package/src/antd-config-provider/index.tsx +4 -2
  74. package/src/api-client/APIClient.ts +2 -120
  75. package/src/block-provider/hooks/index.ts +106 -69
  76. package/src/collection-manager/Configuration/AddFieldAction.tsx +18 -0
  77. package/src/collection-manager/Configuration/EditFieldAction.tsx +19 -0
  78. package/src/i18n/i18n.ts +3 -3
  79. package/src/locale/en_US.ts +11 -1
  80. package/src/locale/zh_CN.ts +39 -1
  81. package/src/schema-component/antd/action/Action.Designer.tsx +33 -1
  82. package/src/schema-component/antd/action/utils.ts +68 -0
  83. package/src/schema-component/antd/date-picker/util.ts +4 -3
  84. package/src/schema-initializer/SchemaInitializer.tsx +2 -2
  85. package/src/schema-initializer/buttons/FormActionInitializers.tsx +66 -0
  86. package/src/schema-initializer/buttons/ReadPrettyFormActionInitializers.tsx +22 -0
  87. package/src/schema-initializer/buttons/TableActionColumnInitializers.tsx +22 -0
  88. package/src/schema-settings/SchemaSettings.tsx +40 -29
  89. package/src/user/CurrentUser.tsx +1 -1
  90. package/src/user/LanguageSettings.tsx +1 -0
  91. package/src/user/SigninPage.tsx +2 -7
  92. package/src/user/SwitchRole.tsx +2 -6
  93. package/src/workflow/triggers/collection.tsx +1 -1
  94. package/src/workflow/triggers/index.tsx +2 -0
  95. package/src/workflow/triggers/schedule.tsx +422 -0
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.useUpdateActionProps = exports.usePickActionProps = exports.useDetailsPaginationProps = exports.useDestroyActionProps = exports.useCustomizeUpdateActionProps = exports.useCreateActionProps = exports.useBulkDestroyActionProps = void 0;
6
+ exports.useUpdateActionProps = exports.usePickActionProps = exports.useDetailsPaginationProps = exports.useDestroyActionProps = exports.useCustomizeUpdateActionProps = exports.useCustomizeRequestActionProps = exports.useCreateActionProps = exports.useBulkDestroyActionProps = void 0;
7
7
 
8
8
  var _react = require("@formily/react");
9
9
 
@@ -13,6 +13,8 @@ var _reactI18next = require("react-i18next");
13
13
 
14
14
  var _reactRouterDom = require("react-router-dom");
15
15
 
16
+ var _apiClient = require("../../api-client");
17
+
16
18
  var _collectionManager = require("../../collection-manager");
17
19
 
18
20
  var _recordProvider = require("../../record-provider");
@@ -94,6 +96,61 @@ var filterValue = function filterValue(value) {
94
96
  return obj;
95
97
  };
96
98
 
99
+ function getFormValues(filterByTk, field, form, fieldNames, getField, resource) {
100
+ var values = {};
101
+
102
+ for (var key in form.values) {
103
+ if (fieldNames.includes(key)) {
104
+ var collectionField = getField(key);
105
+
106
+ if (filterByTk) {
107
+ if (collectionField.interface === 'subTable') {
108
+ values[key] = form.values[key];
109
+ continue;
110
+ }
111
+
112
+ if (field.added && !field.added.has(key)) {
113
+ continue;
114
+ }
115
+ }
116
+
117
+ var items = form.values[key];
118
+
119
+ if (collectionField.interface === 'linkTo') {
120
+ (function () {
121
+ var targetKey = collectionField.targetKey || 'id';
122
+
123
+ if (resource instanceof _TableFieldProvider.TableFieldResource) {
124
+ if (Array.isArray(items)) {
125
+ values[key] = filterValue(items);
126
+ } else if (items && _typeof(items) === 'object') {
127
+ values[key] = filterValue(items);
128
+ } else {
129
+ values[key] = items;
130
+ }
131
+ } else {
132
+ if (Array.isArray(items)) {
133
+ values[key] = items.map(function (item) {
134
+ return item[targetKey];
135
+ });
136
+ } else if (items && _typeof(items) === 'object') {
137
+ values[key] = items[targetKey];
138
+ } else {
139
+ values[key] = items;
140
+ }
141
+ }
142
+ })();
143
+ } else {
144
+ values[key] = form.values[key];
145
+ }
146
+ } else {
147
+ values[key] = form.values[key];
148
+ }
149
+ }
150
+
151
+ return values;
152
+ }
153
+
97
154
  var useCreateActionProps = function useCreateActionProps() {
98
155
  var form = (0, _react.useForm)();
99
156
 
@@ -119,12 +176,13 @@ var useCreateActionProps = function useCreateActionProps() {
119
176
  getField = _useCollection.getField;
120
177
 
121
178
  var compile = (0, _schemaComponent.useCompile)();
179
+ var filterByTk = (0, _BlockProvider.useFilterByTk)();
122
180
  return {
123
181
  onClick: function onClick() {
124
182
  return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
125
183
  var _actionSchema$xActio, _parent$service, _parent$service$refre;
126
184
 
127
- var fieldNames, _ref, assignedValues, onSuccess, overwriteValues, skipValidator, values, key, items, collectionField;
185
+ var fieldNames, _ref, assignedValues, onSuccess, overwriteValues, skipValidator, values;
128
186
 
129
187
  return regeneratorRuntime.wrap(function _callee2$(_context2) {
130
188
  while (1) {
@@ -144,65 +202,27 @@ var useCreateActionProps = function useCreateActionProps() {
144
202
  return form.submit();
145
203
 
146
204
  case 5:
147
- values = {};
148
-
149
- for (key in form.values) {
150
- if (fieldNames.includes(key)) {
151
- items = form.values[key];
152
- collectionField = getField(key);
153
-
154
- if (collectionField.interface === 'linkTo') {
155
- (function () {
156
- var targetKey = collectionField.targetKey || 'id';
157
-
158
- if (resource instanceof _TableFieldProvider.TableFieldResource) {
159
- if (Array.isArray(items)) {
160
- values[key] = filterValue(items);
161
- } else if (items && _typeof(items) === 'object') {
162
- values[key] = filterValue(items);
163
- } else {
164
- values[key] = items;
165
- }
166
- } else {
167
- if (Array.isArray(items)) {
168
- values[key] = items.map(function (item) {
169
- return item[targetKey];
170
- });
171
- } else if (items && _typeof(items) === 'object') {
172
- values[key] = items[targetKey];
173
- } else {
174
- values[key] = items;
175
- }
176
- }
177
- })();
178
- } else {
179
- values[key] = form.values[key];
180
- }
181
- } else {
182
- values[key] = form.values[key];
183
- }
184
- }
185
-
205
+ values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
186
206
  actionField.data = field.data || {};
187
207
  actionField.data.loading = true;
188
- _context2.next = 11;
208
+ _context2.next = 10;
189
209
  return resource.create({
190
210
  values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
191
211
  });
192
212
 
193
- case 11:
213
+ case 10:
194
214
  actionField.data.loading = false;
195
215
  __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);
196
216
  setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
197
217
 
198
218
  if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
199
- _context2.next = 16;
219
+ _context2.next = 15;
200
220
  break;
201
221
  }
202
222
 
203
223
  return _context2.abrupt("return");
204
224
 
205
- case 16:
225
+ case 15:
206
226
  if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
207
227
  _antd.Modal.success({
208
228
  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
@@ -243,7 +263,7 @@ var useCreateActionProps = function useCreateActionProps() {
243
263
  _antd.message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
244
264
  }
245
265
 
246
- case 17:
266
+ case 16:
247
267
  case "end":
248
268
  return _context2.stop();
249
269
  }
@@ -361,137 +381,186 @@ var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProps() {
361
381
 
362
382
  exports.useCustomizeUpdateActionProps = useCustomizeUpdateActionProps;
363
383
 
364
- var useUpdateActionProps = function useUpdateActionProps() {
365
- var form = (0, _react.useForm)();
384
+ var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
385
+ var apiClient = (0, _apiClient.useAPIClient)();
386
+ var history = (0, _reactRouterDom.useHistory)();
366
387
  var filterByTk = (0, _BlockProvider.useFilterByTk)();
367
-
368
- var _useBlockRequestConte3 = (0, _BlockProvider.useBlockRequestContext)(),
369
- field = _useBlockRequestConte3.field,
370
- resource = _useBlockRequestConte3.resource,
371
- __parent = _useBlockRequestConte3.__parent;
372
-
373
- var _useActionContext2 = (0, _schemaComponent.useActionContext)(),
374
- setVisible = _useActionContext2.setVisible;
375
-
376
388
  var actionSchema = (0, _react.useFieldSchema)();
377
- var history = (0, _reactRouterDom.useHistory)();
389
+ var compile = (0, _schemaComponent.useCompile)();
390
+ var form = (0, _react.useForm)();
378
391
 
379
392
  var _useCollection2 = (0, _collectionManager.useCollection)(),
380
393
  fields = _useCollection2.fields,
381
394
  getField = _useCollection2.getField;
382
395
 
383
- var compile = (0, _schemaComponent.useCompile)();
384
- var actionField = (0, _react.useField)();
396
+ var _useBlockRequestConte3 = (0, _BlockProvider.useBlockRequestContext)(),
397
+ field = _useBlockRequestConte3.field,
398
+ resource = _useBlockRequestConte3.resource;
399
+
385
400
  return {
386
401
  onClick: function onClick() {
387
402
  return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
388
- var _actionSchema$xActio3, _parent$service3, _parent$service3$refr;
403
+ var _actionSchema$xActio3;
389
404
 
390
- var _ref3, assignedValues, onSuccess, overwriteValues, skipValidator, fieldNames, values, key, collectionField, items, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
405
+ var _ref3, skipValidator, onSuccess, requestSettings, headers, params, data, methods, fieldNames, values;
391
406
 
392
407
  return regeneratorRuntime.wrap(function _callee6$(_context6) {
393
408
  while (1) {
394
409
  switch (_context6.prev = _context6.next) {
395
410
  case 0:
396
- _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;
411
+ _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;
397
412
 
398
- if (skipValidator) {
399
- _context6.next = 4;
413
+ if (requestSettings['url']) {
414
+ _context6.next = 3;
400
415
  break;
401
416
  }
402
417
 
403
- _context6.next = 4;
404
- return form.submit();
405
-
406
- case 4:
407
- fieldNames = fields.map(function (field) {
408
- return field.name;
409
- });
410
- values = {};
411
- _context6.t0 = regeneratorRuntime.keys(form.values);
418
+ return _context6.abrupt("return");
412
419
 
413
- case 7:
414
- if ((_context6.t1 = _context6.t0()).done) {
415
- _context6.next = 23;
420
+ case 3:
421
+ if (!(skipValidator === false)) {
422
+ _context6.next = 6;
416
423
  break;
417
424
  }
418
425
 
419
- key = _context6.t1.value;
426
+ _context6.next = 6;
427
+ return form.submit();
420
428
 
421
- if (!fieldNames.includes(key)) {
422
- _context6.next = 20;
423
- break;
429
+ case 6:
430
+ headers = requestSettings['headers'] ? JSON.parse(requestSettings['headers']) : {};
431
+ params = requestSettings['params'] ? JSON.parse(requestSettings['params']) : {};
432
+ data = requestSettings['data'] ? JSON.parse(requestSettings['data']) : {};
433
+ methods = ['POST', 'PUT', 'PATCH'];
434
+
435
+ if (actionSchema['x-action'] === 'customize:form:request' && methods.includes(requestSettings['method'])) {
436
+ fieldNames = fields.map(function (field) {
437
+ return field.name;
438
+ });
439
+ values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
440
+ Object.assign(data, values);
424
441
  }
425
442
 
426
- collectionField = getField(key);
443
+ _context6.next = 13;
444
+ return apiClient.request(_objectSpread(_objectSpread({}, requestSettings), {}, {
445
+ headers: headers,
446
+ params: params,
447
+ data: data
448
+ }));
427
449
 
428
- if (!(collectionField.interface === 'subTable')) {
429
- _context6.next = 14;
450
+ case 13:
451
+ if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
452
+ _context6.next = 15;
430
453
  break;
431
454
  }
432
455
 
433
- values[key] = form.values[key];
434
- return _context6.abrupt("continue", 7);
456
+ return _context6.abrupt("return");
435
457
 
436
- case 14:
437
- if (!(field.added && !field.added.has(key))) {
438
- _context6.next = 16;
439
- break;
440
- }
458
+ case 15:
459
+ if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
460
+ _antd.Modal.success({
461
+ title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
462
+ onOk: function () {
463
+ var _onOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
464
+ return regeneratorRuntime.wrap(function _callee5$(_context5) {
465
+ while (1) {
466
+ switch (_context5.prev = _context5.next) {
467
+ case 0:
468
+ if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
469
+ if (isURL(onSuccess.redirectTo)) {
470
+ window.location.href = onSuccess.redirectTo;
471
+ } else {
472
+ history.push(onSuccess.redirectTo);
473
+ }
474
+ }
441
475
 
442
- return _context6.abrupt("continue", 7);
476
+ case 1:
477
+ case "end":
478
+ return _context5.stop();
479
+ }
480
+ }
481
+ }, _callee5);
482
+ }));
443
483
 
444
- case 16:
445
- items = form.values[key];
446
-
447
- if (collectionField.interface === 'linkTo') {
448
- (function () {
449
- var targetKey = collectionField.targetKey || 'id';
450
-
451
- if (resource instanceof _TableFieldProvider.TableFieldResource) {
452
- if (Array.isArray(items)) {
453
- values[key] = filterValue(items);
454
- } else if (items && _typeof(items) === 'object') {
455
- values[key] = filterValue(items);
456
- } else {
457
- values[key] = items;
458
- }
459
- } else {
460
- if (Array.isArray(items)) {
461
- values[key] = items.map(function (item) {
462
- return item[targetKey];
463
- });
464
- } else if (items && _typeof(items) === 'object') {
465
- values[key] = items[targetKey];
466
- } else {
467
- values[key] = items;
484
+ function onOk() {
485
+ return _onOk3.apply(this, arguments);
468
486
  }
469
- }
470
- })();
487
+
488
+ return onOk;
489
+ }()
490
+ });
471
491
  } else {
472
- values[key] = form.values[key];
492
+ _antd.message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
473
493
  }
474
494
 
475
- _context6.next = 21;
476
- break;
495
+ case 16:
496
+ case "end":
497
+ return _context6.stop();
498
+ }
499
+ }
500
+ }, _callee6);
501
+ }))();
502
+ }
503
+ };
504
+ };
505
+
506
+ exports.useCustomizeRequestActionProps = useCustomizeRequestActionProps;
477
507
 
478
- case 20:
479
- values[key] = form.values[key];
508
+ var useUpdateActionProps = function useUpdateActionProps() {
509
+ var form = (0, _react.useForm)();
510
+ var filterByTk = (0, _BlockProvider.useFilterByTk)();
511
+
512
+ var _useBlockRequestConte4 = (0, _BlockProvider.useBlockRequestContext)(),
513
+ field = _useBlockRequestConte4.field,
514
+ resource = _useBlockRequestConte4.resource,
515
+ __parent = _useBlockRequestConte4.__parent;
516
+
517
+ var _useActionContext2 = (0, _schemaComponent.useActionContext)(),
518
+ setVisible = _useActionContext2.setVisible;
519
+
520
+ var actionSchema = (0, _react.useFieldSchema)();
521
+ var history = (0, _reactRouterDom.useHistory)();
522
+
523
+ var _useCollection3 = (0, _collectionManager.useCollection)(),
524
+ fields = _useCollection3.fields,
525
+ getField = _useCollection3.getField;
526
+
527
+ var compile = (0, _schemaComponent.useCompile)();
528
+ var actionField = (0, _react.useField)();
529
+ return {
530
+ onClick: function onClick() {
531
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
532
+ var _actionSchema$xActio4, _parent$service3, _parent$service3$refr;
533
+
534
+ var _ref4, assignedValues, onSuccess, overwriteValues, skipValidator, fieldNames, values, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
535
+
536
+ return regeneratorRuntime.wrap(function _callee8$(_context8) {
537
+ while (1) {
538
+ switch (_context8.prev = _context8.next) {
539
+ case 0:
540
+ _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;
541
+
542
+ if (skipValidator) {
543
+ _context8.next = 4;
544
+ break;
545
+ }
480
546
 
481
- case 21:
482
- _context6.next = 7;
483
- break;
547
+ _context8.next = 4;
548
+ return form.submit();
484
549
 
485
- case 23:
550
+ case 4:
551
+ fieldNames = fields.map(function (field) {
552
+ return field.name;
553
+ });
554
+ values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
486
555
  actionField.data = field.data || {};
487
556
  actionField.data.loading = true;
488
- _context6.next = 27;
557
+ _context8.next = 10;
489
558
  return resource.update({
490
559
  filterByTk: filterByTk,
491
560
  values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
492
561
  });
493
562
 
494
- case 27:
563
+ case 10:
495
564
  actionField.data.loading = false;
496
565
  __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);
497
566
 
@@ -502,23 +571,23 @@ var useUpdateActionProps = function useUpdateActionProps() {
502
571
  setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
503
572
 
504
573
  if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
505
- _context6.next = 33;
574
+ _context8.next = 16;
506
575
  break;
507
576
  }
508
577
 
509
- return _context6.abrupt("return");
578
+ return _context8.abrupt("return");
510
579
 
511
- case 33:
580
+ case 16:
512
581
  if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
513
582
  _antd.Modal.success({
514
583
  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
515
584
  onOk: function () {
516
- var _onOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
517
- return regeneratorRuntime.wrap(function _callee5$(_context5) {
585
+ var _onOk4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
586
+ return regeneratorRuntime.wrap(function _callee7$(_context7) {
518
587
  while (1) {
519
- switch (_context5.prev = _context5.next) {
588
+ switch (_context7.prev = _context7.next) {
520
589
  case 0:
521
- _context5.next = 2;
590
+ _context7.next = 2;
522
591
  return form.reset();
523
592
 
524
593
  case 2:
@@ -532,14 +601,14 @@ var useUpdateActionProps = function useUpdateActionProps() {
532
601
 
533
602
  case 3:
534
603
  case "end":
535
- return _context5.stop();
604
+ return _context7.stop();
536
605
  }
537
606
  }
538
- }, _callee5);
607
+ }, _callee7);
539
608
  }));
540
609
 
541
610
  function onOk() {
542
- return _onOk3.apply(this, arguments);
611
+ return _onOk4.apply(this, arguments);
543
612
  }
544
613
 
545
614
  return onOk;
@@ -549,12 +618,12 @@ var useUpdateActionProps = function useUpdateActionProps() {
549
618
  _antd.message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
550
619
  }
551
620
 
552
- case 34:
621
+ case 17:
553
622
  case "end":
554
- return _context6.stop();
623
+ return _context8.stop();
555
624
  }
556
625
  }
557
- }, _callee6);
626
+ }, _callee8);
558
627
  }))();
559
628
  }
560
629
  };
@@ -565,20 +634,20 @@ exports.useUpdateActionProps = useUpdateActionProps;
565
634
  var useDestroyActionProps = function useDestroyActionProps() {
566
635
  var filterByTk = (0, _BlockProvider.useFilterByTk)();
567
636
 
568
- var _useBlockRequestConte4 = (0, _BlockProvider.useBlockRequestContext)(),
569
- resource = _useBlockRequestConte4.resource,
570
- service = _useBlockRequestConte4.service;
637
+ var _useBlockRequestConte5 = (0, _BlockProvider.useBlockRequestContext)(),
638
+ resource = _useBlockRequestConte5.resource,
639
+ service = _useBlockRequestConte5.service;
571
640
 
572
641
  return {
573
642
  onClick: function onClick() {
574
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
643
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
575
644
  var _service$refresh2;
576
645
 
577
- return regeneratorRuntime.wrap(function _callee7$(_context7) {
646
+ return regeneratorRuntime.wrap(function _callee9$(_context9) {
578
647
  while (1) {
579
- switch (_context7.prev = _context7.next) {
648
+ switch (_context9.prev = _context9.next) {
580
649
  case 0:
581
- _context7.next = 2;
650
+ _context9.next = 2;
582
651
  return resource.destroy({
583
652
  filterByTk: filterByTk
584
653
  });
@@ -588,10 +657,10 @@ var useDestroyActionProps = function useDestroyActionProps() {
588
657
 
589
658
  case 3:
590
659
  case "end":
591
- return _context7.stop();
660
+ return _context9.stop();
592
661
  }
593
662
  }
594
- }, _callee7);
663
+ }, _callee9);
595
664
  }))();
596
665
  }
597
666
  };
@@ -600,31 +669,31 @@ var useDestroyActionProps = function useDestroyActionProps() {
600
669
  exports.useDestroyActionProps = useDestroyActionProps;
601
670
 
602
671
  var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
603
- var _useBlockRequestConte5 = (0, _BlockProvider.useBlockRequestContext)(),
604
- field = _useBlockRequestConte5.field;
605
-
606
672
  var _useBlockRequestConte6 = (0, _BlockProvider.useBlockRequestContext)(),
607
- resource = _useBlockRequestConte6.resource,
608
- service = _useBlockRequestConte6.service;
673
+ field = _useBlockRequestConte6.field;
674
+
675
+ var _useBlockRequestConte7 = (0, _BlockProvider.useBlockRequestContext)(),
676
+ resource = _useBlockRequestConte7.resource,
677
+ service = _useBlockRequestConte7.service;
609
678
 
610
679
  return {
611
680
  onClick: function onClick() {
612
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
681
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
613
682
  var _field$data, _field$data$selectedR, _field$data2, _service$refresh3;
614
683
 
615
- return regeneratorRuntime.wrap(function _callee8$(_context8) {
684
+ return regeneratorRuntime.wrap(function _callee10$(_context10) {
616
685
  while (1) {
617
- switch (_context8.prev = _context8.next) {
686
+ switch (_context10.prev = _context10.next) {
618
687
  case 0:
619
688
  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) {
620
- _context8.next = 2;
689
+ _context10.next = 2;
621
690
  break;
622
691
  }
623
692
 
624
- return _context8.abrupt("return");
693
+ return _context10.abrupt("return");
625
694
 
626
695
  case 2:
627
- _context8.next = 4;
696
+ _context10.next = 4;
628
697
  return resource.destroy({
629
698
  filterByTk: (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : _field$data2.selectedRowKeys
630
699
  });
@@ -635,10 +704,10 @@ var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
635
704
 
636
705
  case 6:
637
706
  case "end":
638
- return _context8.stop();
707
+ return _context10.stop();
639
708
  }
640
709
  }
641
- }, _callee8);
710
+ }, _callee10);
642
711
  }))();
643
712
  }
644
713
  };
@@ -658,13 +727,13 @@ var useDetailsPaginationProps = function useDetailsPaginationProps() {
658
727
  total: count,
659
728
  pageSize: 1,
660
729
  onChange: function onChange(page) {
661
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
730
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
662
731
  var _ctx$service3, _ctx$service3$params;
663
732
 
664
733
  var params;
665
- return regeneratorRuntime.wrap(function _callee9$(_context9) {
734
+ return regeneratorRuntime.wrap(function _callee11$(_context11) {
666
735
  while (1) {
667
- switch (_context9.prev = _context9.next) {
736
+ switch (_context11.prev = _context11.next) {
668
737
  case 0:
669
738
  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];
670
739
  ctx.service.run(_objectSpread(_objectSpread({}, params), {}, {
@@ -673,10 +742,10 @@ var useDetailsPaginationProps = function useDetailsPaginationProps() {
673
742
 
674
743
  case 2:
675
744
  case "end":
676
- return _context9.stop();
745
+ return _context11.stop();
677
746
  }
678
747
  }
679
- }, _callee9);
748
+ }, _callee11);
680
749
  }))();
681
750
  },
682
751
  style: {