@nocobase/client 0.9.2-alpha.3 → 0.9.3-alpha.1

package/es/collection-manager/Configuration/CollectionFields.js

@@ -165,9 +165,8 @@ var CurrentFields = function CurrentFields(props) {
       type: 'checkbox',
       onChange: function onChange(selectedRowKeys) {
         setState(function (state) {
-          var result = [].concat(_toConsumableArray(state.selectedRowKeys || []), _toConsumableArray(selectedRowKeys));
           return _objectSpread(_objectSpread({}, state), {}, {
-            selectedRowKeys: result
+            selectedRowKeys: selectedRowKeys
           });
         });
       }

package/es/collection-manager/Configuration/EditCollectionAction.d.ts

@@ -1,17 +1,4 @@
-export declare const useValuesFromRecord: (options: any) => {
-    state: {};
-    setState: import("ahooks/lib/useSetState").SetState<{}>;
-    loading: boolean;
-    data?: any;
-    error?: Error;
-    params: any;
-    cancel: () => void;
-    refresh: () => void;
-    refreshAsync: () => Promise<any>;
-    run: (...params: any) => void;
-    runAsync: (...params: any) => Promise<any>;
-    mutate: (data?: any) => void;
-};
+export declare const useValuesFromRecord: (options: any) => any;
 export declare const useUpdateCollectionActionAndRefreshCM: (options: any) => {
     run(): Promise<void>;
 };

package/es/collection-manager/action-hooks.d.ts

@@ -1,20 +1,7 @@
 export declare const useCancelAction: () => {
     run(): Promise<void>;
 };
-export declare const useValuesFromRecord: (options: any) => {
-    state: {};
-    setState: import("ahooks/lib/useSetState").SetState<{}>;
-    loading: boolean;
-    data?: any;
-    error?: Error;
-    params: any;
-    cancel: () => void;
-    refresh: () => void;
-    refreshAsync: () => Promise<any>;
-    run: (...params: any) => void;
-    runAsync: (...params: any) => Promise<any>;
-    mutate: (data?: any) => void;
-};
+export declare const useValuesFromRecord: (options: any) => any;
 export declare const useResetFilterAction: () => {
     run(): Promise<void>;
 };
@@ -40,20 +27,7 @@ export declare const useChildrenCollections: (collectionName: string) => {
 }[];
 export declare const useCollectionFilterOptions: (collectionName: string) => any[];
 export declare const useLinkageCollectionFilterOptions: (collectionName: string) => any[];
-export declare const useFilterDataSource: (options: any) => {
-    state: {};
-    setState: import("ahooks/lib/useSetState").SetState<{}>;
-    loading: boolean;
-    data?: any;
-    error?: Error;
-    params: any;
-    cancel: () => void;
-    refresh: () => void;
-    refreshAsync: () => Promise<any>;
-    run: (...params: any) => void;
-    runAsync: (...params: any) => Promise<any>;
-    mutate: (data?: any) => void;
-};
+export declare const useFilterDataSource: (options: any) => any;
 export declare const useFilterAction: () => {
     run(): Promise<void>;
 };
@@ -76,22 +50,9 @@ export declare const useDestroyAction: () => {
     run(): Promise<void>;
 };
 export declare const useBulkDestroyAction: () => {
-    run(): Promise<void>;
-};
-export declare const useValuesFromRA: (options: any) => {
-    state: {};
-    setState: import("ahooks/lib/useSetState").SetState<{}>;
-    loading: boolean;
-    data?: any;
-    error?: Error;
-    params: any;
-    cancel: () => void;
-    refresh: () => void;
-    refreshAsync: () => Promise<any>;
-    run: (...params: any) => void;
-    runAsync: (...params: any) => Promise<any>;
-    mutate: (data?: any) => void;
+    run(): Promise<any>;
 };
+export declare const useValuesFromRA: (options: any) => any;
 export declare const useCreateActionAndRefreshCM: () => {
     run(): Promise<void>;
 };

package/es/collection-manager/action-hooks.js

@@ -20,6 +20,7 @@ import { useField, useForm } from '@formily/react';
 import { message } from 'antd';
 import omit from 'lodash/omit';
 import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionManager } from '.';
 import { useCompile } from '..';
 import { useRequest } from '../api-client';
@@ -220,9 +221,10 @@ export var useCollectionFilterOptions = function useCollectionFilterOptions(coll
   var options = getOptions(fields, 1);
   var compile = useCompile();
   var _useCollectionManager4 = useCollectionManager(),
-    getChildrenCollections = _useCollectionManager4.getChildrenCollections;
-  var collection = useCollection();
-  var childrenCollections = getChildrenCollections(collection.name);
+    getChildrenCollections = _useCollectionManager4.getChildrenCollections,
+    getCollection = _useCollectionManager4.getCollection;
+  var collection = getCollection(collectionName);
+  var childrenCollections = getChildrenCollections(collectionName);
   if (childrenCollections.length > 0 && !options.find(function (v) {
     return v.name == 'tableoid';
   })) {
@@ -233,7 +235,7 @@ export var useCollectionFilterOptions = function useCollectionFilterOptions(coll
       schema: {
         'x-component': 'Select',
         enum: [{
-          value: collection.name,
+          value: collectionName,
           label: compile(collection.title)
         }].concat(childrenCollections.map(function (v) {
           return {
@@ -581,22 +583,31 @@ export var useBulkDestroyAction = function useBulkDestroyAction() {
     refresh = _useResourceActionCon7.refresh;
   var _useResourceContext7 = useResourceContext(),
     resource = _useResourceContext7.resource;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        var _state$selectedRowKey;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context11.next = 2;
+              if (state === null || state === void 0 ? void 0 : (_state$selectedRowKey = state.selectedRowKeys) === null || _state$selectedRowKey === void 0 ? void 0 : _state$selectedRowKey.length) {
+                _context11.next = 2;
+                break;
+              }
+              return _context11.abrupt("return", message.error(t('Please select the records you want to delete')));
+            case 2:
+              _context11.next = 4;
               return resource.destroy({
                 filterByTk: (state === null || state === void 0 ? void 0 : state.selectedRowKeys) || []
               });
-            case 2:
+            case 4:
               setState === null || setState === void 0 ? void 0 : setState({
                 selectedRowKeys: []
               });
               refresh();
-            case 4:
+            case 6:
             case "end":
               return _context11.stop();
           }

package/es/collection-manager/interfaces/createdBy.js

@@ -21,7 +21,7 @@ export var createdBy = {
     uiSchema: {
       type: 'object',
       title: '{{t("Created by")}}',
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         fieldNames: {
           value: 'id',

package/es/collection-manager/interfaces/linkTo.js

@@ -5,8 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { uid } from '@formily/shared';
-import { cloneDeep } from 'lodash';
-import { defaultProps, recordPickerSelector, recordPickerViewer } from './properties';
+import { defaultProps } from './properties';
 export var linkTo = {
   name: 'linkTo',
   type: 'object',
@@ -20,7 +19,7 @@ export var linkTo = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -36,7 +35,7 @@ export var linkTo = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -59,41 +58,6 @@ export var linkTo = {
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    } else {
-      if (readPretty) {
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer)
-        };
-      } else {
-        schema['properties'] = {
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -180,5 +144,6 @@ export var linkTo = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/m2m.js

@@ -5,8 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { uid } from '@formily/shared';
-import { cloneDeep } from 'lodash';
-import { defaultProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
+import { defaultProps, relationshipType, reverseFieldProperties } from './properties';
 export var m2m = {
   name: 'm2m',
   type: 'object',
@@ -20,7 +19,7 @@ export var m2m = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -36,7 +35,7 @@ export var m2m = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -53,46 +52,13 @@ export var m2m = {
     var readPretty = _ref.readPretty,
       block = _ref.block,
       targetCollection = _ref.targetCollection;
+    schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -279,5 +245,6 @@ export var m2m = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/m2o.js

@@ -4,8 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { cloneDeep } from 'lodash';
-import { constraintsProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
 export var m2o = {
   name: 'm2o',
   type: 'object',
@@ -19,7 +18,7 @@ export var m2o = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -35,7 +34,7 @@ export var m2o = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -52,46 +51,13 @@ export var m2o = {
     var block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
+    schema['type'] = 'object';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -211,5 +177,6 @@ export var m2o = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/o2m.js

@@ -4,8 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { cloneDeep } from 'lodash';
-import { constraintsProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
 export var o2m = {
   name: 'o2m',
   type: 'object',
@@ -19,7 +18,7 @@ export var o2m = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -35,7 +34,7 @@ export var o2m = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -53,76 +52,13 @@ export var o2m = {
       block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
+    schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'TableField') {
-        var association = "".concat(field.collectionName, ".").concat(field.name);
-        schema['type'] = 'void';
-        schema['properties'] = {
-          block: {
-            type: 'void',
-            'x-decorator': 'TableFieldProvider',
-            'x-acl-action': "".concat(association, ":list"),
-            'x-decorator-props': {
-              collection: field.target,
-              association: association,
-              resource: association,
-              action: 'list',
-              params: {
-                paginate: false
-              },
-              showIndex: true,
-              dragSort: false,
-              fieldName: field.name
-            },
-            properties: _defineProperty({
-              actions: {
-                type: 'void',
-                'x-initializer': 'SubTableActionInitializers',
-                'x-component': 'TableField.ActionBar',
-                'x-component-props': {}
-              }
-            }, field.name, {
-              type: 'array',
-              'x-initializer': 'TableColumnInitializers',
-              'x-component': 'TableV2',
-              'x-component-props': {
-                rowSelection: {
-                  type: 'checkbox'
-                },
-                useProps: '{{ useTableFieldProps }}'
-              }
-            })
-          }
-        };
-      } else if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -269,5 +205,6 @@ export var o2m = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };