@nocobase/client 0.7.4-alpha.4 → 0.7.4-alpha.7

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.
@@ -255,7 +255,7 @@ export var collectionSchema = {
255
255
  'x-component': 'Action',
256
256
  'x-component-props': {
257
257
  type: 'primary',
258
- useAction: '{{ cm.useUpdateActionAndRefreshCM }}'
258
+ useAction: '{{ cm.useUpdateCollectionActionAndRefreshCM }}'
259
259
  }
260
260
  }
261
261
  }
@@ -56,6 +56,9 @@ export declare const useDestroyAction: () => {
56
56
  export declare const useBulkDestroyAction: () => {
57
57
  run(): Promise<void>;
58
58
  };
59
+ export declare const useUpdateCollectionActionAndRefreshCM: (options: any) => {
60
+ run(): Promise<void>;
61
+ };
59
62
  export declare const useValuesFromRecord: (options: any) => {
60
63
  state: {};
61
64
  setState: (patch: Partial<{}> | ((prevState: {}) => Partial<{}>)) => void;
@@ -28,6 +28,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
28
28
 
29
29
  import { useForm } from '@formily/react';
30
30
  import { message } from 'antd';
31
+ import omit from 'lodash/omit';
31
32
  import { useEffect } from 'react';
32
33
  import { useCollection, useCollectionManager } from '.';
33
34
  import { useRequest } from '../api-client';
@@ -567,6 +568,60 @@ export var useBulkDestroyAction = function useBulkDestroyAction() {
567
568
  }
568
569
  };
569
570
  };
571
+ export var useUpdateCollectionActionAndRefreshCM = function useUpdateCollectionActionAndRefreshCM(options) {
572
+ var _useCollectionManager3 = useCollectionManager(),
573
+ refreshCM = _useCollectionManager3.refreshCM;
574
+
575
+ var form = useForm();
576
+ var ctx = useActionContext();
577
+
578
+ var _useResourceActionCon8 = useResourceActionContext(),
579
+ refresh = _useResourceActionCon8.refresh;
580
+
581
+ var _useResourceContext8 = useResourceContext(),
582
+ resource = _useResourceContext8.resource,
583
+ targetKey = _useResourceContext8.targetKey;
584
+
585
+ var _useRecord4 = useRecord(),
586
+ filterByTk = _useRecord4[targetKey];
587
+
588
+ return {
589
+ run: function run() {
590
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
591
+ return regeneratorRuntime.wrap(function _callee12$(_context12) {
592
+ while (1) {
593
+ switch (_context12.prev = _context12.next) {
594
+ case 0:
595
+ _context12.next = 2;
596
+ return form.submit();
597
+
598
+ case 2:
599
+ _context12.next = 4;
600
+ return resource.update({
601
+ filterByTk: filterByTk,
602
+ values: omit(form.values, ['fields'])
603
+ });
604
+
605
+ case 4:
606
+ ctx.setVisible(false);
607
+ _context12.next = 7;
608
+ return form.reset();
609
+
610
+ case 7:
611
+ refresh();
612
+ _context12.next = 10;
613
+ return refreshCM();
614
+
615
+ case 10:
616
+ case "end":
617
+ return _context12.stop();
618
+ }
619
+ }
620
+ }, _callee12);
621
+ }))();
622
+ }
623
+ };
624
+ };
570
625
  export var useValuesFromRecord = function useValuesFromRecord(options) {
571
626
  var record = useRecord();
572
627
  var result = useRequest(function () {
@@ -596,29 +651,29 @@ export var useCreateActionAndRefreshCM = function useCreateActionAndRefreshCM()
596
651
  var _useCreateAction = useCreateAction(),
597
652
  _run3 = _useCreateAction.run;
598
653
 
599
- var _useCollectionManager3 = useCollectionManager(),
600
- refreshCM = _useCollectionManager3.refreshCM;
654
+ var _useCollectionManager4 = useCollectionManager(),
655
+ refreshCM = _useCollectionManager4.refreshCM;
601
656
 
602
657
  return {
603
658
  run: function run() {
604
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
605
- return regeneratorRuntime.wrap(function _callee12$(_context12) {
659
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
660
+ return regeneratorRuntime.wrap(function _callee13$(_context13) {
606
661
  while (1) {
607
- switch (_context12.prev = _context12.next) {
662
+ switch (_context13.prev = _context13.next) {
608
663
  case 0:
609
- _context12.next = 2;
664
+ _context13.next = 2;
610
665
  return _run3();
611
666
 
612
667
  case 2:
613
- _context12.next = 4;
668
+ _context13.next = 4;
614
669
  return refreshCM();
615
670
 
616
671
  case 4:
617
672
  case "end":
618
- return _context12.stop();
673
+ return _context13.stop();
619
674
  }
620
675
  }
621
- }, _callee12);
676
+ }, _callee13);
622
677
  }))();
623
678
  }
624
679
  };
@@ -627,29 +682,29 @@ export var useUpdateActionAndRefreshCM = function useUpdateActionAndRefreshCM()
627
682
  var _useUpdateAction = useUpdateAction(),
628
683
  _run4 = _useUpdateAction.run;
629
684
 
630
- var _useCollectionManager4 = useCollectionManager(),
631
- refreshCM = _useCollectionManager4.refreshCM;
685
+ var _useCollectionManager5 = useCollectionManager(),
686
+ refreshCM = _useCollectionManager5.refreshCM;
632
687
 
633
688
  return {
634
689
  run: function run() {
635
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
636
- return regeneratorRuntime.wrap(function _callee13$(_context13) {
690
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
691
+ return regeneratorRuntime.wrap(function _callee14$(_context14) {
637
692
  while (1) {
638
- switch (_context13.prev = _context13.next) {
693
+ switch (_context14.prev = _context14.next) {
639
694
  case 0:
640
- _context13.next = 2;
695
+ _context14.next = 2;
641
696
  return _run4();
642
697
 
643
698
  case 2:
644
- _context13.next = 4;
699
+ _context14.next = 4;
645
700
  return refreshCM();
646
701
 
647
702
  case 4:
648
703
  case "end":
649
- return _context13.stop();
704
+ return _context14.stop();
650
705
  }
651
706
  }
652
- }, _callee13);
707
+ }, _callee14);
653
708
  }))();
654
709
  }
655
710
  };
@@ -658,29 +713,29 @@ export var useDestroyActionAndRefreshCM = function useDestroyActionAndRefreshCM(
658
713
  var _useDestroyAction = useDestroyAction(),
659
714
  _run5 = _useDestroyAction.run;
660
715
 
661
- var _useCollectionManager5 = useCollectionManager(),
662
- refreshCM = _useCollectionManager5.refreshCM;
716
+ var _useCollectionManager6 = useCollectionManager(),
717
+ refreshCM = _useCollectionManager6.refreshCM;
663
718
 
664
719
  return {
665
720
  run: function run() {
666
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
667
- return regeneratorRuntime.wrap(function _callee14$(_context14) {
721
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
722
+ return regeneratorRuntime.wrap(function _callee15$(_context15) {
668
723
  while (1) {
669
- switch (_context14.prev = _context14.next) {
724
+ switch (_context15.prev = _context15.next) {
670
725
  case 0:
671
- _context14.next = 2;
726
+ _context15.next = 2;
672
727
  return _run5();
673
728
 
674
729
  case 2:
675
- _context14.next = 4;
730
+ _context15.next = 4;
676
731
  return refreshCM();
677
732
 
678
733
  case 4:
679
734
  case "end":
680
- return _context14.stop();
735
+ return _context15.stop();
681
736
  }
682
737
  }
683
- }, _callee14);
738
+ }, _callee15);
684
739
  }))();
685
740
  }
686
741
  };
@@ -689,29 +744,29 @@ export var useBulkDestroyActionAndRefreshCM = function useBulkDestroyActionAndRe
689
744
  var _useBulkDestroyAction = useBulkDestroyAction(),
690
745
  _run6 = _useBulkDestroyAction.run;
691
746
 
692
- var _useCollectionManager6 = useCollectionManager(),
693
- refreshCM = _useCollectionManager6.refreshCM;
747
+ var _useCollectionManager7 = useCollectionManager(),
748
+ refreshCM = _useCollectionManager7.refreshCM;
694
749
 
695
750
  return {
696
751
  run: function run() {
697
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
698
- return regeneratorRuntime.wrap(function _callee15$(_context15) {
752
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
753
+ return regeneratorRuntime.wrap(function _callee16$(_context16) {
699
754
  while (1) {
700
- switch (_context15.prev = _context15.next) {
755
+ switch (_context16.prev = _context16.next) {
701
756
  case 0:
702
- _context15.next = 2;
757
+ _context16.next = 2;
703
758
  return _run6();
704
759
 
705
760
  case 2:
706
- _context15.next = 4;
761
+ _context16.next = 4;
707
762
  return refreshCM();
708
763
 
709
764
  case 4:
710
765
  case "end":
711
- return _context15.stop();
766
+ return _context16.stop();
712
767
  }
713
768
  }
714
- }, _callee15);
769
+ }, _callee16);
715
770
  }))();
716
771
  }
717
772
  };
@@ -264,7 +264,7 @@ var collectionSchema = {
264
264
  'x-component': 'Action',
265
265
  'x-component-props': {
266
266
  type: 'primary',
267
- useAction: '{{ cm.useUpdateActionAndRefreshCM }}'
267
+ useAction: '{{ cm.useUpdateCollectionActionAndRefreshCM }}'
268
268
  }
269
269
  }
270
270
  }
@@ -56,6 +56,9 @@ export declare const useDestroyAction: () => {
56
56
  export declare const useBulkDestroyAction: () => {
57
57
  run(): Promise<void>;
58
58
  };
59
+ export declare const useUpdateCollectionActionAndRefreshCM: (options: any) => {
60
+ run(): Promise<void>;
61
+ };
59
62
  export declare const useValuesFromRecord: (options: any) => {
60
63
  state: {};
61
64
  setState: (patch: Partial<{}> | ((prevState: {}) => Partial<{}>)) => void;
@@ -3,12 +3,14 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.useValuesFromRecord = exports.useValuesFromRA = exports.useUpdateViewAction = exports.useUpdateActionAndRefreshCM = exports.useUpdateAction = exports.useSortFields = exports.useResetFilterAction = exports.useMoveAction = exports.useKanbanEvents = exports.useFilterDataSource = exports.useFilterAction = exports.useDestroyActionAndRefreshCM = exports.useDestroyAction = exports.useCreateActionWithoutRefresh = exports.useCreateActionAndRefreshCM = exports.useCreateAction = exports.useCollectionFilterOptions = exports.useCancelAction = exports.useBulkDestroyActionAndRefreshCM = exports.useBulkDestroyAction = void 0;
6
+ exports.useValuesFromRecord = exports.useValuesFromRA = exports.useUpdateViewAction = exports.useUpdateCollectionActionAndRefreshCM = exports.useUpdateActionAndRefreshCM = exports.useUpdateAction = exports.useSortFields = exports.useResetFilterAction = exports.useMoveAction = exports.useKanbanEvents = exports.useFilterDataSource = exports.useFilterAction = exports.useDestroyActionAndRefreshCM = exports.useDestroyAction = exports.useCreateActionWithoutRefresh = exports.useCreateActionAndRefreshCM = exports.useCreateAction = exports.useCollectionFilterOptions = exports.useCancelAction = exports.useBulkDestroyActionAndRefreshCM = exports.useBulkDestroyAction = void 0;
7
7
 
8
8
  var _react = require("@formily/react");
9
9
 
10
10
  var _antd = require("antd");
11
11
 
12
+ var _omit = _interopRequireDefault(require("lodash/omit"));
13
+
12
14
  var _react2 = require("react");
13
15
 
14
16
  var _ = require(".");
@@ -21,6 +23,8 @@ var _schemaComponent = require("../schema-component");
21
23
 
22
24
  var _ResourceActionProvider = require("./ResourceActionProvider");
23
25
 
26
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
27
+
24
28
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
25
29
 
26
30
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -624,6 +628,63 @@ var useBulkDestroyAction = function useBulkDestroyAction() {
624
628
 
625
629
  exports.useBulkDestroyAction = useBulkDestroyAction;
626
630
 
631
+ var useUpdateCollectionActionAndRefreshCM = function useUpdateCollectionActionAndRefreshCM(options) {
632
+ var _useCollectionManager3 = (0, _.useCollectionManager)(),
633
+ refreshCM = _useCollectionManager3.refreshCM;
634
+
635
+ var form = (0, _react.useForm)();
636
+ var ctx = (0, _schemaComponent.useActionContext)();
637
+
638
+ var _useResourceActionCon8 = (0, _ResourceActionProvider.useResourceActionContext)(),
639
+ refresh = _useResourceActionCon8.refresh;
640
+
641
+ var _useResourceContext8 = (0, _ResourceActionProvider.useResourceContext)(),
642
+ resource = _useResourceContext8.resource,
643
+ targetKey = _useResourceContext8.targetKey;
644
+
645
+ var _useRecord4 = (0, _recordProvider.useRecord)(),
646
+ filterByTk = _useRecord4[targetKey];
647
+
648
+ return {
649
+ run: function run() {
650
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
651
+ return regeneratorRuntime.wrap(function _callee12$(_context12) {
652
+ while (1) {
653
+ switch (_context12.prev = _context12.next) {
654
+ case 0:
655
+ _context12.next = 2;
656
+ return form.submit();
657
+
658
+ case 2:
659
+ _context12.next = 4;
660
+ return resource.update({
661
+ filterByTk: filterByTk,
662
+ values: (0, _omit.default)(form.values, ['fields'])
663
+ });
664
+
665
+ case 4:
666
+ ctx.setVisible(false);
667
+ _context12.next = 7;
668
+ return form.reset();
669
+
670
+ case 7:
671
+ refresh();
672
+ _context12.next = 10;
673
+ return refreshCM();
674
+
675
+ case 10:
676
+ case "end":
677
+ return _context12.stop();
678
+ }
679
+ }
680
+ }, _callee12);
681
+ }))();
682
+ }
683
+ };
684
+ };
685
+
686
+ exports.useUpdateCollectionActionAndRefreshCM = useUpdateCollectionActionAndRefreshCM;
687
+
627
688
  var useValuesFromRecord = function useValuesFromRecord(options) {
628
689
  var record = (0, _recordProvider.useRecord)();
629
690
  var result = (0, _apiClient.useRequest)(function () {
@@ -659,29 +720,29 @@ var useCreateActionAndRefreshCM = function useCreateActionAndRefreshCM() {
659
720
  var _useCreateAction = useCreateAction(),
660
721
  _run3 = _useCreateAction.run;
661
722
 
662
- var _useCollectionManager3 = (0, _.useCollectionManager)(),
663
- refreshCM = _useCollectionManager3.refreshCM;
723
+ var _useCollectionManager4 = (0, _.useCollectionManager)(),
724
+ refreshCM = _useCollectionManager4.refreshCM;
664
725
 
665
726
  return {
666
727
  run: function run() {
667
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
668
- return regeneratorRuntime.wrap(function _callee12$(_context12) {
728
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
729
+ return regeneratorRuntime.wrap(function _callee13$(_context13) {
669
730
  while (1) {
670
- switch (_context12.prev = _context12.next) {
731
+ switch (_context13.prev = _context13.next) {
671
732
  case 0:
672
- _context12.next = 2;
733
+ _context13.next = 2;
673
734
  return _run3();
674
735
 
675
736
  case 2:
676
- _context12.next = 4;
737
+ _context13.next = 4;
677
738
  return refreshCM();
678
739
 
679
740
  case 4:
680
741
  case "end":
681
- return _context12.stop();
742
+ return _context13.stop();
682
743
  }
683
744
  }
684
- }, _callee12);
745
+ }, _callee13);
685
746
  }))();
686
747
  }
687
748
  };
@@ -693,29 +754,29 @@ var useUpdateActionAndRefreshCM = function useUpdateActionAndRefreshCM() {
693
754
  var _useUpdateAction = useUpdateAction(),
694
755
  _run4 = _useUpdateAction.run;
695
756
 
696
- var _useCollectionManager4 = (0, _.useCollectionManager)(),
697
- refreshCM = _useCollectionManager4.refreshCM;
757
+ var _useCollectionManager5 = (0, _.useCollectionManager)(),
758
+ refreshCM = _useCollectionManager5.refreshCM;
698
759
 
699
760
  return {
700
761
  run: function run() {
701
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
702
- return regeneratorRuntime.wrap(function _callee13$(_context13) {
762
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
763
+ return regeneratorRuntime.wrap(function _callee14$(_context14) {
703
764
  while (1) {
704
- switch (_context13.prev = _context13.next) {
765
+ switch (_context14.prev = _context14.next) {
705
766
  case 0:
706
- _context13.next = 2;
767
+ _context14.next = 2;
707
768
  return _run4();
708
769
 
709
770
  case 2:
710
- _context13.next = 4;
771
+ _context14.next = 4;
711
772
  return refreshCM();
712
773
 
713
774
  case 4:
714
775
  case "end":
715
- return _context13.stop();
776
+ return _context14.stop();
716
777
  }
717
778
  }
718
- }, _callee13);
779
+ }, _callee14);
719
780
  }))();
720
781
  }
721
782
  };
@@ -727,29 +788,29 @@ var useDestroyActionAndRefreshCM = function useDestroyActionAndRefreshCM() {
727
788
  var _useDestroyAction = useDestroyAction(),
728
789
  _run5 = _useDestroyAction.run;
729
790
 
730
- var _useCollectionManager5 = (0, _.useCollectionManager)(),
731
- refreshCM = _useCollectionManager5.refreshCM;
791
+ var _useCollectionManager6 = (0, _.useCollectionManager)(),
792
+ refreshCM = _useCollectionManager6.refreshCM;
732
793
 
733
794
  return {
734
795
  run: function run() {
735
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
736
- return regeneratorRuntime.wrap(function _callee14$(_context14) {
796
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
797
+ return regeneratorRuntime.wrap(function _callee15$(_context15) {
737
798
  while (1) {
738
- switch (_context14.prev = _context14.next) {
799
+ switch (_context15.prev = _context15.next) {
739
800
  case 0:
740
- _context14.next = 2;
801
+ _context15.next = 2;
741
802
  return _run5();
742
803
 
743
804
  case 2:
744
- _context14.next = 4;
805
+ _context15.next = 4;
745
806
  return refreshCM();
746
807
 
747
808
  case 4:
748
809
  case "end":
749
- return _context14.stop();
810
+ return _context15.stop();
750
811
  }
751
812
  }
752
- }, _callee14);
813
+ }, _callee15);
753
814
  }))();
754
815
  }
755
816
  };
@@ -761,29 +822,29 @@ var useBulkDestroyActionAndRefreshCM = function useBulkDestroyActionAndRefreshCM
761
822
  var _useBulkDestroyAction = useBulkDestroyAction(),
762
823
  _run6 = _useBulkDestroyAction.run;
763
824
 
764
- var _useCollectionManager6 = (0, _.useCollectionManager)(),
765
- refreshCM = _useCollectionManager6.refreshCM;
825
+ var _useCollectionManager7 = (0, _.useCollectionManager)(),
826
+ refreshCM = _useCollectionManager7.refreshCM;
766
827
 
767
828
  return {
768
829
  run: function run() {
769
- return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
770
- return regeneratorRuntime.wrap(function _callee15$(_context15) {
830
+ return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
831
+ return regeneratorRuntime.wrap(function _callee16$(_context16) {
771
832
  while (1) {
772
- switch (_context15.prev = _context15.next) {
833
+ switch (_context16.prev = _context16.next) {
773
834
  case 0:
774
- _context15.next = 2;
835
+ _context16.next = 2;
775
836
  return _run6();
776
837
 
777
838
  case 2:
778
- _context15.next = 4;
839
+ _context16.next = 4;
779
840
  return refreshCM();
780
841
 
781
842
  case 4:
782
843
  case "end":
783
- return _context15.stop();
844
+ return _context16.stop();
784
845
  }
785
846
  }
786
- }, _callee15);
847
+ }, _callee16);
787
848
  }))();
788
849
  }
789
850
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/client",
3
- "version": "0.7.4-alpha.4",
3
+ "version": "0.7.4-alpha.7",
4
4
  "license": "Apache-2.0",
5
5
  "licenses": [
6
6
  {
@@ -19,8 +19,8 @@
19
19
  "@formily/antd": "2.0.20",
20
20
  "@formily/core": "2.0.20",
21
21
  "@formily/react": "2.0.20",
22
- "@nocobase/sdk": "0.7.4-alpha.4",
23
- "@nocobase/utils": "0.7.4-alpha.4",
22
+ "@nocobase/sdk": "0.7.4-alpha.7",
23
+ "@nocobase/utils": "0.7.4-alpha.7",
24
24
  "ahooks": "^3.0.5",
25
25
  "antd": "~4.19.5",
26
26
  "axios": "^0.26.1",
@@ -55,5 +55,5 @@
55
55
  "@types/marked": "^4.0.1",
56
56
  "axios-mock-adapter": "^1.20.0"
57
57
  },
58
- "gitHead": "726c06b721b217a6aa5c1421b899d1315e552b57"
58
+ "gitHead": "77f22e6da464d19be111835316faf4b94cd80413"
59
59
  }